Resolved conflicts

Author: jitendra-webkul

README.md

@@ -28,7 +28,7 @@ a progressive Javascript framework.
 
 **We also have a forum for any type of concerns, feature requests, or discussions. Please visit: [Krayin CRM Forums](https://forums.krayincrm.com/)**
 
-# Visit our live [Demo](https://crm.bagisto.com)
+# Visit our live [Demo](https://demo.krayincrm.com)
 
 It packs in lots of features that will allow your E-Commerce business to scale in no time:
 

packages/Webkul/Admin/src/DataGrids/Lead/LeadDataGrid.php

@@ -11,8 +11,6 @@ class LeadDataGrid extends DataGrid
 
     protected $tabFilters = [];
 
-    protected $stagesMassActionOptions;
-
     protected $redirectRow = [
         "id"    => "id",
         "route" => "admin.leads.view",
@@ -161,6 +159,12 @@ public function prepareActions()
 
     public function prepareMassActions()
     {
+        $stages = [];
+
+        foreach (app("\Webkul\Lead\Repositories\StageRepository")->get(['id', 'name'])->toArray() as $stage) {
+            $stages[$stage['name']] = $stage['id'];
+        }
+
         $this->addMassAction([
             'type'   => 'delete',
             'label'  => trans('ui::app.datagrid.delete'),
@@ -173,7 +177,7 @@ public function prepareMassActions()
             'label'   => trans('admin::app.datagrid.update_stage'),
             'action'  => route('admin.leads.mass_update'),
             'method'  => 'PUT',
-            'options' => $this->stagesMassActionOptions,
+            'options' => $stages,
         ]);
     }
 }

packages/Webkul/Admin/src/DataGrids/Quote/QuoteDataGrid.php

@@ -44,6 +44,7 @@ public function prepareQueryBuilder()
 
         $this->addFilter('id', 'quotes.id');
         $this->addFilter('user', 'quotes.user_id');
+        $this->addFilter('user_name', 'quotes.user_id');
         $this->addFilter('person_name', 'persons.name');
 
         $this->setQueryBuilder($queryBuilder);

packages/Webkul/Admin/src/DataGrids/Setting/GroupDataGrid.php

@@ -18,7 +18,7 @@ public function prepareQueryBuilder()
             ->addSelect(
                 'groups.id',
                 'groups.name',
-                'groups.description',
+                'groups.description'
             );
 
         $this->setQueryBuilder($queryBuilder);

packages/Webkul/Admin/src/Resources/lang/en/app.php

@@ -375,7 +375,7 @@
                 'update-btn-title'  => 'Update Group',
                 'create-success'    => 'Group created successfully.',
                 'update-success'    => 'Group updated successfully.',
-                'delete-success'    => 'Group deleted successfully.',
+                'destroy-success'    => 'Group deleted successfully.',
                 'delete-failed'     => 'Group can not be deleted.',
                 'user-define-error' => 'Can not delete system group.',
             ],

packages/Webkul/Core/src/Config/concord.php

@@ -2,6 +2,7 @@
 
 return [
     'modules' => [
+        \Webkul\Activity\Providers\ModuleServiceProvider::class,
         \Webkul\Admin\Providers\ModuleServiceProvider::class,
         \Webkul\Attribute\Providers\ModuleServiceProvider::class,
         \Webkul\Contact\Providers\ModuleServiceProvider::class,

packages/Webkul/UI/publishable/assets/js/ui.js

@@ -1,5 +1,5 @@
 {
-    "/js/ui.js": "/js/ui.js?id=2ca0835dfe1f8da34c1a",
+    "/js/ui.js": "/js/ui.js?id=04e2fdebe8621c6953e2",
     "/css/ui.css": "/css/ui.css?id=58acb02c87af96127d4b",
     "/images/add-icon.svg": "/images/add-icon.svg?id=9135b4e0e1c239c36981",
     "/images/align-justify-icon.svg": "/images/align-justify-icon.svg?id=ee8d48e636b80417a884",

packages/Webkul/UI/publishable/assets/mix-manifest.json

@@ -72,7 +72,7 @@ private function filterCollection($collection, $info, $columnName, $type = "filt
                 switch ($condition) {
                     case 'in':
                         foreach (explode(',', $filter_value) as $value) {
-                            $collection->orWhere(
+                            $collection->where(
                                 $columnName,
                                 'like',
                                 "%$value%"

packages/Webkul/UI/src/DataGrid/Traits/DatagridCollection.php

@@ -242,6 +242,12 @@
                 }
 
                 this.makeURL();
+            },
+
+            '$store.state.tableData.columns': function (newValue, oldValue) {
+                if (newValue.length != oldValue.length) {
+                    this.updateFilterValue();
+                }
             }
         },
 
@@ -471,6 +477,7 @@
 
                     obj.column = key.replace(']', '').split('[')[0];
                     obj.cond = key.replace(']', '').split('[')[1];
+
                     obj.val = value;
 
                     if (obj?.column?.replaceAll) {
@@ -537,17 +544,17 @@
 
                     if (key == "sort") {
                         data.prettyValue = `${data.cond.replaceAll("_", " ")} - ${data.val}`;
-                    } else {
-                        if (data.cond == 'bw') {
-                            var timestamp = Date.parse(data.val.split(",")[0]);
+                    } else if (data.cond == 'bw') {
+                        var timestamp = Date.parse(data.val.split(",")[0]);
 
-                            if (isNaN(timestamp) == false) {
-                                data.prettyValue = `${data.val.replaceAll(",", " - ")}`;
-                            }
+                        if (isNaN(timestamp) == false) {
+                            data.prettyValue = `${data.val.replaceAll(",", " - ")}`;
                         }
                     }
 
                     this.filters.push(data);
+
+                    this.updateFilterValue();
                 }
 
                 this.makeURL();
@@ -659,6 +666,20 @@
                     }
                 }
             },
+
+            updateFilterValue: function () {
+                this.filters = this.filters.map(filter => {
+                    let column = this.$store.state.tableData.columns.find(column => column.index == filter.column);
+
+                    if (column?.filterable_options) {
+                        let value = filter.val.split(",");
+                        value = value.map(id => column.filterable_options.find(option => option.value == id).label);
+                        filter.prettyValue = value.join(",");
+                    }
+
+                    return filter;
+                });
+            }
         }
     };
 </script>