From e5d212bd9a317f10e96d423b4b75c218cce93d31 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Fri, 2 Dec 2022 10:36:47 +1100 Subject: [PATCH] Ensure due_date_days is populated --- app/Factory/RecurringInvoiceFactory.php | 1 + .../RecurringInvoice/StoreRecurringInvoiceRequest.php | 5 +++++ .../RecurringInvoice/UpdateRecurringInvoiceRequest.php | 4 ++++ 3 files changed, 10 insertions(+) diff --git a/app/Factory/RecurringInvoiceFactory.php b/app/Factory/RecurringInvoiceFactory.php index df655b3c19..ee761ceabb 100644 --- a/app/Factory/RecurringInvoiceFactory.php +++ b/app/Factory/RecurringInvoiceFactory.php @@ -29,6 +29,7 @@ class RecurringInvoiceFactory $invoice->private_notes = ''; $invoice->date = null; $invoice->due_date = null; + $invoice->due_date_days = 'terms'; $invoice->partial_due_date = null; $invoice->is_deleted = false; $invoice->line_items = json_encode([]); diff --git a/app/Http/Requests/RecurringInvoice/StoreRecurringInvoiceRequest.php b/app/Http/Requests/RecurringInvoice/StoreRecurringInvoiceRequest.php index 0d6925dc0d..4839068e6d 100644 --- a/app/Http/Requests/RecurringInvoice/StoreRecurringInvoiceRequest.php +++ b/app/Http/Requests/RecurringInvoice/StoreRecurringInvoiceRequest.php @@ -65,6 +65,7 @@ class StoreRecurringInvoiceRequest extends Request $rules['tax_name1'] = 'bail|sometimes|string|nullable'; $rules['tax_name2'] = 'bail|sometimes|string|nullable'; $rules['tax_name3'] = 'bail|sometimes|string|nullable'; + $rules['due_date_days'] = 'bail|sometimes|string'; return $rules; } @@ -73,6 +74,10 @@ class StoreRecurringInvoiceRequest extends Request { $input = $this->all(); + if (array_key_exists('due_date_days', $input) && is_null($input['due_date_days'])){ + $input['due_date_days'] = 'terms'; + } + if (array_key_exists('next_send_date', $input) && is_string($input['next_send_date'])) { $input['next_send_date_client'] = $input['next_send_date']; } diff --git a/app/Http/Requests/RecurringInvoice/UpdateRecurringInvoiceRequest.php b/app/Http/Requests/RecurringInvoice/UpdateRecurringInvoiceRequest.php index e22ae36fe2..94fbd0ed76 100644 --- a/app/Http/Requests/RecurringInvoice/UpdateRecurringInvoiceRequest.php +++ b/app/Http/Requests/RecurringInvoice/UpdateRecurringInvoiceRequest.php @@ -68,6 +68,10 @@ class UpdateRecurringInvoiceRequest extends Request { $input = $this->all(); + if (array_key_exists('due_date_days', $input) && is_null($input['due_date_days'])){ + $input['due_date_days'] = 'terms'; + } + if (array_key_exists('next_send_date', $input) && is_string($input['next_send_date'])) { $input['next_send_date_client'] = $input['next_send_date']; }