From b0282c236493ad6aa96455037c9ac876a6f0ae35 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Mon, 23 Aug 2021 07:12:58 +1000 Subject: [PATCH] Fix missing includes for triggered actions --- app/Models/Presenters/ClientPresenter.php | 2 +- app/Services/Invoice/TriggeredActions.php | 1 + routes/api.php | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/Models/Presenters/ClientPresenter.php b/app/Models/Presenters/ClientPresenter.php index be0fea30a6c3..824393a7ba11 100644 --- a/app/Models/Presenters/ClientPresenter.php +++ b/app/Models/Presenters/ClientPresenter.php @@ -28,7 +28,7 @@ class ClientPresenter extends EntityPresenter } //$contact = $this->entity->primary_contact->first(); - $contact = $this->entity->contacts->first(); + $contact = $this->entity->contacts->whereNotNull('email')->first(); $contact_name = 'No Contact Set'; diff --git a/app/Services/Invoice/TriggeredActions.php b/app/Services/Invoice/TriggeredActions.php index 9dca9a50f733..ac49d0d1991b 100644 --- a/app/Services/Invoice/TriggeredActions.php +++ b/app/Services/Invoice/TriggeredActions.php @@ -12,6 +12,7 @@ namespace App\Services\Invoice; use App\Events\Invoice\InvoiceWasEmailed; +use App\Jobs\Entity\EmailEntity; use App\Jobs\Invoice\EmailEntity; use App\Models\Invoice; use App\Services\AbstractService; diff --git a/routes/api.php b/routes/api.php index ceeb78fadf6e..a0e63da14382 100644 --- a/routes/api.php +++ b/routes/api.php @@ -159,8 +159,8 @@ Route::group(['middleware' => ['api_db', 'token_auth', 'locale'], 'prefix' => 'a Route::post('templates', 'TemplateController@show')->name('templates.show'); - Route::resource('tokens', 'TokenController')->middleware('password_protected'); // name = (tokens. index / create / show / update / destroy / edit - Route::post('tokens/bulk', 'TokenController@bulk')->name('tokens.bulk')->middleware('password_protected'); + Route::resource('tokens', 'TokenController'); // name = (tokens. index / create / show / update / destroy / edit + Route::post('tokens/bulk', 'TokenController@bulk')->name('tokens.bulk'); Route::get('settings/enable_two_factor', 'TwoFactorController@setupTwoFactor'); Route::post('settings/enable_two_factor', 'TwoFactorController@enableTwoFactor');