Merge pull request bagisto#10516 from shivendra-webkul/issue_10512

Fixed issue bagisto#10512
devansh-webkul · Jan 30, 2025 · a437f67 · a437f67
2 parents b40f451 + c07c435
commit a437f67
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 5 deletions.
diff --git a/packages/Webkul/Admin/src/Config/system.php b/packages/Webkul/Admin/src/Config/system.php
@@ -1221,11 +1221,11 @@
                 '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',
                 'type'          => 'text',
+                'validation'    => 'phone',
                 'channel_based' => true,
             ], [
                 'name'          => 'bank_details',

diff --git a/packages/Webkul/Admin/src/Http/Requests/ConfigurationForm.php b/packages/Webkul/Admin/src/Http/Requests/ConfigurationForm.php
@@ -2,6 +2,9 @@
 
 namespace Webkul\Admin\Http\Requests;
 
+use Webkul\Core\Rules\Decimal;
+use Webkul\Core\Rules\PostCode;
+use Webkul\Core\Rules\PhoneNumber;
 use Illuminate\Foundation\Http\FormRequest;
 
 class ConfigurationForm extends FormRequest
@@ -31,13 +34,31 @@ public function rules()
 
                 // Check delete key exist in the request
                 if (! $this->has("{$key}.delete")) {
-                    $validation = isset($field['validation']) && $field['validation'] ? $field['validation'] : 'nullable';
-
-                    return [$key => $validation];
+                    return [$key => $this->getValidationRules($field['validation'] ?? 'nullable')];
                 }
 
                 return [];
             })->toArray();
         })->toArray();
     }
+
+    /**
+     * Transform validation rules into an array and map custom validation rules
+     *
+     * @param string|array $validation
+     * @return array
+     */
+    protected function getValidationRules($validation)
+    {
+        $validations = is_array($validation) ? $validation : explode('|', $validation);
+
+        return array_map(function ($rule) {
+            return match ($rule) {
+                'phone'    => new PhoneNumber(),
+                'postcode' => new PostCode(),
+                'decimal'  => new Decimal(),
+                default => $rule,
+            };
+        }, $validations);
+    }
 }
diff --git a/packages/Webkul/Core/src/SystemConfig/ItemField.php b/packages/Webkul/Core/src/SystemConfig/ItemField.php
@@ -12,7 +12,7 @@ class ItemField
      * @var array
      */
     protected $veeValidateMappings = [
-        'min'=> 'min_value',
+        'min' => 'min_value',
     ];
 
     /**