Merge branch '2.2'

devansh-webkul · Jan 21, 2025 · f9bc530 · f9bc530
2 parents b74d583 + a50a2a6
commit f9bc530
Show file tree

Hide file tree

Showing 22 changed files with 124 additions and 76 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/packages/Webkul/Admin/src/Config/system.php b/packages/Webkul/Admin/src/Config/system.php
@@ -1415,7 +1415,7 @@
                 'name'          => 'zipcode',
                 'title'         => 'admin::app.configuration.index.sales.shipping-setting.origin.zip',
                 'type'          => 'text',
-                'validation'    => 'required',
+                'validation'    => 'required|postcode',
                 'channel_based' => true,
                 'locale_based'  => true,
             ], [
@@ -1429,6 +1429,7 @@
                 'title'         => 'admin::app.configuration.index.sales.shipping-setting.origin.vat-number',
                 'type'          => 'text',
                 'channel_based' => true,
+                'validation'    => 'phone',
             ], [
                 'name'          => 'contact',
                 'title'         => 'admin::app.configuration.index.sales.shipping-setting.origin.contact-number',

diff --git a/packages/Webkul/Admin/src/Http/Requests/AddressRequest.php b/packages/Webkul/Admin/src/Http/Requests/AddressRequest.php
@@ -4,6 +4,7 @@
 
 use Illuminate\Foundation\Http\FormRequest;
 use Webkul\Core\Rules\PhoneNumber;
+use Webkul\Core\Rules\PostCode;
 use Webkul\Customer\Rules\VatIdRule;
 
 class AddressRequest extends FormRequest
@@ -33,7 +34,7 @@ public function rules()
             'country'         => ['required'],
             'state'           => ['required'],
             'city'            => ['required'],
-            'postcode'        => ['required', 'numeric'],
+            'postcode'        => ['required', new PostCode],
             'phone'           => ['required', new PhoneNumber],
             'vat_id'          => [new VatIdRule],
             'email'           => ['required'],

diff --git a/packages/Webkul/Admin/src/Http/Requests/CartAddressRequest.php b/packages/Webkul/Admin/src/Http/Requests/CartAddressRequest.php
@@ -4,6 +4,7 @@
 
 use Illuminate\Foundation\Http\FormRequest;
 use Webkul\Core\Rules\PhoneNumber;
+use Webkul\Core\Rules\PostCode;
 
 class CartAddressRequest extends FormRequest
 {
@@ -54,7 +55,7 @@ private function mergeAddressRules(string $addressType)
             "{$addressType}.city"         => ['required'],
             "{$addressType}.country"      => ['required'],
             "{$addressType}.state"        => ['required'],
-            "{$addressType}.postcode"     => ['required', 'numeric'],
+            "{$addressType}.postcode"     => ['required', new PostCode],
             "{$addressType}.phone"        => ['required', new PhoneNumber],
         ]);
     }

diff --git a/packages/Webkul/Admin/src/Http/Requests/InventorySourceRequest.php b/packages/Webkul/Admin/src/Http/Requests/InventorySourceRequest.php
@@ -6,6 +6,7 @@
 use Webkul\Core\Rules\Address;
 use Webkul\Core\Rules\Code;
 use Webkul\Core\Rules\PhoneNumber;
+use Webkul\Core\Rules\PostCode;
 
 class InventorySourceRequest extends FormRequest
 {
@@ -39,7 +40,7 @@ public function rules()
             'country'        => ['required'],
             'state'          => ['required'],
             'city'           => ['required'],
-            'postcode'       => ['required'],
+            'postcode'       => ['required', new PostCode],
         ];
     }
 }
diff --git a/packages/Webkul/Admin/src/Resources/assets/js/plugins/vee-validate.js b/packages/Webkul/Admin/src/Resources/assets/js/plugins/vee-validate.js
@@ -79,6 +79,18 @@ export default {
             return true;
         });
 
+        defineRule("postcode", (value) => {
+            if (! value || ! value.length) {
+                return true;
+            }
+
+            if (! /^[a-zA-Z0-9][a-zA-Z0-9\s-]*[a-zA-Z0-9]$/.test(value)) {
+                return false;
+            }
+
+            return true;
+        });
+
         defineRule("decimal", (value, { decimals = '*', separator = '.' } = {}) => {
             if (value === null || value === undefined || value === '') {
                 return true;

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
@@ -218,7 +218,7 @@ class="mb-2"
                             <x-admin::form.control-group.control
                                 type="text"
                                 name="postcode"
-                                rules="required|integer"
+                                rules="required|postcode"
                                 :label="trans('admin::app.customers.customers.view.address.create.post-code')"
                                 :placeholder="trans('admin::app.customers.customers.view.address.create.post-code')"
                             />

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
@@ -234,7 +234,7 @@ class="mb-2"
                                     type="text"
                                     name="postcode"
                                     ::value="address.postcode"
-                                    rules="required|integer"
+                                    rules="required|postcode"
                                     :label="trans('admin::app.customers.customers.view.address.edit.post-code')"
                                     :placeholder="trans('admin::app.customers.customers.view.address.edit.post-code')"
                                 />

diff --git a/packages/Webkul/Admin/src/Resources/views/sales/orders/create/cart/address/form.blade.php b/packages/Webkul/Admin/src/Resources/views/sales/orders/create/cart/address/form.blade.php
@@ -256,7 +256,7 @@ class="mb-2"
                     type="text"
                     ::name="controlName + '.postcode'"
                     ::value="address.postcode"
-                    rules="{{ core()->isPostCodeRequired() ? 'required' : '' }}"
+                    rules="{{ core()->isPostCodeRequired() ? 'required' : '' }}|postcode"
                     :label="trans('admin::app.sales.orders.create.cart.address.postcode')"
                     :placeholder="trans('admin::app.sales.orders.create.cart.address.postcode')"
                 />

diff --git a/packages/Webkul/Admin/src/Resources/views/settings/inventory-sources/create.blade.php b/packages/Webkul/Admin/src/Resources/views/settings/inventory-sources/create.blade.php
@@ -444,7 +444,7 @@ class="!mb-0 text-gray-600 dark:text-gray-300"
                         type="text"
                         id="postcode"
                         name="postcode"
-                        rules="required"
+                        rules="required|postcode"
                         :value="old('postcode')"
                         :label="trans('admin::app.settings.inventory-sources.create.postcode')"
                         :placeholder="trans('admin::app.settings.inventory-sources.create.postcode')"

diff --git a/packages/Webkul/Admin/src/Resources/views/settings/inventory-sources/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/settings/inventory-sources/edit.blade.php
@@ -443,7 +443,7 @@ class="text-gray-600 dark:text-gray-300"
                         type="text"
                         id="postcode"
                         name="postcode"
-                        rules="required"
+                        rules="required|postcode"
                         :value="old('postcode') ?? $inventorySource->postcode"
                         :label="trans('admin::app.settings.inventory-sources.edit.postcode')"
                         :placeholder="trans('admin::app.settings.inventory-sources.edit.postcode')"

diff --git a/packages/Webkul/Core/src/Rules/PostCode.php b/packages/Webkul/Core/src/Rules/PostCode.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace Webkul\Core\Rules;
+
+use Closure;
+use Illuminate\Contracts\Validation\ValidationRule;
+
+class PostCode implements ValidationRule
+{
+    /**
+     * Run the validation rule.
+     */
+    public function validate(string $attribute, mixed $value, Closure $fail): void
+    {
+        if (! preg_match('/^[a-zA-Z0-9][a-zA-Z0-9\s-]*[a-zA-Z0-9]$/', $value)) {
+            $fail('core::validation.postcode')->translate();
+        }
+    }
+}
diff --git a/packages/Webkul/Shop/src/Http/Requests/Customer/AddressRequest.php b/packages/Webkul/Shop/src/Http/Requests/Customer/AddressRequest.php
@@ -4,6 +4,7 @@
 
 use Illuminate\Foundation\Http\FormRequest;
 use Webkul\Core\Rules\PhoneNumber;
+use Webkul\Core\Rules\PostCode;
 use Webkul\Customer\Rules\VatIdRule;
 
 class AddressRequest extends FormRequest
@@ -33,7 +34,7 @@ public function rules()
             'country'      => core()->isCountryRequired() ? ['required'] : ['nullable'],
             'state'        => core()->isStateRequired() ? ['required'] : ['nullable'],
             'city'         => ['required', 'string'],
-            'postcode'     => core()->isPostCodeRequired() ? ['required', 'numeric'] : ['numeric'],
+            'postcode'     => core()->isPostCodeRequired() ? ['required', new PostCode] : [new PostCode],
             'phone'        => ['required', new PhoneNumber],
             'vat_id'       => [new VatIdRule],
             'email'        => ['required'],

diff --git a/packages/Webkul/Shop/src/Resources/assets/js/plugins/vee-validate.js b/packages/Webkul/Shop/src/Resources/assets/js/plugins/vee-validate.js
@@ -79,6 +79,18 @@ export default {
             return true;
         });
 
+        defineRule("postcode", (value) => {
+            if (! value || ! value.length) {
+                return true;
+            }
+
+            if (! /^[a-zA-Z0-9][a-zA-Z0-9\s-]*[a-zA-Z0-9]$/.test(value)) {
+                return false;
+            }
+
+            return true;
+        });
+
         defineRule(
             "decimal",
             (value, { decimals = "*", separator = "." } = {}) => {

diff --git a/packages/Webkul/Shop/src/Resources/views/checkout/cart/summary/estimate-shipping.blade.php b/packages/Webkul/Shop/src/Resources/views/checkout/cart/summary/estimate-shipping.blade.php
@@ -113,7 +113,7 @@ class="overflow-hidden rounded-xl border max-md:rounded-lg max-md:!border-none m
                     <x-shop::form.control-group.control
                         type="text"
                         name="postcode"
-                        rules="{{ core()->isPostCodeRequired() ? 'required' : '' }}"
+                        rules="{{ core()->isPostCodeRequired() ? 'required' : '' }}|postcode"
                         :label="trans('shop::app.checkout.cart.summary.estimate-shipping.postcode')"
                         :placeholder="trans('shop::app.checkout.cart.summary.estimate-shipping.postcode')"
                     />

diff --git a/packages/Webkul/Shop/src/Resources/views/checkout/onepage/address/form.blade.php b/packages/Webkul/Shop/src/Resources/views/checkout/onepage/address/form.blade.php
@@ -241,7 +241,7 @@ class="mb-2"
                         type="text"
                         ::name="controlName + '.postcode'"
                         ::value="address.postcode"
-                        rules="{{ core()->isPostCodeRequired() ? 'required' : '' }}"
+                        rules="{{ core()->isPostCodeRequired() ? 'required' : '' }}|postcode"
                         :label="trans('shop::app.checkout.onepage.address.postcode')"
                         :placeholder="trans('shop::app.checkout.onepage.address.postcode')"
                     />