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:696b457978b818c0dc33225fdef201a52d8b73a5
Branches Tags
farmcontrol:main
farmcontrol:development
farmcontrol:windows-auth-fix
farmcontrol:electrobun-migration
..
compare: farmcontrol:2d36b8ee97665d1e63b65ecbc0dde3a27417da8c
Branches Tags
farmcontrol:main
farmcontrol:development
farmcontrol:windows-auth-fix
farmcontrol:electrobun-migration

No commits in common. "696b457978b818c0dc33225fdef201a52d8b73a5" and "2d36b8ee97665d1e63b65ecbc0dde3a27417da8c" have entirely different histories.
696b457978 ... 2d36b8ee97

21 changed files with 27 additions and 56 deletions
Show Stats Expand all files Collapse all files

1
src/components/Dashboard/Inventory/FilamentStocks/NewFilamentStock.jsx
View File

@ -36,7 +36,6 @@ const NewFilamentStock = ({ onOk, reset, defaultValues }) => {
bordered={false} bordered={false}
visibleProperties={{ visibleProperties={{
_id: false, _id: false,
_reference: false,
createdAt: false, createdAt: false,
updatedAt: false updatedAt: false
}} }}

1
src/components/Dashboard/Inventory/PartStocks/NewPartStock.jsx
View File

@ -36,7 +36,6 @@ const NewPartStock = ({ onOk, reset, defaultValues }) => {
bordered={false} bordered={false}
visibleProperties={{ visibleProperties={{
_id: false, _id: false,
_reference: false,
createdAt: false, createdAt: false,
updatedAt: false updatedAt: false
}} }}

1
src/components/Dashboard/Inventory/StockAudits/NewStockAudit.jsx
View File

@ -36,7 +36,6 @@ const NewStockAudit = ({ onOk, reset, defaultValues }) => {
bordered={false} bordered={false}
visibleProperties={{ visibleProperties={{
_id: false, _id: false,
_reference: false,
createdAt: false, createdAt: false,
updatedAt: false updatedAt: false
}} }}

1
src/components/Dashboard/Inventory/StockLocations/NewStockLocation.jsx
View File

@ -32,7 +32,6 @@ const NewStockLocation = ({ onOk, reset }) => {
bordered={false} bordered={false}
visibleProperties={{ visibleProperties={{
_id: false, _id: false,
_reference: false,
createdAt: false, createdAt: false,
updatedAt: false updatedAt: false
}} }}

1
src/components/Dashboard/Management/CourierServices/NewCourierService.jsx
View File

@ -53,7 +53,6 @@ const NewCourierService = ({ onOk, defaultValues }) => {
bordered={false} bordered={false}
visibleProperties={{ visibleProperties={{
_id: false, _id: false,
_reference: false,
createdAt: false, createdAt: false,
updatedAt: false updatedAt: false
}} }}

1
src/components/Dashboard/Management/Couriers/NewCourier.jsx
View File

@ -46,7 +46,6 @@ const NewCourier = ({ onOk, defaultValues }) => {
bordered={false} bordered={false}
visibleProperties={{ visibleProperties={{
_id: false, _id: false,
_reference: false,
createdAt: false, createdAt: false,
updatedAt: false updatedAt: false
}} }}

1
src/components/Dashboard/Management/DocumentPrinters/NewDocumentPrinter.jsx
View File

@ -50,7 +50,6 @@ const NewDocumentPrinter = ({ onOk, defaultValues }) => {
bordered={false} bordered={false}
visibleProperties={{ visibleProperties={{
_id: false, _id: false,
_reference: false,
createdAt: false, createdAt: false,
updatedAt: false updatedAt: false
}} }}

1
src/components/Dashboard/Management/DocumentSizes/NewDocumentSize.jsx
View File

@ -32,7 +32,6 @@ const NewDocumentSize = ({ onOk, defaultValues }) => {
bordered={false} bordered={false}
visibleProperties={{ visibleProperties={{
_id: false, _id: false,
_reference: false,
createdAt: false, createdAt: false,
updatedAt: false updatedAt: false
}} }}

1
src/components/Dashboard/Management/DocumentTemplates/NewDocumentTemplate.jsx
View File

@ -50,7 +50,6 @@ const NewDocumentTemplate = ({ onOk, defaultValues }) => {
bordered={false} bordered={false}
visibleProperties={{ visibleProperties={{
_id: false, _id: false,
_reference: false,
createdAt: false, createdAt: false,
updatedAt: false updatedAt: false
}} }}

1
src/components/Dashboard/Management/Filaments/NewFilament.jsx
View File

@ -46,7 +46,6 @@ const NewFilament = ({ onOk }) => {
bordered={false} bordered={false}
visibleProperties={{ visibleProperties={{
_id: false, _id: false,
_reference: false,
createdAt: false, createdAt: false,
updatedAt: false updatedAt: false
}} }}

1
src/components/Dashboard/Management/Materials/NewMaterial.jsx
View File

@ -46,7 +46,6 @@ const NewMaterial = ({ onOk }) => {
bordered={false} bordered={false}
visibleProperties={{ visibleProperties={{
_id: false, _id: false,
_reference: false,
createdAt: false, createdAt: false,
updatedAt: false updatedAt: false
}} }}

1
src/components/Dashboard/Management/NoteTypes/NewNoteType.jsx
View File

@ -51,7 +51,6 @@ const NewNoteType = ({ onOk }) => {
bordered={false} bordered={false}
visibleProperties={{ visibleProperties={{
_id: false, _id: false,
_reference: false,
createdAt: false, createdAt: false,
updatedAt: false updatedAt: false
}} }}

1
src/components/Dashboard/Management/Parts/NewPart.jsx
View File

@ -88,7 +88,6 @@ const NewPart = ({ onOk, defaultValues }) => {
bordered={false} bordered={false}
visibleProperties={{ visibleProperties={{
_id: false, _id: false,
_reference: false,
createdAt: false, createdAt: false,
updatedAt: false updatedAt: false
}} }}

1
src/components/Dashboard/Management/ProductCategories/NewProductCategory.jsx
View File

@ -32,7 +32,6 @@ const NewProductCategory = ({ onOk }) => {
bordered={false} bordered={false}
visibleProperties={{ visibleProperties={{
_id: false, _id: false,
_reference: false,
createdAt: false, createdAt: false,
updatedAt: false updatedAt: false
}} }}

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

@ -25,13 +25,7 @@ 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
}} }}
/> />
) )
@ -50,13 +44,7 @@ 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
}} }}
/> />
) )
@ -85,7 +73,6 @@ const NewProduct = ({ onOk, defaultValues }) => {
bordered={false} bordered={false}
visibleProperties={{ visibleProperties={{
_id: false, _id: false,
_reference: false,
createdAt: false, createdAt: false,
updatedAt: false updatedAt: false
}} }}

1
src/components/Dashboard/Management/TaxRates/NewTaxRate.jsx
View File

@ -46,7 +46,6 @@ const NewTaxRate = ({ onOk, defaultValues }) => {
bordered={false} bordered={false}
visibleProperties={{ visibleProperties={{
_id: false, _id: false,
_reference: false,
createdAt: false, createdAt: false,
updatedAt: false updatedAt: false
}} }}

1
src/components/Dashboard/Management/TaxRecords/NewTaxRecord.jsx
View File

@ -46,7 +46,6 @@ const NewTaxRecord = ({ onOk, defaultValues }) => {
bordered={false} bordered={false}
visibleProperties={{ visibleProperties={{
_id: false, _id: false,
_reference: false,
createdAt: false, createdAt: false,
updatedAt: false updatedAt: false
}} }}

1
src/components/Dashboard/Management/Vendors/NewVendor.jsx
View File

@ -49,7 +49,6 @@ const NewVendor = ({ onOk, defaultValues }) => {
bordered={false} bordered={false}
visibleProperties={{ visibleProperties={{
_id: false, _id: false,
_reference: false,
createdAt: false, createdAt: false,
updatedAt: false updatedAt: false
}} }}

2
src/components/Dashboard/Sales/Clients/NewClient.jsx
View File

@ -49,7 +49,6 @@ const NewClient = ({ onOk, defaultValues }) => {
bordered={false} bordered={false}
visibleProperties={{ visibleProperties={{
_id: false, _id: false,
_reference: false,
createdAt: false, createdAt: false,
updatedAt: false updatedAt: false
}} }}
@ -85,3 +84,4 @@ NewClient.propTypes = {
} }
export default NewClient export default NewClient

14
src/components/Dashboard/context/ApiServerContext.jsx
View File

@ -802,14 +802,12 @@ const ApiServerProvider = ({ children }) => {
if (filter != null && Object.keys(filter).length > 0) { if (filter != null && Object.keys(filter).length > 0) {
const model = getModelByName(type) const model = getModelByName(type)
if (model.name !== 'unknown') { for (const key of Object.keys(filter)) {
for (const key of Object.keys(filter)) { const property = model?.properties?.find((p) => p.name === key)
const property = model?.properties?.find((p) => p.name === key) if (property && property.type === 'object') {
if (property && property.type === 'object') { const value = filter[key]
const value = filter[key] newFilter[`${key}._id`] = value?._id ?? value
newFilter[`${key}._id`] = value?._id ?? value delete newFilter[key]
delete newFilter[key]
}
} }
} }
} }

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

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