diff --git a/app/Http/Requests/Document/Document.php b/app/Http/Requests/Document/Document.php index effeca3bf..9e9c05183 100644 --- a/app/Http/Requests/Document/Document.php +++ b/app/Http/Requests/Document/Document.php @@ -115,13 +115,13 @@ class Document extends FormRequest $this->request->set('issued_at', $issued_at); $this->request->set('due_at', $due_at); - if ($this->request->get('recurring_started_at')) { + if ($this->request->has('recurring_started_at')) { $recurring_started_at = Date::parse($this->request->get('recurring_started_at'))->format('Y-m-d'); $this->request->set('recurring_started_at', $recurring_started_at); } - if ($this->request->get('recurring_limit_date')) { + if ($this->request->has('recurring_limit_date')) { $recurring_limit_date = Date::parse($this->request->get('recurring_limit_date'))->format('Y-m-d'); $this->request->set('recurring_limit_date', $recurring_limit_date); @@ -151,8 +151,6 @@ class Document extends FormRequest 'height' => config('filesystems.max_height'), ]); - $messages['recurring_limit_date.after_or_equal'] = trans(''); - return $messages; } } diff --git a/database/factories/Transaction.php b/database/factories/Transaction.php index 725fe8be9..ba78299fc 100644 --- a/database/factories/Transaction.php +++ b/database/factories/Transaction.php @@ -95,7 +95,7 @@ class Transaction extends Factory 'recurring_custom_frequency' => 'daily', 'recurring_interval' => '1', 'recurring_limit' => 'date', - 'recurring_limit_date' => Date::now()->addDay(7)->format('Y-m-d'), + 'recurring_limit_date' => Date::now()->addDay(7)->format('Y-m-d H:i:s'), 'disabled_transaction_paid' => "Auto-generated", 'disabled_transaction_number' => "Auto-generated", 'real_type' => $this->getRawAttribute('type'),