From bc81691f14badebd1243dc2f83b943dff4ad047d Mon Sep 17 00:00:00 2001
From: Yash Maheshwari <yashmaheshwari551@gmail.com>
Date: Thu, 8 Feb 2024 15:44:33 +0530
Subject: [PATCH 1/3] Improved: UI to display the message when promise date
 filter is selected(#68)

---
 src/locales/en.json          | 1 +
 src/views/BrokeringQuery.vue | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/src/locales/en.json b/src/locales/en.json
index 6e1314e..cc438ed 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -86,6 +86,7 @@
   "Order Rule Filters": "Order Rule Filters",
   "Order Rule Sort": "Order Rule Sort",
   "operator": "operator",
+  "Partial allocation cannot be disabled. Orders are filtered by item when filtering by promise date.": "Partial allocation cannot be disabled. Orders are filtered by item when filtering by promise date.",
   "Partially available": "Partially available",
   "Passed duration": "Passed duration",
   "Password":  "Password",
diff --git a/src/views/BrokeringQuery.vue b/src/views/BrokeringQuery.vue
index 09187e1..4c3291e 100644
--- a/src/views/BrokeringQuery.vue
+++ b/src/views/BrokeringQuery.vue
@@ -169,6 +169,11 @@
                 <ion-item lines="none">
                   <ion-toggle :disabled="isPromiseDateFilterApplied()" :checked="selectedRoutingRule.assignmentEnumId === 'ORA_MULTI'" @ionChange="updatePartialAllocation($event.detail.checked)">{{ translate("Allow partial allocation") }}</ion-toggle>
                 </ion-item>
+                <ion-item v-show="isPromiseDateFilterApplied()" lines="none">
+                  <ion-label class="ion-text-wrap">
+                    <p>{{ translate("Partial allocation cannot be disabled. Orders are filtered by item when filtering by promise date.") }}</p>
+                  </ion-label>
+                </ion-item>
               </ion-card>
               <ion-card>
                 <ion-card-header>

From 0a3cd3a17ca757729197d218ff949e7784a48786 Mon Sep 17 00:00:00 2001
From: Yash Maheshwari <yashmaheshwari551@gmail.com>
Date: Wed, 14 Feb 2024 15:54:00 +0530
Subject: [PATCH 2/3] Improved: code to display the partial allocation action
 as checked when promise date filter is applied on routing level

When checking the partial allocation action in this case, no change will be made on the server side(#68)
---
 src/views/BrokeringQuery.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/views/BrokeringQuery.vue b/src/views/BrokeringQuery.vue
index f3bf044..e4d7654 100644
--- a/src/views/BrokeringQuery.vue
+++ b/src/views/BrokeringQuery.vue
@@ -203,7 +203,8 @@
                   {{ translate("Select if partial allocation should be allowed in this inventory rule") }}
                 </ion-card-content>
                 <ion-item lines="none">
-                  <ion-toggle :disabled="isPromiseDateFilterApplied()" :checked="selectedRoutingRule.assignmentEnumId === 'ORA_MULTI'" @ionChange="updatePartialAllocation($event.detail.checked)">{{ translate("Allow partial allocation") }}</ion-toggle>
+                  <!-- When selecting promiseDate route filter we will show the partial allocation option as checked on UI, but will not update its value on backend. Discussed with Aditya Sir -->
+                  <ion-toggle :disabled="isPromiseDateFilterApplied()" :checked="selectedRoutingRule.assignmentEnumId === 'ORA_MULTI' || isPromiseDateFilterApplied()" @ionChange="updatePartialAllocation($event.detail.checked)">{{ translate("Allow partial allocation") }}</ion-toggle>
                 </ion-item>
                 <ion-item v-show="isPromiseDateFilterApplied()" lines="none">
                   <ion-label class="ion-text-wrap">

From 734f41a1475b1c75a5cff58dde51cde99def5411 Mon Sep 17 00:00:00 2001
From: Yash Maheshwari <yashmaheshwari551@gmail.com>
Date: Wed, 14 Feb 2024 16:20:53 +0530
Subject: [PATCH 3/3] Removed: logic to revert the value for partial allocation
 when promise date filter is selected(#68)

---
 src/views/BrokeringQuery.vue | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/src/views/BrokeringQuery.vue b/src/views/BrokeringQuery.vue
index e4d7654..d9ca7ad 100644
--- a/src/views/BrokeringQuery.vue
+++ b/src/views/BrokeringQuery.vue
@@ -624,18 +624,8 @@ function isPromiseDateFilterApplied() {
     return;
   }
 
+  // When user updates partial allocation and then selects promiseDate filter then we will assume that the user wants to change the value for partialAllocation on server and thus we will not revert any change made in the partial allocation action and update its value on server
   const filter = getFilterValue(orderRoutingFilterOptions.value, ruleEnums, "PROMISE_DATE")
-
-  // When promise date range is selected for order filter, we will revert any change made to the partialAllocation enum and will change it to its initial value and will disable the partial allocation feature
-  if(filter?.fieldValue || filter?.fieldValue == 0) {
-    const assignmentEnumId = JSON.parse(JSON.stringify(currentRouting.value["rules"])).find((rule: any) => rule.routingRuleId === selectedRoutingRule.value.routingRuleId)?.assignmentEnumId
-    inventoryRules.value.find((inventoryRule: any) => {
-      if(inventoryRule.routingRuleId === selectedRoutingRule.value.routingRuleId) {
-        inventoryRule.assignmentEnumId = assignmentEnumId
-        return true;
-      }
-    })
-  }
   return filter?.fieldValue || filter?.fieldValue == 0
 }