From e4a9ae4526ab9874cf3838faa0f516600336f9c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Beganovi=C4=87?= Date: Tue, 23 Aug 2022 14:15:09 +0200 Subject: [PATCH 1/2] Add `vendor` & `expense` includes for purchase orders --- app/Transformers/PurchaseOrderTransformer.php | 21 +++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/app/Transformers/PurchaseOrderTransformer.php b/app/Transformers/PurchaseOrderTransformer.php index 0e21a8414867..fd0684c76c08 100644 --- a/app/Transformers/PurchaseOrderTransformer.php +++ b/app/Transformers/PurchaseOrderTransformer.php @@ -14,6 +14,7 @@ namespace App\Transformers; use App\Models\PurchaseOrder; use App\Models\PurchaseOrderInvitation; +use App\Models\Vendor; use App\Transformers\DocumentTransformer; use App\Utils\Traits\MakesHash; @@ -27,7 +28,8 @@ class PurchaseOrderTransformer extends EntityTransformer ]; protected $availableIncludes = [ - 'expense' + 'expense', + 'vendor', ]; public function includeInvitations(PurchaseOrder $purchase_order) @@ -49,7 +51,22 @@ class PurchaseOrderTransformer extends EntityTransformer { $transformer = new ExpenseTransformer($this->serializer); - return $this->includeItem($purchase_order->expense, $transformer, Document::class); + if (!$purchase_order->expense) { + return null; + } + + return $this->includeItem($purchase_order->expense, $transformer, Expense::class); + } + + public function includeVendor(PurchaseOrder $purchase_order) + { + $transformer = new VendorTransformer($this->serializer); + + if (!$purchase_order->vendor) { + return null; + } + + return $this->includeItem($purchase_order->vendor, $transformer, Vendor::class); } public function transform(PurchaseOrder $purchase_order) From e2d536107513a5bac9c8207c10c9e6762d332bbe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Beganovi=C4=87?= Date: Tue, 23 Aug 2022 14:17:16 +0200 Subject: [PATCH 2/2] Add missing translatations --- lang/en/texts.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lang/en/texts.php b/lang/en/texts.php index 52e3731eb41e..83141fe88992 100644 --- a/lang/en/texts.php +++ b/lang/en/texts.php @@ -4767,6 +4767,9 @@ $LANG = array( 'bulk_email_invoices' => 'Email Invoices', 'bulk_email_quotes' => 'Email Quotes', 'bulk_email_credits' => 'Email Credits', + 'archive_purchase_order' => 'Archive Purchase Order', + 'restore_purchase_order' => 'Restore Purchase Order', + 'delete_purchase_order' => 'Delete Purchase Order', ); return $LANG;