src/components/Dashboard/Management/PartSkus/NewPartSku.jsx

@@ -5,15 +5,7 @@ import WizardView from '../../common/WizardView'
 
 const NewPartSku = ({ onOk, reset, defaultValues }) => {
   return (
-    <NewObjectForm
+    <NewObjectForm type='partSku' reset={reset} defaultValues={defaultValues}>
-      type='partSku'
-      reset={reset}
-      defaultValues={{
-        overrideCost: false,
-        overridePrice: false,
-        ...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,
+                  _id: false,
-                  cost: true,
+                  createdAt: false,
-                  costTaxRate: true,
+                  updatedAt: false,
-                  costWithTax: true,
+                  barcode: false,
-                  overridePrice: true,
+                  part: false,
-                  priceMode: true,
+                  name: false,
-                  price: true,
+                  description: false
-                  margin: true,
-                  priceTaxRate: true,
-                  priceWithTax: true
                 }}
                 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}

src/components/Dashboard/Management/Parts/PartInfo.jsx

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

src/components/Dashboard/Management/ProductSkus/NewProductSku.jsx

@@ -8,11 +8,7 @@ const NewProductSku = ({ onOk, reset, defaultValues }) => {
     <NewObjectForm
       type='productSku'
       reset={reset}
-      defaultValues={{
+      defaultValues={defaultValues}
-        overrideCost: false,
-        overridePrice: false,
-        ...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,
+                  _id: false,
-                  cost: true,
+                  createdAt: false,
-                  costTaxRate: true,
+                  updatedAt: false,
-                  costWithTax: true,
+                  barcode: false,
-                  overridePrice: true,
+                  product: false,
-                  priceMode: true,
+                  name: false,
-                  price: true,
+                  description: false,
-                  margin: true,
+                  parts: false
-                  priceTaxRate: true,
+                }}
-                  priceWithTax: true
+                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,
+                  _reference: false
-                  parts: false
                 }}
-                labelWidth={120}
+                labelWidth={100}
                 bordered={false}
                 isEditing={false}
                 objectData={objectData}

src/components/Dashboard/Management/Products/ProductInfo.jsx

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

src/database/models/PartSku.js

@@ -75,17 +75,7 @@ export const PartSku = {
     'createdAt',
     'updatedAt'
   ],
-  filters: [
+  filters: ['_id', 'barcode', 'part', 'part._id', 'name', 'cost', 'costWithTax', 'price', 'priceWithTax'],
-    '_id',
-    'barcode',
-    'part',
-    'part._id',
-    'name',
-    'cost',
-    'costWithTax',
-    'price',
-    'priceWithTax'
-  ],
   sorters: [
     'barcode',
     'part',
@@ -163,43 +153,53 @@ export const PartSku = {
       columnWidth: 200
     },
     {
-      name: 'overrideCost',
+      name: 'priceMode',
-      label: 'Override Cost',
+      label: 'Price Mode',
-      required: true,
+      required: false,
-      type: 'bool',
+      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) => {
+      disabled: (objectData) => !objectData?.overrideCost,
-        return 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) => {
+      disabled: (objectData) => !objectData?.overrideCost,
-        return objectData?.overrideCost
-      },
       value: (objectData) => {
-        if (!objectData?.overrideCost)
+        if (!objectData?.overrideCost) return undefined
-          return objectData?.part?.costWithTax || 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) => {
+      disabled: (objectData) => !objectData?.overrideCost,
-        return objectData?.overrideCost
-      },
       value: (objectData) =>
-        objectData?.overrideCost
+        objectData?.overrideCost ? objectData?.costTaxRate : undefined,
-          ? 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',
       columnWidth: 150
     },
     {
       name: 'price',
       label: 'Price',
-      required: true,
+      required: false,
       type: 'number',
       prefix: '£',
       min: 0,
       step: 0.1,
-      fixedNumber: 2,
+      disabled: (objectData) => !objectData?.overridePrice,
-      visible: (objectData) => {
-        return objectData?.overridePrice
-      },
       readOnly: (objectData) =>
         objectData?.overridePrice && objectData?.priceMode == 'margin',
       value: (objectData) => {
-        if (!objectData?.overridePrice)
+        if (!objectData?.overridePrice) return undefined
-          return objectData?.part?.price || 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) => {
+      disabled: (objectData) => !objectData?.overridePrice,
-        return objectData?.overridePrice
-      },
       value: (objectData) => {
-        if (!objectData?.overridePrice)
+        if (!objectData?.overridePrice) return undefined
-          return objectData.part?.priceWithTax || 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) => {
+      disabled: (objectData) =>
-        return objectData?.overridePrice
+        !objectData?.overridePrice || objectData?.priceMode == 'amount',
-      },
-      readOnly: (objectData) => {
-        const priceMode = objectData?.priceMode ?? objectData?.part?.priceMode
-        return priceMode == 'amount'
-      },
       suffix: '%',
       min: 0,
       max: 100,
       step: 0.01,
-      value: (objectData) => {
+      value: (objectData) =>
-        if (!objectData?.overridePrice)
+        objectData?.overridePrice ? objectData?.margin : undefined,
-          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
-      },
       columnWidth: 85
     },
     {
       name: 'priceTaxRate',
       label: 'Price Tax Rate',
-      required: true,
+      required: false,
       type: 'object',
       objectType: 'taxRate',
       showHyperlink: true,
-      visible: (objectData) => {
+      disabled: (objectData) => !objectData?.overridePrice,
-        return objectData?.overridePrice
-      },
       value: (objectData) =>
-        objectData?.overridePrice
+        objectData?.overridePrice ? objectData?.priceTaxRate : undefined,
-          ? objectData?.priceTaxRate
-          : objectData?.part?.priceTaxRate,
       columnWidth: 150
     }
   ]

src/database/models/ProductSku.js

@@ -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) => {
+      disabled: (objectData) => !objectData?.overrideCost,
-        return objectData?.overrideCost
-      },
       value: (objectData) =>
-        objectData?.overrideCost
+        objectData?.overrideCost ? objectData?.cost : undefined,
-          ? objectData?.cost
-          : objectData?.product?.cost,
       columnWidth: 100
     },
     {
       name: 'costWithTax',
       label: 'Cost w/ Tax',
-      required: true,
+      required: false,
       readOnly: true,
       type: 'number',
       prefix: '£',
       min: 0,
       step: 0.01,
-      visible: (objectData) => {
+      disabled: (objectData) => !objectData?.overrideCost,
-        return objectData?.overrideCost
-      },
       value: (objectData) => {
-        if (!objectData?.overrideCost)
+        if (!objectData?.overrideCost) return undefined
-          return objectData?.product?.costWithTax || 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) => {
+      disabled: (objectData) => !objectData?.overrideCost,
-        return objectData?.overrideCost
-      },
       value: (objectData) =>
-        objectData?.overrideCost
+        objectData?.overrideCost ? objectData?.costTaxRate : undefined,
-          ? 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',
       columnWidth: 150
     },
     {
       name: 'price',
       label: 'Price',
-      required: true,
+      required: false,
       type: 'number',
       prefix: '£',
       min: 0,
       step: 0.1,
-      fixedNumber: 2,
+      disabled: (objectData) => !objectData?.overridePrice,
-      visible: (objectData) => {
-        return objectData?.overridePrice
-      },
       readOnly: (objectData) =>
         objectData?.overridePrice && objectData?.priceMode == 'margin',
       value: (objectData) => {
-        if (!objectData?.overridePrice)
+        if (!objectData?.overridePrice) return undefined
-          return objectData?.product?.price || 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) => {
+      disabled: (objectData) => !objectData?.overridePrice,
-        return objectData?.overridePrice
-      },
       value: (objectData) => {
-        if (!objectData?.overridePrice)
+        if (!objectData?.overridePrice) return undefined
-          return objectData.product?.priceWithTax || 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) => {
+      disabled: (objectData) =>
-        return objectData?.overridePrice
+        !objectData?.overridePrice || objectData?.priceMode == 'amount',
-      },
-      readOnly: (objectData) => {
-        const priceMode =
-          objectData?.priceMode ?? objectData?.product?.priceMode
-        return priceMode == 'amount'
-      },
       suffix: '%',
       min: 0,
       max: 100,
       step: 0.01,
-      value: (objectData) => {
+      value: (objectData) =>
-        if (!objectData?.overridePrice)
+        objectData?.overridePrice ? objectData?.margin : undefined,
-          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
-      },
       columnWidth: 85
     },
     {
       name: 'priceTaxRate',
       label: 'Price Tax Rate',
-      required: true,
+      required: false,
       type: 'object',
       objectType: 'taxRate',
       showHyperlink: true,
-      visible: (objectData) => {
+      disabled: (objectData) => !objectData?.overridePrice,
-        return objectData?.overridePrice
-      },
       value: (objectData) =>
-        objectData?.overridePrice
+        objectData?.overridePrice ? objectData?.priceTaxRate : undefined,
-          ? objectData?.priceTaxRate
-          : objectData?.product?.priceTaxRate,
       columnWidth: 150
     },
     {