From 617703b4051debfb0485855608ad912d5bd5d060 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Sat, 18 Sep 2021 17:55:34 +1000 Subject: [PATCH] Set company as a reference for Company Export --- app/Jobs/Company/CompanyExport.php | 6 ++++-- routes/api.php | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/app/Jobs/Company/CompanyExport.php b/app/Jobs/Company/CompanyExport.php index 537083a6602e..77f92407693a 100644 --- a/app/Jobs/Company/CompanyExport.php +++ b/app/Jobs/Company/CompanyExport.php @@ -506,10 +506,12 @@ class CompanyExport implements ShouldQueue $t = app('translator'); $t->replace(Ninja::transformTranslations($this->company->settings)); + $company_reference = Company::find($this->company->id);; + $nmo = new NinjaMailerObject; - $nmo->mailable = new DownloadBackup($storage_file_path, $this->company); + $nmo->mailable = new DownloadBackup($storage_file_path, $company_reference); $nmo->to_user = $this->user; - $nmo->company = $this->company; + $nmo->company = $company_reference; $nmo->settings = $this->company->settings; NinjaMailerJob::dispatch($nmo); diff --git a/routes/api.php b/routes/api.php index ce6a957ba210..8e230cf3bf27 100644 --- a/routes/api.php +++ b/routes/api.php @@ -67,7 +67,7 @@ Route::group(['middleware' => ['api_db', 'token_auth', 'locale'], 'prefix' => 'a Route::resource('designs', 'DesignController'); // name = (payments. index / create / show / update / destroy / edit Route::post('designs/bulk', 'DesignController@bulk')->name('designs.bulk'); - Route::post('designs/default', 'DesignController@default')->name('designs.default'); + Route::post('designs/set/default', 'DesignController@default')->name('designs.default'); Route::resource('documents', 'DocumentController'); // name = (documents. index / create / show / update / destroy / edit Route::get('documents/{document}/download', 'DocumentController@download')->name('documents.download');