@things-factory/product-ui 4.3.186 → 4.3.204

package/client/pages/product-list.js

@@ -88,6 +88,11 @@ class ProductList extends localize(i18next)(PageView) {
         handler: records => {
           records.map(record => {
             record.costPrice = record.costPrice == null ? '0.00' : parseFloat(record.costPrice).toFixed(2)
+            record.commissionFee = record.commissionFee == null ? '0.00' : parseFloat(record.commissionFee).toFixed(2)
+            record.platformFee = record.platformFee == null ? '0.00' : parseFloat(record.platformFee).toFixed(2)
+            record.serviceFee = record.serviceFee == null ? '0.00' : parseFloat(record.serviceFee).toFixed(2)
+            record.transactionFee =
+              record.transactionFee == null ? '0.00' : parseFloat(record.transactionFee).toFixed(2)
           })
           const config = {
             rows: this.productGristConfig.rows,
@@ -106,12 +111,39 @@ class ProductList extends localize(i18next)(PageView) {
                 record: { editable: true, align: 'left' },
                 header: i18next.t('field.packing_size'),
                 width: 80
+              },
+              {
+                type: 'float',
+                name: 'commissionFee',
+                record: { editable: true, align: 'left' },
+                header: i18next.t('field.commission_fee'),
+                width: 80
+              },
+              {
+                type: 'float',
+                name: 'platformFee',
+                record: { editable: true, align: 'left' },
+                header: i18next.t('field.platform_fee'),
+                width: 80
+              },
+              {
+                type: 'float',
+                name: 'serviceFee',
+                record: { editable: true, align: 'left' },
+                header: i18next.t('field.service_fee'),
+                width: 80
+              },
+              {
+                type: 'float',
+                name: 'transactionFee',
+                record: { editable: true, align: 'left' },
+                header: i18next.t('field.transaction_fee'),
+                width: 80
               }
             ]
           }
           openImportPopUp(records, config, async patches => {
             await this._importProducts(patches)
-            history.back()
           })
         }
       },
@@ -687,6 +719,34 @@ class ProductList extends localize(i18next)(PageView) {
             header: `${i18next.t('field.picking_strategy')}`,
             width: 100
           },
+          {
+            type: 'float',
+            name: 'commissionFee',
+            record: { editable: true },
+            header: i18next.t('field.commission_fee'),
+            width: 80
+          },
+          {
+            type: 'float',
+            name: 'platformFee',
+            record: { editable: true },
+            header: i18next.t('field.platform_fee'),
+            width: 80
+          },
+          {
+            type: 'float',
+            name: 'serviceFee',
+            record: { editable: true },
+            header: i18next.t('field.service_fee'),
+            width: 80
+          },
+          {
+            type: 'float',
+            name: 'transactionFee',
+            record: { editable: true },
+            header: i18next.t('field.transaction_fee'),
+            width: 80
+          },
           {
             type: 'object',
             name: 'updater',
@@ -782,6 +842,10 @@ class ProductList extends localize(i18next)(PageView) {
               subBrand
               gtin
               pickingStrategy
+              commissionFee
+              platformFee
+              serviceFee
+              transactionFee
               updater {
                 name
                 description
@@ -807,7 +871,17 @@ class ProductList extends localize(i18next)(PageView) {
             return {
               ...itm,
               productRef: { name: itm?.productRef ? '(' + itm.productRef.sku + ') ' + itm.productRef.name : '' },
-              costPrice: parseFloat(itm.costPrice).toFixed(2)
+              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)
             }
           }) || []
       }
@@ -886,12 +960,23 @@ class ProductList extends localize(i18next)(PageView) {
       patches = patches.map(patch => {
         return {
           ...patch,
-          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
+          parentProductRef: patch.parentProductRef?.id ? { id: patch.parentProductRef?.id } : undefined,
+          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,
+          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
         }
       })
 
@@ -921,6 +1006,11 @@ class ProductList extends localize(i18next)(PageView) {
       if (!patches?.length) {
         return this.showToast(i18next.t('text.nothing_changed'))
       }
+
+      if (patches.find(itm => Object.values(itm).find(val => typeof val == 'number' && val < 0))) {
+        return this.showToast(`Minimum value of 0 is required.`)
+      }
+
       patches = patches.map(patch => {
         patch.costPrice = patch.costPrice == null ? 0 : patch.costPrice
 
@@ -936,7 +1026,11 @@ class ProductList extends localize(i18next)(PageView) {
           shelfLife: patch?.shelfLife ? parseInt(patch.shelfLife) : undefined,
           productRef: patch.productRef?.id ? { id: patch.productRef?.id } : undefined,
           pickingStrategy: patch?.pickingStrategy ? patch.pickingStrategy.toUpperCase() : undefined,
-          gtin: patch?.gtin ? patch.gtin : patch.sku
+          gtin: patch?.gtin ? patch.gtin : patch.sku,
+          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
         }
       })
 
@@ -957,6 +1051,7 @@ class ProductList extends localize(i18next)(PageView) {
       if (!response.errors) {
         this.showToast(i18next.t('text.data_import_successfully'))
         this.dataGrist.fetch()
+        history.back()
       }
     } catch (error) {
       this.showToast(error.message)
@@ -1112,10 +1207,28 @@ class ProductList extends localize(i18next)(PageView) {
 
     headerSetting.push({ header: `${i18next.t('field.child_gtin')}`, key: 'childGtin', width: 20, type: 'string' })
     headerSetting.push({ header: `${i18next.t('field.packing_size')}`, key: 'packingSize', width: 20, type: 'float' })
+    headerSetting.push({
+      header: `${i18next.t('field.commission_fee')}`,
+      key: 'commissionFee',
+      width: 20,
+      type: 'float'
+    })
+    headerSetting.push({ header: `${i18next.t('field.platform_fee')}`, key: 'platformFee', width: 20, type: 'float' })
+    headerSetting.push({ header: `${i18next.t('field.service_fee')}`, key: 'serviceFee', width: 20, type: 'float' })
+    headerSetting.push({
+      header: `${i18next.t('field.transaction_fee')}`,
+      key: 'transactionFee',
+      width: 20,
+      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) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/product-ui",
-  "version": "4.3.186",
+  "version": "4.3.204",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -28,8 +28,8 @@
     "@things-factory/i18n-base": "^4.3.179",
     "@things-factory/import-ui": "^4.3.179",
     "@things-factory/layout-base": "^4.3.179",
-    "@things-factory/product-base": "^4.3.186",
+    "@things-factory/product-base": "^4.3.204",
     "@things-factory/shell": "^4.3.179"
   },
-  "gitHead": "854c79b134b5d94c5635c75c467eca229430183b"
+  "gitHead": "d7400c05d76662c2df54c0278078ade54e57f271"
 }

package/translations/en.json

@@ -25,6 +25,7 @@
   "field.child_qty": "child qty",
   "field.cogs_account_code": "COGS account code",
   "field.combination": "combination",
+  "field.commission_fee": "commission fee",
   "field.deleted": "deleted",
   "field.density": "density",
   "field.depth": "depth",
@@ -43,6 +44,7 @@
   "field.packing_size": "packing size",
   "field.packing_type": "packing type",
   "field.picking_strategy": "picking strategy",
+  "field.platform_fee": "platform fee",
   "field.product_info": "product info",
   "field.product_ref": "product ref",
   "field.product_set_info": "product set info",
@@ -51,10 +53,12 @@
   "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.service_fee": "service fee",
   "field.shelf_life": "shelf life",
   "field.sku": "SKU",
   "field.sub_brand": "sub brand",
   "field.threshold_qty": "threshold qty",
+  "field.transaction_fee": "transaction fee",
   "field.type": "type",
   "field.updated_at": "updated at",
   "field.updater": "updater",

package/translations/ko.json

@@ -24,6 +24,7 @@
   "field.child_qty": "[ko]child qty",
   "field.cogs_account_code": "[ko]COGS account code",
   "field.combination": "[ko]combination",
+  "field.commission_fee": "[ko]commission fee",
   "field.deleted": "[ko]deleted",
   "field.density": "[ko]density",
   "field.depth": "[ko]depth",
@@ -41,6 +42,7 @@
   "field.nett_weight": "n[ko]ett weight",
   "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",
@@ -49,9 +51,11 @@
   "field.required_checking_expiry": "[ko]required checking expiry",
   "field.require_serial_number_scanning_inbound": "[ko] require serial number scanning inbound",
   "field.require_serial_number_scanning_outbound": "[ko] require serial number scanning outbound",
+  "field.service_fee": "[ko]service fee",
   "field.sku": "[ko]SKU",
   "field.sub_brand": "[ko]sub brand",
   "field.threshold_qty": "[ko]threshold qty",
+  "field.transaction_fee": "[ko]transaction fee",
   "field.type": "[ko]type",
   "field.updated_at": "[ko]updated at",
   "field.updater": "[ko]updater",

package/translations/ms.json

@@ -24,6 +24,7 @@
   "field.child_qty": "[ms]child qty",
   "field.cogs_account_code": "[ms]COGS account code",
   "field.combination": "[ms] combination",
+  "field.commission_fee": "[ms]commission fee",
   "field.deleted": "[ms]deleted",
   "field.density": "[ms]density",
   "field.depth": "[ms]depth",
@@ -41,6 +42,7 @@
   "field.nett_weight": "n[ms]ett weight",
   "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",
@@ -49,9 +51,11 @@
   "field.required_checking_expiry": "[ms]required checking expiry",
   "field.require_serial_number_scanning_inbound": "[ms]require serial number scanning inbound",
   "field.require_serial_number_scanning_outbound": "[ms]require serial number scanning outbound",
+  "field.service_fee": "[ms]service fee",
   "field.sku": "[ms]SKU",
   "field.sub_brand": "[ms]sub brand",
   "field.threshold_qty": "[ms]threshold qty",
+  "field.transaction_fee": "[ms]transaction fee",
   "field.type": "[ms]type",
   "field.updated_at": "[ms]updated at",
   "field.updater": "[ms]updater",

package/translations/zh.json

@@ -24,6 +24,7 @@
   "field.child_qty": "[zh]child qty",
   "field.cogs_account_code": "[zh]COGS account code",
   "field.combination": "[zh] combination",
+  "field.commission_fee": "[zh]commission fee",
   "field.deleted": "[zh]deleted",
   "field.density": "[zh]density",
   "field.depth": "[zh]depth",
@@ -41,6 +42,7 @@
   "field.nett_weight": "[zh]nett weight",
   "field.packing_size": "[zh]packing size",
   "field.packing_type": "[zh]packing type",
+  "field.platform_fee": "[zh]platform fee",
   "field.product_info": "[zh]product info",
   "field.product_ref": "[zh]product ref",
   "field.product_set_info": "[zh]product set info",
@@ -49,9 +51,11 @@
   "field.required_checking_expiry": "[zh]required checking expiry",
   "field.require_serial_number_scanning_inbound": "[zh]require serial number scanning inbound",
   "field.require_serial_number_scanning_outbound": "[zh]require serial number scanning outbound",
+  "field.service_fee": "[zh]service fee",
   "field.sku": "[zh]SKU",
   "field.sub_brand": "[zh]sub brand",
   "field.threshold_qty": "[zh]threshold qty",
+  "field.transaction_fee": "[zh]transaction fee",
   "field.type": "[zh]type",
   "field.updated_at": "[zh]updated at",
   "field.updater": "[zh]updater",