Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

🛠️ [v2.0] : Fixed Issue #1822 #1903

Open
wants to merge 3 commits into
base: 2.0
Choose a base branch
from
+7 −8
Open

🛠️ [v2.0] : Fixed Issue #1822 #1903

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ff5d65f
Fixed Issue #1822
amit-webkul Dec 27, 2024
0372668
Revert some changes
amit-webkul Dec 27, 2024
491a1d0
Revert some changes
amit-webkul Dec 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions packages/Webkul/Admin/src/Resources/views/activities/edit.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ class="primary-button"
<div class="flex gap-2.5 max-xl:flex-wrap">
<!-- Left sub-component -->
<div class="flex flex-1 flex-col gap-2 max-xl:flex-auto">
<div class="box-shadow rounded-lg border border-gray-200 bg-white p-4 dark:bg-gray-900 dark:border-gray-800">
<div class="box-shadow rounded-lg border border-gray-200 bg-white p-4 dark:border-gray-800 dark:bg-gray-900">
{!! view_render_event('admin.activities.edit.form_controls.before') !!}

<!-- Schedule Date -->
Expand Down Expand Up @@ -109,7 +109,7 @@ class="flex w-full rounded-md border px-3 py-2 text-sm text-gray-600 transition-
@lang('admin::app.activities.edit.participants')
</x-admin::form.control-group.label>

<!-- Participants Multilookup Vue Component -->
<!-- Participants Multi lookup Vue Component -->
<v-multi-lookup-component>
<div
class="relative rounded border border-gray-200 px-2 py-1 hover:border-gray-400 focus:border-gray-400 dark:border-gray-800 dark:hover:border-gray-400 dark:focus:border-gray-400"
Expand Down
10 changes: 5 additions & 5 deletions ...l/Admin/src/Resources/views/components/form/control-group/controls/inline/email.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,16 +30,16 @@ class="group relative !w-full pl-2.5"
:style="{ 'text-align': position }"
>
<span class="cursor-pointer truncate rounded">
@{{ valueLabel ? valueLabel : inputValue.map(item => `${item.value}(${item.label})`).join(', ').length > 20 ? inputValue.map(item => `${item.value}(${item.label})`).join(', ').substring(0, 20) + '...' : inputValue.map(item => `${item.value}(${item.label})`).join(', ') }}
@{{ valueLabel ? valueLabel : inputValue?.map(item => `${item.value}(${item.label})`).join(', ').length > 20 ? inputValue?.map(item => `${item.value}(${item.label})`).join(', ').substring(0, 20) + '...' : inputValue?.map(item => `${item.value}(${item.label})`).join(', ') }}
</span>

<!-- Tooltip -->
<div
class="absolute bottom-0 mb-5 hidden flex-col group-hover:flex"
v-if="inputValue.map(item => `${item.value}(${item.label})`).join(', ').length > 20"
v-if="inputValue?.map(item => `${item.value}(${item.label})`).join(', ').length > 20"
>
<span class="whitespace-no-wrap relative z-10 rounded-md bg-black px-4 py-2 text-xs leading-none text-white shadow-lg dark:bg-white dark:text-gray-900">
@{{ inputValue.map(item => `${item.value}(${item.label})`).join(', \n') }}
@{{ inputValue?.map(item => `${item.value}(${item.label})`).join(', \n') }}
</span>

<div class="-mt-2 ml-4 h-3 w-3 rotate-45 bg-black dark:bg-white"></div>
Expand Down Expand Up @@ -212,7 +212,7 @@ class="primary-button justify-center"
*/
value(newValue, oldValue) {
if (JSON.stringify(newValue) !== JSON.stringify(oldValue)) {
this.emails = newVal || [{'value': '', 'label': 'work'}];
this.emails = newValue || [{'value': '', 'label': 'work'}];
}
},
},
Expand Down Expand Up @@ -286,7 +286,7 @@ class="primary-button justify-center"
},

updateOrCreate(params) {
this.inputValue = params.contact_emails;
this.inputValue = params.emails || params.contact_emails || this.inputValue;

if (this.url) {
this.$axios.put(this.url, {
Expand Down
1 change: 0 additions & 1 deletion packages/Webkul/Admin/src/Resources/views/contacts/organizations/create.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ class="primary-button"
</div>
</div>

<!-- Left sub-component -->
<div class="box-shadow rounded-lg border border-gray-200 bg-white p-4 dark:border-gray-800 dark:bg-gray-900">
{!! view_render_event('admin.contacts.organizations.create.form_controls.before') !!}

Expand Down
Loading