From 460b7b640358d3e5792676aceab5369b24c02019 Mon Sep 17 00:00:00 2001 From: amansinghbais Date: Wed, 4 Sep 2024 11:16:13 +0530 Subject: [PATCH 1/3] Improved: added option for ignoring facility order limit (#256) --- .env.example | 2 +- src/views/BrokeringQuery.vue | 12 +++++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/.env.example b/.env.example index 381858a..f47483d 100644 --- a/.env.example +++ b/.env.example @@ -5,7 +5,7 @@ VUE_APP_VIEW_SIZE=10 VUE_APP_PERMISSION_ID= VUE_APP_DEFAULT_LOG_LEVEL="error" VUE_APP_RULE_ENUMS={"QUEUE":{"id":"OIP_QUEUE","code":"facilityId"},"SHIPPING_METHOD":{"id":"OIP_SHIP_METH_TYPE","code":"shipmentMethodTypeId"},"PRIORITY":{"id":"OIP_PRIORITY","code":"priority"},"PROMISE_DATE":{"id":"OIP_PROMISE_DATE","code":"promiseDaysCutoff"},"SALES_CHANNEL":{"id":"OIP_SALES_CHANNEL","code":"salesChannelEnumId"},"ORIGIN_FACILITY_GROUP":{"id":"OIP_ORIGIN_FAC_GRP","code":"originFacilityGroupId"},"SHIP_BY":{"id":"OSP_SHIP_BY","code":"shipBeforeDate"},"SHIP_AFTER":{"id":"OSP_SHIP_AFTER","code":"shipAfterDate"},"ORDER_DATE":{"id":"OSP_ORDER_DATE","code":"orderDate"},"SHIPPING_METHOD_SORT":{"id":"OSP_SHIP_METH","code":"deliveryDays"},"SORT_PRIORITY":{"id":"OSP_PRIORITY","code":"priority"}} -VUE_APP_RULE_FILTER_ENUMS={"FACILITY_GROUP":{"id":"IIP_FACILITY_GROUP","code":"facilityGroupId"},"PROXIMITY":{"id":"IIP_PROXIMITY","code":"distance"},"BRK_SAFETY_STOCK":{"id":"IIP_BRK_SFTY_STOCK","code":"brokeringSafetyStock"},"MEASUREMENT_SYSTEM":{"id":"IIP_MSMNT_SYSTEM","code":"measurementSystem"},"SPLIT_ITEM_GROUP":{"id":"IIP_SPLIT_ITEM_GROUP","code":"splitOrderItemGroup"}} +VUE_APP_RULE_FILTER_ENUMS={"FACILITY_GROUP":{"id":"IIP_FACILITY_GROUP","code":"facilityGroupId"},"PROXIMITY":{"id":"IIP_PROXIMITY","code":"distance"},"BRK_SAFETY_STOCK":{"id":"IIP_BRK_SFTY_STOCK","code":"brokeringSafetyStock"},"MEASUREMENT_SYSTEM":{"id":"IIP_MSMNT_SYSTEM","code":"measurementSystem"}, "SPLIT_ITEM_GROUP":{"id":"IIP_SPLIT_ITEM_GROUP","code":"splitOrderItemGroup"}, "FACILITY_ORDER_LIMIT": {"id":"IFP_IGNORE_ORD_FAC_LIMIT", "code":"ignoreFacilityOrderLimit"}} VUE_APP_RULE_SORT_ENUMS={"PROXIMITY":{"id":"ISP_PROXIMITY","code":"distance"},"INV_BALANCE":{"id":"ISP_INV_BAL","code":"inventoryForAllocation"},"CUSTOMER_SEQ":{"id":"ISP_CUST_SEQ","code":"facilitySequence"}} VUE_APP_RULE_ACTION_ENUMS={"RM_AUTO_CANCEL_DATE":{"id":"ORA_RM_CANCEL_DATE","code":"RM_AUTO_CANCEL_DATE"},"AUTO_CANCEL_DAYS":{"id":"ORA_AUTO_CANCEL_DAYS","code":"ADD_AUTO_CANCEL_DATE"},"NEXT_RULE":{"id":"ORA_NEXT_RULE","code":"NEXT_RULE"},"MOVE_TO_QUEUE":{"id":"ORA_MV_TO_QUEUE","code":"MOVE_TO_QUEUE"}} VUE_APP_CRON_EXPRESSIONS={"Every 5 minutes":"0 */5 * ? * *","Every 15 minutes":"0 */15 * ? * *","Every 30 minutes":"0 */30 * ? * *","Hourly":"0 0 * ? * *","Every six hours":"0 0 */6 ? * *","Every day at midnight":"0 0 0 * * ?"} diff --git a/src/views/BrokeringQuery.vue b/src/views/BrokeringQuery.vue index 0d96c3e..acfa0aa 100644 --- a/src/views/BrokeringQuery.vue +++ b/src/views/BrokeringQuery.vue @@ -220,6 +220,12 @@ {{ getFilterValue(inventoryRuleFilterOptions, conditionFilterEnums, "BRK_SAFETY_STOCK").fieldValue || getFilterValue(inventoryRuleFilterOptions, conditionFilterEnums, "BRK_SAFETY_STOCK").fieldValue == 0 ? getFilterValue(inventoryRuleFilterOptions, conditionFilterEnums, "BRK_SAFETY_STOCK").fieldValue : "-" }} + + + + {{ translate("Turn of the facility order limit check") }} + + @@ -949,7 +955,11 @@ function updateOrderFilterValue(event: CustomEvent, id: string, multi = false) { } function updateRuleFilterValue(event: CustomEvent, id: string) { - inventoryRuleFilterOptions.value[conditionFilterEnums[id].code].fieldValue = event.detail.value + if(id === "FACILITY_ORDER_LIMIT") { + inventoryRuleFilterOptions.value[conditionFilterEnums[id].code].fieldValue = event.detail.checked === true ? "Y" : "N" + } else { + inventoryRuleFilterOptions.value[conditionFilterEnums[id].code].fieldValue = event.detail.value + } updateRule() } From c7b6f8b757e6ec86d733767a48fc0f61a5d13398 Mon Sep 17 00:00:00 2001 From: amansinghbais Date: Wed, 4 Sep 2024 11:24:19 +0530 Subject: [PATCH 2/3] Improved: added entry in locale for the missing static label (#256) --- src/locales/en.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/locales/en.json b/src/locales/en.json index c192ba5..027a8a7 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -174,6 +174,7 @@ "This is the name of the OMS you are connected to right now. Make sure that you are connected to the right instance before proceeding.": "This is the name of the OMS you are connected to right now. Make sure that you are connected to the right instance before proceeding.", "Timezone": "Timezone", "Time zone updated successfully": "Time zone updated successfully", + "Turn of the facility order limit check": "Turn of the facility order limit check", "Unarchive": "Unarchive", "Unavailable items": "Unavailable items", "Updated at": "Updated at", From d6895c1c0b28c5b8fcd3e30cd8c592d071ca2c23 Mon Sep 17 00:00:00 2001 From: amansinghbais Date: Wed, 4 Sep 2024 12:12:23 +0530 Subject: [PATCH 3/3] Improved: optimized check condition (#256) --- src/views/BrokeringQuery.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/BrokeringQuery.vue b/src/views/BrokeringQuery.vue index acfa0aa..468136c 100644 --- a/src/views/BrokeringQuery.vue +++ b/src/views/BrokeringQuery.vue @@ -956,7 +956,7 @@ function updateOrderFilterValue(event: CustomEvent, id: string, multi = false) { function updateRuleFilterValue(event: CustomEvent, id: string) { if(id === "FACILITY_ORDER_LIMIT") { - inventoryRuleFilterOptions.value[conditionFilterEnums[id].code].fieldValue = event.detail.checked === true ? "Y" : "N" + inventoryRuleFilterOptions.value[conditionFilterEnums[id].code].fieldValue = event.detail.checked ? "Y" : "N" } else { inventoryRuleFilterOptions.value[conditionFilterEnums[id].code].fieldValue = event.detail.value }