From 04b4bc5f8e63d844804741dc7feca2477fdd8b7b Mon Sep 17 00:00:00 2001 From: David Bomba Date: Mon, 25 Oct 2021 16:39:05 +1100 Subject: [PATCH 1/3] Minor fixes for Gateway TYpes --- app/Models/GatewayType.php | 2 +- .../portal/ninja2020/gateways/stripe/becs/becs_debit.blade.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Models/GatewayType.php b/app/Models/GatewayType.php index e7b5160b816a..d6c51bc4e7f1 100644 --- a/app/Models/GatewayType.php +++ b/app/Models/GatewayType.php @@ -84,7 +84,7 @@ class GatewayType extends StaticModel case self::EPS: return ctrans('texts.eps'); case self::BECS: - return ctrans('tets.becs'); + return ctrans('texts.becs'); case self::ACSS: return ctrans('texts.acss'); case self::DIRECT_DEBIT: diff --git a/resources/views/portal/ninja2020/gateways/stripe/becs/becs_debit.blade.php b/resources/views/portal/ninja2020/gateways/stripe/becs/becs_debit.blade.php index cd41c59d29e6..cf52d7a8b501 100644 --- a/resources/views/portal/ninja2020/gateways/stripe/becs/becs_debit.blade.php +++ b/resources/views/portal/ninja2020/gateways/stripe/becs/becs_debit.blade.php @@ -22,7 +22,7 @@
- +
@endcomponent From c2452ea137fe9966a7a4290260898f3cdd852221 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Mon, 25 Oct 2021 20:11:23 +1100 Subject: [PATCH 2/3] Fixes for recurring invoices --- app/Jobs/Cron/RecurringInvoicesCron.php | 2 +- app/Jobs/RecurringInvoice/SendRecurring.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Jobs/Cron/RecurringInvoicesCron.php b/app/Jobs/Cron/RecurringInvoicesCron.php index bff131da8838..014db2578b65 100644 --- a/app/Jobs/Cron/RecurringInvoicesCron.php +++ b/app/Jobs/Cron/RecurringInvoicesCron.php @@ -71,7 +71,7 @@ class RecurringInvoicesCron SendRecurring::dispatchNow($recurring_invoice, $recurring_invoice->company->db); } catch(\Exception $e){ - nlog("Unable to sending recurring invoice {$recurring_invoice->id}"); + nlog("Unable to sending recurring invoice {$recurring_invoice->id} ". $e->getMessage()); } }); diff --git a/app/Jobs/RecurringInvoice/SendRecurring.php b/app/Jobs/RecurringInvoice/SendRecurring.php index 0aab4e659cbd..a13720a6bba4 100644 --- a/app/Jobs/RecurringInvoice/SendRecurring.php +++ b/app/Jobs/RecurringInvoice/SendRecurring.php @@ -79,7 +79,7 @@ class SendRecurring implements ShouldQueue $invoice = $invoice->service() ->markSent() ->applyNumber() - // ->createInvitations() //need to only link invitations to those in the recurring invoice + ->createInvitations() //need to only link invitations to those in the recurring invoice ->fillDefaults() ->save(); From f2f52e05c7ee4770988d60d1076e4748bce7e032 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Mon, 25 Oct 2021 21:39:02 +1100 Subject: [PATCH 3/3] Fixes for recurring invoices --- app/Jobs/Cron/RecurringInvoicesCron.php | 2 +- app/Jobs/RecurringInvoice/SendRecurring.php | 5 +++-- app/Services/Invoice/MarkSent.php | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/app/Jobs/Cron/RecurringInvoicesCron.php b/app/Jobs/Cron/RecurringInvoicesCron.php index 014db2578b65..f30232650a3e 100644 --- a/app/Jobs/Cron/RecurringInvoicesCron.php +++ b/app/Jobs/Cron/RecurringInvoicesCron.php @@ -107,7 +107,7 @@ class RecurringInvoicesCron SendRecurring::dispatchNow($recurring_invoice, $recurring_invoice->company->db); } catch(\Exception $e){ - nlog("Unable to sending recurring invoice {$recurring_invoice->id}"); + nlog("Unable to sending recurring invoice {$recurring_invoice->id} ". $e->getMessage()); } }); diff --git a/app/Jobs/RecurringInvoice/SendRecurring.php b/app/Jobs/RecurringInvoice/SendRecurring.php index a13720a6bba4..464849ef70d8 100644 --- a/app/Jobs/RecurringInvoice/SendRecurring.php +++ b/app/Jobs/RecurringInvoice/SendRecurring.php @@ -73,13 +73,14 @@ class SendRecurring implements ShouldQueue $invoice->date = now()->format('Y-m-d'); $invoice->due_date = $this->recurring_invoice->calculateDueDate(now()->format('Y-m-d')); $invoice->recurring_id = $this->recurring_invoice->id; - + $invoice->saveQuietly(); + if($invoice->client->getSetting('auto_email_invoice')) { $invoice = $invoice->service() ->markSent() ->applyNumber() - ->createInvitations() //need to only link invitations to those in the recurring invoice + //->createInvitations() //need to only link invitations to those in the recurring invoice ->fillDefaults() ->save(); diff --git a/app/Services/Invoice/MarkSent.php b/app/Services/Invoice/MarkSent.php index a205b83dd047..8fe2f2e87a49 100644 --- a/app/Services/Invoice/MarkSent.php +++ b/app/Services/Invoice/MarkSent.php @@ -33,7 +33,7 @@ class MarkSent extends AbstractService { /* Return immediately if status is not draft */ - if ($this->invoice->fresh()->status_id != Invoice::STATUS_DRAFT) { + if ($this->invoice && $this->invoice->fresh()->status_id != Invoice::STATUS_DRAFT) { return $this->invoice; }