From 32596b4287d138c98f1ee75da2948e26cdd627f2 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Mon, 28 Feb 2022 14:38:13 +1100 Subject: [PATCH] Fixes for CSV import --- app/Http/Controllers/ClientPortal/NinjaPlanController.php | 2 ++ app/Import/Transformer/Csv/InvoiceTransformer.php | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/app/Http/Controllers/ClientPortal/NinjaPlanController.php b/app/Http/Controllers/ClientPortal/NinjaPlanController.php index 6c064a2ef541..d980dd3a27ec 100644 --- a/app/Http/Controllers/ClientPortal/NinjaPlanController.php +++ b/app/Http/Controllers/ClientPortal/NinjaPlanController.php @@ -159,6 +159,8 @@ class NinjaPlanController extends Controller $recurring_invoice->next_send_date = now()->addDays(14)->format('Y-m-d'); $recurring_invoice->save(); + $recurring_invoice = $recurring_invoice->calc()->getRecurringInvoice(); + $recurring_invoice->service()->start(); return redirect('/'); diff --git a/app/Import/Transformer/Csv/InvoiceTransformer.php b/app/Import/Transformer/Csv/InvoiceTransformer.php index 992ad63f2e5b..b632e9113ace 100644 --- a/app/Import/Transformer/Csv/InvoiceTransformer.php +++ b/app/Import/Transformer/Csv/InvoiceTransformer.php @@ -125,7 +125,7 @@ class InvoiceTransformer extends BaseTransformer $this->getString($invoice_data, 'invoice.status') )) ] ?? Invoice::STATUS_SENT, - 'archived' => $status === 'archived', + // 'archived' => $status === 'archived', ]; /* If we can't find the client, then lets try and create a client */