diff --git a/app/Http/Controllers/Sales/RecurringInvoices.php b/app/Http/Controllers/Sales/RecurringInvoices.php index ba42a505c..7bdc7b478 100644 --- a/app/Http/Controllers/Sales/RecurringInvoices.php +++ b/app/Http/Controllers/Sales/RecurringInvoices.php @@ -80,7 +80,9 @@ class RecurringInvoices extends Controller */ public function store(Request $request) { - $response = $this->ajaxDispatch(new CreateDocument($request->merge(['issued_at' => $request->get('recurring_started_at')]))); + $request->merge(['issued_at' => $request->get('recurring_started_at')]); + + $response = $this->ajaxDispatch(new CreateDocument($request)); if ($response['success']) { $response['redirect'] = route('recurring-invoices.show', $response['data']->id); @@ -163,7 +165,9 @@ class RecurringInvoices extends Controller */ public function update(Document $recurring_invoice, Request $request) { - $response = $this->ajaxDispatch(new UpdateDocument($recurring_invoice, $request->merge(['issued_at' => $request->get('recurring_started_at')]))); + $request->merge(['issued_at' => $request->get('recurring_started_at')]); + + $response = $this->ajaxDispatch(new UpdateDocument($recurring_invoice, $request)); if ($response['success']) { $response['redirect'] = route('recurring-invoices.show', $response['data']->id); diff --git a/app/Traits/Documents.php b/app/Traits/Documents.php index db0894148..505e2bf98 100644 --- a/app/Traits/Documents.php +++ b/app/Traits/Documents.php @@ -28,7 +28,7 @@ trait Documents public function isNotRecurringDocument(): bool { - return ! $this->isRecurring(); + return ! $this->isRecurringDocument(); } public function getRecurringDocumentTypes() : array diff --git a/app/Traits/Transactions.php b/app/Traits/Transactions.php index 22083c2fa..b9a2be175 100644 --- a/app/Traits/Transactions.php +++ b/app/Traits/Transactions.php @@ -42,7 +42,7 @@ trait Transactions public function isNotRecurringTransaction(): bool { - return ! $this->isRecurring(); + return ! $this->isRecurringTransaction(); } public function isTransferTransaction(): bool @@ -194,7 +194,7 @@ trait Transactions 'add_an' => trans('general.form.add_an', ['field' => trans_choice('general.' . Str::plural($document_type), 1)]), 'transaction' => trans_choice('general.' . Str::plural($type), 1), 'difference' => trans('general.difference'), - 'connect_tax' => trans('messages.warning.connect_tax', ['type' => $type]), + 'connect_tax' => trans('messages.warning.connect_tax', ['type' => $type]), ]; }