From 290ac8dc7e76680b8848c2baf1bb24e1d6194ddc Mon Sep 17 00:00:00 2001 From: David Bomba Date: Thu, 23 Jun 2022 17:04:11 +1000 Subject: [PATCH 1/2] Fixes for purchase orders --- app/Models/PurchaseOrder.php | 1 - 1 file changed, 1 deletion(-) diff --git a/app/Models/PurchaseOrder.php b/app/Models/PurchaseOrder.php index 29e25b2fdb1b..253ce4072356 100644 --- a/app/Models/PurchaseOrder.php +++ b/app/Models/PurchaseOrder.php @@ -34,7 +34,6 @@ class PurchaseOrder extends BaseModel 'discount', 'company_id', 'status_id', - 'user_id', 'last_sent_date', 'is_deleted', 'po_number', From a7c5779eea7e6f005235b2b0d5032f78a1f2d3c8 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Thu, 23 Jun 2022 17:38:57 +1000 Subject: [PATCH 2/2] Change purchase order transformer type --- app/Transformers/PurchaseOrderTransformer.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Transformers/PurchaseOrderTransformer.php b/app/Transformers/PurchaseOrderTransformer.php index 7982fff5a6bd..0163714e6009 100644 --- a/app/Transformers/PurchaseOrderTransformer.php +++ b/app/Transformers/PurchaseOrderTransformer.php @@ -89,7 +89,7 @@ class PurchaseOrderTransformer extends EntityTransformer 'custom_surcharge_tax3' => (bool)$purchase_order->custom_surcharge_tax3, 'custom_surcharge_tax4' => (bool)$purchase_order->custom_surcharge_tax4, 'line_items' => $purchase_order->line_items ?: (array)[], - 'entity_type' => 'purchase_order', + 'entity_type' => 'purchaseOrder', 'exchange_rate' => (float)$purchase_order->exchange_rate, 'paid_to_date' => (float)$purchase_order->paid_to_date, 'subscription_id' => $this->encodePrimaryKey($purchase_order->subscription_id),