@things-factory/product-ui 4.3.156 → 4.3.159

package/client/pages/product-details-popup.js

@@ -341,13 +341,6 @@ export class ProductDetailsPopup extends localize(i18next)(LitElement) {
           header: i18next.t('field.volume'),
           width: 70
         },
-        {
-          type: 'float',
-          name: 'costPrice',
-          record: { editable: true, options: { min: 0 } },
-          header: i18next.t('field.unit_cost'),
-          width: 70
-        },
         {
           type: 'string',
           name: 'auxUnit1',
@@ -540,16 +533,6 @@ export class ProductDetailsPopup extends localize(i18next)(LitElement) {
 
       let data = this._updateRowOption(response.data.productDetails.items)
 
-      data.map(item => {
-        if (item.costPrice) {
-          item.costPrice = item.costPrice.toFixed(2)
-        }
-        if (!item.costPrice) {
-          item.costPrice = 0
-          item.costPrice = item.costPrice.toFixed(2)
-        }
-      })
-
       if (!response.errors) {
         this._data = {
           total: response.data.productDetails.total || 0,
@@ -574,9 +557,6 @@ export class ProductDetailsPopup extends localize(i18next)(LitElement) {
       this._validate()
 
       let patches = this.dataGrist._data.records.map(itm => {
-        if (itm.costPrice) {
-          itm.costPrice = itm.costPrice
-        }
         return {
           id: itm.id,
           name: itm.name,
@@ -617,7 +597,7 @@ export class ProductDetailsPopup extends localize(i18next)(LitElement) {
           auxValue5: itm.auxValue5,
           isTrackedAsInventory: itm.isTrackedAsInventory,
           discountId: itm.discountId,
-          costPrice: itm?.costPrice ? parseFloat(itm.costPrice) : undefined,
+          costPrice: itm.costPrice,
           mrpPrice: itm.mrpPrice,
           sellPrice: itm.sellPrice,
           afterTaxCostPrice: itm.afterTaxCostPrice,
@@ -666,9 +646,7 @@ export class ProductDetailsPopup extends localize(i18next)(LitElement) {
 
   _validate() {
     let errors = []
-    if (this.dataGrist.dirtyRecords.length < 1) {
-      throw new Error(i18next.t('text.nothing_changed'))
-    }
+
     if (!this.dataGrist._data.records.find(x => x.isDefault)) {
       errors.push({ type: 'isDefault', value: 'Must have 1 default' })
     }
@@ -715,9 +693,6 @@ export class ProductDetailsPopup extends localize(i18next)(LitElement) {
         if (!errors.find(err => err.type == 'uomValue'))
           errors.push({ type: 'uomValue', value: 'UOM Value is required' })
       }
-      if (itm.costPrice < 0) {
-        throw new Error(i18next.t('text.unit_cost_cannot_be_negative_value'))
-      }
       return itm
     })
 
@@ -732,7 +707,6 @@ export class ProductDetailsPopup extends localize(i18next)(LitElement) {
   }
 
   _fieldChange(e) {
-    let unitCostError = ''
     var { after, before, column, record, row } = e.detail
     let updatedRecords = {
       ...this.dataGrist._data,
@@ -762,17 +736,6 @@ export class ProductDetailsPopup extends localize(i18next)(LitElement) {
           updatedRecords.records[row].uomValue = 1
         }
         break
-
-      case 'costPrice':
-        if (isNaN(after) === true) {
-          unitCostError = 'not a number'
-          updatedRecords.records[row].costPrice = updatedRecords.records[row].__dirtyfields__.costPrice.before
-          this._showToast({ type: 'error', message: `Invalid value in Unit Cost (${unitCostError})` })
-        }
-        if (after < 0) {
-          unitCostError = 'negative value'
-        }
-        break
       default:
         break
     }
@@ -783,11 +746,7 @@ export class ProductDetailsPopup extends localize(i18next)(LitElement) {
         ...this.dataGrist._data
       }
 
-      if (column.name == 'costPrice') {
-        this._showToast({ type: 'error', message: `Invalid value in Unit Cost (${unitCostError})` })
-      } else {
-        this._showToast({ type: 'error', message: `Minimum value of ${column.record.options.min} is required.` })
-      }
+      this._showToast({ type: 'error', message: `Minimum value of ${column.record.options.min} is required.` })
     }
 
     this._data = { ...updatedRecords }

package/client/pages/product-list.js

@@ -359,15 +359,6 @@ class ProductList extends localize(i18next)(PageView) {
             sortable: true,
             width: 140
           },
-          {
-            type: 'integer',
-            name: 'shelfLife',
-            record: { editable: true },
-            imex: { header: i18next.t('field.shelf_life'), key: 'shelfLife', width: 30, type: 'integer' },
-            header: i18next.t('field.shelf_life'),
-            sortable: true,
-            width: 140
-          },
           {
             type: 'boolean',
             name: 'isRequiredCheckExpiry',
@@ -580,14 +571,6 @@ class ProductList extends localize(i18next)(PageView) {
             header: i18next.t('field.volume_size'),
             width: 100
           },
-          {
-            type: 'float',
-            name: 'costPrice',
-            record: { editable: true },
-            imex: { header: `${i18next.t('field.unit_cost')} 1`, key: 'costPrice', width: 20, type: 'number' },
-            header: `${i18next.t('field.unit_cost')}`,
-            width: 100
-          },
           {
             type: 'string',
             name: 'auxUnit1',
@@ -739,7 +722,6 @@ class ProductList extends localize(i18next)(PageView) {
               inventoryAccountCode
               cogsAccountCode
               expirationPeriod
-              shelfLife
               isRequiredCheckExpiry
               isRequireSerialNumberScanning
               isRequireSerialNumberScanningInbound
@@ -798,13 +780,9 @@ class ProductList extends localize(i18next)(PageView) {
         total: response.data.myBizplaceProducts.total || 0,
         records:
           response.data.myBizplaceProducts.items.map(itm => {
-            if (itm.costPrice == NaN || itm.costPrice == null) {
-              itm.costPrice = 0
-            }
             return {
               ...itm,
-              productRef: { name: itm?.productRef ? '(' + itm.productRef.sku + ') ' + itm.productRef.name : '' },
-              costPrice: parseFloat(itm.costPrice).toFixed(2)
+              productRef: { name: itm?.productRef ? '(' + itm.productRef.sku + ') ' + itm.productRef.name : '' }
             }
           }) || []
       }
@@ -878,26 +856,17 @@ class ProductList extends localize(i18next)(PageView) {
         return this.showToast(i18next.t('text.nothing_changed'))
       }
 
-      this._validate(this.dataGrist.dirtyRecords)
-
       patches = patches.map(patch => {
-        if (patch.costPrice) {
-          patch.costPrice = parseFloat(patch.costPrice).toFixed(2)
-        }
-        if (!patch.costPrice) {
-          patch.costPrice = 0
-          patch.costPrice = parseFloat(patch.costPrice).toFixed(2)
-        }
         return {
           ...patch,
-          costPrice: patch?.costPrice ? parseFloat(patch.costPrice) : undefined,
           expirationPeriod: patch?.expirationPeriod ? parseInt(patch.expirationPeriod) : undefined,
-          shelfLife: patch?.shelfLife ? parseInt(patch.shelfLife) : undefined,
           productRef: patch.productRef?.id ? { id: patch.productRef?.id } : undefined,
           parentProductRef: patch.parentProductRef?.id ? { id: patch.parentProductRef?.id } : undefined
         }
       })
 
+      this._validate(this.dataGrist.dirtyRecords)
+
       const response = await client.mutate({
         mutation: gql`
           mutation updateMultipleProduct($patches: [ProductPatch!]!) {
@@ -924,28 +893,16 @@ class ProductList extends localize(i18next)(PageView) {
       if (!patches?.length) {
         return this.showToast(i18next.t('text.nothing_changed'))
       }
+
       patches = patches.map(patch => {
-        if (patch.costPrice) {
-          patch.costPrice = parseFloat(patch.costPrice).toFixed(2)
-        }
-        if (!patch.costPrice) {
-          if (patch.costPrice == null) {
-            patch.costPrice = 0
-            patch.costPrice = parseFloat(patch.costPrice).toFixed(2)
-          } else {
-            patch.costPrice = parseFloat(patch.costPrice).toFixed(2)
-          }
-        }
         return {
           ...patch,
-          costPrice: patch?.costPrice ? parseFloat(patch.costPrice) : undefined,
           uomValue: patch?.uomValue ? parseFloat(patch.uomValue) : undefined,
           bufferQty: patch?.bufferQty ? parseInt(patch.bufferQty) : undefined,
           minQty: patch?.minQty ? parseInt(patch.minQty) : undefined,
           maxQty: patch?.maxQty ? parseInt(patch.maxQty) : undefined,
           packingSize: patch?.packingSize ? parseInt(patch.packingSize) : undefined,
           expirationPeriod: patch?.expirationPeriod ? parseInt(patch.expirationPeriod) : undefined,
-          shelfLife: patch?.shelfLife ? parseInt(patch.shelfLife) : undefined,
           productRef: patch.productRef?.id ? { id: patch.productRef?.id } : undefined,
           pickingStrategy: patch?.pickingStrategy ? patch.pickingStrategy.toUpperCase() : undefined
         }
@@ -997,38 +954,6 @@ class ProductList extends localize(i18next)(PageView) {
         if (!errors.find(err => err.type == 'uomValue'))
           errors.push({ type: 'uomValue', value: 'UOM Value is required' })
       }
-      if (itm?.shelfLife < 0) {
-        if (!errors.find(err => err.type == 'shelfLife'))
-          errors.push({ type: 'shelfLife', value: 'Shelf Life cannot be negative' })
-      }
-      if (itm?.expirationPeriod < 0) {
-        if (!errors.find(err => err.type == 'expirationPeriod'))
-          errors.push({ type: 'expirationPeriod', value: 'Expiration period cannot be negative' })
-      }
-
-      if (itm.costPrice < 0 && itm.__dirty__ != '+') {
-        if (!errors.find(err => err.type == 'costPrice'))
-          errors.push({ type: 'costPrice', value: 'invalid unit cost (negative value)' })
-      }
-      if (!itm.costPrice && itm.__dirty__ != '+') {
-        if (itm.costPrice == 0) {
-          itm.costPrice = 0
-        } else {
-          errors.push({ type: 'costPrice', value: 'invalid unit cost (not a number)' })
-        }
-      }
-      if (itm.__dirty__ == '+') {
-        if (!itm.costPrice) {
-          if (itm.costPrice == undefined || itm.costPrice == 0) {
-            itm.costPrice = 0
-          } else {
-            errors.push({ type: 'costPrice', value: 'invalid unit cost (not a number)' })
-          }
-        }
-        if (itm.costPrice < 0) {
-          errors.push({ type: 'costPrice', value: 'invalid unit cost (negative value)' })
-        }
-      }
       return itm
     })
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/product-ui",
-  "version": "4.3.156",
+  "version": "4.3.159",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -23,13 +23,13 @@
     "migration:create": "node ../../node_modules/typeorm/cli.js migration:create -d ./server/migrations"
   },
   "dependencies": {
-    "@things-factory/form-ui": "^4.3.156",
-    "@things-factory/grist-ui": "^4.3.156",
-    "@things-factory/i18n-base": "^4.3.156",
-    "@things-factory/import-ui": "^4.3.156",
-    "@things-factory/layout-base": "^4.3.156",
-    "@things-factory/product-base": "^4.3.156",
-    "@things-factory/shell": "^4.3.156"
+    "@things-factory/form-ui": "^4.3.159",
+    "@things-factory/grist-ui": "^4.3.159",
+    "@things-factory/i18n-base": "^4.3.159",
+    "@things-factory/import-ui": "^4.3.159",
+    "@things-factory/layout-base": "^4.3.159",
+    "@things-factory/product-base": "^4.3.159",
+    "@things-factory/shell": "^4.3.159"
   },
-  "gitHead": "cbdf5546969663ba03bb1f4f10666599aa6d00bc"
+  "gitHead": "4ef9913b22e5b7baee27d9057fb04c707f7f49ec"
 }

package/translations/en.json

@@ -51,7 +51,6 @@
   "field.require_serial_number_scanning_outbound": "require serial number scanning outbound",
   "field.require_serial_number_scanning": "require serial number scanning",
   "field.required_checking_expiry": "required checking expiry",
-  "field.shelf_life": "shelf life",
   "field.sku": "SKU",
   "field.sub_brand": "sub brand",
   "field.threshold_qty": "threshold qty",
@@ -64,7 +63,6 @@
   "field.weight_unit": "weight unit",
   "field.weight": "weight",
   "field.width": "width",
-  "field.unit_cost": "unit cost",
   "label.fefo": "FEFO",
   "label.fmfo": "FMFO",
   "label.fifo": "FIFO",

package/translations/ko.json

@@ -77,7 +77,5 @@
   "title.product_bundle": "[ko]product bundle",
   "title.product_set": "[ko]product set",
   "title.product": "[ko]product",
-  "field.child_product_detail": "[ko] child product detail",
-  "field.unit_cost": "[ko] unit cost",
-  "field.shelf_life": "[ko] shelf life"
+  "field.child_product_detail": "[ko] child product detail"
 }

package/translations/ms.json

@@ -77,7 +77,5 @@
   "title.product_bundle": "[ms]product bundle",
   "title.product_set": "[ms]product set",
   "title.product": "[ms]product",
-  "field.child_product_detail": "[ms] child product detail",
-  "field.unit_cost": "[ms] unit cost",
-  "field.shelf_life": "[ms] shelf life"
+  "field.child_product_detail": "[ms] child product detail"
 }

package/translations/zh.json

@@ -77,7 +77,5 @@
   "title.product_bundle": "[zh]product bundle",
   "title.product_set": "[zh]product set",
   "title.product": "[zh]product",
-  "field.child_product_detail": "[zh] child product detail",
-  "field.unit_cost": "[zh] unit cost",
-  "field.shelf_life": "[zh] shelf life"
+  "field.child_product_detail": "[zh] child product detail"
 }