@things-factory/sales-ui 4.3.135 → 4.3.138

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

@@ -772,7 +772,7 @@ class PurchaseOrderApprovalDetail extends connect(store)(localize(i18next)(PageV
 
       if (!response.errors) {
         this._clearView()
-        this._showToast({ message: i18next.t('purchase_order_updated') })
+        this._showToast({ message: i18next.t('text.purchase_order_updated') })
         this._navigateToList()
       }
     } catch (e) {
@@ -839,6 +839,10 @@ class PurchaseOrderApprovalDetail extends connect(store)(localize(i18next)(PageV
                 brand
                 description
               }
+              productDetail {
+                id
+                name
+              }
               adjustedBatchId
               remark
               status

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

@@ -2,6 +2,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 '@things-factory/operato-wms/client/pages/components/select-product-popup'
 
 import gql from 'graphql-tag'
 import { css, html } from 'lit-element'
@@ -524,29 +525,13 @@ class PurchaseOrderDetail extends connect(store)(localize(i18next)(PageView)) {
         width: 150
       },
       {
-        type: 'object',
-        name: 'product',
+        type: 'string',
+        name: 'productName',
         header: i18next.t('field.product'),
-        record: {
-          editable: this._editable,
-          options: {
-            queryName: 'products',
-            basicArgs: {
-              filters: [{ name: 'bizplace_id', operator: 'eq', value: this._purchaseOrderData?.bizplace?.id }]
-            },
-            nameField: 'name',
-            descriptionField: 'description',
-            select: [
-              { name: 'id', hidden: true },
-              { name: 'sku', header: i18next.t('field.sku') },
-              { name: 'name', header: i18next.t('field.name') },
-              { name: 'brand', header: i18next.t('field.brand') },
-              { name: 'description', header: i18next.t('field.description') },
-              { name: 'packingType', header: i18next.t('field.packing_type') },
-              { name: 'primaryUnit', header: i18next.t('field.uom') },
-              { name: 'primaryValue', header: i18next.t('field.uom_value') }
-            ],
-            list: { fields: ['sku', 'name', 'brand', 'description', 'packingType'] }
+        imex: { header: i18next.t('field.product'), key: 'productName', width: 50, type: 'string' },
+        handlers: {
+          click: (columns, data, column, record, rowIndex) => {
+            this._openProductSelection(rowIndex)
           }
         },
         width: 350
@@ -1094,6 +1079,10 @@ class PurchaseOrderDetail extends connect(store)(localize(i18next)(PageView)) {
                 brand
                 description
               }
+              productDetail {
+                id
+                name
+              }
               adjustedBatchId
               remark
               status
@@ -1223,11 +1212,19 @@ class PurchaseOrderDetail extends connect(store)(localize(i18next)(PageView)) {
       throw new Error(i18next.t('text.container_no_is_empty'))
   }
 
-  _validateProducts() {
+  _validateProducts(records = []) {
     // no records
-    const records = this.productGrist.dirtyData.records
+    if (!records?.length) {
+      records = this.productGrist.dirtyData.records
+    }
+
     if (!records?.length) throw new Error(i18next.t('text.no_products'))
 
+    const duplicatedProducts = records.filter((item, index) => records.indexOf(item) != index)
+
+    if (duplicatedProducts?.length > 0)
+      throw new Error(i18next.t('text.there_is_duplicated_products_with_same_batch_no'))
+
     const checkRequiredFields = ({ batchId, packingType, uomValue, uom }) =>
       !batchId || !packingType || !uomValue || !uom
 
@@ -1268,6 +1265,7 @@ class PurchaseOrderDetail extends connect(store)(localize(i18next)(PageView)) {
         id: record.id || null,
         batchId: record.batchId,
         product: { id: record.product.id },
+        productDetail: record.productDetailId ? { id: record.productDetailId } : { id: record.productDetail.id },
         packingType: record.packingType,
         uomValue: record?.uomValue ? record.uomValue : 0,
         uom: record.uom,
@@ -1276,7 +1274,7 @@ class PurchaseOrderDetail extends connect(store)(localize(i18next)(PageView)) {
         remark: record?.remark || null,
         discountAmt: record.discountAmt,
         unitPrice:
-          status == PURCHASE_ORDER_STATUS.DRAFT ? record.unitPrice : record.unitPrice > 1 ? record.unitPrice : 1,
+          status == PURCHASE_ORDER_STATUS.DRAFT ? record.unitPrice : record.unitPrice > 0 ? record.unitPrice : 1,
         miscAmt: record.miscAmt,
         taxRate: record.taxRate
       }
@@ -1498,6 +1496,20 @@ class PurchaseOrderDetail extends connect(store)(localize(i18next)(PageView)) {
         imex: { header: i18next.t('field.packing_type'), key: 'packingType', width: 25, type: 'string' },
         width: 100
       },
+      {
+        type: 'string',
+        name: 'uom',
+        header: i18next.t('field.uom'),
+        imex: { header: i18next.t('field.uom'), key: 'uom', width: 25, type: 'string' },
+        width: 100
+      },
+      {
+        type: 'float',
+        name: 'uomValue',
+        header: i18next.t('field.uom_value'),
+        imex: { header: i18next.t('field.uom_value'), key: 'uomValue', width: 25, type: 'float' },
+        width: 100
+      },
       {
         type: 'string',
         name: 'remark',
@@ -1545,6 +1557,59 @@ class PurchaseOrderDetail extends connect(store)(localize(i18next)(PageView)) {
     return productGrist
   }
 
+  _openProductSelection(rowIndex) {
+    if (this._purchaseOrderData?.bizplace?.id) {
+      openPopup(
+        html`
+          <select-product-popup
+            .bizplaceId="${this._purchaseOrderData?.bizplace?.id}"
+            @selected="${e => {
+              // let newRecord = []
+              // newRecord.push(e.detail)
+
+              if (this.productGrist.dirtyData.records.length !== rowIndex) {
+                // update existing product data records
+                this.productGrist.dirtyData.records.splice(rowIndex, 1, {
+                  ...this.productGrist.dirtyData.records[rowIndex],
+                  ...e.detail
+                })
+
+                this.productGrist.dirtyData.records = this.productGrist.dirtyData.records.map(item => {
+                  return {
+                    ...item,
+                    totalUomValue:
+                      item?.packQty > 0
+                        ? item?.totalUomValue
+                          ? item.totalUomValue
+                          : `${parseFloat(item.packQty * e.detail.uomValue).toFixed(2)} ${e.detail.uom}`
+                        : null
+                  }
+                })
+
+                this.productData = {
+                  ...this.productData,
+                  records: [...this.productGrist.dirtyData.records]
+                }
+              } else {
+                this.productData = {
+                  ...this.productData,
+                  records: [...this.productGrist.dirtyData.records, e.detail]
+                }
+              }
+            }}"
+          ></select-product-popup>
+        `,
+        {
+          backdrop: true,
+          size: 'large',
+          title: i18next.t('title.select_item')
+        }
+      )
+    } else {
+      this._showToast({ message: i18next.t('text.company_selection_is_empty') })
+    }
+  }
+
   async _exportableData() {
     try {
       var headerSetting = [
@@ -1595,6 +1660,10 @@ class PurchaseOrderDetail extends connect(store)(localize(i18next)(PageView)) {
               primaryUnit
               primaryValue
             }
+            productDetail {
+              id
+              name
+            }
           }
         }
       `,
@@ -1629,21 +1698,25 @@ class PurchaseOrderDetail extends connect(store)(localize(i18next)(PageView)) {
   }
 
   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)
+    try {
+      this._validateProducts(records)
+
+      const orderProducts = records.map(record => {
+        delete record.cuFlag
+        delete record.id
+        return {
+          ...record,
+          unitPrice: record?.unitPrice > 0 ? parseFloat(record?.unitPrice) : 0,
+          packQty: parseInt(record?.packQty) || 0,
+          miscAmt: record?.miscAmt > 0 ? parseFloat(record?.miscAmt) : 0,
+          discountAmt: record?.discountAmt > 0 ? parseFloat(record?.discountAmt) : 0,
+          taxRate: record?.taxRate > 0 ? parseFloat(record?.taxRate) : 0
+        }
+      })
+      await this.bulkUploadValidatePoOrderProducts(orderProducts)
+    } catch (e) {
+      this._showToast(e)
+    }
     history.back()
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/sales-ui",
-  "version": "4.3.135",
+  "version": "4.3.138",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -23,15 +23,15 @@
     "migration:create": "node ../../node_modules/typeorm/cli.js migration:create -d ./server/migrations"
   },
   "dependencies": {
-    "@things-factory/code-base": "^4.3.131",
+    "@things-factory/code-base": "^4.3.138",
     "@things-factory/form-ui": "^4.3.131",
-    "@things-factory/grist-ui": "^4.3.131",
+    "@things-factory/grist-ui": "^4.3.138",
     "@things-factory/i18n-base": "^4.3.131",
-    "@things-factory/import-ui": "^4.3.131",
-    "@things-factory/sales-base": "^4.3.135",
-    "@things-factory/setting-ui": "^4.3.131",
+    "@things-factory/import-ui": "^4.3.138",
+    "@things-factory/sales-base": "^4.3.138",
+    "@things-factory/setting-ui": "^4.3.138",
     "@things-factory/shell": "^4.3.131",
-    "@things-factory/warehouse-ui": "^4.3.135"
+    "@things-factory/warehouse-ui": "^4.3.138"
   },
-  "gitHead": "55b877e97abb4350a0fa9dceb051c54fd496dcf0"
+  "gitHead": "1d4e0a3ff6b8792c843b9735a28a3f5fb946b144"
 }

package/translations/en.json

@@ -30,6 +30,7 @@
   "text.please_select_a_valid_draft_order_to_generate_release_order": "please select a valid draft order to generate release order",
   "text.purchase_order_form_invalid": "purchase order form invalid",
   "text.purchase_order_saved": "purchase order saved",
+  "text.purchase_order_updated": "purchase order updated",
   "text.release_order(s)_has_been_generated": "release order(s) has been generated",
   "text.total_price_exceed_x_y": "total price exceed {x}{y}",
   "text.update_draft_release_order": "update draft release order",
@@ -43,5 +44,6 @@
   "title.purchase_order": "purchase order",
   "title.purchase_orders_approval": "purchase orders approval",
   "title.purchase_orders": "purchase orders",
+  "text.there_is_duplicated_products_with_same_batch_no": "there is duplicated products with same batch no",
   "title.tolerance_limit": "tolerance limit"
 }

package/translations/ko.json

@@ -43,5 +43,7 @@
   "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"
+  "label.tax_rate": "[ko] tax rate",
+  "text.purchase_order_updated": "[ko] purchase order updated",
+  "text.there_is_duplicated_products_with_same_batch_no": "[ko] there is duplicated products with same batch no"
 }

package/translations/ms.json

@@ -43,5 +43,7 @@
   "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"
+  "label.tax_rate": "[ms] tax rate",
+  "text.purchase_order_updated": "[ms] purchase order updated",
+  "text.there_is_duplicated_products_with_same_batch_no": "[ms] there is duplicated products with same batch no"
 }

package/translations/zh.json

@@ -43,5 +43,7 @@
   "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"
+  "label.tax_rate": "[zh] tax rate",
+  "text.purchase_order_updated": "[zh] purchase order updated",
+  "text.there_is_duplicated_products_with_same_batch_no": "[zh] there is duplicated products with same batch no"
 }