From a41f168adcad3c2d222bcf82fbfe7b9805116ef6 Mon Sep 17 00:00:00 2001
From: Tom Butcher <thomasbutcher15@gmail.com>
Date: Tue, 1 Sep 2026 16:49:39 +0100
Subject: [PATCH] Refactor ShipmentInfo and PurchaseOrder Models for Improved
 Clarity and Functionality

- Updated ShipmentInfo component to enhance code readability by adjusting label widths and formatting masterFilter properties.
- Refactored PurchaseOrder model to spread objectData properties, improving data handling and consistency across order-related functionalities.
---
 .../Inventory/Shipments/ShipmentInfo.jsx         | 16 ++++++++--------
 src/database/models/PurchaseOrder.js             |  6 +++---
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/components/Dashboard/Inventory/Shipments/ShipmentInfo.jsx b/src/components/Dashboard/Inventory/Shipments/ShipmentInfo.jsx
index 9daed29f..8f27c025 100644
--- a/src/components/Dashboard/Inventory/Shipments/ShipmentInfo.jsx
+++ b/src/components/Dashboard/Inventory/Shipments/ShipmentInfo.jsx
@@ -87,7 +87,7 @@ const ShipmentInfo = () => {
     finishEdit: () => {
       objectFormRef?.current?.handleUpdate?.()
       return true
-    },
+    }
   }
 
   return (
@@ -196,7 +196,7 @@ const ShipmentInfo = () => {
                       visibleProperties={{
                         items: false
                       }}
-                      labelWidth='175px'
+                      labelWidth='285px'
                     />
                   </InfoCollapse>
                   <InfoCollapse
@@ -210,7 +210,10 @@ const ShipmentInfo = () => {
                   >
                     <ObjectTable
                       type='orderItem'
-                      masterFilter={{ shipment: getModelByName('shipment').prefix + ':' + shipmentId }}
+                      masterFilter={{
+                        shipment:
+                          getModelByName('shipment').prefix + ':' + shipmentId
+                      }}
                       visibleColumns={{
                         shipment: false,
                         order: false,
@@ -234,7 +237,7 @@ const ShipmentInfo = () => {
               indicator={<LoadingOutlined />}
             >
               <Card>
-              <NotesPanel _id={shipmentId} type='shipment' />
+                <NotesPanel _id={shipmentId} type='shipment' />
               </Card>
             </Spin>
           </InfoCollapse>
@@ -251,10 +254,7 @@ const ShipmentInfo = () => {
               <ObjectTable
                 type='auditLog'
                 masterFilter={{
-                    parent:
-                      getModelByName('shipment').prefix +
-                      ':' +
-                      shipmentId
+                  parent: getModelByName('shipment').prefix + ':' + shipmentId
                 }}
                 visibleColumns={{ _id: false, parent: false }}
               />
diff --git a/src/database/models/PurchaseOrder.js b/src/database/models/PurchaseOrder.js
index 4939455e..69f93693 100644
--- a/src/database/models/PurchaseOrder.js
+++ b/src/database/models/PurchaseOrder.js
@@ -133,7 +133,7 @@ export const PurchaseOrder = {
         return objectData?.state?.type != 'draft'
       },
       objectData: (objectData) => ({
-        order: { _id: objectData._id },
+        order: { ...objectData },
         orderType: 'purchaseOrder',
         syncAmount: 'itemCost'
       })
@@ -148,7 +148,7 @@ export const PurchaseOrder = {
       },
       objectData: (objectData) => ({
         orderType: 'purchaseOrder',
-        order: { _id: objectData._id }
+        order: { ...objectData }
       })
     },
     {
@@ -167,7 +167,7 @@ export const PurchaseOrder = {
       },
       objectData: (objectData) => ({
         orderType: 'purchaseOrder',
-        order: objectData
+        order: { ...objectData }
       })
     },
     {