@things-factory/product-ui 4.3.234 → 4.3.248

package/client/pages/product-list.js

@@ -78,7 +78,7 @@ class ProductList extends localize(i18next)(PageView) {
     ]
 
     return {
-      title: i18next.t('title.product'),
+    title: i18next.t('title.product'),
       actions,
       exportable: {
         name: i18next.t('title.product'),
@@ -387,19 +387,37 @@ class ProductList extends localize(i18next)(PageView) {
           },
           {
             type: 'integer',
-            name: 'expirationPeriod',
+            name: 'minOutboundShelfLife',
+            record: { editable: true, options: { min: 0 } },
+            imex: { header: i18next.t('field.min_inbound_shelf_life'), key: 'minOutboundShelfLife', width: 30, type: 'integer' },
+            header: i18next.t('field.min_inbound_shelf_life'),
+            sortable: true,
+            width: 140
+          },
+          {
+            type: 'integer',
+            name: 'minInboundShelfLife',
             record: { editable: true },
-            imex: { header: i18next.t('field.expiration_period'), key: 'expirationPeriod', width: 30, type: 'integer' },
-            header: i18next.t('field.expiration_period'),
+            imex: { header: i18next.t('field.min_outbound_shelf_life'), key: 'minInboundShelfLife', width: 30, type: 'integer' },
+            header: i18next.t('field.min_outbound_shelf_life'),
             sortable: true,
             width: 140
           },
           {
             type: 'integer',
-            name: 'shelfLife',
+            name: 'outboundAlert',
             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'),
+            imex: { header: i18next.t('field.outbound_alert'), key: 'outboundAlert', width: 30, type: 'integer' },
+            header: i18next.t('field.outbound_alert'),
+            sortable: true,
+            width: 140
+          },
+          {
+            type: 'integer',
+            name: 'productShelfLife',
+            record: { editable: true, options: { min: 0 } },
+            imex: { header: i18next.t('field.product_shelf_life'), key: 'productShelfLife', width: 30, type: 'integer' },
+            header: i18next.t('field.product_shelf_life'),
             sortable: true,
             width: 140
           },
@@ -795,14 +813,17 @@ class ProductList extends localize(i18next)(PageView) {
                 name
                 description
               }
+
               refCode
               bundleQty
               packingType
               type
               inventoryAccountCode
               cogsAccountCode
-              expirationPeriod
-              shelfLife
+              minInboundShelfLife
+              minOutboundShelfLife
+              outboundAlert
+              productShelfLife
               isRequiredCheckExpiry
               isRequireSerialNumberScanning
               isRequireSerialNumberScanningInbound
@@ -960,9 +981,9 @@ class ProductList extends localize(i18next)(PageView) {
       patches = patches.map(patch => {
         return {
           ...patch,
-          expirationPeriod:
-            patch?.expirationPeriod || patch?.expirationPeriod == 0 ? parseInt(patch.expirationPeriod) : undefined,
-          shelfLife: patch?.shelfLife || patch?.shelfLife == 0 ? parseInt(patch.shelfLife) : undefined,
+          minInboundShelfLife:
+            patch?.minInboundShelfLife || patch?.minInboundShelfLife == 0 ? parseInt(patch.minInboundShelfLife) : undefined,
+          minOutboundShelfLife: patch?.minOutboundShelfLife || patch?.minOutboundShelfLife == 0 ? parseInt(patch.minOutboundShelfLife) : 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,
@@ -971,8 +992,10 @@ class ProductList extends localize(i18next)(PageView) {
           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,
+          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,
@@ -1022,8 +1045,8 @@ class ProductList extends localize(i18next)(PageView) {
           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,
+          minInboundShelfLife: patch?.minInboundShelfLife ? parseInt(patch.minInboundShelfLife) : undefined,
+          minOutboundShelfLife: patch?.minOutboundShelfLife ? parseInt(patch.minOutboundShelfLife) : undefined,
           productRef: patch.productRef?.id ? { id: patch.productRef?.id } : undefined,
           pickingStrategy: patch?.pickingStrategy ? patch.pickingStrategy.toUpperCase() : undefined,
           gtin: patch?.gtin ? patch.gtin : patch.sku,
@@ -1081,13 +1104,13 @@ 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?.minOutboundShelfLife < 0) {
+        if (!errors.find(err => err.type == 'minOutboundShelfLife'))
+          errors.push({ type: 'minOutboundShelfLife', 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?.minInboundShelfLife < 0) {
+        if (!errors.find(err => err.type == 'minInboundShelfLife'))
+          errors.push({ type: 'minInboundShelfLife', value: 'Expiration period cannot be negative' })
       }
 
       if (isNaN(itm.costPrice) && itm.costPrice !== undefined) {
@@ -1222,24 +1245,172 @@ class ProductList extends localize(i18next)(PageView) {
       type: 'float'
     })
 
-    var data = records.map(item => {
-      return {
-        id: '',
-        commissionFee: item.commissionFee,
-        platformFee: item.platformFee,
-        serviceFee: item.serviceFee,
-        transactionFee: item.transactionFee,
-        ...this.productGristConfig.columns
-          .filter(column => column.type !== 'gutter' && column.record !== undefined && column.imex !== undefined)
-          .reduce((record, column) => {
-            record[column.imex.key] = column.imex.key
-              .split('.')
-              .reduce((obj, key) => (obj && obj[key] !== 'undefined' ? obj[key] : undefined), item)
-            return record
-          }, {})
-      }
+    const pagination = { page: 0, limit: 99999 }
+    const sorters =[{ name: 'sku' }]
+    const sortings = sorters
+    const filters = await this.searchForm.getQueryFilters()
+
+    if(records.length > 0){
+      const ids = records.map(record => { return record.id })
+      filters.push({ name: 'id', value: ids, operator: 'in' })
+    }
+
+    const response = await client.query({
+      query: gql`
+        query myBizplaceProducts($filters: [Filter!], $pagination: Pagination, $sortings: [Sorting!]) {
+          myBizplaceProducts(filters: $filters, pagination: $pagination, sortings: $sortings) {
+            items {
+              sku
+              id
+              name
+              description
+              productRef {
+                sku
+                name
+                description
+              }
+              parentProductRef {
+                sku
+                name
+                description
+              }
+              productDetails{
+                id
+                sku
+                name
+                type
+                packingType
+                uom
+                uomValue
+                productBarcodes {
+                  gtin
+                }
+              }
+              refCode
+              bundleQty
+              packingType
+              type
+              inventoryAccountCode
+              cogsAccountCode
+              minInboundShelfLife
+              minOutboundShelfLife
+              outboundAlert
+              productShelfLife
+              isRequiredCheckExpiry
+              isRequireSerialNumberScanning
+              isRequireSerialNumberScanningInbound
+              isRequireSerialNumberScanningOutbound
+              weightUnit
+              nettWeight
+              grossWeight
+              density
+              lengthUnit
+              volume
+              width
+              depth
+              height
+              volumeSize
+              uom
+              uomValue
+              costPrice
+              afterTaxCostPrice
+              sellPrice
+              afterTaxSalesPrice
+              mrpPrice
+              bufferQty
+              minQty
+              maxQty
+              auxUnit1
+              auxValue1
+              auxUnit2
+              auxValue2
+              auxUnit3
+              auxValue3
+              auxUnit4
+              auxValue4
+              auxUnit5
+              auxValue5
+              brandSku
+              brand
+              subBrand
+              gtin
+              pickingStrategy
+              commissionFee
+              platformFee
+              serviceFee
+              transactionFee
+              updater {
+                name
+                description
+              }
+              updatedAt
+            }
+            total
+          }
+        }
+      `,
+      variables: { filters, pagination, sortings },
+      context: gqlContext()
     })
 
+    if (!response.errors) {
+
+          const exportData = 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?.isNaN || itm?.costPrice == null ? 0 : itm.costPrice).toFixed(2),
+              commissionFee: parseFloat(
+                itm?.commissionFee?.isNaN || itm?.commissionFee == null ? 0 : itm.commissionFee
+              ).toFixed(2),
+              platformFee: parseFloat(
+                itm?.platformFee?.isNaN || itm?.platformFee == null ? 0 : itm.platformFee
+              ).toFixed(2),
+              serviceFee: parseFloat(itm?.serviceFee?.isNaN || itm?.serviceFee == null ? 0 : itm.serviceFee).toFixed(2),
+              transactionFee: parseFloat(
+                itm?.transactionFee?.isNaN || itm?.transactionFee == null ? 0 : itm.transactionFee
+              ).toFixed(2)
+            }
+          }) || []
+
+          const flattenedList = []
+          for (let product of exportData) {
+            const pds = product.productDetails.map(pd => {
+              return {
+                  ...product,
+                  name: pd.name,
+                  packingType: pd.packingType,
+                  uom: pd.uom,
+                  uomValue: pd.uomValue,
+                  gtin: pd.productBarcodes.map(pb => {return pb.gtin}).reduce((acc, cur) => acc + ',' + cur)
+                  
+              }
+            })
+            flattenedList.push(...pds)
+          }
+
+          var data = flattenedList.map(item => {
+            return {
+              id: '',
+              commissionFee: item.commissionFee,
+              platformFee: item.platformFee,
+              serviceFee: item.serviceFee,
+              transactionFee: item.transactionFee,
+              ...this.productGristConfig.columns
+                .filter(column => column.type !== 'gutter' && column.record !== undefined && column.imex !== undefined)
+                .reduce((record, column) => {
+                  record[column.imex.key] = column.imex.key
+                    .split('.')
+                    .reduce((obj, key) => (obj && obj[key] !== 'undefined' ? obj[key] : undefined), item)
+                  return record
+                }, {})
+            }
+          })
+    }
+
     return { header: headerSetting, data: data }
   }
 

package/client/pages/product-set-link-popup.js

@@ -288,9 +288,9 @@ export class ProductSetLinkPopup extends localize(i18next)(LitElement) {
         },
         {
           type: 'integer',
-          name: 'expirationPeriod',
+          name: 'minInboundShelfLife',
           record: { editable: true },
-          imex: { header: 'Expiration Period', key: 'expirationPeriod', width: 50, type: 'integer' },
+          imex: { header: 'Expiration Period', key: 'minInboundShelfLife', width: 50, type: 'integer' },
           header: i18next.t('field.expiration_period'),
           sortable: true,
           width: 80
@@ -544,7 +544,7 @@ export class ProductSetLinkPopup extends localize(i18next)(LitElement) {
               type
               inventoryAccountCode
               cogsAccountCode
-              expirationPeriod
+              minInboundShelfLife
               weightUnit
               weight
               density
@@ -669,7 +669,7 @@ export class ProductSetLinkPopup extends localize(i18next)(LitElement) {
         patch.width = parseFloat(patch.width)
         patch.depth = parseFloat(patch.depth)
         patch.height = parseFloat(patch.height)
-        patch.expirationPeriod = parseFloat(patch.expirationPeriod)
+        patch.minInboundShelfLife = parseFloat(patch.minInboundShelfLife)
         patch.bundleQty = parseFloat(patch.bundleQty)
 
         if (patch.parentProductRef) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/product-ui",
-  "version": "4.3.234",
+  "version": "4.3.248",
   "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.227",
-    "@things-factory/grist-ui": "^4.3.227",
-    "@things-factory/i18n-base": "^4.3.227",
-    "@things-factory/import-ui": "^4.3.227",
-    "@things-factory/layout-base": "^4.3.227",
-    "@things-factory/product-base": "^4.3.234",
-    "@things-factory/shell": "^4.3.227"
+    "@things-factory/form-ui": "^4.3.237",
+    "@things-factory/grist-ui": "^4.3.237",
+    "@things-factory/i18n-base": "^4.3.237",
+    "@things-factory/import-ui": "^4.3.237",
+    "@things-factory/layout-base": "^4.3.237",
+    "@things-factory/product-base": "^4.3.248",
+    "@things-factory/shell": "^4.3.237"
   },
-  "gitHead": "f09a8d10fcf4cffc06abb9777ca60ee82b00ce33"
+  "gitHead": "c45a9863ca451fa4d4fe3dbc797d7cc883b5bfd5"
 }

package/translations/en.json

@@ -38,9 +38,12 @@
   "field.length_unit": "length unit",
   "field.max_qty": "max qty",
   "field.min_qty": "min qty",
+  "field.min_inbound_shelf_life": "min inbound shelf life",
+  "field.min_outbound_shelf_life": "min outbound shelf life",
   "field.movement": "movement",
   "field.name": "name",
   "field.nett_weight": "nett weight",
+  "field.outbound_alert": "outbound alert",
   "field.packing_size": "packing size",
   "field.packing_type": "packing type",
   "field.picking_strategy": "picking strategy",
@@ -48,6 +51,7 @@
   "field.product_info": "product info",
   "field.product_ref": "product ref",
   "field.product_set_info": "product set info",
+  "field.product_shelf_life": "product shelf life",
   "field.ref_code": "ref code",
   "field.require_serial_number_scanning_inbound": "require serial number scanning inbound",
   "field.require_serial_number_scanning_outbound": "require serial number scanning outbound",

package/translations/ja.json

@@ -0,0 +1,88 @@
+{
+  "field.picking_strategy": "[jp]picking strategy",
+  "button.add_new_product": "[jp]add new product",
+  "button.back": "[jp]back",
+  "button.cancel": "[jp]cancel",
+  "button.delete": "[jp]delete",
+  "button.link_product": "[jp]link product",
+  "button.restore": "[jp]restore",
+  "button.save": "[jp]save",
+  "button.sync_data": "[jp]sync data",
+  "field.aux_unit": "[jp]aux unit",
+  "field.aux_value": "[jp]aux value",
+  "field.brand_sku": "[jp]brand sku",
+  "field.buffer_qty": "[jp]buffer qty",
+  "field.case_depth": "[jp]case depth",
+  "field.case_gross_weight": "[jp]case gross weight",
+  "field.case_gtin": "[jp]case GTIN",
+  "field.case_height": "[jp]case height",
+  "field.case_volume": "[jp]case volume",
+  "field.case_weight": "[jp]case weight",
+  "field.case_width": "[jp]case width",
+  "field.child_gtin": "[jp]child GTIN",
+  "field.child_product_ref": "[jp]child product ref",
+  "field.child_qty": "[jp]child qty",
+  "field.cogs_account_code": "[jp]COGS account code",
+  "field.combination": "[jp]combination",
+  "field.commission_fee": "[jp]commission fee",
+  "field.deleted": "[jp]deleted",
+  "field.density": "[jp]density",
+  "field.depth": "[jp]depth",
+  "field.description": "[jp]description",
+  "field.expiration_period": "[jp]expiration Period",
+  "field.gross_weight": "g[jp]ross weight",
+  "field.gtin": "[jp]GTIN",
+  "field.height": "[jp]height",
+  "field.inventory_account_code": "[jp]inventory account code",
+  "field.length_unit": "[jp]length unit",
+  "field.max_qty": "[jp]max qty",
+  "field.min_qty": "[jp]min qty",
+  "field.movement": "[jp]movement",
+  "field.name": "[jp]name",
+  "field.nett_weight": "n[jp]ett weight",
+  "field.packing_size": "[jp]packing size",
+  "field.packing_type": "[jp]packing type",
+  "field.platform_fee": "[jp]platform fee",
+  "field.product_info": "[jp]product info",
+  "field.product_ref": "[jp]product ref",
+  "field.product_set_info": "[jp]product set info",
+  "field.ref_code": "[jp]ref code",
+  "field.require_serial_number_scanning": "[jp]require serial number scanning",
+  "field.required_checking_expiry": "[jp]required checking expiry",
+  "field.require_serial_number_scanning_inbound": "[jp] require serial number scanning inbound",
+  "field.require_serial_number_scanning_outbound": "[jp] require serial number scanning outbound",
+  "field.service_fee": "[jp]service fee",
+  "field.sku": "[jp]SKU",
+  "field.sub_brand": "[jp]sub brand",
+  "field.threshold_qty": "[jp]threshold qty",
+  "field.transaction_fee": "[jp]transaction fee",
+  "field.type": "[jp]type",
+  "field.updated_at": "[jp]updated at",
+  "field.updater": "[jp]updater",
+  "field.volume_size": "[jp]volume size",
+  "field.volume": "[jp]volume",
+  "field.weight_ratio": "[jp]weight ratio",
+  "field.weight_unit": "[jp]weight unit",
+  "field.weight": "[jp]weight",
+  "field.width": "[jp]width",
+  "label.fefo": "[jp]FEFO",
+  "label.fmfo": "[jp]FMFO",
+  "label.fifo": "[jp]FIFO",
+  "label.lifo": "[jp]LIFO",
+  "label.location": "[jp]location",
+  "text.data_restore_successfully": "[jp]data restore successfully",
+  "text.invalid_bundle_qty_for_item_number": "[jp]invalid bundle qty for item number",
+  "text.invalid_qty_for_item_number_x": "[jp]invalid qty for item #{state.x}",
+  "text.saved": "[jp]saved",
+  "text.there_is_nothing_to_restore": "[jp]there is nothing to restore",
+  "title.combination_sets": "[jp]combination sets",
+  "title.combination": "[jp]combination",
+  "title.linked_products": "[jp]linked products",
+  "title.product_bundle_setting": "[jp]product bundle setting",
+  "title.product_bundle": "[jp]product bundle",
+  "title.product_set": "[jp]product set",
+  "title.product": "[jp]product",
+  "field.child_product_detail": "[jp] child product detail",
+  "field.unit_cost": "[jp] unit cost",
+  "field.shelf_life": "[jp] shelf life"
+}

package/translations/ko.json

@@ -37,15 +37,19 @@
   "field.length_unit": "[ko]length unit",
   "field.max_qty": "[ko]max qty",
   "field.min_qty": "[ko]min qty",
+  "field.min_inbound_shelf_life": "[ko] min inbound shelf life",
+  "field.min_outbound_shelf_life": "[ko] min outbound shelf life",
   "field.movement": "[ko]movement",
   "field.name": "[ko]name",
   "field.nett_weight": "n[ko]ett weight",
+  "field.outbound_alert": "[ko] outbound alert",
   "field.packing_size": "[ko]packing size",
   "field.packing_type": "[ko]packing type",
   "field.platform_fee": "[ko]platform fee",
   "field.product_info": "[ko]product info",
   "field.product_ref": "[ko]product ref",
   "field.product_set_info": "[ko]product set info",
+  "field.product_shelf_life": "[ko] product shelf life",
   "field.ref_code": "[ko]ref code",
   "field.require_serial_number_scanning": "[ko]require serial number scanning",
   "field.required_checking_expiry": "[ko]required checking expiry",

package/translations/ms.json

@@ -37,15 +37,19 @@
   "field.length_unit": "[ms]length unit",
   "field.max_qty": "[ms]max qty",
   "field.min_qty": "[ms]min qty",
+  "field.min_inbound_shelf_life": "[ms] min inbound shelf life",
+  "field.min_outbound_shelf_life": "[ms] min outbound shelf life",
   "field.movement": "[ms]movement",
   "field.name": "[ms]name",
-  "field.nett_weight": "n[ms]ett weight",
+  "field.nett_weight": "[ms]ett weight",
+  "field.outbound_alert": "[ms] outbound alert",
   "field.packing_size": "[ms]packing size",
   "field.packing_type": "[ms]packing type",
   "field.platform_fee": "[ms]platform fee",
   "field.product_info": "[ms]product info",
   "field.product_ref": "[ms]product ref",
   "field.product_set_info": "[ms]product set info",
+  "field.product_shelf_life": "[ms] product shelf life",
   "field.ref_code": "[ms]ref code",
   "field.require_serial_number_scanning": "[ms]require serial number scanning",
   "field.required_checking_expiry": "[ms]required checking expiry",

package/translations/zh.json

@@ -37,8 +37,11 @@
   "field.length_unit": "[zh]length unit",
   "field.max_qty": "[zh]max qty",
   "field.min_qty": "[zh]min qty",
+  "field.min_inbound_shelf_life": "[zh] min inbound shelf life",
+  "field.min_outbound_shelf_life": "[zh] min outbound shelf life",
   "field.movement": "[zh]movement",
   "field.name": "[zh]name",
+  "field.outbound_alert": "[zh] outbound alert",
   "field.nett_weight": "[zh]nett weight",
   "field.packing_size": "[zh]packing size",
   "field.packing_type": "[zh]packing type",
@@ -46,6 +49,7 @@
   "field.product_info": "[zh]product info",
   "field.product_ref": "[zh]product ref",
   "field.product_set_info": "[zh]product set info",
+  "field.product_shelf_life": "[zh] product shelf life",
   "field.ref_code": "[zh]ref code",
   "field.require_serial_number_scanning": "[zh]require serial number scanning",
   "field.required_checking_expiry": "[zh]required checking expiry",