From 8b15839be2aeb8d39f2d33db0581bcad56bac91f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=BCneyt=20=C5=9Eent=C3=BCrk?= Date: Sun, 20 Jun 2021 15:23:12 +0300 Subject: [PATCH 1/2] fixed request date validation issue.. --- app/Http/Requests/Banking/Reconciliation.php | 4 ++-- app/Http/Requests/Document/Document.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/Http/Requests/Banking/Reconciliation.php b/app/Http/Requests/Banking/Reconciliation.php index 1f55a9f24..c76fb7cf1 100644 --- a/app/Http/Requests/Banking/Reconciliation.php +++ b/app/Http/Requests/Banking/Reconciliation.php @@ -25,8 +25,8 @@ class Reconciliation extends FormRequest { return [ 'account_id' => 'required|integer', - 'started_at' => 'required|date_format:Y-m-d H:i:s|before:ended_at', - 'ended_at' => 'required|date_format:Y-m-d H:i:s|after:started_at', + 'started_at' => 'required|date_format:Y-m-d H:i:s|before_or_equal:ended_at', + 'ended_at' => 'required|date_format:Y-m-d H:i:s|after_or_equal:started_at', 'closing_balance' => 'required', ]; } diff --git a/app/Http/Requests/Document/Document.php b/app/Http/Requests/Document/Document.php index 9aaa750f9..bcd29e3ca 100644 --- a/app/Http/Requests/Document/Document.php +++ b/app/Http/Requests/Document/Document.php @@ -57,8 +57,8 @@ class Document extends FormRequest 'type' => 'required|string', 'document_number' => 'required|string|unique:documents,NULL,' . $id . ',id,type,' . $type . ',company_id,' . $company_id . ',deleted_at,NULL', 'status' => 'required|string', - 'issued_at' => 'required|date_format:Y-m-d H:i:s|before:due_at', - 'due_at' => 'required|date_format:Y-m-d H:i:s|after:issued_at', + 'issued_at' => 'required|date_format:Y-m-d H:i:s|before_or_equal:due_at', + 'due_at' => 'required|date_format:Y-m-d H:i:s|after_or_equal:issued_at', 'amount' => 'required', 'items.*.name' => 'required|string', 'items.*.quantity' => 'required', From b64b3f3232dcdd25fe0362d306e71495edce7f9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=BCneyt=20=C5=9Eent=C3=BCrk?= Date: Sun, 20 Jun 2021 15:38:48 +0300 Subject: [PATCH 2/2] fixed bulk_action message issue --- resources/views/partials/form/bulk_action_row_group.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/partials/form/bulk_action_row_group.blade.php b/resources/views/partials/form/bulk_action_row_group.blade.php index 80790975e..1eb17a737 100644 --- a/resources/views/partials/form/bulk_action_row_group.blade.php +++ b/resources/views/partials/form/bulk_action_row_group.blade.php @@ -46,7 +46,7 @@