Merge pull request #9746 from shivendra-webkul/custpmer-datagrid

Fixed customer datagrid issue and phone validation
bagisto · May 14, 2024 · d55c8ba · d55c8ba
2 parents a6bc4f2 + 9bdc6e8
commit d55c8ba
Show file tree

Hide file tree

Showing 16 changed files with 83 additions and 83 deletions.
diff --git a/packages/Webkul/Admin/src/DataGrids/Sales/OrderShipmentsDataGrid.php b/packages/Webkul/Admin/src/DataGrids/Sales/OrderShipmentsDataGrid.php
@@ -42,10 +42,10 @@ public function prepareQueryBuilder()
         $this->addFilter('shipment_id', 'shipments.id');
         $this->addFilter('shipment_order_id', 'ors.increment_id');
         $this->addFilter('shipment_total_qty', 'shipments.total_qty');
-        // $this->addFilter('inventory_source_name', DB::raw('IF(' . DB::getTablePrefix() . 'shipments.inventory_source_id IS NOT NULL,' . DB::getTablePrefix() . 'is.name, ' . DB::getTablePrefix() . 'shipments.inventory_source_name)'));
+        $this->addFilter('inventory_source_name', DB::raw('IF('.DB::getTablePrefix().'shipments.inventory_source_id IS NOT NULL,'.DB::getTablePrefix().'is.name, '.DB::getTablePrefix().'shipments.inventory_source_name)'));
         $this->addFilter('order_date', 'ors.created_at');
         $this->addFilter('shipment_created_at', 'shipments.created_at');
-        // $this->addFilter('shipped_to', DB::raw('CONCAT(' . DB::getTablePrefix() . 'order_address_shipping.first_name, " ", ' . DB::getTablePrefix() . 'order_address_shipping.last_name)'));
+        $this->addFilter('shipped_to', DB::raw('CONCAT('.DB::getTablePrefix().'order_address_shipping.first_name, " ", '.DB::getTablePrefix().'order_address_shipping.last_name)'));
 
         return $queryBuilder;
     }

diff --git a/packages/Webkul/Admin/src/Resources/views/customers/customers/index.blade.php b/packages/Webkul/Admin/src/Resources/views/customers/customers/index.blade.php
@@ -41,7 +41,7 @@ class="primary-button"
 
     <x-admin::datagrid
         :src="route('admin.customers.customers.index')"
-        ref="customer_data"
+        ref="customerDatagrid"
         :isMultiRow="true"
     >
         @php 

diff --git a/packages/Webkul/Admin/src/Resources/views/customers/customers/index/create.blade.php b/packages/Webkul/Admin/src/Resources/views/customers/customers/index/create.blade.php
@@ -87,7 +87,7 @@
                                 type="text"
                                 id="phone"
                                 name="phone"
-                                rules="integer"
+                                rules="phone"
                                 :label="trans('admin::app.customers.customers.index.create.contact-number')"
                                 :placeholder="trans('admin::app.customers.customers.index.create.contact-number')"
                             />

diff --git a/packages/Webkul/Admin/src/Resources/views/customers/customers/view/address/create.blade.php b/packages/Webkul/Admin/src/Resources/views/customers/customers/view/address/create.blade.php
@@ -268,7 +268,7 @@ class="mb-2"
                                 <x-admin::form.control-group.control
                                     type="text"
                                     name="phone"
-                                    rules="required|integer"
+                                    rules="required|phone"
                                     :label="trans('admin::app.customers.customers.view.address.create.phone')"
                                     :placeholder="trans('admin::app.customers.customers.view.address.create.phone')"
                                 />

diff --git a/packages/Webkul/Admin/src/Resources/views/customers/customers/view/address/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/customers/customers/view/address/edit.blade.php
@@ -289,7 +289,7 @@ class="mb-2"
                                         type="text"
                                         name="phone"
                                         ::value="address.phone"
-                                        rules="required|integer"
+                                        rules="required|phone"
                                         :label="trans('admin::app.customers.customers.view.address.edit.phone')"
                                         :placeholder="trans('admin::app.customers.customers.view.address.edit.phone')"
                                     />

diff --git a/packages/Webkul/Admin/src/Resources/views/customers/customers/view/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/customers/customers/view/edit.blade.php
@@ -114,7 +114,7 @@ class="flex cursor-pointer items-center justify-between gap-1.5 px-2.5 text-blue
                                     name="phone"
                                     ::value="customer.phone"
                                     id="phone"
-                                    rules="integer"
+                                    rules="phone"
                                     :label="trans('admin::app.customers.customers.view.edit.contact-number')"
                                     :placeholder="trans('admin::app.customers.customers.view.edit.contact-number')"
                                 />

diff --git a/packages/Webkul/Admin/src/Resources/views/customers/customers/view/reviews.blade.php b/packages/Webkul/Admin/src/Resources/views/customers/customers/view/reviews.blade.php
@@ -74,7 +74,7 @@ class="align-text-bottom text-base text-gray-800 dark:text-white ltr:ml-1.5 rtl:
             <template v-else>
                 <div 
                     v-if="available.meta.total"
-                    class="grid gap-y-4 border-b p-4 pt-0 transition-all hover:bg-gray-50 dark:border-gray-800 dark:hover:bg-gray-950"
+                    class="grid gap-y-4 border-b p-4 transition-all hover:bg-gray-50 dark:border-gray-800 dark:hover:bg-gray-950"
                     v-for="record in available.records"
                 >
                     <div class="flex justify-start [&amp;>*]:flex-1">

diff --git a/packages/Webkul/Shop/src/Resources/views/customers/account/addresses/create.blade.php b/packages/Webkul/Shop/src/Resources/views/customers/account/addresses/create.blade.php
@@ -284,7 +284,7 @@ class="mb-2"
                         <x-shop::form.control-group.control
                             type="text"
                             name="phone"
-                            rules="required|integer"
+                            rules="required|phone"
                             :value="old('phone')"
                             :label="trans('shop::app.customers.account.addresses.create.phone')"
                             :placeholder="trans('shop::app.customers.account.addresses.create.phone')"

diff --git a/packages/Webkul/Shop/src/Resources/views/customers/account/addresses/edit.blade.php b/packages/Webkul/Shop/src/Resources/views/customers/account/addresses/edit.blade.php
@@ -292,7 +292,7 @@ class="mb-2"
                     <x-shop::form.control-group.control
                         type="text"
                         name="phone"
-                        rules="required|integer"
+                        rules="required|phone"
                         :value="old('phone') ?? $address->phone"
                         :label="trans('shop::app.customers.account.addresses.edit.phone')"
                         :placeholder="trans('shop::app.customers.account.addresses.edit.phone')"

diff --git a/packages/Webkul/Shop/src/Resources/views/home/contact-us.blade.php b/packages/Webkul/Shop/src/Resources/views/home/contact-us.blade.php
@@ -71,6 +71,7 @@ class="px-6 py-5"
                             type="text"
                             class="px-6 py-5"
                             name="contact"
+                            rules="phone"
                             :value="old('contact')"
                             :label="trans('shop::app.home.contact.phone-number')"
                             :placeholder="trans('shop::app.home.contact.phone-number')"

diff --git a/public/themes/admin/default/build/assets/app-25c0197d.js b/public/themes/admin/default/build/assets/app-25c0197d.js
diff --git a/public/themes/admin/default/build/assets/app-2766b45c.css b/public/themes/admin/default/build/assets/app-2766b45c.css
diff --git a/public/themes/admin/default/build/assets/app-878daf20.js b/public/themes/admin/default/build/assets/app-878daf20.js
diff --git a/...min/default/build/assets/app-a475c0fa.css → ...min/default/build/assets/app-911536a8.css b/...min/default/build/assets/app-a475c0fa.css → ...min/default/build/assets/app-911536a8.css
diff --git a/public/themes/admin/default/build/assets/app-d119ac0a.css b/public/themes/admin/default/build/assets/app-d119ac0a.css
diff --git a/public/themes/admin/default/build/manifest.json b/public/themes/admin/default/build/manifest.json
@@ -1,6 +1,6 @@
 {
   "src/Resources/assets/css/app.css": {
-    "file": "assets/app-2766b45c.css",
+    "file": "assets/app-911536a8.css",
     "isEntry": true,
     "src": "src/Resources/assets/css/app.css"
   },
@@ -172,7 +172,7 @@
     "css": [
       "assets/app-c04ede37.css"
     ],
-    "file": "assets/app-25c0197d.js",
+    "file": "assets/app-878daf20.js",
     "isEntry": true,
     "src": "src/Resources/assets/js/app.js"
   },