Fixed Issue #1784

krayin · Dec 27, 2024 · 1597371 · 1597371
1 parent 1f90616
commit 1597371
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 13 deletions.
diff --git a/packages/Webkul/Admin/src/Resources/views/components/attributes/edit/address.blade.php b/packages/Webkul/Admin/src/Resources/views/components/attributes/edit/address.blade.php
@@ -1,6 +1,7 @@
 @if (isset($attribute))
     <v-address-component
         :attribute='@json($attribute)'
+        :validations="'{{ $validations }}'"
         :data='@json(old($attribute->code) ?: $value)'
     >
         <!-- Addresses Shimmer -->    
@@ -23,7 +24,7 @@
                         rows="10"
                         ::value="data ? data['address'] : ''"
                         :label="trans('admin::app.common.custom-attributes.address')"
-                        ::rules="attribute.is_required ? 'required' : ''"
+                        ::rules="attribute.is_required ? 'required' : validations"
                     />
 
                     <x-admin::form.control-group.error ::name="attribute['code'] + '[address]'" />
@@ -38,7 +39,7 @@
                     <x-admin::form.control-group.control
                         type="select"
                         ::name="attribute['code'] + '[country]'"
-                        ::rules="attribute.is_required ? 'required' : ''"
+                        ::rules="attribute.is_required ? 'required|' + validations : validations"
                         :label="trans('admin::app.common.custom-attributes.country')"
                         v-model="country"
                     >
@@ -62,7 +63,7 @@
                             ::name="attribute['code'] + '[state]'"
                             v-model="state"
                             :label="trans('admin::app.common.custom-attributes.state')"
-                            ::rules="attribute.is_required ? 'required' : ''"
+                            ::rules="attribute.is_required ? 'required|' + validations : validations"
                         >
                             <option value="">@lang('admin::app.common.custom-attributes.select-state')</option>
                             
@@ -87,7 +88,7 @@
                             ::name="attribute['code'] + '[state]'"
                             :placeholder="trans('admin::app.common.custom-attributes.state')"
                             :label="trans('admin::app.common.custom-attributes.state')"
-                            ::rules="attribute.is_required ? 'required' : ''"
+                            ::rules="attribute.is_required ? 'required|' + validations : validations"
                             v-model="state"
                         >
                         </x-admin::form.control-group.control>
@@ -106,7 +107,7 @@
                         ::value="data && data['city'] ? data['city'] : ''"
                         :placeholder="trans('admin::app.common.custom-attributes.city')"
                         :label="trans('admin::app.common.custom-attributes.city')"
-                        ::rules="attribute.is_required ? 'required' : ''"
+                        ::rules="attribute.is_required ? 'required|' + validations : validations"
                     />
 
                     <x-admin::form.control-group.error ::name="attribute['code'] + '[city]'"/>
@@ -122,7 +123,7 @@
                         ::value="data &&  data['postcode'] ? data['postcode'] : ''"
                         :placeholder="trans('admin::app.common.custom-attributes.postcode')"
                         :label="trans('admin::app.common.custom-attributes.postcode')"
-                        ::rules="attribute.is_required ? 'required' : ''"
+                        ::rules="attribute.is_required ? 'required|min:5|max:10' : 'min:5|max:10'"
                     />
 
                     <x-admin::form.control-group.error ::name="attribute['code'] + '[postcode]'" />
@@ -137,7 +138,7 @@
         app.component('v-address-component', {
             template: '#v-address-component-template',
 
-            props: ['attribute', 'data'],
+            props: ['attribute', 'data', 'validations'],
 
             data() {
                 return {

diff --git a/packages/Webkul/Admin/src/Resources/views/contacts/organizations/create.blade.php b/packages/Webkul/Admin/src/Resources/views/contacts/organizations/create.blade.php
@@ -54,6 +54,17 @@ class="primary-button"
                     :custom-attributes="app('Webkul\Attribute\Repositories\AttributeRepository')->findWhere([
                         'entity_type' => 'organizations',
                     ])"
+                    :custom-validations="[
+                        'name' => [
+                            'max:100',
+                        ],
+                        'address' => [
+                            'max:100',
+                        ],
+                        'postcode' => [
+                            'max:20',
+                        ],
+                    ]"
                 />
 
                 {!! view_render_event('admin.contacts.organizations.edit.form_controls.after') !!}

diff --git a/packages/Webkul/Admin/src/Resources/views/contacts/persons/view.blade.php b/packages/Webkul/Admin/src/Resources/views/contacts/persons/view.blade.php
@@ -11,7 +11,7 @@
         <div class="[&>div:last-child]:border-b-0 sticky top-[73px] flex min-w-[394px] max-w-[394px] flex-col self-start rounded-lg border border-gray-200 bg-white dark:border-gray-800 dark:bg-gray-900">
             <!-- Person Information -->
             <div class="flex w-full flex-col gap-2 border-b border-gray-200 p-4 dark:border-gray-800">
-                <!-- Breadcrums -->
+                <!-- Breadcrumbs -->
                 <div class="flex items-center justify-between">
                     <x-admin::breadcrumbs
                         name="contacts.persons.view"

diff --git a/packages/Webkul/Admin/src/Resources/views/leads/index.blade.php b/packages/Webkul/Admin/src/Resources/views/leads/index.blade.php
@@ -11,7 +11,7 @@
 
         <div class="flex flex-col gap-2">
             <div class="flex cursor-pointer items-center">
-                <!-- Bredcrumbs -->
+                <!-- Breadcrumb's -->
                 <x-admin::breadcrumbs name="leads" />
             </div>
 

diff --git a/packages/Webkul/Admin/src/Resources/views/leads/index/kanban.blade.php b/packages/Webkul/Admin/src/Resources/views/leads/index/kanban.blade.php
@@ -1,6 +1,6 @@
 {!! view_render_event('admin.leads.index.kanban.before') !!}
 
-<!-- Kanabn Vue Component -->
+<!-- Kanban Vue Component -->
 <v-leads-kanban>
     <div class="flex flex-col gap-4">
         <!-- Shimmer -->

diff --git a/packages/Webkul/Admin/src/Resources/views/leads/view.blade.php b/packages/Webkul/Admin/src/Resources/views/leads/view.blade.php
@@ -11,7 +11,7 @@
         <div class="[&>div:last-child]:border-b-0 sticky top-[73px] flex min-w-[394px] max-w-[394px] flex-col self-start rounded-lg border border-gray-200 bg-white dark:border-gray-800 dark:bg-gray-900">
             <!-- Lead Information -->
             <div class="flex w-full flex-col gap-2 border-b border-gray-200 p-4 dark:border-gray-800">
-                <!-- Breadcrums -->
+                <!-- Breadcrumb's -->
                 <div class="flex items-center justify-between">
                     <x-admin::breadcrumbs
                         name="leads.view"

diff --git a/packages/Webkul/Admin/src/Resources/views/products/view.blade.php b/packages/Webkul/Admin/src/Resources/views/products/view.blade.php
@@ -11,7 +11,7 @@
         <div class="[&>div:last-child]:border-b-0 sticky top-[73px] flex min-w-[394px] max-w-[394px] flex-col self-start rounded-lg border border-gray-200 bg-white dark:border-gray-800 dark:bg-gray-900">
             <!-- Product Information -->
             <div class="flex w-full flex-col gap-2 border-b border-gray-200 p-4 dark:border-gray-800">
-                <!-- Breadcrums -->
+                <!-- Breadcrumbs -->
                 <div class="flex items-center justify-between">
                     <x-admin::breadcrumbs name="products.view" :entity="$product" />
                 </div>

diff --git a/packages/Webkul/Admin/src/Resources/views/settings/warehouses/view.blade.php b/packages/Webkul/Admin/src/Resources/views/settings/warehouses/view.blade.php
@@ -10,7 +10,7 @@
         <div class="[&>div:last-child]:border-b-0 sticky top-[73px] flex min-w-[394px] max-w-[394px] flex-col self-start rounded-lg border border-gray-200 bg-white dark:border-gray-800 dark:bg-gray-900">
             <!-- Product Information -->
             <div class="flex w-full flex-col gap-2 border-b border-gray-200 p-4 dark:border-gray-800">
-                <!-- Breadcrums -->
+                <!-- Breadcrumbs -->
                 <div class="flex items-center justify-between">
                     <x-admin::breadcrumbs
                         name="settings.warehouses.view"