@shopware-ag/acceptance-test-suite 2.5.0 → 2.6.0

package/dist/index.d.mts

@@ -195,6 +195,17 @@ type Product = Omit<components['schemas']['Product'], 'price' | 'prices'> & {
         name: string;
     };
 };
+type OrderDelivery = Omit<components['schemas']['OrderDelivery'], 'shippingOrderAddress' | 'shippingCosts'> & {
+    id: string;
+    shippingOrderAddress: Partial<components['schemas']['OrderAddress']>;
+    shippingCosts: {
+        unitPrice: number;
+        totalPrice: number;
+        quantity: number;
+        calculatedTaxes: CalculatedTaxes[];
+        taxRules: TaxRules[];
+    };
+};
 type Manufacturer = components['schemas']['ProductManufacturer'] & {
     id: string;
 };
@@ -216,7 +227,16 @@ type Rule = components['schemas']['Rule'] & {
 type Currency$1 = components['schemas']['Currency'] & {
     id: string;
 };
-type Order = components['schemas']['Order'] & {
+interface CalculatedTaxes {
+    tax: number;
+    taxRate: number;
+    price: number;
+}
+interface TaxRules {
+    taxRate: number;
+    percentage: number;
+}
+type Order = Omit<components['schemas']['Order'], 'deliveries' | 'price'> & {
     id: string;
     orderCustomer: {
         firstName: string;
@@ -229,7 +249,10 @@ type Order = components['schemas']['Order'] & {
         rawTotal: number;
         taxStatus: string;
         totalPrice: number;
+        calculatedTaxes: CalculatedTaxes[];
+        taxRules: TaxRules[];
     };
+    deliveries: Record<string, unknown>[];
 };
 type ShippingMethod = components['schemas']['ShippingMethod'] & {
     id: string;
@@ -243,7 +266,19 @@ type StateMachine = components['schemas']['StateMachine'] & {
 type StateMachineState = components['schemas']['StateMachineState'] & {
     id: string;
 };
-type Promotion = components['schemas']['Promotion'] & {
+type Promotion = Omit<components['schemas']['Promotion'], 'discounts'> & {
+    id: string;
+    discounts: [
+        {
+            id?: string;
+            scope: string;
+            type: string;
+            value: number;
+            considerAdvancedRules: boolean;
+        }
+    ];
+};
+type PromotionDiscount = components['schemas']['PromotionDiscount'] & {
     id: string;
 };
 
@@ -252,7 +287,7 @@ interface CreatedRecord {
     payload: Record<string, string>;
 }
 interface SimpleLineItem {
-    product: Product;
+    product: Product | Promotion;
     quantity?: number;
     position?: number;
 }
@@ -410,12 +445,12 @@ declare class TestDataService {
      *
      * @param lineItems - Products that should be added to the order.
      * @param customer - The customer to which the order should be assigned.
-     * @param salesChannel - The sales channel in which the order should be created.
      * @param overrides - Specific data overrides that will be applied to the order data struct.
+     * @param salesChannel - The sales channel in which the order should be created.
      */
     createOrder(lineItems: SimpleLineItem[], customer: Customer, overrides?: Partial<Order>, salesChannel?: SalesChannel): Promise<Order>;
     /**
-     * Creates a new promotion with a promotion code.
+     * Creates a new promotion with a promotion code and only single discount option.
      *
      * @param overrides - Specific data overrides that will be applied to the promotion data struct.
      * @param salesChannelId - The uuid of the sales channel in which the promotion should be active.
@@ -563,6 +598,9 @@ declare class TestDataService {
         active: boolean;
     } & Partial<Category$1>;
     getBasicCustomerStruct(salesChannelId: string, customerGroupId: string, languageId: string, countryId: string, defaultPaymentMethodId: string, salutationId: string, overrides?: Partial<Customer>): Partial<Customer>;
+    getBasicOrderDeliveryStruct(deliveryState: StateMachineState, shippingMethod: ShippingMethod, customerAddress: CustomerAddress): Partial<OrderDelivery>;
+    isProduct(item: Product | Promotion): item is Product;
+    isPromotion(item: Product | Promotion): item is Promotion;
     getBasicOrderStruct(lineItems: SimpleLineItem[], languageId: string, currency: Currency$1, paymentMethod: PaymentMethod, shippingMethod: ShippingMethod, orderState: StateMachineState, deliveryState: StateMachineState, transactionState: StateMachineState, customer: Customer, customerAddress: CustomerAddress, salesChannelId?: string, overrides?: Partial<Order>): Partial<Order>;
     getBasicProductLineItemStruct(lineItem: SimpleLineItem): {
         productId: string;
@@ -602,6 +640,36 @@ declare class TestDataService {
             referencePriceDefinition: null;
         };
     };
+    getBasicPromotionLineItemStruct(lineItem: SimpleLineItem): {
+        payload: {
+            code: string | undefined;
+        };
+        identifier: string | undefined;
+        type: string;
+        label: string;
+        description: string;
+        quantity: number;
+        position: number;
+        price: {
+            unitPrice: number;
+            totalPrice: number;
+            quantity: number | undefined;
+            calculatedTaxes: {
+                tax: number;
+                taxRate: number;
+                price: number;
+            }[];
+            taxRules: {
+                taxRate: number;
+                percentage: number;
+            }[];
+        };
+        priceDefinition: {
+            type: string;
+            price: number;
+            percentage: number | null;
+        };
+    };
     getBasicPromotionStruct(salesChannelId?: string, overrides?: Partial<Promotion>): Partial<Promotion>;
 }
 
@@ -1107,6 +1175,10 @@ declare const getMediaId: (fileName: string, adminApiContext: AdminApiContext) =
 declare function extractIdFromUrl(url: string): string | null;
 type OrderStatus = 'cancel' | 'complete' | 'reopen' | 'process';
 declare const setOrderStatus: (orderId: string, orderStatus: OrderStatus, adminApiContext: AdminApiContext) => Promise<APIResponse>;
+/**
+ * Return a single promotion entity with a fetched single discount entity
+ */
+declare const getPromotionWithDiscount: (promotionId: string, adminApiContext: AdminApiContext) => Promise<Promotion>;
 
 declare const isSaaSInstance: (adminApiContext: AdminApiContext) => Promise<boolean>;
 declare const isThemeCompiled: (context: AdminApiContext, storefrontUrl: string) => Promise<boolean>;
@@ -1149,4 +1221,4 @@ declare const test: _playwright_test.TestType<_playwright_test.PlaywrightTestArg
     ValidateAccessibility: (pageName: string, assertViolations?: number | boolean | undefined, createReport?: boolean | undefined, ruleTags?: string[] | undefined, outputDir?: string | undefined) => () => Promise<axe_core.Result[]>;
 }, _playwright_test.PlaywrightWorkerArgs & _playwright_test.PlaywrightWorkerOptions & FixtureTypes>;
 
-export { AdminPageObjects, type Category$1 as Category, type CreatedRecord, type Currency$1 as Currency, type Customer, type CustomerAddress, type DataServiceOptions, type FixtureTypes, type Manufacturer, type Media, type Order, type PageObject, type PaymentMethod, type Price, type Product, type ProductPrice, type Promotion, type PropertyGroup, type Rule, type SalesChannel, type Salutation, type ShippingMethod, type SimpleLineItem, type StateMachine, type StateMachineState, StorefrontPageObjects, type SyncApiOperation, type Tag, type Task, TestDataService, createRandomImage, extractIdFromUrl, getCountryId, getCurrency, getDefaultShippingMethodId, getFlowId, getLanguageData, getMediaId, getOrderTransactionId, getPaymentMethodId, getSalutationId, getSnippetSetId, getStateMachineId, getStateMachineStateId, getTaxId, getThemeId, isSaaSInstance, isThemeCompiled, setOrderStatus, test };
+export { AdminPageObjects, type CalculatedTaxes, type Category$1 as Category, type CreatedRecord, type Currency$1 as Currency, type Customer, type CustomerAddress, type DataServiceOptions, type FixtureTypes, type Manufacturer, type Media, type Order, type OrderDelivery, type PageObject, type PaymentMethod, type Price, type Product, type ProductPrice, type Promotion, type PromotionDiscount, type PropertyGroup, type Rule, type SalesChannel, type Salutation, type ShippingMethod, type SimpleLineItem, type StateMachine, type StateMachineState, StorefrontPageObjects, type SyncApiOperation, type Tag, type Task, type TaxRules, TestDataService, createRandomImage, extractIdFromUrl, getCountryId, getCurrency, getDefaultShippingMethodId, getFlowId, getLanguageData, getMediaId, getOrderTransactionId, getPaymentMethodId, getPromotionWithDiscount, getSalutationId, getSnippetSetId, getStateMachineId, getStateMachineStateId, getTaxId, getThemeId, isSaaSInstance, isThemeCompiled, setOrderStatus, test };

package/dist/index.d.ts

@@ -195,6 +195,17 @@ type Product = Omit<components['schemas']['Product'], 'price' | 'prices'> & {
         name: string;
     };
 };
+type OrderDelivery = Omit<components['schemas']['OrderDelivery'], 'shippingOrderAddress' | 'shippingCosts'> & {
+    id: string;
+    shippingOrderAddress: Partial<components['schemas']['OrderAddress']>;
+    shippingCosts: {
+        unitPrice: number;
+        totalPrice: number;
+        quantity: number;
+        calculatedTaxes: CalculatedTaxes[];
+        taxRules: TaxRules[];
+    };
+};
 type Manufacturer = components['schemas']['ProductManufacturer'] & {
     id: string;
 };
@@ -216,7 +227,16 @@ type Rule = components['schemas']['Rule'] & {
 type Currency$1 = components['schemas']['Currency'] & {
     id: string;
 };
-type Order = components['schemas']['Order'] & {
+interface CalculatedTaxes {
+    tax: number;
+    taxRate: number;
+    price: number;
+}
+interface TaxRules {
+    taxRate: number;
+    percentage: number;
+}
+type Order = Omit<components['schemas']['Order'], 'deliveries' | 'price'> & {
     id: string;
     orderCustomer: {
         firstName: string;
@@ -229,7 +249,10 @@ type Order = components['schemas']['Order'] & {
         rawTotal: number;
         taxStatus: string;
         totalPrice: number;
+        calculatedTaxes: CalculatedTaxes[];
+        taxRules: TaxRules[];
     };
+    deliveries: Record<string, unknown>[];
 };
 type ShippingMethod = components['schemas']['ShippingMethod'] & {
     id: string;
@@ -243,7 +266,19 @@ type StateMachine = components['schemas']['StateMachine'] & {
 type StateMachineState = components['schemas']['StateMachineState'] & {
     id: string;
 };
-type Promotion = components['schemas']['Promotion'] & {
+type Promotion = Omit<components['schemas']['Promotion'], 'discounts'> & {
+    id: string;
+    discounts: [
+        {
+            id?: string;
+            scope: string;
+            type: string;
+            value: number;
+            considerAdvancedRules: boolean;
+        }
+    ];
+};
+type PromotionDiscount = components['schemas']['PromotionDiscount'] & {
     id: string;
 };
 
@@ -252,7 +287,7 @@ interface CreatedRecord {
     payload: Record<string, string>;
 }
 interface SimpleLineItem {
-    product: Product;
+    product: Product | Promotion;
     quantity?: number;
     position?: number;
 }
@@ -410,12 +445,12 @@ declare class TestDataService {
      *
      * @param lineItems - Products that should be added to the order.
      * @param customer - The customer to which the order should be assigned.
-     * @param salesChannel - The sales channel in which the order should be created.
      * @param overrides - Specific data overrides that will be applied to the order data struct.
+     * @param salesChannel - The sales channel in which the order should be created.
      */
     createOrder(lineItems: SimpleLineItem[], customer: Customer, overrides?: Partial<Order>, salesChannel?: SalesChannel): Promise<Order>;
     /**
-     * Creates a new promotion with a promotion code.
+     * Creates a new promotion with a promotion code and only single discount option.
      *
      * @param overrides - Specific data overrides that will be applied to the promotion data struct.
      * @param salesChannelId - The uuid of the sales channel in which the promotion should be active.
@@ -563,6 +598,9 @@ declare class TestDataService {
         active: boolean;
     } & Partial<Category$1>;
     getBasicCustomerStruct(salesChannelId: string, customerGroupId: string, languageId: string, countryId: string, defaultPaymentMethodId: string, salutationId: string, overrides?: Partial<Customer>): Partial<Customer>;
+    getBasicOrderDeliveryStruct(deliveryState: StateMachineState, shippingMethod: ShippingMethod, customerAddress: CustomerAddress): Partial<OrderDelivery>;
+    isProduct(item: Product | Promotion): item is Product;
+    isPromotion(item: Product | Promotion): item is Promotion;
     getBasicOrderStruct(lineItems: SimpleLineItem[], languageId: string, currency: Currency$1, paymentMethod: PaymentMethod, shippingMethod: ShippingMethod, orderState: StateMachineState, deliveryState: StateMachineState, transactionState: StateMachineState, customer: Customer, customerAddress: CustomerAddress, salesChannelId?: string, overrides?: Partial<Order>): Partial<Order>;
     getBasicProductLineItemStruct(lineItem: SimpleLineItem): {
         productId: string;
@@ -602,6 +640,36 @@ declare class TestDataService {
             referencePriceDefinition: null;
         };
     };
+    getBasicPromotionLineItemStruct(lineItem: SimpleLineItem): {
+        payload: {
+            code: string | undefined;
+        };
+        identifier: string | undefined;
+        type: string;
+        label: string;
+        description: string;
+        quantity: number;
+        position: number;
+        price: {
+            unitPrice: number;
+            totalPrice: number;
+            quantity: number | undefined;
+            calculatedTaxes: {
+                tax: number;
+                taxRate: number;
+                price: number;
+            }[];
+            taxRules: {
+                taxRate: number;
+                percentage: number;
+            }[];
+        };
+        priceDefinition: {
+            type: string;
+            price: number;
+            percentage: number | null;
+        };
+    };
     getBasicPromotionStruct(salesChannelId?: string, overrides?: Partial<Promotion>): Partial<Promotion>;
 }
 
@@ -1107,6 +1175,10 @@ declare const getMediaId: (fileName: string, adminApiContext: AdminApiContext) =
 declare function extractIdFromUrl(url: string): string | null;
 type OrderStatus = 'cancel' | 'complete' | 'reopen' | 'process';
 declare const setOrderStatus: (orderId: string, orderStatus: OrderStatus, adminApiContext: AdminApiContext) => Promise<APIResponse>;
+/**
+ * Return a single promotion entity with a fetched single discount entity
+ */
+declare const getPromotionWithDiscount: (promotionId: string, adminApiContext: AdminApiContext) => Promise<Promotion>;
 
 declare const isSaaSInstance: (adminApiContext: AdminApiContext) => Promise<boolean>;
 declare const isThemeCompiled: (context: AdminApiContext, storefrontUrl: string) => Promise<boolean>;
@@ -1149,4 +1221,4 @@ declare const test: _playwright_test.TestType<_playwright_test.PlaywrightTestArg
     ValidateAccessibility: (pageName: string, assertViolations?: number | boolean | undefined, createReport?: boolean | undefined, ruleTags?: string[] | undefined, outputDir?: string | undefined) => () => Promise<axe_core.Result[]>;
 }, _playwright_test.PlaywrightWorkerArgs & _playwright_test.PlaywrightWorkerOptions & FixtureTypes>;
 
-export { AdminPageObjects, type Category$1 as Category, type CreatedRecord, type Currency$1 as Currency, type Customer, type CustomerAddress, type DataServiceOptions, type FixtureTypes, type Manufacturer, type Media, type Order, type PageObject, type PaymentMethod, type Price, type Product, type ProductPrice, type Promotion, type PropertyGroup, type Rule, type SalesChannel, type Salutation, type ShippingMethod, type SimpleLineItem, type StateMachine, type StateMachineState, StorefrontPageObjects, type SyncApiOperation, type Tag, type Task, TestDataService, createRandomImage, extractIdFromUrl, getCountryId, getCurrency, getDefaultShippingMethodId, getFlowId, getLanguageData, getMediaId, getOrderTransactionId, getPaymentMethodId, getSalutationId, getSnippetSetId, getStateMachineId, getStateMachineStateId, getTaxId, getThemeId, isSaaSInstance, isThemeCompiled, setOrderStatus, test };
+export { AdminPageObjects, type CalculatedTaxes, type Category$1 as Category, type CreatedRecord, type Currency$1 as Currency, type Customer, type CustomerAddress, type DataServiceOptions, type FixtureTypes, type Manufacturer, type Media, type Order, type OrderDelivery, type PageObject, type PaymentMethod, type Price, type Product, type ProductPrice, type Promotion, type PromotionDiscount, type PropertyGroup, type Rule, type SalesChannel, type Salutation, type ShippingMethod, type SimpleLineItem, type StateMachine, type StateMachineState, StorefrontPageObjects, type SyncApiOperation, type Tag, type Task, type TaxRules, TestDataService, createRandomImage, extractIdFromUrl, getCountryId, getCurrency, getDefaultShippingMethodId, getFlowId, getLanguageData, getMediaId, getOrderTransactionId, getPaymentMethodId, getPromotionWithDiscount, getSalutationId, getSnippetSetId, getStateMachineId, getStateMachineStateId, getTaxId, getThemeId, isSaaSInstance, isThemeCompiled, setOrderStatus, test };

package/dist/index.mjs

@@ -202,6 +202,28 @@ function extractIdFromUrl(url) {
 const setOrderStatus = async (orderId, orderStatus, adminApiContext) => {
   return await adminApiContext.post(`./_action/order/${orderId}/state/${orderStatus}`);
 };
+const getPromotionWithDiscount = async (promotionId, adminApiContext) => {
+  const resp = await adminApiContext.post("search/promotion", {
+    data: {
+      limit: 1,
+      associations: {
+        discounts: {
+          limit: 10,
+          type: "equals",
+          field: "promotionId",
+          value: promotionId
+        }
+      },
+      filter: [{
+        type: "equals",
+        field: "id",
+        value: promotionId
+      }]
+    }
+  });
+  const { data: promotion } = await resp.json();
+  return promotion[0];
+};
 
 const test$b = test$d.extend({
   SalesChannelBaseConfig: [
@@ -247,51 +269,6 @@ const test$b = test$d.extend({
       const { uuid: customerUuid } = IdProvider.getWorkerDerivedStableId("customer");
       const baseUrl = `${SalesChannelBaseConfig.appUrl}test-${uuid}/`;
       await AdminApiContext.delete(`./customer/${customerUuid}`);
-      const ordersResp = await AdminApiContext.post(`./search/order`, {
-        data: {
-          filter: [{
-            type: "equals",
-            field: "salesChannelId",
-            value: uuid
-          }]
-        }
-      });
-      const orders = await ordersResp.json();
-      if (orders.data) {
-        for (const order of orders.data) {
-          const deleteOrderResp = await AdminApiContext.delete(`./order/${order.id}`);
-          expect(deleteOrderResp.ok()).toBeTruthy();
-        }
-      }
-      const versionsResp = await AdminApiContext.post(`./search/version`);
-      expect(versionsResp.ok()).toBeTruthy();
-      const versions = await versionsResp.json();
-      const versionIds = versions.data.map((v) => v.id);
-      for (const versionId of versionIds) {
-        const ordersResp2 = await AdminApiContext.post(`./search/order`, {
-          data: {
-            filter: [
-              {
-                type: "equals",
-                field: "salesChannelId",
-                value: uuid
-              }
-            ]
-          },
-          headers: {
-            "sw-version-id": versionId
-          }
-        });
-        const orders2 = await ordersResp2.json();
-        if (orders2.data) {
-          for (const order of orders2.data) {
-            const deleteOrderResp = await AdminApiContext.post(
-              `./_action/version/${versionId}/order/${order.id}`
-            );
-            expect(deleteOrderResp.ok()).toBeTruthy();
-          }
-        }
-      }
       const syncResp = await AdminApiContext.post("./_action/sync", {
         data: {
           "write-sales-channel": {
@@ -1223,8 +1200,8 @@ class TestDataService {
    *
    * @param lineItems - Products that should be added to the order.
    * @param customer - The customer to which the order should be assigned.
-   * @param salesChannel - The sales channel in which the order should be created.
    * @param overrides - Specific data overrides that will be applied to the order data struct.
+   * @param salesChannel - The sales channel in which the order should be created.
    */
   async createOrder(lineItems, customer, overrides = {}, salesChannel = this.defaultSalesChannel) {
     const orderStateMachine = await this.getOrderStateMachine();
@@ -1260,7 +1237,7 @@ class TestDataService {
     return order;
   }
   /**
-   * Creates a new promotion with a promotion code.
+   * Creates a new promotion with a promotion code and only single discount option.
    *
    * @param overrides - Specific data overrides that will be applied to the promotion data struct.
    * @param salesChannelId - The uuid of the sales channel in which the promotion should be active.
@@ -1271,8 +1248,9 @@ class TestDataService {
       data: basicPromotion
     });
     const { data: promotion } = await promotionResponse.json();
+    const promotionWithDiscount = await getPromotionWithDiscount(promotion.id, this.AdminApiClient);
     this.addCreatedRecord("promotion", promotion.id);
-    return promotion;
+    return promotionWithDiscount;
   }
   /**
    * Assigns a media resource as the download of a digital product.
@@ -1763,18 +1741,84 @@ class TestDataService {
     };
     return Object.assign({}, basicCustomer, overrides);
   }
+  getBasicOrderDeliveryStruct(deliveryState, shippingMethod, customerAddress) {
+    const date = /* @__PURE__ */ new Date();
+    const shippingDate = new Date(date);
+    shippingDate.setDate(shippingDate.getDate() + 3);
+    const shippingDateTime = this.convertDateTime(shippingDate);
+    const shippingCosts = 8.99;
+    return {
+      stateId: deliveryState.id,
+      shippingMethodId: shippingMethod.id,
+      shippingOrderAddress: {
+        id: customerAddress.id,
+        salutationId: customerAddress.salutationId,
+        firstName: customerAddress.firstName,
+        lastName: customerAddress.lastName,
+        street: customerAddress.street,
+        zipcode: customerAddress.zipcode,
+        city: customerAddress.city,
+        countryId: customerAddress.countryId,
+        phoneNumber: customerAddress.phoneNumber
+      },
+      shippingDateEarliest: shippingDateTime,
+      shippingDateLatest: shippingDateTime,
+      shippingCosts: {
+        unitPrice: shippingCosts,
+        totalPrice: shippingCosts,
+        quantity: 1,
+        calculatedTaxes: [
+          {
+            tax: 0,
+            taxRate: 0,
+            price: shippingCosts
+          }
+        ],
+        taxRules: [
+          {
+            taxRate: 0,
+            percentage: 100
+          }
+        ]
+      }
+    };
+  }
+  isProduct(item) {
+    return item.productNumber !== void 0;
+  }
+  isPromotion(item) {
+    return item.code !== void 0;
+  }
   getBasicOrderStruct(lineItems, languageId, currency, paymentMethod, shippingMethod, orderState, deliveryState, transactionState, customer, customerAddress, salesChannelId = this.defaultSalesChannel.id, overrides = {}) {
     const date = /* @__PURE__ */ new Date();
     const orderDateTime = this.convertDateTime(date);
-    const shippingDate = new Date(date.getDate() + 3);
-    const shippingDateTime = this.convertDateTime(shippingDate);
     let totalPrice = 0;
-    const lineItemProducts = [];
+    const orderLineItems = [];
     lineItems.forEach((lineItem) => {
-      lineItemProducts.push(this.getBasicProductLineItemStruct(lineItem));
-      totalPrice += lineItem.product.price[0].gross * (lineItem.quantity || 1);
+      if (this.isProduct(lineItem.product)) {
+        const product = lineItem.product;
+        orderLineItems.push(this.getBasicProductLineItemStruct(lineItem));
+        totalPrice += product.price[0].gross * (lineItem.quantity || 1);
+      }
+      if (this.isPromotion(lineItem.product)) {
+        const promotion = lineItem.product;
+        orderLineItems.push(this.getBasicPromotionLineItemStruct(lineItem));
+        const promotionDiscountValue = promotion.discounts[0].value;
+        const promotionDiscountType = promotion.discounts[0].type;
+        if (promotionDiscountType === "absolute") {
+          totalPrice -= (promotionDiscountValue || 10) * (lineItem.quantity || 1);
+        } else if (promotionDiscountType === "percentage") {
+          totalPrice -= promotionDiscountValue * totalPrice / 100 * (lineItem.quantity || 1);
+        } else if (promotionDiscountType === "fixed_unit") {
+          totalPrice = (promotionDiscountValue || 10) * (lineItem.quantity || 1);
+        }
+      }
     });
-    const shippingCosts = 8.99;
+    const orderDelivery = this.getBasicOrderDeliveryStruct(deliveryState, shippingMethod, customerAddress);
+    let shippingCosts = 0;
+    if (orderDelivery.shippingCosts != null) {
+      shippingCosts = orderDelivery.shippingCosts.totalPrice;
+    }
     totalPrice += shippingCosts;
     const basicOrder = {
       orderNumber: this.IdProvider.getIdPair().id,
@@ -1832,44 +1876,8 @@ class TestDataService {
           percentage: 100
         }]
       },
-      lineItems: lineItemProducts,
-      deliveries: [
-        {
-          stateId: deliveryState.id,
-          shippingMethodId: shippingMethod.id,
-          shippingOrderAddress: {
-            id: customerAddress.id,
-            salutationId: customerAddress.salutationId,
-            firstName: customerAddress.firstName,
-            lastName: customerAddress.lastName,
-            street: customerAddress.street,
-            zipcode: customerAddress.zipcode,
-            city: customerAddress.city,
-            countryId: customerAddress.countryId,
-            phoneNumber: customerAddress.phoneNumber
-          },
-          shippingDateEarliest: shippingDateTime,
-          shippingDateLatest: shippingDateTime,
-          shippingCosts: {
-            unitPrice: shippingCosts,
-            totalPrice: shippingCosts,
-            quantity: 1,
-            calculatedTaxes: [
-              {
-                tax: 0,
-                taxRate: 0,
-                price: shippingCosts
-              }
-            ],
-            taxRules: [
-              {
-                taxRate: 0,
-                percentage: 100
-              }
-            ]
-          }
-        }
-      ],
+      lineItems: orderLineItems,
+      deliveries: [orderDelivery],
       transactions: [
         {
           paymentMethodId: paymentMethod.id,
@@ -1898,17 +1906,21 @@ class TestDataService {
     return Object.assign({}, basicOrder, overrides);
   }
   getBasicProductLineItemStruct(lineItem) {
-    const unitPrice = lineItem.product.price[0].gross || 10;
+    if (!this.isProduct(lineItem.product)) {
+      console.error("Error: Object is not of type Product");
+    }
+    const product = lineItem.product;
+    const unitPrice = product.price[0].gross || 10;
     const totalPrice = unitPrice * (lineItem.quantity || 1);
     return {
-      productId: lineItem.product.id,
-      referencedId: lineItem.product.id,
+      productId: product.id,
+      referencedId: product.id,
       payload: {
-        productNumber: lineItem.product.productNumber
+        productNumber: product.productNumber
       },
-      identifier: lineItem.product.id,
+      identifier: product.id,
       type: "product",
-      label: lineItem.product.name,
+      label: product.name,
       quantity: lineItem.quantity || 1,
       position: lineItem.position || 1,
       price: {
@@ -1939,6 +1951,47 @@ class TestDataService {
       }
     };
   }
+  getBasicPromotionLineItemStruct(lineItem) {
+    if (!this.isPromotion(lineItem.product)) {
+      console.error("Error: Object is not of type Promotion");
+    }
+    const promotion = lineItem.product;
+    const promotionDiscountValue = promotion.discounts[0].value;
+    const promotionDiscountType = promotion.discounts[0].type;
+    const promotionDiscountId = promotion.discounts[0].id;
+    const unitPrice = -Math.abs(promotionDiscountValue || 10);
+    const totalPrice = unitPrice * (lineItem.quantity || 1);
+    return {
+      payload: {
+        code: promotion.code
+      },
+      identifier: promotionDiscountId,
+      type: "promotion",
+      label: promotion.name,
+      description: promotion.name,
+      quantity: lineItem.quantity || 1,
+      position: lineItem.position || 1,
+      price: {
+        unitPrice,
+        totalPrice,
+        quantity: lineItem.quantity,
+        calculatedTaxes: [{
+          tax: 0,
+          taxRate: 0,
+          price: totalPrice
+        }],
+        taxRules: [{
+          taxRate: 0,
+          percentage: 100
+        }]
+      },
+      priceDefinition: {
+        type: promotionDiscountType,
+        price: totalPrice,
+        percentage: promotionDiscountType === "percentage" ? promotionDiscountValue : null
+      }
+    };
+  }
   getBasicPromotionStruct(salesChannelId = this.defaultSalesChannel.id, overrides = {}) {
     const promotionCode = `${this.IdProvider.getIdPair().id}`;
     const promotionName = `${this.namePrefix}Promotion-${promotionCode}${this.nameSuffix}`;
@@ -3782,4 +3835,4 @@ const test = mergeTests(
   test$1
 );
 
-export { AdminPageObjects, StorefrontPageObjects, TestDataService, createRandomImage, extractIdFromUrl, getCountryId, getCurrency, getDefaultShippingMethodId, getFlowId, getLanguageData, getMediaId, getOrderTransactionId, getPaymentMethodId, getSalutationId, getSnippetSetId, getStateMachineId, getStateMachineStateId, getTaxId, getThemeId, isSaaSInstance, isThemeCompiled, setOrderStatus, test };
+export { AdminPageObjects, StorefrontPageObjects, TestDataService, createRandomImage, extractIdFromUrl, getCountryId, getCurrency, getDefaultShippingMethodId, getFlowId, getLanguageData, getMediaId, getOrderTransactionId, getPaymentMethodId, getPromotionWithDiscount, getSalutationId, getSnippetSetId, getStateMachineId, getStateMachineStateId, getTaxId, getThemeId, isSaaSInstance, isThemeCompiled, setOrderStatus, test };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shopware-ag/acceptance-test-suite",
-  "version": "2.5.0",
+  "version": "2.6.0",
   "description": "Shopware Acceptance Test Suite",
   "author": "shopware AG",
   "license": "MIT",