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

Compare commits

base: farmcontrol:4501f9936f28b16601dec7289cf9ae482d8aee83
Branches Tags
farmcontrol:main
farmcontrol:development
farmcontrol:windows-auth-fix
farmcontrol:electrobun-migration
..
compare: farmcontrol:c7189a21c56d3030fd88104261e3331e51aaef20
Branches Tags
farmcontrol:main
farmcontrol:development
farmcontrol:windows-auth-fix
farmcontrol:electrobun-migration

No commits in common. "4501f9936f28b16601dec7289cf9ae482d8aee83" and "c7189a21c56d3030fd88104261e3331e51aaef20" have entirely different histories.
4501f9936f ... c7189a21c5

6 changed files with 143 additions and 237 deletions
Show Stats Expand all files Collapse all files

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

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

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

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

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

@ -8,11 +8,7 @@ const NewProductSku = ({ onOk, reset, defaultValues }) => {
<NewObjectForm
type='productSku'
reset={reset}
defaultValues={{
overrideCost: false,
overridePrice: false,
...defaultValues
}}
defaultValues={defaultValues}
>
{({ handleSubmit, submitLoading, objectData, formValid }) => {
const steps = [
@ -39,8 +35,6 @@ const NewProductSku = ({ onOk, reset, defaultValues }) => {
margin: false,
amount: false,
priceTaxRate: false,
overrideCost: false,
overridePrice: false,
vendor: false,
parts: false
}}
@ -54,18 +48,49 @@ const NewProductSku = ({ onOk, reset, defaultValues }) => {
<ObjectInfo
type='productSku'
column={1}
labelWidth={120}
labelWidth={100}
visibleProperties={{
overrideCost: true,
cost: true,
costTaxRate: true,
costWithTax: true,
overridePrice: true,
priceMode: true,
price: true,
margin: true,
priceTaxRate: true,
priceWithTax: true
_id: false,
createdAt: false,
updatedAt: false,
barcode: false,
product: false,
name: false,
description: false,
parts: false
}}
bordered={false}
isEditing={true}
objectData={objectData}
/>
)
},
{
title: 'Parts',
key: 'parts',
content: (
<ObjectInfo
type='productSku'
column={1}
labelWidth={100}
visibleProperties={{
_id: false,
createdAt: false,
updatedAt: false,
barcode: false,
product: false,
name: false,
description: false,
priceMode: false,
cost: false,
costWithTax: false,
costTaxRate: false,
price: false,
priceWithTax: false,
margin: false,
amount: false,
priceTaxRate: false,
vendor: false
}}
bordered={false}
isEditing={true}
@ -102,10 +127,9 @@ const NewProductSku = ({ onOk, reset, defaultValues }) => {
createdAt: false,
updatedAt: false,
_id: false,
_reference: false,
parts: false
_reference: false
}}
labelWidth={120}
labelWidth={100}
bordered={false}
isEditing={false}
objectData={objectData}

2
src/components/Dashboard/Management/Products/ProductInfo.jsx
View File

@ -197,7 +197,7 @@ const ProductInfo = () => {
}}
reset={newProductSkuOpen}
defaultValues={{
product: objectFormState?.objectData || undefined
product: productId ? { _id: productId } : undefined
}}
/>
</Modal>

146
src/database/models/PartSku.js
View File

@ -75,17 +75,7 @@ export const PartSku = {
'createdAt',
'updatedAt'
],
filters: [
'_id',
'barcode',
'part',
'part._id',
'name',
'cost',
'costWithTax',
'price',
'priceWithTax'
],
filters: ['_id', 'barcode', 'part', 'part._id', 'name', 'cost', 'costWithTax', 'price', 'priceWithTax'],
sorters: [
'barcode',
'part',
@ -163,43 +153,53 @@ export const PartSku = {
columnWidth: 200
},
{
name: 'overrideCost',
label: 'Override Cost',
required: true,
type: 'bool',
name: 'priceMode',
label: 'Price Mode',
required: false,
type: 'priceMode',
columnWidth: 150
},
{
name: 'overrideCost',
label: 'Override Cost',
required: false,
type: 'bool',
value: (objectData) => objectData?.overrideCost ?? false,
columnWidth: 150
},
{
name: 'overridePrice',
label: 'Override Price',
required: false,
type: 'bool',
value: (objectData) => objectData?.overridePrice ?? false,
columnWidth: 150
},
{
name: 'cost',
label: 'Cost',
required: true,
required: false,
type: 'number',
prefix: '£',
min: 0,
step: 0.01,
visible: (objectData) => {
return objectData?.overrideCost
},
disabled: (objectData) => !objectData?.overrideCost,
value: (objectData) =>
objectData?.overrideCost ? objectData?.cost : objectData?.part?.cost,
objectData?.overrideCost ? objectData?.cost : undefined,
columnWidth: 100
},
{
name: 'costWithTax',
label: 'Cost w/ Tax',
required: true,
required: false,
readOnly: true,
type: 'number',
prefix: '£',
min: 0,
step: 0.01,
visible: (objectData) => {
return objectData?.overrideCost
},
disabled: (objectData) => !objectData?.overrideCost,
value: (objectData) => {
if (!objectData?.overrideCost)
return objectData?.part?.costWithTax || undefined
if (!objectData?.overrideCost) return undefined
const cost = objectData?.cost
const taxRate = objectData?.costTaxRate
if (!cost) return 0
@ -215,58 +215,28 @@ export const PartSku = {
{
name: 'costTaxRate',
label: 'Cost Tax Rate',
required: true,
required: false,
type: 'object',
objectType: 'taxRate',
showHyperlink: true,
visible: (objectData) => {
return objectData?.overrideCost
},
disabled: (objectData) => !objectData?.overrideCost,
value: (objectData) =>
objectData?.overrideCost
? objectData?.costTaxRate
: objectData?.part?.costTaxRate,
columnWidth: 150
},
{
name: 'overridePrice',
label: 'Override Price',
required: true,
type: 'bool',
columnWidth: 150
},
{
name: 'priceMode',
label: 'Price Mode',
required: true,
visible: (objectData) => {
return objectData?.overridePrice
},
value: (objectData) => {
return objectData?.overridePrice
? objectData?.priceMode
: objectData?.part?.priceMode
},
type: 'priceMode',
objectData?.overrideCost ? objectData?.costTaxRate : undefined,
columnWidth: 150
},
{
name: 'price',
label: 'Price',
required: true,
required: false,
type: 'number',
prefix: '£',
min: 0,
step: 0.1,
fixedNumber: 2,
visible: (objectData) => {
return objectData?.overridePrice
},
disabled: (objectData) => !objectData?.overridePrice,
readOnly: (objectData) =>
objectData?.overridePrice && objectData?.priceMode == 'margin',
value: (objectData) => {
if (!objectData?.overridePrice)
return objectData?.part?.price || undefined
if (!objectData?.overridePrice) return undefined
const priceMode = objectData?.priceMode ?? objectData?.part?.priceMode
const cost = objectData?.overrideCost
? objectData?.cost
@ -278,7 +248,7 @@ export const PartSku = {
margin !== null &&
cost != null
) {
return cost * (1 + margin / 100) || undefined
return (cost * (1 + margin / 100)).toFixed(2) || undefined
}
return objectData?.price
},
@ -287,18 +257,15 @@ export const PartSku = {
{
name: 'priceWithTax',
label: 'Price w/ Tax',
required: true,
required: false,
readOnly: true,
type: 'number',
prefix: '£',
min: 0,
step: 0.01,
visible: (objectData) => {
return objectData?.overridePrice
},
disabled: (objectData) => !objectData?.overridePrice,
value: (objectData) => {
if (!objectData?.overridePrice)
return objectData.part?.priceWithTax || undefined
if (!objectData?.overridePrice) return undefined
let price
const priceMode = objectData?.priceMode ?? objectData?.part?.priceMode
const cost = objectData?.overrideCost
@ -325,51 +292,28 @@ export const PartSku = {
{
name: 'margin',
label: 'Margin',
required: true,
required: false,
type: 'number',
visible: (objectData) => {
return objectData?.overridePrice
},
readOnly: (objectData) => {
const priceMode = objectData?.priceMode ?? objectData?.part?.priceMode
return priceMode == 'amount'
},
disabled: (objectData) =>
!objectData?.overridePrice || objectData?.priceMode == 'amount',
suffix: '%',
min: 0,
max: 100,
step: 0.01,
value: (objectData) => {
if (!objectData?.overridePrice)
return objectData?.part?.margin || undefined
const priceMode = objectData?.priceMode ?? objectData?.part?.priceMode
const cost = objectData?.overrideCost
? objectData?.cost
: objectData?.part?.cost
if (priceMode == 'amount') {
const price = objectData?.price
if (price != null && cost != null) {
return Number(((price / cost - 1) * 100).toFixed(2)) || undefined
}
return undefined
}
return objectData?.margin ?? objectData?.part?.margin
},
value: (objectData) =>
objectData?.overridePrice ? objectData?.margin : undefined,
columnWidth: 85
},
{
name: 'priceTaxRate',
label: 'Price Tax Rate',
required: true,
required: false,
type: 'object',
objectType: 'taxRate',
showHyperlink: true,
visible: (objectData) => {
return objectData?.overridePrice
},
disabled: (objectData) => !objectData?.overridePrice,
value: (objectData) =>
objectData?.overridePrice
? objectData?.priceTaxRate
: objectData?.part?.priceTaxRate,
objectData?.overridePrice ? objectData?.priceTaxRate : undefined,
columnWidth: 150
}
]

131
src/database/models/ProductSku.js
View File

@ -163,45 +163,54 @@ export const ProductSku = {
type: 'text',
columnWidth: 200
},
{
name: 'priceMode',
label: 'Price Mode',
required: false,
type: 'priceMode',
columnWidth: 150
},
{
name: 'overrideCost',
label: 'Override Cost',
required: true,
required: false,
type: 'bool',
value: (objectData) => objectData?.overrideCost ?? false,
columnWidth: 150
},
{
name: 'overridePrice',
label: 'Override Price',
required: false,
type: 'bool',
value: (objectData) => objectData?.overridePrice ?? false,
columnWidth: 150
},
{
name: 'cost',
label: 'Cost',
required: true,
required: false,
type: 'number',
prefix: '£',
min: 0,
step: 0.01,
visible: (objectData) => {
return objectData?.overrideCost
},
disabled: (objectData) => !objectData?.overrideCost,
value: (objectData) =>
objectData?.overrideCost
? objectData?.cost
: objectData?.product?.cost,
objectData?.overrideCost ? objectData?.cost : undefined,
columnWidth: 100
},
{
name: 'costWithTax',
label: 'Cost w/ Tax',
required: true,
required: false,
readOnly: true,
type: 'number',
prefix: '£',
min: 0,
step: 0.01,
visible: (objectData) => {
return objectData?.overrideCost
},
disabled: (objectData) => !objectData?.overrideCost,
value: (objectData) => {
if (!objectData?.overrideCost)
return objectData?.product?.costWithTax || undefined
if (!objectData?.overrideCost) return undefined
const cost = objectData?.cost
const taxRate = objectData?.costTaxRate
if (!cost) return 0
@ -217,58 +226,28 @@ export const ProductSku = {
{
name: 'costTaxRate',
label: 'Cost Tax Rate',
required: true,
required: false,
type: 'object',
objectType: 'taxRate',
showHyperlink: true,
visible: (objectData) => {
return objectData?.overrideCost
},
disabled: (objectData) => !objectData?.overrideCost,
value: (objectData) =>
objectData?.overrideCost
? objectData?.costTaxRate
: objectData?.product?.costTaxRate,
columnWidth: 150
},
{
name: 'overridePrice',
label: 'Override Price',
required: true,
type: 'bool',
columnWidth: 150
},
{
name: 'priceMode',
label: 'Price Mode',
required: true,
visible: (objectData) => {
return objectData?.overridePrice
},
value: (objectData) => {
return objectData?.overridePrice
? objectData?.priceMode
: objectData?.product?.priceMode
},
type: 'priceMode',
objectData?.overrideCost ? objectData?.costTaxRate : undefined,
columnWidth: 150
},
{
name: 'price',
label: 'Price',
required: true,
required: false,
type: 'number',
prefix: '£',
min: 0,
step: 0.1,
fixedNumber: 2,
visible: (objectData) => {
return objectData?.overridePrice
},
disabled: (objectData) => !objectData?.overridePrice,
readOnly: (objectData) =>
objectData?.overridePrice && objectData?.priceMode == 'margin',
value: (objectData) => {
if (!objectData?.overridePrice)
return objectData?.product?.price || undefined
if (!objectData?.overridePrice) return undefined
const priceMode =
objectData?.priceMode ?? objectData?.product?.priceMode
const cost = objectData?.overrideCost
@ -281,7 +260,7 @@ export const ProductSku = {
margin !== null &&
cost != null
) {
return cost * (1 + margin / 100) || undefined
return (cost * (1 + margin / 100)).toFixed(2) || undefined
}
return objectData?.price
},
@ -290,18 +269,15 @@ export const ProductSku = {
{
name: 'priceWithTax',
label: 'Price w/ Tax',
required: true,
required: false,
readOnly: true,
type: 'number',
prefix: '£',
min: 0,
step: 0.01,
visible: (objectData) => {
return objectData?.overridePrice
},
disabled: (objectData) => !objectData?.overridePrice,
value: (objectData) => {
if (!objectData?.overridePrice)
return objectData.product?.priceWithTax || undefined
if (!objectData?.overridePrice) return undefined
let price
const priceMode =
objectData?.priceMode ?? objectData?.product?.priceMode
@ -329,53 +305,28 @@ export const ProductSku = {
{
name: 'margin',
label: 'Margin',
required: true,
required: false,
type: 'number',
visible: (objectData) => {
return objectData?.overridePrice
},
readOnly: (objectData) => {
const priceMode =
objectData?.priceMode ?? objectData?.product?.priceMode
return priceMode == 'amount'
},
disabled: (objectData) =>
!objectData?.overridePrice || objectData?.priceMode == 'amount',
suffix: '%',
min: 0,
max: 100,
step: 0.01,
value: (objectData) => {
if (!objectData?.overridePrice)
return objectData?.product?.margin || undefined
const priceMode =
objectData?.priceMode ?? objectData?.product?.priceMode
const cost = objectData?.overrideCost
? objectData?.cost
: objectData?.product?.cost
if (priceMode == 'amount') {
const price = objectData?.price
if (price != null && cost != null) {
return Number(((price / cost - 1) * 100).toFixed(2)) || undefined
}
return undefined
}
return objectData?.margin ?? objectData?.product?.margin
},
value: (objectData) =>
objectData?.overridePrice ? objectData?.margin : undefined,
columnWidth: 85
},
{
name: 'priceTaxRate',
label: 'Price Tax Rate',
required: true,
required: false,
type: 'object',
objectType: 'taxRate',
showHyperlink: true,
visible: (objectData) => {
return objectData?.overridePrice
},
disabled: (objectData) => !objectData?.overridePrice,
value: (objectData) =>
objectData?.overridePrice
? objectData?.priceTaxRate
: objectData?.product?.priceTaxRate,
objectData?.overridePrice ? objectData?.priceTaxRate : undefined,
columnWidth: 150
},
{