issues fixes #320 #288 #309

packages/Webkul/Admin/src/DataGrids/CustomerDataGrid.php

@@ -106,7 +106,12 @@ class CustomerDataGrid
                     'alias' => 'CustomerGroupName',
                     'type' => 'string',
                     'label' => 'Group Name',
-                ]
+                ], [
+                    'column' => 'CONCAT(first_name, " ", last_name)',
+                    'alias' => 'Name',
+                    'type' => 'string',
+                    'label' => 'Name',
+                ],
             ],
 
             //don't use aliasing in case of searchables

packages/Webkul/Admin/src/DataGrids/OrderDataGrid.php

@@ -133,6 +133,11 @@ class OrderDataGrid
                     'alias' => 'createdat',
                     'type' => 'datetime',
                     'label' => 'Order Date',
+                ], [
+                    'column' => 'CONCAT(or.customer_first_name, " ", or.customer_last_name)',
+                    'alias' => 'oafirstname',
+                    'type' => 'string',
+                    'label' => 'Billed To',
                 ],
             ],
 

packages/Webkul/Admin/src/DataGrids/OrderInvoicesDataGrid.php

@@ -101,6 +101,21 @@ class OrderInvoicesDataGrid
                     'alias' => 'invid',
                     'type' => 'number',
                     'label' => 'ID',
+                ], [
+                    'column' => 'inv.order_id',
+                    'alias' => 'invorderid',
+                    'type' => 'number',
+                    'label' => 'Order ID',
+                ], [
+                    'column' => 'inv.state',
+                    'alias' => 'invstate',
+                    'type' => 'string',
+                    'label' => 'State',
+                ], [
+                    'column' => 'inv.grand_total',
+                    'alias' => 'invgrandtotal',
+                    'type' => 'number',
+                    'label' => 'Amount',
                 ], [
                     'column' => 'inv.created_at',
                     'alias' => 'invcreated_at',

packages/Webkul/Admin/src/Http/Controllers/Customer/CustomerController.php

@@ -116,7 +116,7 @@ class CustomerController extends Controller
 
         $this->customer->create($data);
 
-        session()->flash('success', 'Customer created successfully.');
+        session()->flash('success', trans('admin::app.customers.customers.created'));
 
         return redirect()->route($this->_config['redirect']);
     }
@@ -159,7 +159,7 @@ class CustomerController extends Controller
 
         $this->customer->update(request()->all(),$id);
 
-        session()->flash('success', 'Customer updated successfully.');
+        session()->flash('success', trans('admin::app.customers.customers.updated'));
 
         return redirect()->route($this->_config['redirect']);
     }
@@ -174,7 +174,7 @@ class CustomerController extends Controller
     {
         $this->customer->delete($id);
 
-        session()->flash('success', 'Customer deleted successfully.');
+        session()->flash('success', trans('admin::app.customers.customers.deleted'));
 
         return redirect()->back();
     }

packages/Webkul/Admin/src/Http/Controllers/Customer/CustomerGroupController.php

@@ -81,7 +81,7 @@ class CustomerGroupController extends Controller
 
         $this->customerGroup->create($data);
 
-        session()->flash('success', 'Customer Group created successfully.');
+        session()->flash('success', trans('admin::app.customers.customers.group-created'));
 
         return redirect()->route($this->_config['redirect']);
     }
@@ -114,7 +114,7 @@ class CustomerGroupController extends Controller
 
         $this->customerGroup->update(request()->all(),$id);
 
-        session()->flash('success', 'Customer Group updated successfully.');
+        session()->flash('success', trans('admin::app.customers.customers.group-updated'));
 
         return redirect()->route($this->_config['redirect']);
     }
@@ -130,9 +130,9 @@ class CustomerGroupController extends Controller
         $group = $this->customerGroup->findOneByField('id', $id);
 
         if($group->is_user_defined == 0) {
-            session()->flash('warning', 'Cannot delete the default group');
+            session()->flash('warning', trans('admin::app.customers.customers.group-default'));
         } else {
-            session()->flash('success', 'Customer Group deleted successfully');
+            session()->flash('success', trans('admin::app.customers.customers.group-deleted'));
 
             $this->customerGroup->delete($id);
         }

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

@@ -574,7 +574,14 @@ return [
             'select-state' => 'Select a region, state or province.',
             'country' => 'Country',
             'male' => 'Male',
-            'female' => 'Female'
+            'female' => 'Female',
+            'created' => 'Customer created successfully.',
+            'updated' => 'Customer updated successfully.',
+            'deleted' => 'Customer deleted successfully.',
+            'group-created' => 'Customer Group created successfully.',
+            'group-updated' => 'Customer Group updated successfully.',
+            'group-deleted' => 'Customer Group deleted successfully.',
+            'group-default' => 'Cannot delete the default group.',
         ],
         'reviews' => [
             'title' => 'Reviews',

packages/Webkul/Attribute/src/Http/Controllers/AttributeFamilyController.php

@@ -169,7 +169,7 @@ class AttributeFamilyController extends Controller
             }
 
             if (!$suppressFlash)
-                session()->flash('success', trans('admin::app.datagrid.mass-ops.delete-success'));
+                session()->flash('success', ('admin::app.datagrid.mass-ops.delete-success'));
             else
                 session()->flash('info', trans('admin::app.datagrid.mass-ops.partial-action', ['resource' => 'Attribute Family']));
 

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

@@ -1,10 +1,4 @@
 {
-<<<<<<< HEAD
     "/js/shop.js": "/js/shop.js?id=0e3e1ea03fe1f7358aaa",
-    "/css/shop.css": "/css/shop.css?id=d6b0cd4b3af8277a77b1"
+    "/css/shop.css": "/css/shop.css?id=4bdb6dfb99c5788a9dc4"
 }
-=======
-    "/js/shop.js": "/js/shop.js?id=dc2ea56a854d779e7089",
-    "/css/shop.css": "/css/shop.css?id=7aa91d217344fc8f4f53"
-}
->>>>>>> 4e89ce082ea6e0282b569e4928016771b99a8f56

packages/Webkul/Shop/src/Resources/views/products/index.blade.php

@@ -94,7 +94,7 @@
             function sortFilter() {
                 var className = document.getElementById(this.id).className;
 
-                if(className === 'icon sort-icon') {
+                if (className === 'icon sort-icon') {
                     sort.classList.remove("sort-icon");
                     sort.classList.add("icon-menu-close-adj");
 

packages/Webkul/Ui/src/DataGrid/DataGrid.php

@@ -591,19 +591,28 @@ class DataGrid
                     if($count_keys==1)
                     $this->query->where(function ($query) use ($parsed) {
                         foreach ($this->searchable as $search) {
+                            if (strpos($search['column'], 'CONCAT') !== false) {
+                                $query->orWhere(DB::raw($search['column']), 'like', '%'.$parsed['search']['all'].'%');
+                            } else {
                                 $query->orWhere($search['column'], 'like', '%'.$parsed['search']['all'].'%');
                             }
+                        }
                     });
                 } else {
                     $column_name = $this->findAlias($key);
                     if (array_keys($value)[0]=="like" || array_keys($value)[0]=="nlike") {
                         foreach ($value as $condition => $filter_value) {
+                            if (strpos($column_name, 'CONCAT') !== false) {
+                                $this->query->orWhere(DB::raw($column_name), $this->operators[$condition],
+                                '%'.$filter_value.'%');
+                            } else {
                                 $this->query->where(
                                     $column_name,
                                     $this->operators[$condition],
                                     '%'.$filter_value.'%'
                                 );
                             }
+                        }
                     } else {
                         foreach ($value as $condition => $filter_value) {
                             if($column_type == 'datetime') {
@@ -612,6 +621,10 @@ class DataGrid
                                     $this->operators[$condition],
                                     $filter_value
                                 );
+                            } else {
+                                if (strpos($column_name, 'CONCAT') !== false) {
+                                    $this->query->orWhere(DB::raw($column_name), $this->operators[$condition],
+                                    $filter_value);
                                 } else {
                                     $this->query->where(
                                         $column_name,
@@ -623,6 +636,7 @@ class DataGrid
                         }
                     }
                 }
+            }
         } else {
             //this is the case for the non aliasing.
             foreach ($parsed as $key => $value) {
@@ -646,8 +660,12 @@ class DataGrid
                     if($count_keys==1)
                     $this->query->where(function ($query) use ($parsed) {
                         foreach ($this->searchable as $search) {
+                            if (strpos($search['column'], 'CONCAT') !== false) {
+                                $query->orWhere(DB::raw($search['column']), 'like', '%'.$parsed['search']['all'].'%');
+                            } else {
                                 $query->orWhere($search['column'], 'like', '%'.$parsed['search']['all'].'%');
                             }
+                        }
                     });
                     else
                         throw new \Exception('Multiple Search keys Found, Please Resolve the URL Manually.');
@@ -659,12 +677,17 @@ class DataGrid
 
                     if (array_keys($value)[0]=="like" || array_keys($value)[0]=="nlike") {
                         foreach ($value as $condition => $filter_value) {
+                            if (strpos($column_name, 'CONCAT') !== false) {
+                                $this->query->orWhere(DB::raw($column_name), $this->operators[$condition],
+                                '%'.$filter_value.'%');
+                            } else {
                                 $this->query->where(
                                     $column_name,
                                     $this->operators[$condition],
                                     '%'.$filter_value.'%'
                                 );
                             }
+                        }
                     } else {
                         foreach ($value as $condition => $filter_value) {
                             if($column_type == 'datetime') {
@@ -673,6 +696,10 @@ class DataGrid
                                     $this->operators[$condition],
                                     $filter_value
                                 );
+                            } else {
+                                if (strpos($column_name, 'CONCAT') !== false) {
+                                    $this->query->orWhere(DB::raw($column_name), $this->operators[$condition],
+                                    $filter_value);
                                 } else {
                                     $this->query->where(
                                         $column_name,
@@ -684,6 +711,7 @@ class DataGrid
                         }
                     }
                 }
+            }
 
         }
     }

packages/Webkul/Ui/src/Resources/views/datagrid/index.blade.php

@@ -46,14 +46,12 @@
 
                 $('.search-btn').click(function() {
                     search_value = $("#search-field").val();
-                    alert(search_value);
                     formURL('search', 'all', search_value, params);  //format for search
                 });
 
                 $(".search-field").on('keyup', function (e) {
                     if (e.keyCode == 13) {
                         search_value = $("#search-field").val();
-                        alert(search_value);
                         formURL('search', 'all', search_value, params);  //format for search
                     }
                 });

public/installer/Classes/vendor/bin/composer/.htaccess

@@ -0,0 +1 @@
+Deny from all

public/installer/Classes/vendor/bin/composer/cache/.htaccess

@@ -0,0 +1 @@
+Deny from all