From b8891837324964a62a167c4f0be5370049c45eb8 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Fri, 8 Oct 2021 21:27:50 +1100 Subject: [PATCH 1/3] Fixes for default terms being translated on quote conversion to invoice --- app/Factory/CloneQuoteToInvoiceFactory.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/Factory/CloneQuoteToInvoiceFactory.php b/app/Factory/CloneQuoteToInvoiceFactory.php index 0c17ed9de216..086b6db742c5 100644 --- a/app/Factory/CloneQuoteToInvoiceFactory.php +++ b/app/Factory/CloneQuoteToInvoiceFactory.php @@ -28,9 +28,9 @@ class CloneQuoteToInvoiceFactory unset($quote_array['invoice_id']); unset($quote_array['id']); unset($quote_array['invitations']); - //unset($quote_array['terms']); - //unset($quote_array['public_notes']); - //unset($quote_array['footer']); + unset($quote_array['terms']); + unset($quote_array['public_notes']); + unset($quote_array['footer']); unset($quote_array['design_id']); foreach ($quote_array as $key => $value) { From c2599076bd7308d5a2b5adb77881a5bfb76b6fa0 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Fri, 8 Oct 2021 21:46:57 +1100 Subject: [PATCH 2/3] Fixes for settings Default Design --- app/Http/Controllers/DesignController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Controllers/DesignController.php b/app/Http/Controllers/DesignController.php index 5bd721cd6ef0..c6f44abf250a 100644 --- a/app/Http/Controllers/DesignController.php +++ b/app/Http/Controllers/DesignController.php @@ -491,7 +491,7 @@ class DesignController extends BaseController public function default(DefaultDesignRequest $request) { - $design_id = $request->int('design_id'); + $design_id = $request->input('design_id'); $entity = $request->input('entity'); $company = auth()->user()->getCompany(); From 3319326d88f94b339a74bcc6419761bd5ba1465f Mon Sep 17 00:00:00 2001 From: David Bomba Date: Fri, 8 Oct 2021 21:54:38 +1100 Subject: [PATCH 3/3] Ensure valid email present before attempting to send --- app/Jobs/Mail/NinjaMailerJob.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/Jobs/Mail/NinjaMailerJob.php b/app/Jobs/Mail/NinjaMailerJob.php index 8954722e7796..1597a73a1162 100644 --- a/app/Jobs/Mail/NinjaMailerJob.php +++ b/app/Jobs/Mail/NinjaMailerJob.php @@ -257,7 +257,9 @@ class NinjaMailerJob implements ShouldQueue if(Ninja::isHosted() && $this->company->account->emailQuotaExceeded()) return true; - + if(!str_contains($this->nmo->to_user->email, "@")) + return true; + return false; }