@things-factory/sales-ui 4.3.157 → 4.3.161

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

@@ -5,17 +5,32 @@ 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'
+import {
+  css,
+  html
+} from 'lit-element'
 import { connect } from 'pwa-helpers/connect-mixin'
 
 import { getCodeByName } from '@things-factory/code-base'
 import { MultiColumnFormStyles } from '@things-factory/form-ui'
-import { i18next, localize } from '@things-factory/i18n-base'
+import {
+  i18next,
+  localize
+} from '@things-factory/i18n-base'
 import { openPopup } from '@things-factory/layout-base'
 import { fetchSettingRule } from '@things-factory/setting-ui'
-import { client, CustomAlert, navigate, PageView, store } from '@things-factory/shell'
+import {
+  client,
+  CustomAlert,
+  navigate,
+  PageView,
+  store
+} from '@things-factory/shell'
 import { CommonButtonStyles } from '@things-factory/styles'
-import { flattenObject, isMobileDevice } from '@things-factory/utils'
+import {
+  flattenObject,
+  isMobileDevice
+} from '@things-factory/utils'
 
 import { PURCHASE_ORDER_STATUS } from '../../constants'
 
@@ -483,7 +498,6 @@ class PurchaseOrderDetail extends connect(store)(localize(i18next)(PageView)) {
         await this._fetchPO()
 
         this._editable = this._purchaseOrderData?.status == PURCHASE_ORDER_STATUS.DRAFT
-
         this._configureProductGrist()
       } catch (e) {
         this._showToast(e)
@@ -735,6 +749,10 @@ class PurchaseOrderDetail extends connect(store)(localize(i18next)(PageView)) {
         changeRecord.brand = brand ? changeRecord.product.brand : ''
       }
 
+      if(changedColumn == 'unitPrice' && isNaN(changeRecord.unitPrice )){
+          throw new Error(i18next.t('text.invalid_input_in_unit_price'))
+        }
+
       const priceAmtChangeColumn = ['packQty', 'unitPrice', 'miscAmt', 'discountAmt', 'taxRate']
       if (priceAmtChangeColumn.indexOf(changedColumn) >= 0) {
         if (changedColumn != 'miscAmt') {
@@ -754,7 +772,7 @@ class PurchaseOrderDetail extends connect(store)(localize(i18next)(PageView)) {
         }
       }
 
-      const amountRelatedColumns = ['uomValue', 'uom', 'packQty', 'releaseQty', 'releaseUomValue']
+      const amountRelatedColumns = ['uomValue', 'uom', 'packQty', 'releaseQty', 'releaseUomValue', 'unitPrice']
       if (amountRelatedColumns.indexOf(changedColumn) >= 0) {
         const calcedAmount = this._calcAmount(changedColumn, changeRecord)
         for (let key in calcedAmount) {
@@ -891,14 +909,14 @@ class PurchaseOrderDetail extends connect(store)(localize(i18next)(PageView)) {
     let { packQty, totalAmt, taxAmt, taxRate, discountAmt, unitPrice, miscAmt } = changeRecord
 
     packQty = packQty || 0
-    unitPrice = parseFloat((unitPrice || 0).toFixed(2))
+    unitPrice = parseFloat(unitPrice || 0).toFixed(2)
     miscAmt = parseFloat((miscAmt || 0).toFixed(2))
     taxRate = parseFloat((taxRate || 0).toFixed(2))
     discountAmt = parseFloat((discountAmt || 0).toFixed(2))
 
-    let totalAmtBeforeTax = packQty * unitPrice + miscAmt - discountAmt
+    let totalAmtBeforeTax = parseFloat(packQty * unitPrice + miscAmt - discountAmt).toFixed(2)
     taxAmt = parseFloat(((totalAmtBeforeTax * taxRate) / 100).toFixed(2))
-    totalAmt = parseFloat((totalAmtBeforeTax + taxAmt).toFixed(2))
+    totalAmt = parseFloat(totalAmtBeforeTax + taxAmt).toFixed(2)
 
     return { totalAmt, taxAmt, taxRate, discountAmt, unitPrice, miscAmt }
   }
@@ -1079,6 +1097,7 @@ class PurchaseOrderDetail extends connect(store)(localize(i18next)(PageView)) {
                 name
                 brand
                 description
+                costPrice
               }
               productDetail {
                 id
@@ -1163,6 +1182,7 @@ class PurchaseOrderDetail extends connect(store)(localize(i18next)(PageView)) {
           return {
             ...itm,
             brand: itm.product.brand,
+            unitPrice: itm.product.costPrice,
             productName: `${itm.product.name}(${itm.product.description}(${itm.product.sku}))`,
             ...this._calcPrice(itm)
           }
@@ -1242,10 +1262,14 @@ class PurchaseOrderDetail extends connect(store)(localize(i18next)(PageView)) {
       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(({ unitPrice }) => isNaN(unitPrice) && unitPrice !==undefined))
+     { throw new Error(i18next.t('text.invalid_input_in_unit_price')) 
     }
 
+    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') } }))
     }
@@ -1279,8 +1303,7 @@ class PurchaseOrderDetail extends connect(store)(localize(i18next)(PageView)) {
         totalUomValue: record?.uomValue ? `${(record.uomValue * record.packQty).toFixed(2)} ${record.uom}` : ``,
         remark: record?.remark || null,
         discountAmt: record.discountAmt,
-        unitPrice:
-          status == PURCHASE_ORDER_STATUS.DRAFT ? record.unitPrice : record.unitPrice > 0 ? record.unitPrice : 1,
+        unitPrice: parseFloat(PURCHASE_ORDER_STATUS.DRAFT ? record.unitPrice : record.unitPrice > 0 ? record.unitPrice : 0),
         miscAmt: record.miscAmt,
         taxRate: record.taxRate
       }
@@ -1534,7 +1557,7 @@ class PurchaseOrderDetail extends connect(store)(localize(i18next)(PageView)) {
         type: 'float',
         name: 'unitPrice',
         header: i18next.t('field.unit_price'),
-        imex: { header: i18next.t('field.unit_price'), key: 'unitPrice', width: 25, type: 'float' },
+        imex: { header: i18next.t('field.unit_price'), key: 'unitPrice', width: 25, type: 'string' },
         width: 100
       },
       {
@@ -1650,7 +1673,6 @@ class PurchaseOrderDetail extends connect(store)(localize(i18next)(PageView)) {
             taxRate
             batchId
             batchIdRef
-            unitPrice
             remark
             productSKU
             productName
@@ -1665,10 +1687,12 @@ class PurchaseOrderDetail extends connect(store)(localize(i18next)(PageView)) {
               brand
               primaryUnit
               primaryValue
+              costPrice
             }
             productDetail {
               id
               name
+              costPrice
             }
           }
         }
@@ -1678,14 +1702,22 @@ class PurchaseOrderDetail extends connect(store)(localize(i18next)(PageView)) {
 
     if (!response.errors) {
       const data = response.data.bulkUploadValidatePoOrderProducts.map(item => {
+        if (item.unitPrice == null) {
+          item.unitPrice = item.productDetail.costPrice
+        }
+        let totalAmtBeforeTax = parseFloat(item.packQty * item.unitPrice + item.miscAmt - item.discountAmt).toFixed(2)
+        let taxAmt = parseFloat(((totalAmtBeforeTax * item.taxRate) / 100).toFixed(2))
+        let totalAmt = parseFloat(totalAmtBeforeTax + item.taxAmt).toFixed(2)
         return {
           ...item,
           productName: item?.productName,
-          unitPrice: parseFloat(item.unitPrice) || 0,
+          unitPrice: parseFloat(item.unitPrice || 0).toFixed(2),
           packQty: parseInt(item.packQty) || 0,
           miscAmt: parseFloat(item.miscAmt) || 0,
           discountAmt: parseFloat(item.discountAmt) || 0,
-          taxRate: parseFloat(item.taxRate) || 0
+          taxRate: parseFloat(item.taxRate) || 0,
+          taxAmt,
+          totalAmt
         }
       })
       this.productData = {
@@ -1708,11 +1740,29 @@ class PurchaseOrderDetail extends connect(store)(localize(i18next)(PageView)) {
       this._validateProducts(records)
 
       const orderProducts = records.map(record => {
+        if (record.unitPrice) {
+          record.unitPrice = parseFloat(record.unitPrice)
+        }
+        if (!record.unitPrice) {
+          if (record.unitPrice == 0) {
+            record.unitPrice == 0
+          } else {
+            record.unitPrice = null
+          }
+          if (record.unitCost != null) {
+            record.unitCost = parseFloat(record.unitCost)
+            if(isNaN(record.unitCost)){
+              throw new Error(i18next.t('text.invalid_unit_price'))
+  
+            }
+            //itm.unitCost= itm.unitCost.toFixed(2)
+          }
+        }
         delete record.cuFlag
         delete record.id
         return {
           ...record,
-          unitPrice: record?.unitPrice > 0 ? parseFloat(record?.unitPrice) : 0,
+          unitPrice: record.unitPrice,
           packQty: parseInt(record?.packQty) || 0,
           miscAmt: record?.miscAmt > 0 ? parseFloat(record?.miscAmt) : 0,
           discountAmt: record?.discountAmt > 0 ? parseFloat(record?.discountAmt) : 0,
@@ -1733,6 +1783,9 @@ class PurchaseOrderDetail extends connect(store)(localize(i18next)(PageView)) {
         records = records
           .filter(record => record.productSKU)
           .map(record => {
+            if (typeof record.unitPrice === 'object') {
+              record.unitPrice = 0
+            }
             return {
               ...record
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/sales-ui",
-  "version": "4.3.157",
+  "version": "4.3.161",
   "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.151",
-    "@things-factory/form-ui": "^4.3.151",
-    "@things-factory/grist-ui": "^4.3.155",
-    "@things-factory/i18n-base": "^4.3.151",
-    "@things-factory/import-ui": "^4.3.155",
-    "@things-factory/sales-base": "^4.3.157",
-    "@things-factory/setting-ui": "^4.3.155",
-    "@things-factory/shell": "^4.3.151",
-    "@things-factory/warehouse-ui": "^4.3.157"
+    "@things-factory/code-base": "^4.3.159",
+    "@things-factory/form-ui": "^4.3.159",
+    "@things-factory/grist-ui": "^4.3.159",
+    "@things-factory/i18n-base": "^4.3.159",
+    "@things-factory/import-ui": "^4.3.159",
+    "@things-factory/sales-base": "^4.3.161",
+    "@things-factory/setting-ui": "^4.3.159",
+    "@things-factory/shell": "^4.3.159",
+    "@things-factory/warehouse-ui": "^4.3.161"
   },
-  "gitHead": "a1f20b08aa67f2c07f7e5ad138243122641a3d5a"
+  "gitHead": "7fe9232a64285ebaa04382258806889c47924157"
 }

package/translations/en.json

@@ -45,5 +45,6 @@
   "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",
+  "text.invalid_input_in_unit_price": "invalid input in unit price",
   "title.tolerance_limit": "tolerance limit"
 }

package/translations/ko.json

@@ -45,5 +45,6 @@
   "label.total_disc_amt": "[ko] total disc amt",
   "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"
+  "text.there_is_duplicated_products_with_same_batch_no": "[ko] there is duplicated products with same batch no",
+  "text.invalid_input_in_unit_price": "[ko] invalid input in unit price"
 }

package/translations/ms.json

@@ -45,5 +45,6 @@
   "label.total_disc_amt": "[ms] total disc amt",
   "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"
+  "text.there_is_duplicated_products_with_same_batch_no": "[ms] there is duplicated products with same batch no",
+  "text.invalid_input_in_unit_price": "[ms] invalid input in unit price"
 }

package/translations/zh.json

@@ -45,5 +45,6 @@
   "label.total_disc_amt": "[zh] total disc amt",
   "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"
+  "text.there_is_duplicated_products_with_same_batch_no": "[zh] there is duplicated products with same batch no",
+  "text.invalid_input_in_unit_price": "[zh] invalid input in unit price"
 }