Merge pull request #2077 from amit-webkul/lead

Fixing lead validations #2064.

Author: devansh-webkul

packages/Webkul/Admin/src/Resources/views/components/attributes/edit/price.blade.php

@@ -17,7 +17,7 @@
             ::id="attribute.code"
             ::value="value"
             ::name="attribute.code"
-            ::rules="getValidation"
+            ::rules="validations"
             ::label="attribute.name"
         />
     </script>
@@ -27,16 +27,6 @@
             template: '#v-price-component-template',
 
             props: ['validations', 'attribute', 'value'],
-
-            computed: {
-                getValidation() {
-                    return {
-                        decimal: true,
-                        min_value: 0,
-                        ...(this.validations === 'required' ? { required: true } : {}),
-                    };
-                },
-            },
         });
     </script>
 @endPushOnce

packages/Webkul/Admin/src/Resources/views/components/attributes/index.blade.php

@@ -1,22 +1,18 @@
 @foreach ($customAttributes as $attribute)
     @php
-        if (isset($customValidations[$attribute->code])) {
-            $validations = implode('|', $customValidations[$attribute->code]);
-        } else {
-            $validations = [];
+        $validations = [];
 
-            if ($attribute->is_required) {
-                array_push($validations, 'required');
-            }
+        if ($attribute->is_required) {
+            $validations[] = 'required';
+        }
 
-            if ($attribute->type == 'price') {
-                array_push($validations, 'decimal');
-            }
+        if ($attribute->type == 'price') {
+            $validations[] = 'decimal';
+        }
 
-            array_push($validations, $attribute->validation);
+        $validations[] = $attribute->validation;
 
-            $validations = implode('|', array_filter($validations));
-        }
+        $validations = implode('|', array_filter($validations));
     @endphp
 
     <x-admin::form.control-group class="mb-2.5 w-full">

packages/Webkul/Admin/src/Resources/views/leads/common/contact.blade.php

@@ -19,9 +19,10 @@
                 ::src="src"
                 name="person[id]"
                 ::params="params"
-                @on-selected="addPerson"
-                :placeholder="trans('admin::app.leads.common.contact.name')"
+                rules="required"
                 ::value="{id: person.id, name: person.name}"
+                :placeholder="trans('admin::app.leads.common.contact.name')"
+                @on-selected="addPerson"
                 :can-add-new="true"
             />
         

packages/Webkul/Admin/src/Resources/views/quotes/create.blade.php

@@ -344,7 +344,7 @@ class="!px-2 ltr:text-right rtl:text-left"
                 {!! view_render_event('admin.contacts.quotes.create.table.before') !!}
             </div>
 
-            <!-- Add New Qoute Item -->
+            <!-- Add New Quote Item -->
             <span
                 class="text-md cursor-pointer self-start font-semibold text-brandColor hover:underline dark:text-brandColor"
                 @click="addProduct"

packages/Webkul/Admin/src/Resources/views/settings/web-forms/create.blade.php

@@ -107,7 +107,7 @@ class="rounded-l-none"
 
                         <!-- Create Leads -->
                         <x-admin::form.control-group>
-                            <x-admin::form.control-group.label class="required">
+                            <x-admin::form.control-group.label>
                                 @lang('admin::app.settings.webforms.create.create-lead')
                             </x-admin::form.control-group.label>
 
@@ -125,7 +125,7 @@ class="peer sr-only"
                             </label>
                         </x-admin::form.control-group>
 
-                        <!-- Customize Webform -->
+                        <!-- Customize Web-form -->
                         <div class="mb-4 flex items-center justify-between gap-4">
                             <div class="flex flex-col gap-1">
                                 <p class="text-base font-semibold text-gray-800 dark:text-white">

packages/Webkul/Installer/src/Database/Seeders/Attribute/AttributeSeeder.php

@@ -60,7 +60,7 @@ public function run($parameters = [])
                 'type'            => 'price',
                 'entity_type'     => 'leads',
                 'lookup_type'     => null,
-                'validation'      => null,
+                'validation'      => 'decimal',
                 'sort_order'      => '3',
                 'is_required'     => '1',
                 'is_unique'       => '0',