fix(composables): correct delivery address source (#1847)

* fix(composables): correct delivery address source * chore: test and lint
vuestorefront · Mar 14, 2022 · 280af6e · 280af6e
1 parent 1128c69
commit 280af6e
Show file tree

Hide file tree

Showing 5 changed files with 47 additions and 21 deletions.
diff --git a/packages/commons/interfaces/models/checkout/cart/Cart.ts b/packages/commons/interfaces/models/checkout/cart/Cart.ts
@@ -12,15 +12,28 @@ export interface CartErrors {
 }
 
 /**
- * @beta
+ * @public
+ */
+export interface CartDelivery extends Delivery {
+ shippingCosts: {
+ unitPrice: number;
+ quantity: number;
+ listPrice: number | null;
+ apiAlias: string;
+ totalPrice: number;
+ };
+}
+
+/**
+ * @public
  */
 export interface Cart {
  name: string;
  token: string;
  price: CartPrice;
  lineItems: LineItem[];
  errors: CartErrors;
- deliveries: Delivery[];
+ deliveries: CartDelivery[];
  transactions: Transaction[];
  modified: boolean;
  customerComment: null | string;

diff --git a/packages/commons/interfaces/models/checkout/delivery/Delivery.ts b/packages/commons/interfaces/models/checkout/delivery/Delivery.ts
@@ -1,19 +1,37 @@
-import { OrderDeliveryPosition } from "../order/OrderDeliveryPosition";
 import { ShippingMethod } from "../shipping/ShippingMethod";
-import { CalculatedPrice } from "../cart/price/CalculatedPrice";
-import { ShippingLocation } from "./ShippingLocation";
-import { DeliveryDate } from "./DeliveryDate";
 import { StateMachineState } from "../../system/state-machine/StateMachineState";
+import { ShippingAddress } from "@shopware-pwa/commons";
 
 /**
  * @public
  */
 export interface Delivery {
+ apiAlias: string;
+ createdAt: string;
+ customFields: unknown | null;
+ extensions: unknown;
+ id: string;
+ orderId: string;
+ orderVersionId: string;
+ positions: unknown | null;
+ shippingCosts: {
+ unitPrice: number;
+ quantity: number;
+ listPrice: number | null;
+ apiAlias: string;
+ };
+ shippingDateEarliest: string;
+ shippingDateLatest: string;
+ shippingMethod: ShippingMethod;
  shippingMethodId: string;
+ shippingOrderAddress: ShippingAddress;
+ shippingOrderAddressId: string;
+ shippingOrderAddressVersionId: string;
+ stateId: string;
  stateMachineState: StateMachineState;
- positions: OrderDeliveryPosition[];
- location: ShippingLocation;
- deliveryDate: DeliveryDate;
- shippingMethod: ShippingMethod;
- shippingCosts: CalculatedPrice;
+ trackingCodes: unknown[];
+ translated: unknown[];
+ updatedAt: string | null;
+ versionId: string;
+ _uniqueIdentifier: string;
 }
diff --git a/packages/commons/interfaces/models/checkout/order/Order.ts b/packages/commons/interfaces/models/checkout/order/Order.ts
@@ -33,7 +33,6 @@ interface Price {
 interface ShippingCost {
  unitPrice: number;
  quantity: number;
- totalPrice: number;
  calculatedTaxes: CalculatedTax[];
  taxRules: TaxRule[];
  referencePrice: number | null;

diff --git a/packages/composables/__tests__/useOrderDetails.spec.ts b/packages/composables/__tests__/useOrderDetails.spec.ts
@@ -93,10 +93,8 @@ describe("Composables - useOrderDetails", () => {
  ],
  deliveries: [
  {
- location: {
- address: {
- id: "delivery-address-id",
- },
+ shippingOrderAddress: {
+ id: "delivery-address-id"
  },
  shippingMethod: {
  name: "Express",
@@ -117,9 +115,7 @@ describe("Composables - useOrderDetails", () => {
  id: "shipping-address-id",
  },
  ],
- shippingCosts: {
- totalPrice: 10.0,
- },
+ shippingTotal: 10.0,
  price: {
  positionPrice: 90.0,
  totalPrice: 100.0,

diff --git a/packages/composables/src/logic/useOrderDetails.ts b/packages/composables/src/logic/useOrderDetails.ts
@@ -119,11 +119,11 @@ export function useOrderDetails(params: { order: Ref<Order> | Order }): {
  )
  );
  const shippingAddress = computed(
- () => _sharedOrder.value?.deliveries?.[0]?.location?.address
+ () => _sharedOrder.value?.deliveries?.[0]?.shippingOrderAddress
  );
 
  const shippingCosts = computed(
- () => _sharedOrder.value?.shippingCosts?.totalPrice
+ () => _sharedOrder.value?.shippingTotal
  );
  const subtotal = computed(() => _sharedOrder.value?.price?.positionPrice);
  const total = computed(() => _sharedOrder.value?.price?.totalPrice);