@things-factory/product-ui 4.3.607 → 4.3.637

package/client/pages/product-list.js

@@ -3,29 +3,15 @@ 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'
@@ -493,6 +479,20 @@ class ProductList extends localize(i18next)(PageView) {
             sortable: true,
             width: 120
           },
+          {
+            type: 'boolean',
+            name: 'isInventoryDecimal',
+            header: i18next.t('field.inventory_decimal'),
+            record: { editable: true, align: 'center' },
+            imex: {
+              header: i18next.t('field.inventory_decimal'),
+              key: 'isInventoryDecimal',
+              width: 30,
+              type: 'string'
+            },
+            sortable: true,
+            width: 120
+          },
           {
             type: 'object',
             name: 'productRef',
@@ -867,6 +867,7 @@ class ProductList extends localize(i18next)(PageView) {
               isRequireSerialNumberScanning
               isRequireSerialNumberScanningInbound
               isRequireSerialNumberScanningOutbound
+              isInventoryDecimal
               weightUnit
               nettWeight
               grossWeight
@@ -1012,48 +1013,21 @@ 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 || patch?.costPrice == 0 
-            ? parseFloat(patch.costPrice) 
-            : undefined,
+          costPrice: patch?.costPrice || patch?.costPrice == 0 ? parseFloat(patch.costPrice) : undefined,
           uomValue: patch?.uomValue ? parseFloat(patch.uomValue) : 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,
+          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,
-          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
+          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
         }
       })
 
@@ -1095,6 +1069,7 @@ class ProductList extends localize(i18next)(PageView) {
           patch.isRequireSerialNumberScanningInbound?.toString().toLowerCase() === 'true'
         patch.isRequireSerialNumberScanningOutbound =
           patch.isRequireSerialNumberScanningOutbound?.toString().toLowerCase() === 'true'
+        patch.isInventoryDecimal = patch.isInventoryDecimal?.toString().toLowerCase() === 'true'
 
         return {
           ...patch,
@@ -1121,7 +1096,8 @@ class ProductList extends localize(i18next)(PageView) {
           volume: patch?.volume ? parseFloat(patch.volume) : undefined,
           isRequiredCheckExpiry: patch?.isRequiredCheckExpiry || false,
           isRequireSerialNumberScanningInbound: patch?.isRequireSerialNumberScanningInbound || false,
-          isRequireSerialNumberScanningOutbound: patch?.isRequireSerialNumberScanningOutbound || false
+          isRequireSerialNumberScanningOutbound: patch?.isRequireSerialNumberScanningOutbound || false,
+          isInventoryDecimal: patch?.isInventoryDecimal || false
         }
       })
 
@@ -1358,6 +1334,7 @@ class ProductList extends localize(i18next)(PageView) {
                 name
                 type
                 packingType
+                packingSize
                 uom
                 uomValue
                 productBarcodes {
@@ -1378,6 +1355,7 @@ class ProductList extends localize(i18next)(PageView) {
               isRequireSerialNumberScanning
               isRequireSerialNumberScanningInbound
               isRequireSerialNumberScanningOutbound
+              isInventoryDecimal
               weightUnit
               nettWeight
               grossWeight
@@ -1460,9 +1438,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)
@@ -1475,6 +1454,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.607",
+  "version": "4.3.637",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -24,12 +24,12 @@
   },
   "dependencies": {
     "@things-factory/form-ui": "^4.3.591",
-    "@things-factory/grist-ui": "^4.3.591",
+    "@things-factory/grist-ui": "^4.3.637",
     "@things-factory/i18n-base": "^4.3.591",
-    "@things-factory/import-ui": "^4.3.591",
+    "@things-factory/import-ui": "^4.3.637",
     "@things-factory/layout-base": "^4.3.591",
-    "@things-factory/product-base": "^4.3.595",
+    "@things-factory/product-base": "^4.3.637",
     "@things-factory/shell": "^4.3.591"
   },
-  "gitHead": "897591abbc6716566a0f675b53fe5bc9d1025e76"
+  "gitHead": "67af35bd054b84ae5e72c48b1f61917be5d8debb"
 }

package/translations/en.json

@@ -57,6 +57,7 @@
   "field.require_serial_number_scanning_inbound": "require serial number scanning inbound",
   "field.require_serial_number_scanning_outbound": "require serial number scanning outbound",
   "field.require_serial_number_scanning": "require serial number scanning",
+  "field.inventory_decimal": "inventory decimal",
   "field.required_checking_expiry": "required checking expiry",
   "field.service_fee": "service fee",
   "field.shelf_life": "shelf life",