From ba773ac52de89b9c4b5217193c983dce904f6efc Mon Sep 17 00:00:00 2001 From: jitendra Date: Wed, 20 Oct 2021 20:57:12 +0530 Subject: [PATCH] Issue #541 fixed --- .../Admin/src/Resources/views/leads/create.blade.php | 8 +++++++- .../Admin/src/Resources/views/leads/view.blade.php | 10 ++++++++-- 2 files changed, 15 insertions(+), 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 index 7a169efcb..a6448cc4a 100644 --- 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 @@ @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') + ], + ], ]) diff --git a/packages/Webkul/Admin/src/Resources/views/leads/view.blade.php b/packages/Webkul/Admin/src/Resources/views/leads/view.blade.php index 91f36ae11..3adac8608 100644 --- 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 @@ @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, ])