Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixed customer datagrid issue and phone validation #9746

Merged
merged 9 commits into from
May 14, 2024
Merged

Fixed customer datagrid issue and phone validation #9746

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
1e473ce
Fixed customer datagrid issue and phone validation
shivendra-webkul May 1, 2024
a696089
Merge remote-tracking branch 'upstream/master' into custpmer-datagrid
shivendra-webkul May 2, 2024
a92500a
Fix inventory source name filter in OrderShipmentsDataGrid.php
shivendra-webkul May 2, 2024
077e12a
resolved conflicts
shivendra-webkul May 2, 2024
6230076
Merge remote-tracking branch 'upstream/master' into custpmer-datagrid
shivendra-webkul May 2, 2024
80fb32f
fixed customer view review datagrid
shivendra-webkul May 2, 2024
25e7264
Merge branch 'master' into custpmer-datagrid
shivendra-webkul May 13, 2024
3665d68
Merge remote-tracking branch 'upstream/master' into custpmer-datagrid
shivendra-webkul May 14, 2024
9bdc6e8
Resolved conflicts
shivendra-webkul May 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/Webkul/Admin/src/Resources/views/customers/customers/index.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ class="primary-button"

<x-admin::datagrid
:src="route('admin.customers.customers.index')"
ref="customer_data"
ref="customerDatagrid"
:isMultiRow="true"
>
@php
Expand Down
2 changes: 1 addition & 1 deletion packages/Webkul/Admin/src/Resources/views/customers/customers/index/create.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')"
/>
Expand Down
2 changes: 1 addition & 1 deletion packages/Webkul/Admin/src/Resources/views/customers/customers/view/address/create.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')"
/>
Expand Down
2 changes: 1 addition & 1 deletion packages/Webkul/Admin/src/Resources/views/customers/customers/view/address/edit.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')"
/>
Expand Down
2 changes: 1 addition & 1 deletion packages/Webkul/Admin/src/Resources/views/customers/customers/view/edit.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')"
/>
Expand Down
2 changes: 1 addition & 1 deletion packages/Webkul/Shop/src/Resources/views/customers/account/addresses/create.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.phone')"
:placeholder="trans('shop::app.customers.account.addresses.phone')"
Expand Down
2 changes: 1 addition & 1 deletion packages/Webkul/Shop/src/Resources/views/customers/account/addresses/edit.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.phone')"
:placeholder="trans('shop::app.customers.account.addresses.phone')"
Expand Down
1 change: 1 addition & 0 deletions packages/Webkul/Shop/src/Resources/views/home/contact-us.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')"
Expand Down
1 change: 1 addition & 0 deletions public/themes/admin/default/build/assets/app-0b224ae0.css
View file
Open in desktop

Large diffs are not rendered by default.

69 changes: 69 additions & 0 deletions public/themes/admin/default/build/assets/app-878daf20.js
View file
Open in desktop

Large diffs are not rendered by default.

69 changes: 0 additions & 69 deletions public/themes/admin/default/build/assets/app-bfd7cb4f.js
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion public/themes/admin/default/build/assets/app-dcf78157.css
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions public/themes/admin/default/build/manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"src/Resources/assets/css/app.css": {
"file": "assets/app-dcf78157.css",
"file": "assets/app-0b224ae0.css",
"isEntry": true,
"src": "src/Resources/assets/css/app.css"
},
Expand Down Expand Up @@ -172,7 +172,7 @@
"css": [
"assets/app-c04ede37.css"
],
"file": "assets/app-bfd7cb4f.js",
"file": "assets/app-878daf20.js",
"isEntry": true,
"src": "src/Resources/assets/js/app.js"
},
Expand Down