fix: qoutes issues

Author: devansh-webkul

packages/Webkul/Admin/src/Resources/views/components/attributes/edit/lookup.blade.php

@@ -76,21 +76,13 @@ class="text-2xl text-gray-600"
             </div>
 
             <!-- Hidden Input Entity Value -->
-            <template v-if="attribute['code'].includes('organization_id') && ! selectedItem.id">
-                <input
-                    type="hidden"
-                    :name="attribute['code'].replace('organization_id', 'organization_name')"
-                    v-model="selectedItem.name"
-                />
-            </template>
-
-            <template v-else>
-                <input
-                    type="hidden"
-                    :name="attribute['code']"
-                    v-model="selectedItem.id"
-                />
-            </template>
+            <x-admin::form.control-group.control
+                type="hidden"
+                ::name="attribute['code']"
+                v-model="selectedItem.id"
+                ::rules="validations"
+                ::label="attribute['name']"
+            />
 
             <!-- Popup Box -->
             <div
@@ -175,6 +167,8 @@ class="cursor-pointer border-t border-gray-800 px-4 py-2 text-gray-500 hover:bg-
 
                     searchRoute: `{{ route('admin.settings.attributes.lookup') }}/${this.attribute.lookup_type}`,
 
+                    lookupEntityRoute: `{{ route('admin.settings.attributes.lookup_entity') }}/${this.attribute.lookup_type}`,
+
                     isSearching: false,
                 };
             },
@@ -191,19 +185,6 @@ class="cursor-pointer border-t border-gray-800 px-4 py-2 text-gray-500 hover:bg-
                 searchTerm(newVal, oldVal) {
                     this.search();
                 },
-
-                value(newVal, oldVal) {
-                    if (newVal === undefined) {
-                        this.selectedItem = {
-                            id: '',
-                            name: ''
-                        };
-                    }
-
-                    if (newVal) {
-                        this.getLookUpEntity();
-                    }
-                },
             },
 
             computed: {
@@ -256,13 +237,16 @@ class="cursor-pointer border-t border-gray-800 px-4 py-2 text-gray-500 hover:bg-
                 },
 
                 getLookUpEntity() {
-                    this.$axios.get(this.searchRoute, {
-                            params: { query: this.value?.name ?? ""}
+                    this.$axios.get(this.lookupEntityRoute, {
+                            params: { query: this.value?.id ?? ""}
                         })
                         .then (response => {
-                            const [result] = response.data;
-
-                            this.selectedItem = result;
+                            this.selectedItem = Object.keys(response.data).length
+                                ? response.data
+                                : {
+                                    id: '',
+                                    name: ''
+                                };
                         })
                         .catch (error => {});
                 },
@@ -274,7 +258,7 @@ class="cursor-pointer border-t border-gray-800 px-4 py-2 text-gray-500 hover:bg-
 
                     this.searchTerm = '';
 
-                    this.$emit('lookup-added', result);
+                    this.$emit('lookup-added', this.selectedItem);
                 },
 
                 handleFocusOut(e) {
@@ -294,7 +278,7 @@ class="cursor-pointer border-t border-gray-800 px-4 py-2 text-gray-500 hover:bg-
                         name: ''
                     };
 
-                    this.$emit('lookup-removed');
+                    this.$emit('lookup-removed', this.selectedItem);
                 },
             },
         });

packages/Webkul/Admin/src/Resources/views/leads/common/contact.blade.php

@@ -32,7 +32,6 @@
                 name="person[name]"
                 v-model="person.name"
                 v-if="person.name"
-                rules="required"
             />
 
             <x-admin::form.control-group.error control-name="person[id]" />
@@ -87,6 +86,7 @@
             <x-admin::attributes.edit.lookup />
 
             <v-lookup-component
+                :key="person.organization?.id"
                 :attribute='@json($organizationAttribute)'
                 :value="person.organization"
                 :is-disabled="person?.id ? true : false"

packages/Webkul/Admin/src/Resources/views/quotes/edit.blade.php

@@ -110,7 +110,6 @@ class="flex flex-col gap-4"
                                 :entity="$quote"
                             />
 
-
                             <x-admin::attributes
                                 :custom-attributes="app('Webkul\Attribute\Repositories\AttributeRepository')->findWhere([
                                         'entity_type' => 'quotes',
@@ -173,9 +172,11 @@ class="flex flex-col gap-4"
                                     </x-admin::form.control-group.label>
 
                                     <v-lookup-component
+                                        :key="leadEntity.id"
                                         :attribute="{'code': 'lead_id', 'name': 'Lead', 'lookup_type': 'leads'}"
-                                        :value='@json($lookUpEntityData)'
+                                        :value="leadEntity"
                                         can-add-new="true"
+                                        @lookup-removed="setLeadEntity"
                                     ></v-lookup-component>
                                 </x-admin::form.control-group>
                             </div>
@@ -566,6 +567,8 @@ class="icon-delete cursor-pointer text-2xl"
                             { id: 'address-info', label: '@lang('admin::app.quotes.create.address-info')' },
                             { id: 'quote-items', label: '@lang('admin::app.quotes.create.quote-items')' }
                         ],
+
+                        leadEntity: @json($lookUpEntityData ?? []),
                     };
                 },
 
@@ -584,6 +587,10 @@ class="icon-delete cursor-pointer text-2xl"
                             section.scrollIntoView({ behavior: 'smooth' });
                         }
                     },
+
+                    setLeadEntity($event) {
+                        this.leadEntity = $event;
+                    },
                 },
             });