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

Author: amit-webkul

packages/Webkul/Admin/src/Resources/views/products/create.blade.php

@@ -60,8 +60,7 @@ class="primary-button"
                         <x-admin::attributes
                             :custom-attributes="app('Webkul\Attribute\Repositories\AttributeRepository')->findWhere([
                                 'entity_type' => 'products',
-                                ['code', 'NOTIN', ['price']],
-                                ['code' , '!=', 'quantity']
+                                ['code', 'NOTIN', ['price', 'quantity']],
                             ])"
                         />
 
@@ -92,8 +91,7 @@ class="primary-button"
                             <x-admin::attributes
                                 :custom-attributes="app('Webkul\Attribute\Repositories\AttributeRepository')->findWhere([
                                     'entity_type' => 'products',
-                                    ['code', 'IN', ['price']],
-                                    ['code' , '!=', 'quantity']
+                                    ['code', 'IN', ['price', 'quantity']],
                                 ])"
                             />
 

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

@@ -58,8 +58,7 @@ class="primary-button"
                         <x-admin::attributes
                             :custom-attributes="app('Webkul\Attribute\Repositories\AttributeRepository')->findWhere([
                                 'entity_type' => 'products',
-                                ['code', 'NOTIN', ['price']],
-                                ['code' , '!=', 'quantity']
+                                ['code', 'NOTIN', ['price', 'quantity']],
                             ])"
                             :entity="$product"
                         />
@@ -91,8 +90,7 @@ class="primary-button"
                             <x-admin::attributes
                                 :custom-attributes="app('Webkul\Attribute\Repositories\AttributeRepository')->findWhere([
                                     'entity_type' => 'products',
-                                    ['code', 'IN', ['price']],
-                                    ['code' , '!=', 'quantity']
+                                    ['code', 'IN', ['price', 'quantity']],
                                 ])"
                                 :entity="$product"
                             />

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.