From b8adc777a4b08575449730fdca2e67345a7b74c6 Mon Sep 17 00:00:00 2001 From: Tom Butcher Date: Tue, 1 Sep 2026 15:41:45 +0100 Subject: [PATCH] Enhance Invoice, Payment, ProductStock, and PartStock Models with Modal Centering and Code Formatting - Added 'modalCentered' property to the 'post' modal in Invoice, Payment, ProductStock, and PartStock models to improve modal presentation. - Reformatted content return statements in Invoice, Payment, and PurchaseOrder models for better readability and consistency. --- src/database/models/Invoice.js | 7 ++++++- src/database/models/PartStock.js | 1 + src/database/models/Payment.js | 7 ++++++- src/database/models/ProductStock.js | 1 + src/database/models/PurchaseOrder.js | 27 ++++++++++++++++++++------- 5 files changed, 34 insertions(+), 9 deletions(-) diff --git a/src/database/models/Invoice.js b/src/database/models/Invoice.js index c0953bc4..c39f27eb 100644 --- a/src/database/models/Invoice.js +++ b/src/database/models/Invoice.js @@ -40,7 +40,11 @@ export const Invoice = { label: 'New Invoice', icon: PlusIcon, content: (objectData, { onOk } = {}) => { - return createElement(NewInvoice, { defaultValues: objectData, onOk, reset: true }) + return createElement(NewInvoice, { + defaultValues: objectData, + onOk, + reset: true + }) } }, { @@ -131,6 +135,7 @@ export const Invoice = { name: 'post', type: 'modal', modalWidth: 520, + modalCentered: true, label: 'Post', icon: CheckIcon, visible: (objectData) => { diff --git a/src/database/models/PartStock.js b/src/database/models/PartStock.js index f1c90418..ebe13488 100644 --- a/src/database/models/PartStock.js +++ b/src/database/models/PartStock.js @@ -118,6 +118,7 @@ export const PartStock = { name: 'post', type: 'modal', modalWidth: 520, + modalCentered: true, label: 'Post', icon: CheckIcon, disabled: (objectData) => { diff --git a/src/database/models/Payment.js b/src/database/models/Payment.js index 17fa6fc7..c34528aa 100644 --- a/src/database/models/Payment.js +++ b/src/database/models/Payment.js @@ -46,7 +46,11 @@ export const Payment = { label: 'New Payment', icon: PlusIcon, content: (objectData, { onOk } = {}) => { - return createElement(NewPayment, { defaultValues: objectData, onOk, reset: true }) + return createElement(NewPayment, { + defaultValues: objectData, + onOk, + reset: true + }) } }, { @@ -121,6 +125,7 @@ export const Payment = { { name: 'post', type: 'modal', + modalCentered: true, modalWidth: 520, label: 'Post', icon: CheckIcon, diff --git a/src/database/models/ProductStock.js b/src/database/models/ProductStock.js index d8ddbb56..0c6f2669 100644 --- a/src/database/models/ProductStock.js +++ b/src/database/models/ProductStock.js @@ -120,6 +120,7 @@ export const ProductStock = { name: 'post', type: 'modal', modalWidth: 520, + modalCentered: true, label: 'Post', icon: CheckIcon, disabled: (objectData) => { diff --git a/src/database/models/PurchaseOrder.js b/src/database/models/PurchaseOrder.js index 95927c12..4939455e 100644 --- a/src/database/models/PurchaseOrder.js +++ b/src/database/models/PurchaseOrder.js @@ -1,19 +1,24 @@ import { createElement, lazy } from 'react' const PurchaseOrderInfo = lazy( - () => import('../../components/Dashboard/Inventory/PurchaseOrders/PurchaseOrderInfo') + () => + import('../../components/Dashboard/Inventory/PurchaseOrders/PurchaseOrderInfo') ) const NewPurchaseOrder = lazy( - () => import('../../components/Dashboard/Inventory/PurchaseOrders/NewPurchaseOrder') + () => + import('../../components/Dashboard/Inventory/PurchaseOrders/NewPurchaseOrder') ) const PostPurchaseOrder = lazy( - () => import('../../components/Dashboard/Inventory/PurchaseOrders/PostPurchaseOrder') + () => + import('../../components/Dashboard/Inventory/PurchaseOrders/PostPurchaseOrder') ) const AcknowledgePurchaseOrder = lazy( - () => import('../../components/Dashboard/Inventory/PurchaseOrders/AcknowledgePurchaseOrder') + () => + import('../../components/Dashboard/Inventory/PurchaseOrders/AcknowledgePurchaseOrder') ) const CancelPurchaseOrder = lazy( - () => import('../../components/Dashboard/Inventory/PurchaseOrders/CancelPurchaseOrder') + () => + import('../../components/Dashboard/Inventory/PurchaseOrders/CancelPurchaseOrder') ) const DeleteObject = lazy( () => import('../../components/Dashboard/common/DeleteObject') @@ -43,7 +48,11 @@ export const PurchaseOrder = { label: 'New Purchase Order', icon: PlusIcon, content: (objectData, { onOk } = {}) => { - return createElement(NewPurchaseOrder, { defaultValues: objectData, onOk, reset: true }) + return createElement(NewPurchaseOrder, { + defaultValues: objectData, + onOk, + reset: true + }) } }, { @@ -156,7 +165,10 @@ export const PurchaseOrder = { ] return !allowedStates.includes(objectData?.state?.type) }, - objectData: (objectData) => ({ orderType: 'purchaseOrder', order: objectData }) + objectData: (objectData) => ({ + orderType: 'purchaseOrder', + order: objectData + }) }, { type: 'divider' @@ -164,6 +176,7 @@ export const PurchaseOrder = { { name: 'post', type: 'modal', + modalCentered: true, modalWidth: 520, label: 'Post', icon: CheckIcon,