fix(composables): add checkPromotions flag to the loadOrders para…

…ms of `useCustomerOrders` composable (#1492)
shopware · Nov 28, 2024 · a03a492 · a03a492
1 parent 2858e3c
commit a03a492
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 5 deletions.
diff --git a/.changeset/unlucky-dogs-help.md b/.changeset/unlucky-dogs-help.md
@@ -0,0 +1,5 @@
+---
+"@shopware-pwa/composables-next": patch
+---
+
+`useCustomerOrders` - added checkPromotions flag for loading orders
diff --git a/packages/composables/src/useCustomerOrders/useCustomerOrders.ts b/packages/composables/src/useCustomerOrders/useCustomerOrders.ts
@@ -1,7 +1,7 @@
 import { ref, computed } from "vue";
 import type { Ref, ComputedRef } from "vue";
 import { useShopwareContext } from "#imports";
-import type { Schemas } from "#shopware";
+import type { Schemas, operations } from "#shopware";
 
 export type UseCustomerOrdersReturn = {
   /**
@@ -17,7 +17,9 @@ export type UseCustomerOrdersReturn = {
   /**
    * Fetches the orders list and assigns the result to the `orders` property
    */
-  loadOrders(parameters?: Schemas["Criteria"]): Promise<void>;
+  loadOrders(
+    parameters?: operations["readOrder post /order"]["body"],
+  ): Promise<void>;
   /**
    * Current page number
    */
@@ -50,7 +52,7 @@ export function useCustomerOrders(): UseCustomerOrdersReturn {
   const currentParams = ref<Schemas["Criteria"]>({});
 
   const loadOrders = async (
-    parameters: Schemas["Criteria"] = {},
+    parameters: operations["readOrder post /order"]["body"] = {},
   ): Promise<void> => {
     const params = {
       ...parameters,

diff --git a/packages/composables/src/useDefaultOrderAssociations/useDefaultOrderAssociations.test.ts b/packages/composables/src/useDefaultOrderAssociations/useDefaultOrderAssociations.test.ts
@@ -35,7 +35,6 @@ describe("useDefaultOrderAssociations", () => {
             },
           },
         },
-        "checkPromotion": true,
       }
     `);
   });

diff --git a/packages/composables/src/useDefaultOrderAssociations/useDefaultOrderAssociations.ts b/packages/composables/src/useDefaultOrderAssociations/useDefaultOrderAssociations.ts
@@ -39,7 +39,6 @@ export function useDefaultOrderAssociations(): UseDefaultOrderAssociationsReturn
           },
         },
       },
-      checkPromotion: true,
     };
 
   return orderAssociations;

diff --git a/packages/composables/src/useOrderDetails/useOrderDetails.ts b/packages/composables/src/useOrderDetails/useOrderDetails.ts
@@ -185,6 +185,7 @@ export function useOrderDetails(
         },
       ],
       associations: mergedAssociations.associations,
+      checkPromotion: true,
     } as Schemas["Criteria"];
 
     const orderDetailsResponse = await apiClient.invoke(

diff --git a/templates/vue-demo-store/pages/account/order.vue b/templates/vue-demo-store/pages/account/order.vue
@@ -85,6 +85,7 @@ await useAsyncData("getOrders", () => {
   return loadOrders({
     limit: limit.value,
     page: route.query.p ? Number(route.query.p) : defaultPage,
+    checkPromotion: true, // determines whether "paymentChangeable" list is available in the response
     associations: {
       stateMachineState: {},
     },
-Original file line number
+Diff line change
@@ Expand Up / @@ -35,7 +35,6 @@ describe("useDefaultOrderAssociations", () => { @@
                 },
               },
             },
-            "checkPromotion": true,
           }
         `);
       });
@@ Expand Down @@