Merge pull request #2266 from suraj-webkul/issue#2170

issue #2170 fixed.

Author: VikassWebkul214254

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

@@ -8,6 +8,8 @@
         :validations="'{{ $validations }}'"
         :value="{{ json_encode($lookUpEntityData)}}"
         can-add-new="{{ $canAddNew ?? false }}"
+        @lookup-added="handleLookupAdded"
+        @lookup-removed="handleLookupRemoved"
     >
         <div class="relative inline-block w-full">
             <!-- Input Container -->
@@ -152,6 +154,8 @@ class="cursor-pointer border-t border-gray-800 px-4 py-2 text-gray-500 hover:bg-
 
             props: ['validations', 'isDisabled', 'attribute', 'value', 'canAddNew'],
 
+            emits: ['lookup-added', 'lookup-removed'],
+
             data() {
                 return {
                     showPopup: false,

packages/Webkul/Admin/src/Resources/views/contacts/persons/create.blade.php

@@ -5,7 +5,7 @@
     </x-slot>
 
     {!! view_render_event('admin.persons.create.form.before') !!}
-    
+
     <!--Create Page Form -->
     <x-admin::form
         :action="route('admin.contacts.persons.store')"
@@ -43,13 +43,14 @@ class="primary-button"
                     </div>
                 </div>
             </div>
-            
+
             <!-- Form fields -->
             <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.persons.create.form_controls.before') !!}
 
                 <x-admin::attributes
                     :custom-attributes="app('Webkul\Attribute\Repositories\AttributeRepository')->findWhere([
+                        ['code', 'NOTIN', ['organization_id']],
                         'entity_type' => 'persons',
                     ])"
                     :custom-validations="[
@@ -62,11 +63,55 @@ class="primary-button"
                         ],
                     ]"
                 />
-                
+
+                <v-organization></v-organization>
+
                 {!! view_render_event('admin.persons.create.form_controls.after') !!}
             </div>
         </div>
     </x-admin::form>
 
     {!! view_render_event('admin.persons.create.form.after') !!}
+
+    @pushOnce('scripts')
+        <script
+            type="text/x-template"
+            id="v-organization-template"
+        >
+            <div>
+                <x-admin::attributes
+                    :custom-attributes="app('Webkul\Attribute\Repositories\AttributeRepository')->findWhere([
+                        ['code', 'IN', ['organization_id']],
+                        'entity_type' => 'persons',
+                    ])"
+                />
+
+                <template v-if="organizationName">
+                    <x-admin::form.control-group.control
+                        type="hidden"
+                        name="organization_name"
+                        v-model="organizationName"
+                    />
+                </template>
+            </div>
+        </script>
+
+        <script type="module">
+            app.component('v-organization', {
+                template: '#v-organization-template',
+
+                data() {
+                    return {
+                        organizationName: null,
+                    };
+                },
+
+                methods: {
+                    handleLookupAdded(event) {
+                        this.organizationName = event?.name || null;
+                    },
+                },
+            });
+        </script>
+    @endPushOnce
 </x-admin::layouts>

packages/Webkul/Admin/src/Resources/views/contacts/persons/edit.blade.php

@@ -17,8 +17,8 @@
                 <div class="flex flex-col gap-2">
                     {!! view_render_event('admin.persons.edit.breadcrumbs.before') !!}
 
-                    <x-admin::breadcrumbs 
-                        name="contacts.persons.edit" 
+                    <x-admin::breadcrumbs
+                        name="contacts.persons.edit"
                         :entity="$person"
                     />
 
@@ -51,6 +51,7 @@ class="primary-button"
 
                 <x-admin::attributes
                     :custom-attributes="app('Webkul\Attribute\Repositories\AttributeRepository')->findWhere([
+                        ['code', 'NOTIN', ['organization_id']],
                         'entity_type' => 'persons',
                     ])"
                     :custom-validations="[
@@ -64,11 +65,56 @@ class="primary-button"
                     ]"
                     :entity="$person"
                 />
-                
+
+                <v-organization></v-organization>
+
                 {!! view_render_event('admin.contacts.persons.edit.form_controls.after') !!}
             </div>
         </div>
     </x-admin::form>
 
     {!! view_render_event('admin.persons.edit.form.after') !!}
+
+    @pushOnce('scripts')
+        <script
+            type="text/x-template"
+            id="v-organization-template"
+        >
+            <div>
+                <x-admin::attributes
+                    :custom-attributes="app('Webkul\Attribute\Repositories\AttributeRepository')->findWhere([
+                        ['code', 'IN', ['organization_id']],
+                        'entity_type' => 'persons',
+                    ])"
+                    :entity="$person"
+                />
+
+                <template v-if="organizationName">
+                    <x-admin::form.control-group.control
+                        type="hidden"
+                        name="organization_name"
+                        v-model="organizationName"
+                    />
+                </template>
+            </div>
+        </script>
+
+        <script type="module">
+            app.component('v-organization', {
+                template: '#v-organization-template',
+
+                data() {
+                    return {
+                        organizationName: null,
+                    };
+                },
+
+                methods: {
+                    handleLookupAdded(event) {
+                        this.organizationName = event?.name || null;
+                    },
+                },
+            });
+        </script>
+    @endPushOnce
 </x-admin::layouts>