From 0506b08ee0bb979c492914cc52dc35589c5fcfc0 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Mon, 17 May 2021 08:09:20 +1000 Subject: [PATCH] Email invoice paid receipts --- app/Http/Requests/Company/StoreCompanyRequest.php | 5 +++-- app/Http/Requests/Company/UpdateCompanyRequest.php | 4 ++-- app/Mail/Engine/PaymentEmailEngine.php | 11 +++++++++++ 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/app/Http/Requests/Company/StoreCompanyRequest.php b/app/Http/Requests/Company/StoreCompanyRequest.php index 6cd74a3c3fb8..ac18ed1fc854 100644 --- a/app/Http/Requests/Company/StoreCompanyRequest.php +++ b/app/Http/Requests/Company/StoreCompanyRequest.php @@ -55,8 +55,9 @@ class StoreCompanyRequest extends Request { $input = $this->all(); - if(array_key_exists('portal_domain', $input) && strlen($input['portal_domain']) > 1) - $input['portal_domain'] = str_replace("http:", "https:", $input['portal_domain']); + //https not sure i should be forcing this. + // if(array_key_exists('portal_domain', $input) && strlen($input['portal_domain']) > 1) + // $input['portal_domain'] = str_replace("http:", "https:", $input['portal_domain']); if (array_key_exists('google_analytics_url', $input)) { $input['google_analytics_key'] = $input['google_analytics_url']; diff --git a/app/Http/Requests/Company/UpdateCompanyRequest.php b/app/Http/Requests/Company/UpdateCompanyRequest.php index 2c36c9bbdac9..0c7532160d9b 100644 --- a/app/Http/Requests/Company/UpdateCompanyRequest.php +++ b/app/Http/Requests/Company/UpdateCompanyRequest.php @@ -60,8 +60,8 @@ class UpdateCompanyRequest extends Request { $input = $this->all(); - if(array_key_exists('portal_domain', $input) && strlen($input['portal_domain']) > 1) - $input['portal_domain'] = str_replace("http:", "https:", $input['portal_domain']); + // if(array_key_exists('portal_domain', $input) && strlen($input['portal_domain']) > 1) + // $input['portal_domain'] = str_replace("http:", "https:", $input['portal_domain']); if (array_key_exists('settings', $input)) { $input['settings'] = $this->filterSaveableSettings($input['settings']); diff --git a/app/Mail/Engine/PaymentEmailEngine.php b/app/Mail/Engine/PaymentEmailEngine.php index 25a8ae6cb430..cc32c7e26f80 100644 --- a/app/Mail/Engine/PaymentEmailEngine.php +++ b/app/Mail/Engine/PaymentEmailEngine.php @@ -12,6 +12,7 @@ namespace App\Mail\Engine; use App\DataMapper\EmailTemplateDefaults; +use App\Models\Account; use App\Utils\Helpers; use App\Utils\Number; use App\Utils\Traits\MakesDates; @@ -72,6 +73,16 @@ class PaymentEmailEngine extends BaseEmailEngine ->setViewLink('') ->setViewText(''); + if ($this->client->getSetting('pdf_email_attachment') !== false && $this->company->account->hasFeature(Account::FEATURE_PDF_ATTACHMENT)) { + + $this->payment->invoices->each(function ($invoice){ + + $this->setAttachments([$invoice->pdf_file_path()]); + + }); + + } + return $this; }