Merge remote-tracking branch 'origin/2.0' into lead

Author: amit-webkul

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

@@ -139,43 +139,31 @@ class="px-4 py-2 text-center text-gray-500"
                 };
             },
 
-            mounted() {
-                this.initializeValue();
-
-                window.addEventListener('click', this.handleFocusOut);
-            },
-
             watch: {
-                value: {
-                    deep: true,
-
-                    handler() {
-                        this.initializeValue();
-                    },
-                },
-
                 searchTerm(newVal, oldVal) {
                     this.search();
                 },
+
+                value(newVal, oldVal) {
+                    if (newVal) {
+                        this.getLookUpEntity();
+                    }
+                },
+            },
+
+            mounted() {
+                if (this.value) {
+                    this.getLookUpEntity();
+                }
+
+                window.addEventListener('click', this.handleFocusOut);
             },
 
             beforeDestroy() {
                 window.removeEventListener('click', this.handleFocusOut);
             },
 
             methods: {
-                initializeValue() {
-                    if (this.value) {
-                        if (this.value.id && this.value.name) {
-                            this.entityId = this.value.id;
-
-                            this.selectedItem = this.value.name;
-                        } else if (this.value.id) {
-                            this.getLookUpEntity(this.value.id);
-                        }
-                    }
-                },
-
                 toggle() {
                     this.showPopup = ! this.showPopup;
 

packages/Webkul/Contact/src/Repositories/PersonRepository.php

@@ -74,13 +74,9 @@ public function create(array $data)
      */
     public function update(array $data, $id, $attributes = [])
     {
-        $data['user_id'] = $data['user_id'] ?? null;
+        $data['user_id'] = empty($data['user_id']) ? null : $data['user_id'];
 
-        $person = $this->find($id);
-
-        $data['organization_id'] = $data['organization_id'] ?? $person->organization_id;
-
-        $person->update($data);
+        $person = parent::update($data, $id);
 
         /**
          * If attributes are provided then only save the provided attributes and return.