Merge branch 'main' into #260-inventory-filter

.env.example

@@ -4,8 +4,8 @@ VUE_APP_CACHE_MAX_AGE=3600
 VUE_APP_VIEW_SIZE=10
 VUE_APP_PERMISSION_ID="ORDER_ROUTING_APP_VIEW"
 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"}, "FACILITY_ORDER_LIMIT": {"id":"IFP_IGNORE_ORD_FAC_LIMIT", "code":"ignoreFacilityOrderLimit"}, "SHIP_THREHOLD": {"id":"IFP_SHIP_THREHOLD", "code":"shipmentThreshold"}}
+VUE_APP_RULE_ENUMS={"QUEUE":{"id":"OIP_QUEUE","code":"facilityId"},"QUEUE_EXCLUDED":{"id":"OIP_QUEUE_EXCLUDED","code":"facilityId_excluded"},"SHIPPING_METHOD":{"id":"OIP_SHIP_METH_TYPE","code":"shipmentMethodTypeId"},"SHIPPING_METHOD_EXCLUDED":{"id":"OIP_SHIP_METH_TYPE_EXCLUDED","code":"shipmentMethodTypeId_excluded"},"PRIORITY":{"id":"OIP_PRIORITY","code":"priority"},"PRIORITY_EXCLUDED":{"id":"OIP_PRIORITY_EXCLUDED","code":"priority_excluded"},"PROMISE_DATE":{"id":"OIP_PROMISE_DATE","code":"promiseDaysCutoff"},"PROMISE_DATE_EXCLUDED":{"id":"OIP_PROMISE_DATE_EXCLUDED","code":"promiseDaysCutoff_excluded"},"SALES_CHANNEL":{"id":"OIP_SALES_CHANNEL","code":"salesChannelEnumId"},"SALES_CHANNEL_EXCLUDED":{"id":"OIP_SALES_CHANNEL_EXCLUDED","code":"salesChannelEnumId_excluded"},"ORIGIN_FACILITY_GROUP":{"id":"OIP_ORIGIN_FAC_GRP","code":"originFacilityGroupId"},"ORIGIN_FACILITY_GROUP_EXCLUDED":{"id":"OIP_ORIGIN_FAC_GRP_EXCLUDED","code":"originFacilityGroupId_excluded"},"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"},"FACILITY_GROUP_EXCLUDED":{"id":"IIP_FACILITY_GROUP_EXCLUDED","code":"facilityGroupId_excluded"},"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"}, "SHIP_THREHOLD": {"id":"IFP_SHIP_THREHOLD", "code":"shipmentThreshold"}}
 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 * * ?"}

package.json

@@ -1,6 +1,6 @@
 {
   "name": "order-routing-rules",
-  "version": "1.4.0",
+  "version": "1.6.0",
   "private": true,
   "description": "An Ionic project",
   "scripts": {

src/components/AddInventoryFilterOptionsModal.vue

@@ -12,13 +12,18 @@
       <div v-if="!enumerations.length" class="empty-state">
         <p>{{ translate(`Failed to fetch ${props.label?.toLowerCase()} options`) }}</p>
       </div>
+
       <ion-list v-else>
         <ion-item v-for="condition in enumerations" :key="condition.enumId">
           <ion-checkbox :disabled="isConditionDisabled(condition.enumId)" :checked="isConditionOptionSelected(condition.enumCode)" @ionChange="addConditionOption(condition)">
             <template v-if="isConditionDisabled(condition.enumId)">
-              {{ condition.description || condition.enumCode }}<br/>
+              <ion-label>{{ condition.description || condition.enumCode }}</ion-label>
               <ion-note>{{ `Only applicable when ${dependentOptions[condition.enumId].label} is selected` }}</ion-note>
             </template>
+            <template v-else-if="condition.enumCode.includes('_excluded')">
+              <ion-label>{{ condition.description || condition.enumCode }}</ion-label>
+              <ion-note color="danger">{{ translate("Excluded") }}</ion-note>
+            </template>
             <template v-else>
               {{ condition.description || condition.enumCode }}
             </template>
@@ -36,7 +41,7 @@
 </template>
 
 <script setup lang="ts">
-import { IonButton, IonButtons, IonCheckbox, IonContent, IonFab, IonFabButton, IonHeader, IonIcon, IonItem, IonList, IonNote, IonPage, IonTitle, IonToolbar, modalController } from "@ionic/vue";
+import { IonButton, IonButtons, IonCheckbox, IonContent, IonFab, IonFabButton, IonHeader, IonIcon, IonItem, IonLabel, IonList, IonNote, IonPage, IonTitle, IonToolbar, modalController } from "@ionic/vue";
 import { useStore } from "vuex";
 import { computed, defineProps, onMounted, ref } from "vue";
 import { saveOutline } from "ionicons/icons";
@@ -75,7 +80,7 @@ let enumerations = ref([]) as any
 let areFiltersUpdated = ref(false)
 
 // Added those enums here that needs to be hidden form the UI
-const hiddenOptions = ["IIP_MSMNT_SYSTEM", "IIP_SPLIT_ITEM_GROUP"]
+const hiddenOptions = ["IIP_MSMNT_SYSTEM", "IIP_SPLIT_ITEM_GROUP", "IFP_SHIP_THREHOLD"]
 
 // Add entries for the enums those are dependent on another filter {enumId: { code, label }}
 const dependentOptions = {"ISP_CUST_SEQ": { code: "facilityGroupId", label: "Facility group" }} as any
@@ -118,7 +123,8 @@ function addConditionOption(condition: any) {
         conditionTypeEnumId: props.conditionTypeEnumId,
         fieldName: condition.enumCode,
         sequenceNum: Object.keys(inventoryRuleConditions.value).length && inventoryRuleConditions.value[Object.keys(inventoryRuleConditions.value)[Object.keys(inventoryRuleConditions.value).length - 1]]?.sequenceNum >= 0 ? inventoryRuleConditions.value[Object.keys(inventoryRuleConditions.value)[Object.keys(inventoryRuleConditions.value).length - 1]].sequenceNum + 5 : 0,  // added check for `>= 0` as sequenceNum can be 0 which will result in again setting the new seqNum to 0
-        createdDate: DateTime.now().toMillis()
+        createdDate: DateTime.now().toMillis(),
+        operator: condition.enumCode.includes("_excluded") ? "not-equals" : ""
       }
 
       // Adding associatedEnum out of ternary, as we will always get the conditionTypeEnumId, as the filter will already handle that

src/components/AddOrderRouteFilterOptions.vue

@@ -9,13 +9,22 @@
       </ion-toolbar>
     </ion-header>
     <ion-content>
+      <ion-segment v-model="segmentSelected" v-if="conditionTypeEnumId === 'ENTCT_FILTER'">
+        <ion-segment-button value="included">
+          <ion-label>{{ translate("Include") }}</ion-label>
+        </ion-segment-button>
+        <ion-segment-button value="excluded">
+          <ion-label>{{ translate("Exclude") }}</ion-label>
+        </ion-segment-button>
+      </ion-segment>
+
       <div v-if="!enums[props.parentEnumId]" class="empty-state">
         <p>{{ translate(`Failed to fetch ${$props.label?.toLowerCase()} options`) }}</p>
       </div>
       <ion-list v-else>
         <!-- Added this div as we need to hide ProductCategory option from filters, need to remove this once we add support for ProductCategory filter-->
-        <div v-for="sort in Object.values(enums[props.parentEnumId])" :key="sort.enumId">
-          <ion-item v-if="sort.enumId !== 'OIP_PROD_CATEGORY'">
+        <div v-for="sort in getOptions()" :key="sort.enumId">
+          <ion-item v-if="sort.enumId !== 'OIP_PROD_CATEGORY' && sort.enumId !== 'OIP_PROD_CATEGORY_EXCLUDED'">
             <ion-checkbox :checked="isSortOptionSelected(sort.enumCode)" @ionChange="addSortOption(sort)">{{ sort.description || sort.enumCode }}</ion-checkbox>
           </ion-item>
         </div>
@@ -31,7 +40,7 @@
 </template>
 
 <script setup lang="ts">
-import { IonButton, IonButtons, IonCheckbox, IonContent, IonFab, IonFabButton, IonHeader, IonIcon, IonItem, IonList, IonPage, IonTitle, IonToolbar, modalController } from "@ionic/vue";
+import { IonButton, IonButtons, IonCheckbox, IonContent, IonFab, IonFabButton, IonHeader, IonIcon, IonItem, IonLabel, IonList, IonPage, IonSegment, IonSegmentButton, IonTitle, IonToolbar, modalController } from "@ionic/vue";
 import { useStore } from "vuex";
 import { computed, defineProps, onMounted, ref } from "vue";
 import { saveOutline } from "ionicons/icons";
@@ -64,11 +73,22 @@ const props = defineProps({
 })
 let routingFilters = ref({}) as any
 let areFiltersUpdated = ref(false)
+let segmentSelected = ref("included")
 
 onMounted(() => {
   routingFilters.value = props.orderRoutingFilters ? JSON.parse(JSON.stringify(props.orderRoutingFilters)) : {}
 })
 
+function getOptions() {
+  if(props.conditionTypeEnumId === "ENTCT_FILTER") {
+    const excludeOptions = Object.values(enums.value[props.parentEnumId]).filter((enumeration: any) => enumeration.enumId.includes('_EXCLUDED'))
+    const includeOptions = Object.values(enums.value[props.parentEnumId]).filter((enumeration: any) => !enumeration.enumId.includes('_EXCLUDED'))
+    return segmentSelected.value === "excluded" ? excludeOptions : includeOptions
+  }
+
+  return Object.values(enums.value[props.parentEnumId])
+}
+
 function checkFilters() {
   areFiltersUpdated.value = false;
   areFiltersUpdated.value = Object.keys(routingFilters.value).some((options: string) => {

src/components/GroupActionsPopover.vue

@@ -45,12 +45,13 @@ async function updateGroupStatus(paused: string) {
   let routingGroups = [];
   const payload = {
     routingGroupId: props.group.routingGroupId,
-    paused
+    paused,
+    cronExpression: props.group.schedule?.cronExpression || "0 0 0 * * ?"
   }
 
   try {
     const resp = await OrderRoutingService.scheduleBrokering(payload)
-    if(!hasError(resp)){
+    if(!hasError(resp)) {
       showToast(translate("Group status updated"))
       routingGroups = await store.dispatch("orderRouting/updateGroupStatus", { routingGroupId: props.group.routingGroupId, value: paused })
     } else {

src/locales/en.json

@@ -47,6 +47,8 @@
   "Edit": "Edit",
   "Enter a valid value": "Enter a valid value",
   "Error getting user profile": "Error getting user profile",
+  "Exclude": "Exclude",
+  "Excluded": "Excluded",
   "Execution history": "Execution history",
   "Expression": "Expression",
   "Facilities will be sorted based on creation date if no sorting preferences are applied.": "Facilities will be sorted based on creation date if no sorting preferences are applied.",
@@ -75,6 +77,7 @@
   "greater": "greater",
   "greater than or equal to": "greater than or equal to",
   "High": "High",
+  "Include": "Include",
   "Inventory Filters": "Inventory Filters",
   "Inventory rule created successfully": "Inventory rule created successfully",
   "Inventory Sort": "Inventory Sort",

src/store/modules/orderRouting/actions.ts

@@ -198,6 +198,15 @@ const actions: ActionTree<OrderRoutingState, RootState> = {
 
       if(!hasError(resp) && resp.data) {
         currentRoute = resp.data
+
+        if(currentRoute["orderFilters"]?.length) {
+          currentRoute["orderFilters"].map((filter: any) => {
+            if(filter.operator === "not-equals" || filter.operator === "not-in") {
+              filter.fieldName += "_excluded"
+            }
+          })
+        }
+
         currentRoute["rules"] = currentRoute["rules"]?.length ? sortSequence(currentRoute["rules"]) : []
       } else {
         throw resp.data
@@ -372,6 +381,11 @@ const actions: ActionTree<OrderRoutingState, RootState> = {
 
         if(rulesInformation[routingRuleId]["inventoryFilters"]?.length) {
           rulesInformation[routingRuleId]["inventoryFilters"] = sortSequence(rulesInformation[routingRuleId]["inventoryFilters"]).reduce((filters: any, filter: any) => {
+
+            if(filter.operator === "not-equals") {
+              filter.fieldName += "_excluded"
+            }
+
             if(filters[filter.conditionTypeEnumId]) {
               filters[filter.conditionTypeEnumId][filter.fieldName] = filter
             } else {

src/store/modules/util/actions.ts

@@ -31,6 +31,30 @@ const actions: ActionTree<UtilState, RootState> = {
           }
           return enumerations
         }, enums)
+
+        if(enums["ORD_FILTER_PRM_TYPE"]) {
+          Object.values(enums["ORD_FILTER_PRM_TYPE"]).reduce((filters: any, filter: any) => {
+            filters[filter.enumId + "_EXCLUDED"] = {
+              "enumId": filter.enumId + "_EXCLUDED",
+              "enumTypeId": filter.enumTypeId,
+              "enumCode": filter.enumCode + "_excluded",
+              "sequenceNum": 5,
+              "description": filter.description
+            }
+
+            return filters;
+          }, enums["ORD_FILTER_PRM_TYPE"])
+        }
+
+        if(enums["INV_FILTER_PRM_TYPE"] && enums["INV_FILTER_PRM_TYPE"]["IIP_FACILITY_GROUP"]) {
+          enums["INV_FILTER_PRM_TYPE"]["IIP_FACILITY_GROUP_EXCLUDED"] = {
+            "enumId": "IIP_FACILITY_GROUP_EXCLUDED",
+            "enumTypeId": "INV_FILTER_PRM_TYPE",
+            "enumCode": "facilityGroupId_excluded",
+            "sequenceNum": 5,
+            "description": "Facility group"
+          } as any
+        }
       }
     } catch(err) {
       logger.error(err)