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

Improved product creation.
Some checks are pending
farmcontrol/farmcontrol-ui/pipeline/head Build started...
Details

Browse Source
This commit is contained in:
Tom Butcher 2026-06-19 21:49:53 +01:00
parent 53dce0e024
commit 696b457978
2 changed files with 30 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/components/Dashboard/Management/Products/NewProduct.jsx
View File

@ -25,7 +25,13 @@ const NewProduct = ({ onOk, defaultValues }) => {
visibleProperties={{ visibleProperties={{
priceMode: false, priceMode: false,
margin: false, margin: false,
amount: false amount: false,
priceTaxRate: false,
cost: false,
costTaxRate: false,
costWithTax: false,
price: false,
priceWithTax: false
}} }}
/> />
) )
@ -44,7 +50,13 @@ const NewProduct = ({ onOk, defaultValues }) => {
visibleProperties={{ visibleProperties={{
priceMode: true, priceMode: true,
margin: true, margin: true,
amount: true amount: true,
priceTaxRate: true,
cost: true,
costTaxRate: true,
costWithTax: true,
price: true,
priceWithTax: true
}} }}
/> />
) )
@ -73,6 +85,7 @@ const NewProduct = ({ onOk, defaultValues }) => {
bordered={false} bordered={false}
visibleProperties={{ visibleProperties={{
_id: false, _id: false,
_reference: false,
createdAt: false, createdAt: false,
updatedAt: false updatedAt: false
}} }}

33
src/database/models/Product.js
View File

@ -178,7 +178,7 @@ export const Product = {
{ {
name: 'cost', name: 'cost',
label: 'Cost', label: 'Cost',
required: false, required: true,
type: 'number', type: 'number',
prefix: '£', prefix: '£',
min: 0, min: 0,
@ -188,7 +188,7 @@ export const Product = {
{ {
name: 'costWithTax', name: 'costWithTax',
label: 'Cost w/ Tax', label: 'Cost w/ Tax',
required: false, required: true,
readOnly: true, readOnly: true,
type: 'number', type: 'number',
prefix: '£', prefix: '£',
@ -197,14 +197,13 @@ export const Product = {
columnWidth: 150, columnWidth: 150,
value: (objectData) => { value: (objectData) => {
const cost = objectData?.cost const cost = objectData?.cost
if (!cost) return undefined if (!cost) return 0
if (objectData?.costTaxRate?.rateType == 'percentage') { if (objectData?.costTaxRate?.rateType == 'percentage') {
return ( return (
(cost * (1 + objectData?.costTaxRate?.rate / 100)).toFixed(2) || (cost * (1 + objectData?.costTaxRate?.rate / 100)).toFixed(2) || 0
undefined
) )
} else if (objectData?.costTaxRate?.rateType == 'amount') { } else if (objectData?.costTaxRate?.rateType == 'amount') {
return (cost + objectData?.costTaxRate?.rate).toFixed(2) || undefined return (cost + objectData?.costTaxRate?.rate).toFixed(2) || 0
} }
return cost return cost
} }
@ -212,7 +211,7 @@ export const Product = {
{ {
name: 'costTaxRate', name: 'costTaxRate',
label: 'Cost Tax Rate', label: 'Cost Tax Rate',
required: false, required: true,
type: 'object', type: 'object',
objectType: 'taxRate', objectType: 'taxRate',
showHyperlink: true, showHyperlink: true,
@ -221,14 +220,14 @@ export const Product = {
{ {
name: 'priceMode', name: 'priceMode',
label: 'Price Mode', label: 'Price Mode',
required: false, required: true,
type: 'priceMode', type: 'priceMode',
columnWidth: 150 columnWidth: 150
}, },
{ {
name: 'price', name: 'price',
label: 'Price', label: 'Price',
required: false, required: true,
type: 'number', type: 'number',
prefix: '£', prefix: '£',
min: 0, min: 0,
@ -243,8 +242,7 @@ export const Product = {
objectData?.cost != null objectData?.cost != null
) { ) {
return ( return (
(objectData.cost * (1 + objectData.margin / 100)).toFixed(2) || (objectData.cost * (1 + objectData.margin / 100)).toFixed(2) || 0
undefined
) )
} }
return objectData?.price return objectData?.price
@ -253,7 +251,7 @@ export const Product = {
{ {
name: 'margin', name: 'margin',
label: 'Margin', label: 'Margin',
required: false, required: true,
type: 'number', type: 'number',
disabled: (objectData) => objectData?.priceMode == 'amount', disabled: (objectData) => objectData?.priceMode == 'amount',
suffix: '%', suffix: '%',
@ -265,7 +263,7 @@ export const Product = {
{ {
name: 'priceWithTax', name: 'priceWithTax',
label: 'Price w/ Tax', label: 'Price w/ Tax',
required: false, required: true,
readOnly: true, readOnly: true,
type: 'number', type: 'number',
prefix: '£', prefix: '£',
@ -283,14 +281,13 @@ export const Product = {
} else { } else {
price = objectData?.price price = objectData?.price
} }
if (!price) return undefined if (!price) return 0
if (objectData?.priceTaxRate?.rateType == 'percentage') { if (objectData?.priceTaxRate?.rateType == 'percentage') {
return ( return (
(price * (1 + objectData?.priceTaxRate?.rate / 100)).toFixed(2) || (price * (1 + objectData?.priceTaxRate?.rate / 100)).toFixed(2) || 0
undefined
) )
} else if (objectData?.priceTaxRate?.rateType == 'amount') { } else if (objectData?.priceTaxRate?.rateType == 'amount') {
return (price + objectData?.priceTaxRate?.rate).toFixed(2) || undefined return (price + objectData?.priceTaxRate?.rate).toFixed(2) || 0
} }
return price return price
} }
@ -298,7 +295,7 @@ export const Product = {
{ {
name: 'priceTaxRate', name: 'priceTaxRate',
label: 'Price Tax Rate', label: 'Price Tax Rate',
required: false, required: true,
type: 'object', type: 'object',
objectType: 'taxRate', objectType: 'taxRate',
showHyperlink: true, showHyperlink: true,