From 0187d924125d1cadcdd38fa3cb63cf63e0355709 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Mon, 5 Sep 2022 11:29:46 +1000 Subject: [PATCH] Improve handling of purchaseOrder and purchase_order --- app/Http/Controllers/EmailController.php | 2 +- app/Utils/TemplateEngine.php | 2 +- routes/vendor.php | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/EmailController.php b/app/Http/Controllers/EmailController.php index 73b25465ce13..f752c6174e4b 100644 --- a/app/Http/Controllers/EmailController.php +++ b/app/Http/Controllers/EmailController.php @@ -131,7 +131,7 @@ class EmailController extends BaseController if(Ninja::isHosted() && !$entity_obj->company->account->account_sms_verified) return response(['message' => 'Please verify your account to send emails.'], 400); - if($entity == 'purchaseOrder' || $template == 'purchase_order'){ + if($entity == 'purchaseOrder' || $entity == 'purchase_order' || $template == 'purchase_order'){ return $this->sendPurchaseOrder($entity_obj, $data); } diff --git a/app/Utils/TemplateEngine.php b/app/Utils/TemplateEngine.php index 8eb0db321a22..ec6f9c75d78f 100644 --- a/app/Utils/TemplateEngine.php +++ b/app/Utils/TemplateEngine.php @@ -107,7 +107,7 @@ class TemplateEngine private function setSettingsObject() { - if($this->entity == 'purchaseOrder'){ + if($this->entity == 'purchaseOrder' || $this->entity == 'purchase_order'){ $this->settings_entity = auth()->user()->company(); $this->settings = $this->settings_entity->settings; } diff --git a/routes/vendor.php b/routes/vendor.php index b44e1b10c491..57c3bf6c7273 100644 --- a/routes/vendor.php +++ b/routes/vendor.php @@ -46,6 +46,7 @@ Route::group(['middleware' => ['auth:vendor', 'vendor_locale', 'domain_db'], 'pr Route::post('documents/download_multiple', [App\Http\Controllers\VendorPortal\DocumentController::class, 'downloadMultiple'])->name('documents.download_multiple'); Route::get('documents/{document}/download', [App\Http\Controllers\VendorPortal\DocumentController::class, 'download'])->name('documents.download'); + Route::get('documents/{document}/download_pdf', [App\Http\Controllers\VendorPortal\DocumentController::class, 'download'])->name('documents.download'); Route::resource('documents', App\Http\Controllers\VendorPortal\DocumentController::class)->only(['index', 'show']); });