@things-factory/sales-ui 4.3.21 → 4.3.22

package/client/pages/purchase-order/purchase-order-approval-detail.js

@@ -676,7 +676,7 @@ class PurchaseOrderApprovalDetail extends connect(store)(localize(i18next)(PageV
     packQty = packQty || 0
     miscAmt = parseFloat((miscAmt || 0).toFixed(2))
     unitPrice = parseFloat((unitPrice || 0).toFixed(2))
-    taxRate = parseFloat((taxRate || 0).toFixed(1))
+    taxRate = parseFloat((taxRate || 0).toFixed(2))
     discountAmt = parseFloat((discountAmt || 0).toFixed(2))
 
     let totalAmtBeforeTax = packQty * unitPrice + miscAmt - discountAmt

package/client/pages/purchase-order/purchase-order-detail.js

@@ -1,6 +1,7 @@
 import '@things-factory/grist-ui'
 import '@things-factory/biz-ui'
 import '@things-factory/warehouse-ui'
+import '@things-factory/import-ui/client/components/import-pop-up'
 
 import gql from 'graphql-tag'
 import { css, html } from 'lit-element'
@@ -439,7 +440,14 @@ class PurchaseOrderDetail extends connect(store)(localize(i18next)(PageView)) {
     return {
       title: `${i18next.t('title.purchase_order_detail')} `,
       actions,
-      help: 'operato-wms/po-detail'
+      help: 'operato-wms/po-detail',
+      exportable: {
+        name: i18next.t('title.create_purchase_order'),
+        data: this._exportableData.bind(this)
+      },
+      importable: {
+        handler: this._importableData.bind(this)
+      }
     }
   }
 
@@ -703,6 +711,13 @@ class PurchaseOrderDetail extends connect(store)(localize(i18next)(PageView)) {
           'totalAmt'
         ]
       },
+      rows: {
+        classifier: (record, rowIndex) => {
+          return {
+            emphasized: record.isError
+          }
+        }
+      },
       columns: productGristColumns
     }
 
@@ -856,7 +871,7 @@ class PurchaseOrderDetail extends connect(store)(localize(i18next)(PageView)) {
     packQty = packQty || 0
     unitPrice = parseFloat((unitPrice || 0).toFixed(2))
     miscAmt = parseFloat((miscAmt || 0).toFixed(2))
-    taxRate = parseFloat((taxRate || 0).toFixed(1))
+    taxRate = parseFloat((taxRate || 0).toFixed(2))
     discountAmt = parseFloat((discountAmt || 0).toFixed(2))
 
     let totalAmtBeforeTax = packQty * unitPrice + miscAmt - discountAmt
@@ -896,21 +911,30 @@ class PurchaseOrderDetail extends connect(store)(localize(i18next)(PageView)) {
       this._validateProducts()
 
       const result = await CustomAlert({
-        title: i18next.t('title.are_you_sure'),
-        text: i18next.t('text.update_purchase_order'),
+        title: i18next.t('title.update_purchase_order'),
+        text:
+          status == PURCHASE_ORDER_STATUS.DRAFT
+            ? ''
+            : i18next.t('text.pack_qty_and_unit_price_will_be_updated_to_1_if_the_value_is_empty_or_0'),
         confirmButton: { text: i18next.t('button.submit') },
         cancelButton: { text: i18next.t('button.cancel') }
       })
 
       if (!result.value) return
 
+      //comment start
+      //detailed review needed 19 May 2022 by @ChrisLim-git
       let purchaseOrder = {
         ...this._purchaseOrderData,
         ...this._getFormInfo()
       }
 
-      purchaseOrder.orderProducts = this._getOrderProducts()
-      purchaseOrder.otherCharges = this._getPoOtherCharges()
+      purchaseOrder = {
+        ...purchaseOrder,
+        orderProducts: this._getOrderProducts(status),
+        otherCharges: this._getPoOtherCharges()
+      }
+      //comment end
 
       const fileUploader = this._document?.files ? this._document.files : undefined
 
@@ -1146,12 +1170,32 @@ class PurchaseOrderDetail extends connect(store)(localize(i18next)(PageView)) {
     const records = this.productGrist.dirtyData.records
     if (!records?.length) throw new Error(i18next.t('text.no_products'))
 
-    const checkRequiredFields = ({ batchId, packingType, uomValue, uom, packQty, unitPrice }) =>
-      !batchId || !packingType || !uomValue || !uom || !packQty || !unitPrice
+    const checkRequiredFields = ({ batchId, packingType, uomValue, uom }) =>
+      !batchId || !packingType || !uomValue || !uom
 
     if (records.some(checkRequiredFields)) {
       throw new Error(i18next.t('text.empty_value_in_list'))
     }
+
+    if (records.some(({ packQty }) => packQty < 0)) {
+      throw new Error(i18next.t('text.x_should_be_positive', { state: { x: i18next.t('label.pack_qty') } }))
+    }
+
+    if (records.some(({ unitPrice }) => unitPrice < 0)) {
+      throw new Error(i18next.t('text.x_should_be_positive', { state: { x: i18next.t('label.unit_price') } }))
+    }
+
+    if (records.some(({ miscAmt }) => miscAmt < 0)) {
+      throw new Error(i18next.t('text.x_should_be_positive', { state: { x: i18next.t('label.misc_amt') } }))
+    }
+
+    if (records.some(({ discountAmt }) => discountAmt < 0)) {
+      throw new Error(i18next.t('text.x_should_be_positive', { state: { x: i18next.t('label.total_disc_amt') } }))
+    }
+
+    if (records.some(({ taxRate }) => taxRate < 0)) {
+      throw new Error(i18next.t('text.x_should_be_positive', { state: { x: i18next.t('label.tax_rate') } }))
+    }
   }
 
   _getFormInfo() {
@@ -1160,7 +1204,7 @@ class PurchaseOrderDetail extends connect(store)(localize(i18next)(PageView)) {
     return formData
   }
 
-  _getOrderProducts() {
+  _getOrderProducts(status) {
     return this.productGrist.dirtyData.records.map(record => {
       let orderProduct = {
         id: record.id || null,
@@ -1169,11 +1213,12 @@ class PurchaseOrderDetail extends connect(store)(localize(i18next)(PageView)) {
         packingType: record.packingType,
         uomValue: record?.uomValue ? record.uomValue : 0,
         uom: record.uom,
-        packQty: record.packQty,
+        packQty: status == PURCHASE_ORDER_STATUS.DRAFT ? record.packQty : record.packQty > 1 ? record.packQty : 1,
         totalUomValue: record?.uomValue ? `${(record.uomValue * record.packQty).toFixed(2)} ${record.uom}` : ``,
         remark: record?.remark || null,
         discountAmt: record.discountAmt,
-        unitPrice: record.unitPrice,
+        unitPrice:
+          status == PURCHASE_ORDER_STATUS.DRAFT ? record.unitPrice : record.unitPrice > 1 ? record.unitPrice : 1,
         miscAmt: record.miscAmt,
         taxRate: record.taxRate
       }
@@ -1249,7 +1294,7 @@ class PurchaseOrderDetail extends connect(store)(localize(i18next)(PageView)) {
               }
 
               this.partnerBizplaceId = e.detail.id
-              this.companyInput.value = this._purchaseOrderData.bizplace.name
+              this.companyInput.value = e.detail.name
               this.productGrist.reset()
               this._configureProductGrist()
             }}"
@@ -1359,6 +1404,215 @@ class PurchaseOrderDetail extends connect(store)(localize(i18next)(PageView)) {
     if (!this._bizplaces) this._bizplaces = await this.fetchBizplaces()
   }
 
+  poExcelColumns() {
+    const productGrist = [
+      {
+        type: 'string',
+        name: 'batchId',
+        header: i18next.t('field.batch_id'),
+        imex: { header: i18next.t('field.batch_id'), key: 'batchId', width: 25, type: 'string' },
+        width: 100
+      },
+      {
+        type: 'string',
+        name: 'productSKU',
+        header: i18next.t('field.sku'),
+        imex: { header: i18next.t('field.sku'), key: 'productSKU', width: 25, type: 'string' },
+        width: 100
+      },
+      {
+        type: 'string',
+        name: 'packingType',
+        header: i18next.t('field.packing_type'),
+        imex: { header: i18next.t('field.packing_type'), key: 'packingType', width: 25, type: 'string' },
+        width: 100
+      },
+      {
+        type: 'string',
+        name: 'remark',
+        header: i18next.t('field.remark'),
+        imex: { header: i18next.t('field.remark'), key: 'remark', width: 25, type: 'string' },
+        width: 100
+      },
+      {
+        type: 'integer',
+        name: 'packQty',
+        header: i18next.t('field.pack_qty'),
+        imex: { header: i18next.t('field.pack_qty'), key: 'packQty', width: 25, type: 'float' },
+        width: 100
+      },
+      {
+        type: 'float',
+        name: 'unitPrice',
+        header: i18next.t('field.unit_price'),
+        imex: { header: i18next.t('field.unit_price'), key: 'unitPrice', width: 25, type: 'float' },
+        width: 100
+      },
+      {
+        type: 'float',
+        name: 'miscAmt',
+        header: i18next.t('field.misc_amt'),
+        imex: { header: i18next.t('field.misc_amt'), key: 'miscAmt', width: 25, type: 'float' },
+        width: 100
+      },
+      {
+        type: 'float',
+        name: 'discountAmt',
+        header: i18next.t('field.total_disc_amt'),
+        imex: { header: i18next.t('field.total_disc_amt'), key: 'discountAmt', width: 25, type: 'float' },
+        width: 100
+      },
+      {
+        type: 'float',
+        name: 'taxRate',
+        header: i18next.t('field.tax_rate') + '(%)',
+        imex: { header: i18next.t('field.tax_rate'), key: 'taxRate', width: 25, type: 'float' },
+        width: 90
+      }
+    ]
+
+    return productGrist
+  }
+
+  async _exportableData() {
+    try {
+      var headerSetting = [
+        ...this.poExcelColumns()
+          .filter(column => column.type !== 'gutter' && column.imex !== undefined)
+          .map(column => {
+            return column.imex
+          })
+      ]
+
+      return { header: headerSetting, data: [] }
+    } catch (e) {
+      this._showToast(e)
+    }
+  }
+
+  async bulkUploadValidatePoOrderProducts(patches) {
+    const response = await client.query({
+      query: gql`
+        query bulkUploadValidatePoOrderProducts($orderProducts: [NewOrderProduct!], $partnerBizplaceId: String!) {
+          bulkUploadValidatePoOrderProducts(orderProducts: $orderProducts, partnerBizplaceId: $partnerBizplaceId) {
+            id
+            packingType
+            packingSize
+            uom
+            uomValue
+            totalUomValue
+            packQty
+            unitPrice
+            miscAmt
+            discountAmt
+            taxRate
+            batchId
+            batchIdRef
+            unitPrice
+            remark
+            productSKU
+            productName
+            productBrand
+            isError
+            product {
+              id
+              name
+              sku
+              description
+              type
+              brand
+              primaryUnit
+              primaryValue
+            }
+          }
+        }
+      `,
+      variables: { orderProducts: patches, partnerBizplaceId: this.partnerBizplaceId }
+    })
+
+    if (!response.errors) {
+      const data = response.data.bulkUploadValidatePoOrderProducts.map(item => {
+        return {
+          ...item,
+          productName: item?.productName,
+          unitPrice: parseFloat(item.unitPrice) || 0,
+          packQty: parseInt(item.packQty) || 0,
+          miscAmt: parseFloat(item.miscAmt) || 0,
+          discountAmt: parseFloat(item.discountAmt) || 0,
+          taxRate: parseFloat(item.taxRate) || 0
+        }
+      })
+      this.productData = {
+        ...this.productData,
+        records: data.map((dt, idx) => {
+          return {
+            ...dt,
+            name: idx,
+            __dirty__: '+'
+          }
+        })
+      }
+
+      this.productGrist.fetch()
+    }
+  }
+
+  async importHandler(records) {
+    this.productData = { records }
+
+    const orderProducts = records.map(record => {
+      delete record.cuFlag
+      delete record.id
+      return {
+        ...record,
+        unitPrice: record?.unitPrice > 0 ? parseFloat(record?.unitPrice?.toFixed(2)) : 0,
+        packQty: parseInt(record?.packQty) || 0,
+        miscAmt: record?.miscAmt > 0 ? parseFloat(record?.miscAmt?.toFixed(2)) : 0,
+        discountAmt: record?.discountAmt > 0 ? parseFloat(record?.discountAmt?.toFixed(2)) : 0,
+        taxRate: record?.taxRate > 0 ? parseFloat(record?.taxRate?.toFixed(2)) : 0
+      }
+    })
+    await this.bulkUploadValidatePoOrderProducts(orderProducts)
+    history.back()
+  }
+
+  async _importableData(records) {
+    try {
+      if (this.partnerBizplaceId) {
+        records = records
+          .filter(record => record.productSKU)
+          .map(record => {
+            return {
+              ...record
+            }
+          })
+
+        openPopup(
+          html`
+            <import-pop-up
+              .records=${records}
+              .config=${{
+                rows: this.productGristConfig.rows,
+                columns: [...this.poExcelColumns().filter(column => column.imex !== undefined)]
+              }}
+              .importHandler="${await this.importHandler.bind(this)}"
+            ></import-pop-up>
+          `,
+          {
+            backdrop: true,
+            escapable: false,
+            size: 'large',
+            title: i18next.t('title.import')
+          }
+        )
+      } else {
+        throw new Error(i18next.t('text.please_select_a_company'))
+      }
+    } catch (e) {
+      this._showToast(e)
+    }
+  }
+
   _showToast({ type, message }) {
     document.dispatchEvent(
       new CustomEvent('notify', {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/sales-ui",
-  "version": "4.3.21",
+  "version": "4.3.22",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -29,10 +29,10 @@
     "@things-factory/grist-ui": "^4.3.20",
     "@things-factory/i18n-base": "^4.3.20",
     "@things-factory/import-ui": "^4.3.20",
-    "@things-factory/sales-base": "^4.3.21",
+    "@things-factory/sales-base": "^4.3.22",
     "@things-factory/setting-ui": "^4.3.20",
     "@things-factory/shell": "^4.3.20",
-    "@things-factory/warehouse-ui": "^4.3.21"
+    "@things-factory/warehouse-ui": "^4.3.22"
   },
-  "gitHead": "2021cf9407cfd29d9e1b32063f834584c7b97714"
+  "gitHead": "9dd1ce192948dbc0e4f3611e11f4804b71d06643"
 }

package/translations/en.json

@@ -17,9 +17,14 @@
   "field.total_disc_amt": "total disc amt",
   "field.uom": "uom",
   "label.currency": "currency",
+  "label.misc_amt": "misc amt",
   "label.module": "module",
+  "label.pack_qty": "pack qty",
   "label.please_select_a_currency": "please select a currency",
   "label.supplier": "supplier",
+  "label.tax_rate": "tax rate",
+  "label.total_disc_amt": "total disc amt",
+  "label.unit_price": "unit price",
   "text.draft_order_saved": "draft order saved",
   "text.generate_release_order(s)": "generate release order(s)",
   "text.please_select_a_valid_draft_order_to_generate_release_order": "please select a valid draft order to generate release order",

package/translations/ko.json

@@ -36,5 +36,10 @@
   "title.purchase_order_detail": "[ko]purchase order detail",
   "title.purchase_order": "[ko]purchase order",
   "title.purchase_orders_approval": "[ko]purchase orders approval",
-  "title.purchase_orders": "[ko]purchase orders"
+  "title.purchase_orders": "[ko]purchase orders",
+  "label.pack_qty": "[ko] pack qty",
+  "label.unit_price": "[ko] unit price",
+  "label.misc_amt": "[ko] misc amt",
+  "label.total_disc_amt": "[ko] total disc amt",
+  "label.tax_rate": "[ko] tax rate"
 }

package/translations/ms.json

@@ -36,5 +36,10 @@
   "title.purchase_order_detail": "[ms]purchase order detail",
   "title.purchase_order": "[ms]purchase order",
   "title.purchase_orders_approval": "[ms]purchase orders approval",
-  "title.purchase_orders": "[ms]purchase orders"
+  "title.purchase_orders": "[ms]purchase orders",
+  "label.pack_qty": "[ms] pack qty",
+  "label.unit_price": "[ms] unit price",
+  "label.misc_amt": "[ms] misc amt",
+  "label.total_disc_amt": "[ms] total disc amt",
+  "label.tax_rate": "[ms] tax rate"
 }

package/translations/zh.json

@@ -36,5 +36,10 @@
   "title.purchase_order_detail": "[zh]purchase order detail",
   "title.purchase_order": "[zh]purchase order",
   "title.purchase_orders_approval": "[zh]purchase orders approval",
-  "title.purchase_orders": "[zh]purchase orders"
+  "title.purchase_orders": "[zh]purchase orders",
+  "label.pack_qty": "[zh] pack qty",
+  "label.unit_price": "[zh] unit price",
+  "label.misc_amt": "[zh] misc amt",
+  "label.total_disc_amt": "[zh] total disc amt",
+  "label.tax_rate": "[zh] tax rate"
 }