diff --git a/src/components/Dashboard/Management/PartSkus/NewPartSku.jsx b/src/components/Dashboard/Management/PartSkus/NewPartSku.jsx index e056b7e..552fb9e 100644 --- a/src/components/Dashboard/Management/PartSkus/NewPartSku.jsx +++ b/src/components/Dashboard/Management/PartSkus/NewPartSku.jsx @@ -5,7 +5,15 @@ import WizardView from '../../common/WizardView' const NewPartSku = ({ onOk, reset, defaultValues }) => { return ( - + {({ handleSubmit, submitLoading, objectData, formValid }) => { const steps = [ { @@ -28,6 +36,8 @@ const NewPartSku = ({ onOk, reset, defaultValues }) => { costTaxRate: false, price: false, priceWithTax: false, + overrideCost: false, + overridePrice: false, margin: false, amount: false, priceTaxRate: false, @@ -43,15 +53,18 @@ const NewPartSku = ({ onOk, reset, defaultValues }) => { { _id: false, _reference: false }} - labelWidth={100} + labelWidth={120} bordered={false} isEditing={false} objectData={objectData} diff --git a/src/components/Dashboard/Management/Parts/PartInfo.jsx b/src/components/Dashboard/Management/Parts/PartInfo.jsx index b3cb057..1e25d81 100644 --- a/src/components/Dashboard/Management/Parts/PartInfo.jsx +++ b/src/components/Dashboard/Management/Parts/PartInfo.jsx @@ -193,7 +193,7 @@ const PartInfo = () => { }} reset={newPartSkuOpen} defaultValues={{ - part: partId ? { _id: partId } : undefined + part: objectFormState?.objectData || undefined }} /> diff --git a/src/components/Dashboard/Management/ProductSkus/NewProductSku.jsx b/src/components/Dashboard/Management/ProductSkus/NewProductSku.jsx index d2e8311..50fc676 100644 --- a/src/components/Dashboard/Management/ProductSkus/NewProductSku.jsx +++ b/src/components/Dashboard/Management/ProductSkus/NewProductSku.jsx @@ -35,6 +35,8 @@ const NewProductSku = ({ onOk, reset, defaultValues }) => { margin: false, amount: false, priceTaxRate: false, + overrideCost: false, + overridePrice: false, vendor: false, parts: false }} @@ -50,15 +52,17 @@ const NewProductSku = ({ onOk, reset, defaultValues }) => { column={1} labelWidth={100} visibleProperties={{ - _id: false, - createdAt: false, - updatedAt: false, - barcode: false, - product: false, - name: false, - description: false, - parts: false + overrideCost: true, + cost: true, + costTaxRate: true, + costWithTax: true, + overridePrice: true, + price: true, + priceTaxRate: true, + priceWithTax: true, + priceMode: true }} + required={true} bordered={false} isEditing={true} objectData={objectData}