@things-factory/sales-ui 4.3.127 → 4.3.131

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

@@ -24,6 +24,8 @@ class PurchaseOrderDetail extends connect(store)(localize(i18next)(PageView)) {
       _purchaseOrderData: Object,
       _enableTransportationServiceSetting: Boolean,
       _enableTransportForCustomClearanceSetting: Boolean,
+      _enableToleranceLimit: Boolean,
+      _toleranceLimit: Object,
       _disableTransport: Boolean,
       _editable: Boolean,
       _files: Array,
@@ -776,6 +778,12 @@ class PurchaseOrderDetail extends connect(store)(localize(i18next)(PageView)) {
       }
 
       event.detail.after = { ...changeRecord }
+
+      if (this._enableToleranceLimit) {
+        if (this._checkToleranceLimitExceed()) {
+          this._showToast({ message: 'Tolerance limit exceeded' })
+        }
+      }
     } catch (e) {
       const beforeValue = event.detail.before && event.detail.before[event.detail.column.name]
       if (beforeValue) {
@@ -788,6 +796,35 @@ class PurchaseOrderDetail extends connect(store)(localize(i18next)(PageView)) {
     }
   }
 
+  _checkToleranceLimitExceed() {
+    if (this._toleranceLimit?.value) {
+      let originalTotalPrice =
+        this.productData.records.reduce((init, item) => {
+          return (init += item.unitPrice)
+        }, 0) || 0
+
+      let changedTotalPrice =
+        this.productGrist.dirtyData.records.reduce((init, item) => {
+          return (init += item.unitPrice)
+        }, 0) || 0
+
+      if (changedTotalPrice > originalTotalPrice) {
+        if (this._toleranceLimit.type == 'AMOUNT') {
+          if (changedTotalPrice - originalTotalPrice > this._toleranceLimit.value) {
+            return true
+          }
+        } else if (this._toleranceLimit.type == 'PERCENTAGE') {
+          const percentChange = ((changedTotalPrice - originalTotalPrice) / originalTotalPrice) * 100
+          if (percentChange > this._toleranceLimit.value) {
+            return true
+          }
+        }
+      }
+    }
+
+    return false
+  }
+
   _onMiscChargesChangeHandler(event) {
     let changeRecord = event.detail.after
     this._calcMiscCharges(event, changeRecord, false)
@@ -922,6 +959,25 @@ class PurchaseOrderDetail extends connect(store)(localize(i18next)(PageView)) {
 
       if (!result.value) return
 
+      if (this._enableToleranceLimit) {
+        if (this._checkToleranceLimitExceed) {
+          const toleranceLimitResult = await CustomAlert({
+            title: i18next.t('title.tolerance_limit'),
+            text:
+              status == PURCHASE_ORDER_STATUS.DRAFT
+                ? ''
+                : i18next.t('text.total_price_exceed_x_y', {
+                    x: this._toleranceLimit.value,
+                    y: this._toleranceLimit.type == 'PERCENTAGE' ? '%' : ''
+                  }),
+            confirmButton: { text: i18next.t('button.submit') },
+            cancelButton: { text: i18next.t('button.cancel') }
+          })
+
+          if (!toleranceLimitResult.value) return
+        }
+      }
+
       //comment start
       //detailed review needed 19 May 2022 by @ChrisLim-git
       let purchaseOrder = {
@@ -1100,14 +1156,16 @@ class PurchaseOrderDetail extends connect(store)(localize(i18next)(PageView)) {
     if (!response.errors) {
       this._purchaseOrderData = {
         ...response.data.purchaseOrder,
-        bufferLocation: {
-          ...response.data.purchaseOrder.bufferLocation,
-          name: `${response.data.purchaseOrder.bufferLocation.name} ${
-            response.data.purchaseOrder.bufferLocation.description
-              ? `(${response.data.purchaseOrder.bufferLocation.description})`
-              : ''
-          }`
-        }
+        bufferLocation: response.data.purchaseOrder?.bufferLocation
+          ? {
+              ...response.data.purchaseOrder.bufferLocation,
+              name: `${response.data.purchaseOrder.bufferLocation.name} ${
+                response.data.purchaseOrder.bufferLocation.description
+                  ? `(${response.data.purchaseOrder.bufferLocation.description})`
+                  : ''
+              }`
+            }
+          : null
       }
 
       this.productData = {
@@ -1395,6 +1453,17 @@ class PurchaseOrderDetail extends connect(store)(localize(i18next)(PageView)) {
     if (!this._enableTransportForCustomClearanceSetting)
       this._enableTransportForCustomClearanceSetting = await fetchSettingRule('enable-custom-clearance-transportation')
 
+    if (!this._enableToleranceLimit) {
+      this._enableToleranceLimit = await fetchSettingRule('enable-tolerance-limit')
+
+      if (this._enableToleranceLimit) {
+        this._toleranceLimit = await fetchSettingRule('tolerance-limit')
+        if (this._toleranceLimit) {
+          this._toleranceLimit = JSON.parse(this._toleranceLimit)
+        }
+      }
+    }
+
     if (!this._containerSizes) this._containerSizes = await getCodeByName('CONTAINER_SIZES')
 
     if (!this._currency) this._currency = await getCodeByName('CURRENCY')

package/package.json

@@ -1,10 +1,9 @@
 {
   "name": "@things-factory/sales-ui",
-  "version": "4.3.127",
+  "version": "4.3.131",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
-  "license": "MIT",
   "author": "",
   "description": "UI module that handles sales order",
   "publishConfig": {
@@ -24,15 +23,15 @@
     "migration:create": "node ../../node_modules/typeorm/cli.js migration:create -d ./server/migrations"
   },
   "dependencies": {
-    "@things-factory/code-base": "^4.3.122",
-    "@things-factory/form-ui": "^4.3.122",
-    "@things-factory/grist-ui": "^4.3.123",
-    "@things-factory/i18n-base": "^4.3.122",
-    "@things-factory/import-ui": "^4.3.123",
-    "@things-factory/sales-base": "^4.3.127",
-    "@things-factory/setting-ui": "^4.3.123",
-    "@things-factory/shell": "^4.3.122",
-    "@things-factory/warehouse-ui": "^4.3.127"
+    "@things-factory/code-base": "^4.3.131",
+    "@things-factory/form-ui": "^4.3.131",
+    "@things-factory/grist-ui": "^4.3.131",
+    "@things-factory/i18n-base": "^4.3.131",
+    "@things-factory/import-ui": "^4.3.131",
+    "@things-factory/sales-base": "^4.3.131",
+    "@things-factory/setting-ui": "^4.3.131",
+    "@things-factory/shell": "^4.3.131",
+    "@things-factory/warehouse-ui": "^4.3.131"
   },
-  "gitHead": "ed6406fce1541dd5ca6a7508047934e8fa5698b1"
+  "gitHead": "3ae054257c32ac18b023913a313f784459581ea3"
 }

package/translations/en.json

@@ -31,6 +31,7 @@
   "text.purchase_order_form_invalid": "purchase order form invalid",
   "text.purchase_order_saved": "purchase order saved",
   "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",
   "text.update_purchase_order": "update purchase order",
   "title.create_purchase_order": "create purchase order",
@@ -41,5 +42,6 @@
   "title.purchase_order_detail": "purchase order detail",
   "title.purchase_order": "purchase order",
   "title.purchase_orders_approval": "purchase orders approval",
-  "title.purchase_orders": "purchase orders"
+  "title.purchase_orders": "purchase orders",
+  "title.tolerance_limit": "tolerance limit"
 }

package/translations/ko.json

@@ -26,6 +26,7 @@
   "text.draft_order_saved": "[ko]draft order saved",
   "text.purchase_order_form_invalid": "[ko]purchase order form invalid",
   "text.purchase_order_saved": "[ko]purchase order saved",
+  "text.total_price_exceed_x_y": "[ko]total price exceed {x}{y}",
   "text.update_draft_release_order": "update draft release order",
   "text.update_purchase_order": "[ko]update purchase order",
   "title.create_purchase_order": "[ko]create purchase order",
@@ -37,6 +38,7 @@
   "title.purchase_order": "[ko]purchase order",
   "title.purchase_orders_approval": "[ko]purchase orders approval",
   "title.purchase_orders": "[ko]purchase orders",
+  "title.tolerance_limit": "[ko]tolerance limit",
   "label.pack_qty": "[ko] pack qty",
   "label.unit_price": "[ko] unit price",
   "label.misc_amt": "[ko] misc amt",

package/translations/ms.json

@@ -26,6 +26,7 @@
   "text.draft_order_saved": "[ms]draft order saved",
   "text.purchase_order_form_invalid": "[ms]purchase order form invalid",
   "text.purchase_order_saved": "[ms]purchase order saved",
+  "text.total_price_exceed_x_y": "[ms]total price exceed {x}{y}",
   "text.update_draft_release_order": "update draft release order",
   "text.update_purchase_order": "[ms]update purchase order",
   "title.create_purchase_order": "[ms]create purchase order",
@@ -37,6 +38,7 @@
   "title.purchase_order": "[ms]purchase order",
   "title.purchase_orders_approval": "[ms]purchase orders approval",
   "title.purchase_orders": "[ms]purchase orders",
+  "title.tolerance_limit": "[ms]tolerance limit",
   "label.pack_qty": "[ms] pack qty",
   "label.unit_price": "[ms] unit price",
   "label.misc_amt": "[ms] misc amt",

package/translations/zh.json

@@ -26,6 +26,7 @@
   "text.draft_order_saved": "[zh]draft order saved",
   "text.purchase_order_form_invalid": "[zh]purchase order form invalid",
   "text.purchase_order_saved": "[zh]purchase order saved",
+  "text.total_price_exceed_x_y": "[zh]total price exceed {x}{y}",
   "text.update_draft_release_order": "update draft release order",
   "text.update_purchase_order": "[zh]update purchase order",
   "title.create_purchase_order": "[zh]create purchase order",
@@ -37,6 +38,7 @@
   "title.purchase_order": "[zh]purchase order",
   "title.purchase_orders_approval": "[zh]purchase orders approval",
   "title.purchase_orders": "[zh]purchase orders",
+  "title.tolerance_limit": "[zh]tolerance limit",
   "label.pack_qty": "[zh] pack qty",
   "label.unit_price": "[zh] unit price",
   "label.misc_amt": "[zh] misc amt",

package/LICENSE.md

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) Hatiolab
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.