Merge pull request #806 from amansinghbais/#805

Improved: disabling save button in tracking code modal in case of no shipment methods and sorted order payment preferences in descending order of created date (#805)
hotwax · Oct 9, 2024 · 73003b0 · 73003b0
2 parents 2e3e107 + fa8f86c
commit 73003b0
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git 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>

diff --git 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"