Merge pull request #918 from ymaheshwari1/#916

Improved: logic to use the new rejection reason when rejecting entire order(#916)
hotwax · Jan 28, 2025 · b0afd9b · b0afd9b
2 parents bd96700 + cfa24b3
commit b0afd9b
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 6 deletions.
diff --git a/src/locales/en.json b/src/locales/en.json
@@ -452,7 +452,7 @@
   "Reject all": "Reject all",
   "Reject all in progress orders": "Reject all in progress orders",
   "Reject all open orders": "Reject all open orders",
-  "Reject entire order": "Reject entire order",
+  "Reject to avoid order split (no variance)": "Reject to avoid order split (no variance)",
   "Reject in progress orders.": "Reject { ordersCount } in progress orders.",
   "Reject open orders.": "Reject { ordersCount } open orders.",
   "Reject order": "Reject order",

diff --git a/src/locales/es.json b/src/locales/es.json
@@ -449,10 +449,10 @@
   "Reject all": "Rechazar todo",
   "Reject all in progress orders": "Rechazar todos los pedidos en curso",
   "Reject all open orders": "Rechazar todos los pedidos abiertos",
-  "Reject entire order": "Rechazar toda la orden",
   "Reject in progress orders.": "Rechazar { ordersCount } pedidos en curso.",
   "Reject open orders.": "Rechazar { ordersCount } pedidos abiertos.",
   "Reject order": "Rechazar pedido",
+  "Reject to avoid order split (no variance)": "Reject to avoid order split (no variance)",
   "Rejected": "Rechazado",
   "Rejected at": "Rejected at",
   "Rejected by": "Rejected by",

diff --git a/src/locales/ja.json b/src/locales/ja.json
@@ -453,6 +453,7 @@
   "Reject in progress orders.": "進行中の{ordersCount}件の注文を拒否。",
   "Reject open orders.": "オープンの{ordersCount}件の注文を拒否。",
   "Reject order": "注文を拒否",
+  "Reject to avoid order split (no variance)": "Reject to avoid order split (no variance)",
   "Rejected at": "Rejected at",
   "Rejected by": "Rejected by",
   "Rejected from": "Rejected from",

diff --git a/src/views/InProgress.vue b/src/views/InProgress.vue
@@ -120,7 +120,7 @@
                     </template>
                     <template v-else-if="useNewRejectionApi() && isEntierOrderRejectionEnabled(order)">
                       <ion-chip :disabled="order.hasMissingInfo" outline color="danger">
-                        <ion-label> {{ getRejectionReasonDescription(rejectEntireOrderReasonId) ? getRejectionReasonDescription(rejectEntireOrderReasonId) : translate('Reject entire order')}}</ion-label>
+                        <ion-label> {{ getRejectionReasonDescription(rejectEntireOrderReasonId) ? getRejectionReasonDescription(rejectEntireOrderReasonId) : translate('Reject to avoid order split (no variance)')}}</ion-label>
                       </ion-chip>
                     </template>
                     <template v-else>
@@ -378,7 +378,7 @@ export default defineComponent({
       selectedPicklistId: '',
       isScrollingEnabled: false,
       isRejecting: false,
-      rejectEntireOrderReasonId: 'REJECT_ENTIRE_ORDER',
+      rejectEntireOrderReasonId: "REJ_AVOID_ORD_SPLIT",
     }
   },
   async ionViewWillEnter() {

diff --git a/src/views/OrderDetail.vue b/src/views/OrderDetail.vue
@@ -97,7 +97,7 @@
               </template>
               <template v-else-if="useNewRejectionApi() && isEntierOrderRejectionEnabled(order)">
                 <ion-chip :disabled="order.hasMissingInfo" outline color="danger">
-                  <ion-label> {{ getRejectionReasonDescription(rejectEntireOrderReasonId) ? getRejectionReasonDescription(rejectEntireOrderReasonId) : translate('Reject entire order')}}</ion-label>
+                  <ion-label> {{ getRejectionReasonDescription(rejectEntireOrderReasonId) ? getRejectionReasonDescription(rejectEntireOrderReasonId) : translate('Reject to avoid order split (no variance)')}}</ion-label>
                 </ion-chip>
               </template>
               <template v-else>
@@ -532,7 +532,7 @@ export default defineComponent({
         'PAYMENT_REFUNDED': 'warning',
         'PAYMENT_SETTLED': ''
       } as any,
-      rejectEntireOrderReasonId: 'REJECT_ENTIRE_ORDER',
+      rejectEntireOrderReasonId: "REJ_AVOID_ORD_SPLIT",
       shipmentLabelErrorMessages: "",
       shipmentMethodTypeId: "",
       carrierPartyId: "",