From a4e68b5088fa5055f98a08bfd24cfe342521900c Mon Sep 17 00:00:00 2001
From: Tom Butcher <thomasbutcher15@gmail.com>
Date: Sat, 13 Dec 2025 21:06:01 +0000
Subject: [PATCH] Updated models.

---
 src/database/models/Filament.js      | 35 +++++++++++++++++++++++++++-
 src/database/models/OrderItem.js     | 10 +++++++-
 src/database/models/PurchaseOrder.js | 22 +++++++++++++----
 3 files changed, 60 insertions(+), 7 deletions(-)

diff --git a/src/database/models/Filament.js b/src/database/models/Filament.js
index 065e8a1..1ed899c 100644
--- a/src/database/models/Filament.js
+++ b/src/database/models/Filament.js
@@ -130,7 +130,40 @@ export const Filament = {
       label: 'Cost',
       columnWidth: 150,
       required: true,
-      type: 'currency'
+      type: 'number',
+      prefix: '£'
+    },
+    {
+      name: 'costWithTax',
+      label: 'Cost w/ Tax',
+      columnWidth: 150,
+      required: true,
+      readOnly: true,
+      type: 'number',
+      prefix: '£',
+      value: (objectData) => {
+        if (objectData?.costTaxRate?.rateType == 'percentage') {
+          return (
+            (
+              objectData?.cost *
+              (1 + objectData?.costTaxRate?.rate / 100)
+            ).toFixed(2) || undefined
+          )
+        } else if (objectData?.costTaxRate?.rateType == 'amount') {
+          return (
+            (objectData?.cost + objectData?.costTaxRate?.rate).toFixed(2) ||
+            undefined
+          )
+        }
+      }
+    },
+    {
+      name: 'costTaxRate',
+      label: 'Cost Tax Rate',
+      required: true,
+      type: 'object',
+      objectType: 'taxRate',
+      showHyperlink: true
     },
     {
       name: 'color',
diff --git a/src/database/models/OrderItem.js b/src/database/models/OrderItem.js
index 480b122..e57aff3 100644
--- a/src/database/models/OrderItem.js
+++ b/src/database/models/OrderItem.js
@@ -82,11 +82,19 @@ export const OrderItem = {
       },
       required: true
     },
+    {
+      name: 'shipment',
+      label: 'Shipment',
+      type: 'object',
+      objectType: 'shipment',
+      showHyperlink: true,
+      required: true
+    },
     {
       name: 'itemType',
       label: 'Item Type',
       type: 'objectType',
-      masterFilter: ['part', 'packaging'],
+      masterFilter: ['part', 'packaging', 'filament'],
       required: true,
       columnWidth: 125
     },
diff --git a/src/database/models/PurchaseOrder.js b/src/database/models/PurchaseOrder.js
index 28dfcaf..ef88ef6 100644
--- a/src/database/models/PurchaseOrder.js
+++ b/src/database/models/PurchaseOrder.js
@@ -71,12 +71,24 @@ export const PurchaseOrder = {
       showHyperlink: true
     },
     {
-      name: 'cost',
-      label: 'Cost',
-      type: 'netGross',
+      name: 'totalAmount',
+      label: 'Total Amount',
+      type: 'number',
+      prefix: '£',
+      readOnly: true
+    },
+    {
+      name: 'totalAmountWithTax',
+      label: 'Total Amount w/ Tax',
+      type: 'number',
+      prefix: '£',
+      readOnly: true
+    },
+    {
+      name: 'totalTaxAmount',
+      label: 'Total Tax Amount',
+      type: 'number',
       prefix: '£',
-      min: 0,
-      step: 0.01,
       readOnly: true
     }
   ]