@things-factory/product-ui 4.3.156 → 4.3.161

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

@@ -541,11 +541,8 @@ 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 === null ? (item.costPrice = 0) : item.costPrice
+        if (item.costPrice == 0 || item.costPrice) {
           item.costPrice = item.costPrice.toFixed(2)
         }
       })
@@ -574,9 +571,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 +611,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: parseFloat(itm.costPrice),
           mrpPrice: itm.mrpPrice,
           sellPrice: itm.sellPrice,
           afterTaxCostPrice: itm.afterTaxCostPrice,

package/client/pages/product-list.js

@@ -86,6 +86,9 @@ class ProductList extends localize(i18next)(PageView) {
       },
       importable: {
         handler: records => {
+          records.map(record => {
+            record.costPrice = record.costPrice == null ? '0.00' : parseFloat(record.costPrice).toFixed(2)
+          })
           const config = {
             rows: this.productGristConfig.rows,
             columns: [
@@ -362,7 +365,7 @@ class ProductList extends localize(i18next)(PageView) {
           {
             type: 'integer',
             name: 'shelfLife',
-            record: { editable: true },
+            record: { editable: true, options: { min: 0 } },
             imex: { header: i18next.t('field.shelf_life'), key: 'shelfLife', width: 30, type: 'integer' },
             header: i18next.t('field.shelf_life'),
             sortable: true,
@@ -584,7 +587,7 @@ class ProductList extends localize(i18next)(PageView) {
             type: 'float',
             name: 'costPrice',
             record: { editable: true },
-            imex: { header: `${i18next.t('field.unit_cost')} 1`, key: 'costPrice', width: 20, type: 'number' },
+            imex: { header: `${i18next.t('field.unit_cost')}`, key: 'costPrice', width: 20, type: 'number' },
             header: `${i18next.t('field.unit_cost')}`,
             width: 100
           },
@@ -881,18 +884,12 @@ class ProductList extends localize(i18next)(PageView) {
       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,
+          costPrice: patch?.costPrice || patch.costPrice == 0 ? parseFloat(patch.costPrice) : undefined,
+          expirationPeriod:
+            patch?.expirationPeriod || patch?.expirationPeriod == 0 ? parseInt(patch.expirationPeriod) : undefined,
+          shelfLife: patch?.shelfLife || patch?.shelfLife == 0 ? parseInt(patch.shelfLife) : undefined,
           productRef: patch.productRef?.id ? { id: patch.productRef?.id } : undefined,
           parentProductRef: patch.parentProductRef?.id ? { id: patch.parentProductRef?.id } : undefined
         }
@@ -925,17 +922,8 @@ class ProductList extends localize(i18next)(PageView) {
         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)
-          }
-        }
+        patch.costPrice = patch.costPrice == null ? 0 : patch.costPrice
+
         return {
           ...patch,
           costPrice: patch?.costPrice ? parseFloat(patch.costPrice) : undefined,
@@ -1006,29 +994,14 @@ class ProductList extends localize(i18next)(PageView) {
           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 (isNaN(itm.costPrice) && itm.costPrice !== undefined) {
+        errors.push({ type: 'costPrice', value: 'invalid unit cost (not a number)' })
       }
-      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)' })
-        }
+
+      if (itm?.costPrice && 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.161",
   "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.161",
+    "@things-factory/shell": "^4.3.159"
   },
-  "gitHead": "cbdf5546969663ba03bb1f4f10666599aa6d00bc"
+  "gitHead": "7fe9232a64285ebaa04382258806889c47924157"
 }