From bf690e5cb8e8722e0d07c16c764ed0504d4f4b49 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Thu, 26 Aug 2021 13:02:54 +1000 Subject: [PATCH 1/8] Minor fix for postmark --- app/Http/Controllers/PostMarkController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Controllers/PostMarkController.php b/app/Http/Controllers/PostMarkController.php index 89620945c98a..ceb9e1e4e0e9 100644 --- a/app/Http/Controllers/PostMarkController.php +++ b/app/Http/Controllers/PostMarkController.php @@ -213,7 +213,7 @@ class PostMarkController extends BaseController $request->input('MessageID') ); - LightLogs::create($bounce)->batch(); + LightLogs::create($spam)->batch(); SystemLogger::dispatch($request->all(), SystemLog::CATEGORY_MAIL, SystemLog::EVENT_MAIL_SPAM_COMPLAINT, SystemLog::TYPE_WEBHOOK_RESPONSE, $this->invitation->contact->client, $this->invitation->company); } From c68fc24e2c609003c7c53ff7f6f2e083ccb02952 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Thu, 26 Aug 2021 15:19:04 +1000 Subject: [PATCH 2/8] Remove local file --- app/Jobs/Company/CompanyExport.php | 1 + 1 file changed, 1 insertion(+) diff --git a/app/Jobs/Company/CompanyExport.php b/app/Jobs/Company/CompanyExport.php index 239104c4102d..64529b4d1045 100644 --- a/app/Jobs/Company/CompanyExport.php +++ b/app/Jobs/Company/CompanyExport.php @@ -498,6 +498,7 @@ class CompanyExport implements ShouldQueue if(Ninja::isHosted()) { Storage::disk(config('filesystems.default'))->put('backups/'.$file_name, file_get_contents($zip_path)); + unlink($zip_path); } App::forgetInstance('translator'); From ea38fb2b37248d401614ae8d042ba67cb0a8aca4 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Fri, 27 Aug 2021 07:36:05 +1000 Subject: [PATCH 3/8] Fixes for Support Message Template Colors --- app/Mail/SupportMessageSent.php | 3 ++- resources/views/email/support/message.blade.php | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/Mail/SupportMessageSent.php b/app/Mail/SupportMessageSent.php index 8192696600bb..337495ab8e99 100644 --- a/app/Mail/SupportMessageSent.php +++ b/app/Mail/SupportMessageSent.php @@ -45,8 +45,8 @@ class SupportMessageSent extends Mailable $log_file->seek(PHP_INT_MAX); $last_line = $log_file->key(); + $lines = new LimitIterator($log_file, $last_line - 100, $last_line); - $log_lines = iterator_to_array($lines); } @@ -76,6 +76,7 @@ class SupportMessageSent extends Mailable 'system_info' => $system_info, 'laravel_log' => $log_lines, 'logo' => $company->present()->logo(), + 'settings' => $company->settings ]); } } diff --git a/resources/views/email/support/message.blade.php b/resources/views/email/support/message.blade.php index db71b1a42a42..7ecc3d7b0531 100644 --- a/resources/views/email/support/message.blade.php +++ b/resources/views/email/support/message.blade.php @@ -1,4 +1,4 @@ -@component('email.template.admin', ['logo' => $logo ?? 'https://www.invoiceninja.com/wp-content/uploads/2015/10/logo-white-horizontal-1.png']) +@component('email.template.admin', ['settings' => $settings, 'logo' => $logo ?? 'https://www.invoiceninja.com/wp-content/uploads/2015/10/logo-white-horizontal-1.png']) {{-- Body --}} {{ $support_message }} From 97c58bcf70086cc3038c76d30fb89038203421aa Mon Sep 17 00:00:00 2001 From: David Bomba Date: Fri, 27 Aug 2021 09:56:42 +1000 Subject: [PATCH 4/8] fixes for refundS --- app/Http/Controllers/CompanyController.php | 5 ++++- app/Services/Payment/RefundPayment.php | 8 +++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/CompanyController.php b/app/Http/Controllers/CompanyController.php index e77fa41e7e74..af8bb9522ece 100644 --- a/app/Http/Controllers/CompanyController.php +++ b/app/Http/Controllers/CompanyController.php @@ -72,6 +72,9 @@ class CompanyController extends BaseController parent::__construct(); $this->company_repo = $company_repo; + + // $this->middleware('password_protected')->only(['destroy']); + } /** @@ -477,7 +480,7 @@ class CompanyController extends BaseController */ public function destroy(DestroyCompanyRequest $request, Company $company) { - + if(Ninja::isHosted() && config('ninja.ninja_default_company_id') == $company->id) return response()->json(['message' => 'Cannot purge this company'], 400); diff --git a/app/Services/Payment/RefundPayment.php b/app/Services/Payment/RefundPayment.php index a1d733311e1e..0d10b83fa745 100644 --- a/app/Services/Payment/RefundPayment.php +++ b/app/Services/Payment/RefundPayment.php @@ -81,8 +81,14 @@ class RefundPayment if ($response['success'] == false) { $this->payment->save(); - throw new PaymentRefundFailed($response['description']); + + if(array_key_exists('description', $response)) + throw new PaymentRefundFailed($response['description']); + else + throw new PaymentRefundFailed(); + } + } } else { $this->payment->refunded += $this->total_refund; From dd4dbf566b7a519aae0ed1c7d085b781d146cc98 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Fri, 27 Aug 2021 14:32:49 +1000 Subject: [PATCH 5/8] save payment earlier --- app/Services/Invoice/MarkPaid.php | 1 + 1 file changed, 1 insertion(+) diff --git a/app/Services/Invoice/MarkPaid.php b/app/Services/Invoice/MarkPaid.php index 8b8d700c6b1d..a23e42a378fb 100644 --- a/app/Services/Invoice/MarkPaid.php +++ b/app/Services/Invoice/MarkPaid.php @@ -53,6 +53,7 @@ class MarkPaid extends AbstractService $payment->amount = $this->invoice->balance; $payment->applied = $this->invoice->balance; $payment->number = $this->getNextPaymentNumber($this->invoice->client); + $payment->save(); $payment->status_id = Payment::STATUS_COMPLETED; $payment->client_id = $this->invoice->client_id; $payment->transaction_reference = ctrans('texts.manual_entry'); From f2a8d94f3f0833960198373d0b4aaaff7d987d21 Mon Sep 17 00:00:00 2001 From: = Date: Fri, 27 Aug 2021 21:27:13 +1000 Subject: [PATCH 6/8] Additional checks for SystemLogger --- app/Jobs/Util/SystemLogger.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/Jobs/Util/SystemLogger.php b/app/Jobs/Util/SystemLogger.php index f4677cb2c72f..3775eda3faf6 100644 --- a/app/Jobs/Util/SystemLogger.php +++ b/app/Jobs/Util/SystemLogger.php @@ -55,6 +55,10 @@ class SystemLogger implements ShouldQueue MultiDB::setDb($this->company->db); $client_id = $this->client ? $this->client->id : null; + + if(!$this->client && !$this->company->owner()) + return; + $user_id = $this->client ? $this->client->user_id : $this->company->owner()->id; $sl = [ From ca9de2bd74e6e55794eaf1a613d1276efd637674 Mon Sep 17 00:00:00 2001 From: = Date: Fri, 27 Aug 2021 21:46:24 +1000 Subject: [PATCH 7/8] Fixes for tests --- app/Services/Invoice/MarkPaid.php | 1 - 1 file changed, 1 deletion(-) diff --git a/app/Services/Invoice/MarkPaid.php b/app/Services/Invoice/MarkPaid.php index a23e42a378fb..8b8d700c6b1d 100644 --- a/app/Services/Invoice/MarkPaid.php +++ b/app/Services/Invoice/MarkPaid.php @@ -53,7 +53,6 @@ class MarkPaid extends AbstractService $payment->amount = $this->invoice->balance; $payment->applied = $this->invoice->balance; $payment->number = $this->getNextPaymentNumber($this->invoice->client); - $payment->save(); $payment->status_id = Payment::STATUS_COMPLETED; $payment->client_id = $this->invoice->client_id; $payment->transaction_reference = ctrans('texts.manual_entry'); From 90326321049c78eb6a5766d5308357eb2d0feaea Mon Sep 17 00:00:00 2001 From: = Date: Fri, 27 Aug 2021 22:10:21 +1000 Subject: [PATCH 8/8] Fixes for quote workflows --- app/Jobs/Quote/QuoteWorkflowSettings.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/Jobs/Quote/QuoteWorkflowSettings.php b/app/Jobs/Quote/QuoteWorkflowSettings.php index ffc5730ac0a6..54ec01ca03ea 100644 --- a/app/Jobs/Quote/QuoteWorkflowSettings.php +++ b/app/Jobs/Quote/QuoteWorkflowSettings.php @@ -55,8 +55,8 @@ class QuoteWorkflowSettings implements ShouldQueue }); } - if ($this->client->getSetting('auto_archive_quote')) { - $this->base_repository->archive($this->quote); - } + // if ($this->client->getSetting('auto_archive_quote')) { + // $this->base_repository->archive($this->quote); + // } } }