farmcontrol/farmcontrol-ui
farmcontrol/farmcontrol-ui
2
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Enhance NewPartSku and NewProductSku components to include overrideCost and overridePrice properties, improving visibility options. Update PartInfo to utilize objectFormState for default values, ensuring consistency in data handling.

Browse Source
This commit is contained in:
Tom Butcher 2026-06-21 21:17:03 +01:00
parent c7189a21c5
commit 6cd0dca365
3 changed files with 36 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/components/Dashboard/Management/PartSkus/NewPartSku.jsx
View File

@ -5,7 +5,15 @@ import WizardView from '../../common/WizardView'
const NewPartSku = ({ onOk, reset, defaultValues }) => { const NewPartSku = ({ onOk, reset, defaultValues }) => {
return ( return (
<NewObjectForm type='partSku' reset={reset} defaultValues={defaultValues}> <NewObjectForm
type='partSku'
reset={reset}
defaultValues={{
overrideCost: false,
overridePrice: false,
...defaultValues
}}
>
{({ handleSubmit, submitLoading, objectData, formValid }) => { {({ handleSubmit, submitLoading, objectData, formValid }) => {
const steps = [ const steps = [
{ {
@ -28,6 +36,8 @@ const NewPartSku = ({ onOk, reset, defaultValues }) => {
costTaxRate: false, costTaxRate: false,
price: false, price: false,
priceWithTax: false, priceWithTax: false,
overrideCost: false,
overridePrice: false,
margin: false, margin: false,
amount: false, amount: false,
priceTaxRate: false, priceTaxRate: false,
@ -43,15 +53,18 @@ const NewPartSku = ({ onOk, reset, defaultValues }) => {
<ObjectInfo <ObjectInfo
type='partSku' type='partSku'
column={1} column={1}
labelWidth={100} labelWidth={120}
visibleProperties={{ visibleProperties={{
_id: false, overrideCost: true,
createdAt: false, cost: true,
updatedAt: false, costTaxRate: true,
barcode: false, costWithTax: true,
part: false, overridePrice: true,
name: false, priceMode: true,
description: false price: true,
margin: true,
priceTaxRate: true,
priceWithTax: true
}} }}
bordered={false} bordered={false}
isEditing={true} isEditing={true}
@ -90,7 +103,7 @@ const NewPartSku = ({ onOk, reset, defaultValues }) => {
_id: false, _id: false,
_reference: false _reference: false
}} }}
labelWidth={100} labelWidth={120}
bordered={false} bordered={false}
isEditing={false} isEditing={false}
objectData={objectData} objectData={objectData}

2
src/components/Dashboard/Management/Parts/PartInfo.jsx
View File

@ -193,7 +193,7 @@ const PartInfo = () => {
}} }}
reset={newPartSkuOpen} reset={newPartSkuOpen}
defaultValues={{ defaultValues={{
part: partId ? { _id: partId } : undefined part: objectFormState?.objectData || undefined
}} }}
/> />
</Modal> </Modal>

20
src/components/Dashboard/Management/ProductSkus/NewProductSku.jsx
View File

@ -35,6 +35,8 @@ const NewProductSku = ({ onOk, reset, defaultValues }) => {
margin: false, margin: false,
amount: false, amount: false,
priceTaxRate: false, priceTaxRate: false,
overrideCost: false,
overridePrice: false,
vendor: false, vendor: false,
parts: false parts: false
}} }}
@ -50,15 +52,17 @@ const NewProductSku = ({ onOk, reset, defaultValues }) => {
column={1} column={1}
labelWidth={100} labelWidth={100}
visibleProperties={{ visibleProperties={{
_id: false, overrideCost: true,
createdAt: false, cost: true,
updatedAt: false, costTaxRate: true,
barcode: false, costWithTax: true,
product: false, overridePrice: true,
name: false, price: true,
description: false, priceTaxRate: true,
parts: false priceWithTax: true,
priceMode: true
}} }}
required={true}
bordered={false} bordered={false}
isEditing={true} isEditing={true}
objectData={objectData} objectData={objectData}