From e0d56df5fdb7057aabcbd4c08803ffa002c84741 Mon Sep 17 00:00:00 2001
From: amansinghbais <singh11amanbais@gmail.com>
Date: Wed, 9 Oct 2024 10:59:21 +0530
Subject: [PATCH 1/2] Improved: disabling save button of generate tracking code
 modal in case of no shipmentMethod (#805)

---
 src/components/GenerateTrackingCodeModal.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/GenerateTrackingCodeModal.vue b/src/components/GenerateTrackingCodeModal.vue
index f145cb48..456dfe66 100644
--- a/src/components/GenerateTrackingCodeModal.vue
+++ b/src/components/GenerateTrackingCodeModal.vue
@@ -55,7 +55,7 @@
   </ion-content>
 
   <ion-fab vertical="bottom" horizontal="end" slot="fixed">
-    <ion-fab-button :disabled="isGeneratingShippingLabel ? true : isTrackingRequired ? !shipmentMethodTypeId : false" @click="confirmSave()">
+    <ion-fab-button :disabled="isGeneratingShippingLabel ? true : !shipmentMethodTypeId" @click="confirmSave()">
       <ion-icon :icon="isForceScanEnabled ? barcodeOutline : saveOutline" />
     </ion-fab-button>
   </ion-fab>

From fa8f86cdc897baa987cfb6a0a0223929a602c383 Mon Sep 17 00:00:00 2001
From: amansinghbais <singh11amanbais@gmail.com>
Date: Wed, 9 Oct 2024 11:10:36 +0530
Subject: [PATCH 2/2] Improved: fetching order payment preferences sorted in
 descending order of created date (#805)

---
 src/store/modules/orderLookup/actions.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/store/modules/orderLookup/actions.ts b/src/store/modules/orderLookup/actions.ts
index 9744d6be..8dfe7dec 100644
--- a/src/store/modules/orderLookup/actions.ts
+++ b/src/store/modules/orderLookup/actions.ts
@@ -185,6 +185,7 @@ const actions: ActionTree<OrderLookupState, RootState> = {
           statusId: "PAYMENT_CANCELLED",
           statusId_op: "notEqual"
         },
+        orderBy: "createdDate DESC",
         viewSize: 50,
         fieldList: ["paymentMethodTypeId", "maxAmount", "statusId"],
         entityName: "OrderPaymentPreference"