@things-factory/product-ui 4.3.598 → 4.3.631

package/client/pages/product-list.js

@@ -3,15 +3,29 @@ import '@things-factory/grist-ui'
 import './product-details-popup'
 
 import gql from 'graphql-tag'
-import { css, html } from 'lit'
+import {
+  css,
+  html
+} from 'lit'
 import _ from 'lodash'
 
 import { getCodeByName } from '@things-factory/code-base'
-import { i18next, localize } from '@things-factory/i18n-base'
+import {
+  i18next,
+  localize
+} from '@things-factory/i18n-base'
 import { openImportPopUp } from '@things-factory/import-ui'
 import { openPopup } from '@things-factory/layout-base'
-import { client, CustomAlert, gqlContext, PageView } from '@things-factory/shell'
-import { CommonButtonStyles, ScrollbarStyles } from '@things-factory/styles'
+import {
+  client,
+  CustomAlert,
+  gqlContext,
+  PageView
+} from '@things-factory/shell'
+import {
+  CommonButtonStyles,
+  ScrollbarStyles
+} from '@things-factory/styles'
 import { isMobileDevice } from '@things-factory/utils'
 
 import { PICKING_STRATEGIES } from './constants/picking-strategy'
@@ -998,20 +1012,48 @@ class ProductList extends localize(i18next)(PageView) {
               : undefined,
           productRef: patch.productRef?.id ? { id: patch.productRef?.id } : undefined,
           parentProductRef: patch.parentProductRef?.id ? { id: patch.parentProductRef?.id } : undefined,
-          costPrice: patch?.costPrice ? parseFloat(patch.costPrice) : undefined,
+          costPrice: 
+            patch?.costPrice || patch?.costPrice == 0 
+            ? 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,
+          bufferQty: 
+            patch?.bufferQty || patch?.bufferQty == 0 
+            ? parseInt(patch.bufferQty)  
+            : undefined,
+          minQty: 
+            patch?.minQty || patch?.minQty == 0 
+            ? parseInt(patch.minQty) 
+            : undefined,
+          maxQty: 
+            patch?.maxQty || patch?.maxQty == 0 
+            ? parseInt(patch.maxQty) 
+            : undefined,
           packingSize: patch?.packingSize ? parseInt(patch.packingSize) : undefined,
-          minInboundShelfLife: patch?.minInboundShelfLife ? parseInt(patch.minInboundShelfLife) : undefined,
-          minOutboundShelfLife: patch?.minOutboundShelfLife ? parseInt(patch.minOutboundShelfLife) : undefined,
-          outboundAlert: patch?.outboundAlert ? parseInt(patch.outboundAlert) : undefined,
-          productShelfLife: patch?.productShelfLife ? parseInt(patch.productShelfLife) : undefined,
-          commissionFee: patch?.commissionFee ? parseFloat(patch.commissionFee) : undefined,
-          platformFee: patch?.platformFee ? parseFloat(patch.platformFee) : undefined,
-          serviceFee: patch?.serviceFee ? parseFloat(patch.serviceFee) : undefined,
-          transactionFee: patch?.transactionFee ? parseFloat(patch.transactionFee) : undefined
+          outboundAlert: 
+            patch?.outboundAlert || patch?.outboundAlert == 0
+            ? parseInt(patch.outboundAlert) 
+            : undefined,
+          productShelfLife: 
+            patch?.productShelfLife || patch?.productShelfLife == 0
+            ? parseInt(patch.productShelfLife) 
+            : undefined,
+          commissionFee: 
+            patch?.commissionFee || patch?.commissionFee == 0 
+            ? parseFloat(patch.commissionFee) 
+            : undefined,
+          platformFee: 
+            patch?.platformFee || patch?.platformFee == 0
+            ? parseFloat(patch.platformFee) 
+            : undefined,
+          serviceFee: 
+            patch?.serviceFee || patch?.serviceFee == 0 
+            ? parseFloat(patch.serviceFee) 
+            : undefined,
+          transactionFee: 
+            patch?.transactionFee || patch?.transactionFee == 0 
+            ? parseFloat(patch.transactionFee) 
+            : undefined
         }
       })
 
@@ -1316,6 +1358,7 @@ class ProductList extends localize(i18next)(PageView) {
                 name
                 type
                 packingType
+                packingSize
                 uom
                 uomValue
                 productBarcodes {
@@ -1418,9 +1461,10 @@ class ProductList extends localize(i18next)(PageView) {
           return {
             ...product,
             packingType: pd.packingType,
+            packingSize: pd.packingSize,
             uom: pd.uom,
             uomValue: pd.uomValue,
-            gtin: gtin
+            gtin: gtin,
           }
         })
         flattenedList.push(...pds)
@@ -1433,6 +1477,7 @@ class ProductList extends localize(i18next)(PageView) {
           platformFee: item.platformFee,
           serviceFee: item.serviceFee,
           transactionFee: item.transactionFee,
+          packingSize: item.packingSize,
           gtin: item.gtin,
           ...this.productGristConfig.columns
             .filter(column => column.type !== 'gutter' && column.record !== undefined && column.imex !== undefined)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/product-ui",
-  "version": "4.3.598",
+  "version": "4.3.631",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -31,5 +31,5 @@
     "@things-factory/product-base": "^4.3.595",
     "@things-factory/shell": "^4.3.591"
   },
-  "gitHead": "e65dbc1974cf56e879a2359b5ebc44c2ff0e76ab"
+  "gitHead": "c6f91170d443086dcd3bfd691113fcf08a2f1b89"
 }