Merge pull request #561 from jitendra-webkul/master

Issue #541 fixed
krayin · Oct 20, 2021 · ac6aca9 · ac6aca9
2 parents 76d566e + ba773ac
commit ac6aca9
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/packages/Webkul/Admin/src/Resources/views/leads/create.blade.php b/packages/Webkul/Admin/src/Resources/views/leads/create.blade.php
@@ -48,10 +48,16 @@
 
                             <tab name="{{ __('admin::app.leads.details') }}" :selected="true">
                                 @include('admin::common.custom-attributes.edit', [
-                                    'customAttributes' => app('Webkul\Attribute\Repositories\AttributeRepository')->findWhere([
+                                    'customAttributes'  => app('Webkul\Attribute\Repositories\AttributeRepository')->findWhere([
                                         'entity_type' => 'leads',
                                         'quick_add'   => 1
                                     ]),
+                                    'customValidations' => [
+                                        'expected_close_date' => [
+                                            'date_format:yyyy-MM-dd',
+                                            'after:' .  \Carbon\Carbon::yesterday()->format('Y-m-d')
+                                        ],
+                                    ],
                                 ])
                             </tab>
 

diff --git a/packages/Webkul/Admin/src/Resources/views/leads/view.blade.php b/packages/Webkul/Admin/src/Resources/views/leads/view.blade.php
@@ -242,10 +242,16 @@
 
                     <tab name="{{ __('admin::app.leads.details') }}" :selected="true">
                         @include('admin::common.custom-attributes.edit', [
-                            'customAttributes' => app('Webkul\Attribute\Repositories\AttributeRepository')->findWhere([
+                            'customAttributes'  => app('Webkul\Attribute\Repositories\AttributeRepository')->findWhere([
                                 'entity_type' => 'leads',
                             ]),
-                            'entity'           => $lead,
+                            'customValidations' => [
+                                'expected_close_date' => [
+                                    'date_format:yyyy-MM-dd',
+                                    'after:' .  \Carbon\Carbon::yesterday()->format('Y-m-d')
+                                ],
+                            ],
+                            'entity'            => $lead,
                         ])
                     </tab>