Improved lookup attribute type

jitendra-webkul · jitendra-webkul · commit e19dfbcb1e4e · 2021-07-30T21:27:37.000+05:30
diff --git a/packages/Webkul/Admin/src/Config/attribute_lookups.php b/packages/Webkul/Admin/src/Config/attribute_lookups.php
@@ -1,18 +1,19 @@
 <?php
 
 return [
-    'organizations' => [
-        'name'         => 'Organization',
-        'repository'   => 'Webkul\Contact\Repositories\OrganizationRepository',
+    'leads' => [
+        'name'         => 'Leads',
+        'repository'   => 'Webkul\Lead\Repositories\LeadRepository',
+        'label_column' => 'title',
     ],
 
     'lead_sources' => [
-        'name'         => 'Lead Source',
+        'name'         => 'Lead Sources',
         'repository'   => 'Webkul\Lead\Repositories\SourceRepository',
     ],
 
     'lead_types' => [
-        'name'         => 'Lead Type',
+        'name'         => 'Lead Types',
         'repository'   => 'Webkul\Lead\Repositories\TypeRepository',
     ],
 
@@ -22,15 +23,20 @@
     ],
 
     'lead_stages' => [
-        'name'         => 'Lead Stage',
+        'name'         => 'Lead Stages',
         'repository'   => 'Webkul\Lead\Repositories\StageRepository',
     ],
 
     'users' => [
-        'name'         => 'Sales Owner',
+        'name'         => 'Sales Owners',
         'repository'   => 'Webkul\User\Repositories\UserRepository',
     ],
 
+    'organizations' => [
+        'name'         => 'Organizations',
+        'repository'   => 'Webkul\Contact\Repositories\OrganizationRepository',
+    ],
+
     'persons' => [
         'name'         => 'Persons',
         'repository'   => 'Webkul\Contact\Repositories\PersonRepository',
diff --git a/packages/Webkul/Admin/src/Config/datagrid_filters.php b/packages/Webkul/Admin/src/Config/datagrid_filters.php
@@ -11,22 +11,18 @@
                     'name'      => 'admin::app.leads.all',
                     'isActive'  => true,
                     'key'       => 'all',
-                ], [
-                    'name'      => 'admin::app.leads.note',
-                    'isActive'  => false,
-                    'key'       => 'note',
                 ], [
                     'name'      => 'admin::app.leads.call',
                     'isActive'  => false,
                     'key'       => 'call',
-                ], [
-                    'name'      => 'admin::app.leads.email',
-                    'isActive'  => false,
-                    'key'       => 'email',
                 ], [
                     'name'      => 'admin::app.leads.meeting',
                     'isActive'  => false,
                     'key'       => 'meeting',
+                ], [
+                    'name'      => 'admin::app.leads.lunch',
+                    'isActive'  => false,
+                    'key'       => 'lunch',
                 ]
             ]
         ], [
diff --git a/packages/Webkul/Admin/src/Http/Controllers/Setting/AttributeController.php b/packages/Webkul/Admin/src/Http/Controllers/Setting/AttributeController.php
@@ -155,12 +155,12 @@ public function destroy($id)
     /**
      * Search attribute lookup results
      *
-     * @param  int  $id
+     * @param  string  $lookup
      * @return \Illuminate\Http\Response
      */
-    public function search($id)
+    public function lookup($lookup)
     {
-        $results = $this->attributeRepository->getLookUpOptions($id, request()->input('query'));
+        $results = $this->attributeRepository->getLookUpOptions($lookup, request()->input('query'));
 
         return response()->json($results);
     }
diff --git a/packages/Webkul/Admin/src/Http/routes.php b/packages/Webkul/Admin/src/Http/routes.php
@@ -281,7 +281,7 @@
 
                     Route::put('edit/{id}', 'AttributeController@update')->name('admin.settings.attributes.update');
                     
-                    Route::get('lookup/{id?}', 'AttributeController@search')->name('admin.settings.attributes.lookup');
+                    Route::get('lookup/{lookup?}', 'AttributeController@lookup')->name('admin.settings.attributes.lookup');
 
                     Route::delete('{id}', 'AttributeController@destroy')->name('admin.settings.attributes.delete');
 
diff --git a/packages/Webkul/Admin/src/Resources/views/activities/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/activities/edit.blade.php
@@ -90,12 +90,13 @@
                                 </div>
                             </div>
         
+
                             @include ('admin::common.custom-attributes.edit.multi-lookup')
         
                             <div class="form-group">
                                 <label for="participants">{{ __('admin::app.activities.participants') }}</label>
         
-                                <multi-lookup-component :attribute="{'id': 20, 'code': 'participants[]', 'name': 'Participants'}" :data='@json($activity->participants)'></multi-lookup-component>
+                                <multi-lookup-component :attribute="{'lookup_type': 'users', 'code': 'participants[]', 'name': 'Participants'}" :data='@json($activity->participants)'></multi-lookup-component>
                             </div>
 
                             {!! view_render_event('admin.activities.edit.form_controls.after', ['activity' => $activity]) !!}
diff --git a/packages/Webkul/Admin/src/Resources/views/common/custom-attributes/edit/checkbox.blade.php b/packages/Webkul/Admin/src/Resources/views/common/custom-attributes/edit/checkbox.blade.php
@@ -2,7 +2,7 @@
 
     @php
         $options = $attribute->lookup_type
-            ? app('Webkul\Attribute\Repositories\AttributeRepository')->getLookUpOptions($attribute->id)
+            ? app('Webkul\Attribute\Repositories\AttributeRepository')->getLookUpOptions($attribute->lookup_type)
             : $attribute->options()->orderBy('sort_order')->get();
 
         $selectedOption = old($attribute->code) ?: $value;
diff --git a/packages/Webkul/Admin/src/Resources/views/common/custom-attributes/edit/lookup.blade.php b/packages/Webkul/Admin/src/Resources/views/common/custom-attributes/edit/lookup.blade.php
@@ -1,7 +1,7 @@
 @if (isset($attribute))
     @php
         $lookUpEntityData = app('Webkul\Attribute\Repositories\AttributeRepository')
-            ->getLookUpEntity($attribute->code, old($attribute->code) ?: $value);
+            ->getLookUpEntity($attribute->lookup_type, old($attribute->code) ?: $value);
     @endphp
 
     <lookup-component :attribute='@json($attribute)' :validations="'{{$validations}}'" :data='@json($lookUpEntityData)'></lookup-component>
@@ -55,7 +55,7 @@
 
                         results: [],
 
-                        search_route: this.searchRoute ?? `{{ route('admin.settings.attributes.lookup') }}/${this.attribute.id}`,
+                        search_route: this.searchRoute ?? `{{ route('admin.settings.attributes.lookup') }}/${this.attribute.lookup_type}`,
                     }
                 },
 
diff --git a/packages/Webkul/Admin/src/Resources/views/common/custom-attributes/edit/lookup.blade1.php b/packages/Webkul/Admin/src/Resources/views/common/custom-attributes/edit/lookup.blade1.php
@@ -75,7 +75,7 @@
 
                     var self = this;
                     
-                    this.$http.get("{{ route('admin.settings.attributes.lookup', $attribute->id) }}", {params: {query: this.search_term}})
+                    this.$http.get("{{ route('admin.settings.attributes.lookup', $attribute->lookup_type) }}", {params: {query: this.search_term}})
                         .then (function(response) {
                             self.results = response.data;
 
diff --git a/packages/Webkul/Admin/src/Resources/views/common/custom-attributes/edit/multi-lookup.blade.php b/packages/Webkul/Admin/src/Resources/views/common/custom-attributes/edit/multi-lookup.blade.php
@@ -1,7 +1,7 @@
 @if (isset($attribute))
     @php
         $lookUpEntityData = app('Webkul\Attribute\Repositories\AttributeRepository')
-            ->getLookUpEntity($attribute->code, old($attribute->code) ?: $value);
+            ->getLookUpEntity($attribute->lookup_type, old($attribute->code) ?: $value);
     @endphp
 
     <multi-lookup-component :attribute='@json($attribute)' :validations="'{{$validations}}'" :data='@json($lookUpEntityData)'></multi-lookup-component>
@@ -60,7 +60,7 @@
 
                         results: [],
 
-                        search_route: this.searchRoute ?? `{{ route('admin.settings.attributes.lookup') }}/${this.attribute.id}`,
+                        search_route: this.searchRoute ?? `{{ route('admin.settings.attributes.lookup') }}/${this.attribute.lookup_type}`,
                     }
                 },
 
diff --git a/packages/Webkul/Admin/src/Resources/views/common/custom-attributes/edit/multiselect.blade.php b/packages/Webkul/Admin/src/Resources/views/common/custom-attributes/edit/multiselect.blade.php
@@ -2,7 +2,7 @@
 
     @php
         $options = $attribute->lookup_type
-            ? app('Webkul\Attribute\Repositories\AttributeRepository')->getLookUpOptions($attribute->id)
+            ? app('Webkul\Attribute\Repositories\AttributeRepository')->getLookUpOptions($attribute->lookup_type)
             : $attribute->options()->orderBy('sort_order')->get();
 
         $selectedOption = old($attribute->code) ?: $value;
diff --git a/packages/Webkul/Admin/src/Resources/views/common/custom-attributes/edit/select.blade.php b/packages/Webkul/Admin/src/Resources/views/common/custom-attributes/edit/select.blade.php
@@ -2,7 +2,7 @@
 
     @php
         $options = $attribute->lookup_type
-            ? app('Webkul\Attribute\Repositories\AttributeRepository')->getLookUpOptions($attribute->id)
+            ? app('Webkul\Attribute\Repositories\AttributeRepository')->getLookUpOptions($attribute->lookup_type)
             : $attribute->options()->orderBy('sort_order')->get();
 
         $selectedOption = old($attribute->code) ?: $value;
diff --git a/packages/Webkul/Admin/src/Resources/views/common/custom-attributes/edit/tags.blade.php b/packages/Webkul/Admin/src/Resources/views/common/custom-attributes/edit/tags.blade.php
@@ -52,7 +52,7 @@
 
                         is_searching: false,
 
-                        search_route: this.searchRoute ? this.searchRoute : "{{ route('admin.settings.attributes.lookup') }}" + this.attribute['id'],
+                        search_route: this.searchRoute ? this.searchRoute : "{{ route('admin.settings.attributes.lookup') }}" + this.attribute['lookup_type'],
                     }
                 },
 
diff --git a/packages/Webkul/Admin/src/Resources/views/common/custom-attributes/view/checkbox.blade.php b/packages/Webkul/Admin/src/Resources/views/common/custom-attributes/view/checkbox.blade.php
@@ -1,6 +1,6 @@
 @php
     $options = $attribute->lookup_type
-        ? app('Webkul\Attribute\Repositories\AttributeRepository')->getLookUpEntity($attribute->code, explode(',', $value))
+        ? app('Webkul\Attribute\Repositories\AttributeRepository')->getLookUpEntity($attribute->lookup_type, explode(',', $value))
         : $attribute->options()->where('id', $value)->get();
 @endphp
 
diff --git a/packages/Webkul/Admin/src/Resources/views/common/custom-attributes/view/lookup.blade.php b/packages/Webkul/Admin/src/Resources/views/common/custom-attributes/view/lookup.blade.php
@@ -1,5 +1,5 @@
 @php
-    $lookUpEntity = app('Webkul\Attribute\Repositories\AttributeRepository')->getLookUpEntity($attribute->code, $value);
+    $lookUpEntity = app('Webkul\Attribute\Repositories\AttributeRepository')->getLookUpEntity($attribute->lookup_type, $value);
 @endphp
 
 {{ $lookUpEntity ? $lookUpEntity->name : __('admin::app.common.not-available') }}
diff --git a/packages/Webkul/Admin/src/Resources/views/common/custom-attributes/view/multiselect.blade.php b/packages/Webkul/Admin/src/Resources/views/common/custom-attributes/view/multiselect.blade.php
@@ -1,6 +1,6 @@
 @php
     $options = $attribute->lookup_type
-        ? app('Webkul\Attribute\Repositories\AttributeRepository')->getLookUpEntity($attribute->code, explode(',', $value))
+        ? app('Webkul\Attribute\Repositories\AttributeRepository')->getLookUpEntity($attribute->lookup_type, explode(',', $value))
         : $attribute->options()->where('id', $value)->get();
 @endphp
 
diff --git a/packages/Webkul/Admin/src/Resources/views/common/custom-attributes/view/select.blade.php b/packages/Webkul/Admin/src/Resources/views/common/custom-attributes/view/select.blade.php
@@ -1,6 +1,6 @@
 @php
     $option = $attribute->lookup_type
-        ? app('Webkul\Attribute\Repositories\AttributeRepository')->getLookUpEntity($attribute->code, $value)
+        ? app('Webkul\Attribute\Repositories\AttributeRepository')->getLookUpEntity($attribute->lookup_type, $value)
         : $attribute->options()->where('id', $value)->first();
 @endphp
 
diff --git a/packages/Webkul/Admin/src/Resources/views/settings/attributes/create.blade.php b/packages/Webkul/Admin/src/Resources/views/settings/attributes/create.blade.php
@@ -182,7 +182,7 @@ class="list-group-item"
     <script type="text/x-template" id="entity-type-template">
         <div>
             <label :for="name" :class="required == 'true' ? 'required' : ''">
-                {{ __('admin::app.settings.attributes.entity_type') }}
+                {{ __('admin::app.settings.attributes.lookup') }}
             </label>
 
             <select class="control" :id="name" :name="name">
@@ -246,7 +246,7 @@ class="list-group-item"
 
             data: function() {
                 return {
-                    lookupEntityTypes: @json(config('attribute_entity_types')),
+                    lookupEntityTypes: @json(config('attribute_lookups')),
                 }
             },
         });
diff --git a/packages/Webkul/Admin/src/Resources/views/settings/attributes/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/settings/attributes/edit.blade.php
@@ -230,7 +230,7 @@ class="list-group-item"
     <script type="text/x-template" id="entity-type-template">
         <div>
             <label :for="name" :class="required == 'true' ? 'required' : ''">
-                {{ __('admin::app.settings.attributes.entity_type') }}
+                {{ __('admin::app.settings.attributes.lookup') }}
             </label>
 
             <select class="control" :id="name" :name="name" :value="value" :disabled="disabled == 'true'">
@@ -280,7 +280,7 @@ class="list-group-item"
 
             data: function() {
                 return {
-                    lookupEntityTypes: @json(config('attribute_entity_types')),
+                    lookupEntityTypes: @json(config('attribute_lookups')),
                 }
             },
         });
diff --git a/packages/Webkul/Attribute/src/Repositories/AttributeRepository.php b/packages/Webkul/Attribute/src/Repositories/AttributeRepository.php
@@ -124,40 +124,46 @@ public function getAttributeByCode($code)
     }
 
     /**
-     * @param  integer  $id
+     * @param  integer  $lookup
      * @param  string  $query
      * @return array
      */
-    public function getLookUpOptions($id, $query = '')
+    public function getLookUpOptions($lookup, $query = '')
     {
-        $attribute = $this->findOrFail($id);
-
-        $lookup = config('attribute_lookups.' . $attribute->lookup_type);
+        $lookup = config('attribute_lookups.' . $lookup);
 
         return app($lookup['repository'])->findWhere([
-            ['name', 'like', '%' . urldecode($query) . '%']
+            [$lookup['label_column'] ?? 'name', 'like', '%' . urldecode($query) . '%']
+        ], [
+            ($lookup['value_column'] ?? 'id') . ' as id' , ($lookup['label_column'] ?? 'name') . ' as name'
         ]);
     }
 
     /**
-     * @param  string  $code
+     * @param  string  $lookup
      * @param  integer|array  $entityId
      * @return mixed
      */
-    public function getLookUpEntity($code, $entityId)
+    public function getLookUpEntity($lookup, $entityId)
     {
         if (! $entityId) {
             return;
         }
 
-        $attribute = $this->getAttributeByCode($code);
-
-        $lookUp = config('attribute_lookups.' . $attribute->lookup_type);
+        $lookup = config('attribute_lookups.' . $lookup);
 
         if (is_array($entityId)) {
-            return app($lookUp['repository'])->findWhereIn('id', $entityId);
+            return app($lookup['repository'])->findWhereIn(
+                'id',
+                $entityId,
+                [
+                    ($lookup['value_column'] ?? 'id' . ' as id') , ($lookup['label_column'] ?? 'name') . ' as name'
+                ]
+            );
         } else {
-            return app($lookUp['repository'])->find($entityId);
+            return app($lookup['repository'])->find($entityId, [
+                ($lookup['value_column'] ?? 'id') . ' as id' , ($lookup['label_column'] ?? 'name') . ' as name'
+            ]);
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -155,12 +155,12 @@ public function destroy($id)`
`155`	`155`	`/**`
`156`	`156`	`* Search attribute lookup results`
`157`	`157`	`*`
`158`		`- * @param int $id`
	`158`	`+ * @param string $lookup`
`159`	`159`	`* @return \Illuminate\Http\Response`
`160`	`160`	`*/`
`161`		`- public function search($id)`
	`161`	`+ public function lookup($lookup)`
`162`	`162`	`{`
`163`		`- $results = $this->attributeRepository->getLookUpOptions($id, request()->input('query'));`
	`163`	`+ $results = $this->attributeRepository->getLookUpOptions($lookup, request()->input('query'));`
`164`	`164`
`165`	`165`	`return response()->json($results);`
`166`	`166`	`}`