From d5cd1075902ab3de8413924613d9f1c215649050 Mon Sep 17 00:00:00 2001
From: patzick <tomczyk.patryk@gmail.com>
Date: Wed, 15 Apr 2020 11:55:00 +0200
Subject: [PATCH 1/4] chore: shipping address summary

---
 api/composables.api.md                        |  3 ++
 .../interfaces/response/SessionContext.ts     |  2 ++
 packages/composables/src/logic/useCheckout.ts | 16 +++++++++-
 .../summary/ShippingAddressSummary.vue        | 29 ++++++++++++-------
 packages/nuxt-module/plugins/api-client.js    |  9 +++++-
 5 files changed, 46 insertions(+), 13 deletions(-)

diff --git a/api/composables.api.md b/api/composables.api.md
index 5089b7fea..12cf81342 100644
--- a/api/composables.api.md
+++ b/api/composables.api.md
@@ -20,6 +20,7 @@ import { Product } from '@shopware-pwa/commons/interfaces/models/content/product
 import { Ref } from '@vue/composition-api';
 import { Salutation } from '@shopware-pwa/commons/interfaces/models/system/salutation/Salutation';
 import { SessionContext } from '@shopware-pwa/commons/interfaces/response/SessionContext';
+import { ShippingAddress } from '@shopware-pwa/commons/interfaces/request/GuestOrderParams';
 import { ShippingMethod } from '@shopware-pwa/commons/interfaces/models/checkout/shipping/ShippingMethod';
 
 // @alpha (undocumented)
@@ -103,6 +104,8 @@ export interface UseCheckout {
     // (undocumented)
     isGuestOrder: Readonly<Ref<boolean>>;
     // (undocumented)
+    shippingAddress: Readonly<Ref<ShippingAddress | undefined>>;
+    // (undocumented)
     updateGuestOrderParams: (params: Partial<GuestOrderParams>) => void;
 }
 
diff --git a/packages/commons/interfaces/response/SessionContext.ts b/packages/commons/interfaces/response/SessionContext.ts
index 5d3e8cf63..48631c8f1 100644
--- a/packages/commons/interfaces/response/SessionContext.ts
+++ b/packages/commons/interfaces/response/SessionContext.ts
@@ -2,6 +2,7 @@ import { PaymentMethod } from "../models/checkout/payment/PaymentMethod";
 import { ShippingMethod } from "../models/checkout/shipping/ShippingMethod";
 import { Country } from "../models/system/country/Country";
 import { User } from "../models/system/user/User";
+import { ShippingAddress } from "../request/GuestOrderParams";
 
 export interface ContextTokenResponse {
   contextToken: string;
@@ -33,6 +34,7 @@ export interface SessionContext {
   paymentMethod: PaymentMethod;
   shippingMethod: ShippingMethod;
   shippingLocation: {
+    address: ShippingAddress;
     country: Country;
   };
 }
diff --git a/packages/composables/src/logic/useCheckout.ts b/packages/composables/src/logic/useCheckout.ts
index 2e4996a15..228ad3721 100644
--- a/packages/composables/src/logic/useCheckout.ts
+++ b/packages/composables/src/logic/useCheckout.ts
@@ -3,7 +3,10 @@ import { Ref, computed, reactive } from "@vue/composition-api";
 import { useUser, useCart } from "@shopware-pwa/composables";
 import { ShippingMethod } from "@shopware-pwa/commons/interfaces/models/checkout/shipping/ShippingMethod";
 import { PaymentMethod } from "@shopware-pwa/commons/interfaces/models/checkout/payment/PaymentMethod";
-import { GuestOrderParams } from "@shopware-pwa/commons/interfaces/request/GuestOrderParams";
+import {
+  GuestOrderParams,
+  ShippingAddress,
+} from "@shopware-pwa/commons/interfaces/request/GuestOrderParams";
 import { Order } from "@shopware-pwa/commons/interfaces/models/checkout/order/Order";
 import {
   getAvailableShippingMethods,
@@ -11,6 +14,7 @@ import {
   createGuestOrder,
   createOrder as createApiOrder,
 } from "@shopware-pwa/shopware-6-client";
+import { useSessionContext } from "./useSessionContext";
 
 /**
  * @alpha
@@ -26,6 +30,7 @@ export interface UseCheckout {
   }) => Promise<Readonly<Ref<readonly PaymentMethod[]>>>;
   createOrder: () => Promise<Order>;
   updateGuestOrderParams: (params: Partial<GuestOrderParams>) => void;
+  shippingAddress: Readonly<Ref<ShippingAddress | undefined>>;
 }
 
 const orderData: {
@@ -44,6 +49,8 @@ const orderData: {
 export const useCheckout = (): UseCheckout => {
   const { isLoggedIn } = useUser();
   const { refreshCart } = useCart();
+  const { sessionContext } = useSessionContext();
+
   const shippingMethods: Readonly<Ref<readonly ShippingMethod[]>> = computed(
     () => orderData.shippingMethods
   );
@@ -96,6 +103,12 @@ export const useCheckout = (): UseCheckout => {
     orderData.guestOrderParams = { ...orderData.guestOrderParams, ...params };
   };
 
+  const shippingAddress = computed(() =>
+    isGuestOrder.value
+      ? guestOrderParams.value?.shippingAddress
+      : sessionContext.value?.shippingLocation?.address
+  );
+
   return {
     isGuestOrder,
     getPaymentMethods,
@@ -103,5 +116,6 @@ export const useCheckout = (): UseCheckout => {
     createOrder,
     guestOrderParams,
     updateGuestOrderParams,
+    shippingAddress,
   };
 };
diff --git a/packages/default-theme/components/checkout/summary/ShippingAddressSummary.vue b/packages/default-theme/components/checkout/summary/ShippingAddressSummary.vue
index 3d55c0478..0404de9e1 100644
--- a/packages/default-theme/components/checkout/summary/ShippingAddressSummary.vue
+++ b/packages/default-theme/components/checkout/summary/ShippingAddressSummary.vue
@@ -1,14 +1,20 @@
 <template>
   <div class="accordion__item">
-    <div class="accordion__content">
+    <div class="accordion__content" v-if="shippingMethod">
       <p class="content">
-        <span class="content__label">{{ shippingMethod.name }}</span
-        ><br />
-        {{ shippingMethod.streetName }} {{ shippingMethod.apartment }},
-        {{ shippingMethod.zipCode }}<br />
-        {{ shippingMethod.city }}, {{ shippingMethod.country }}
+        <span class="content__label">{{ shippingMethod.name }}</span>
+        <span class="content__label">{{
+          shippingMethod.deliveryTime.name
+        }}</span>
+      </p>
+      <p class="content" v-if="shippingAddress">
+        {{ shippingAddress.street }} {{ shippingAddress.apartment }},
+        {{ shippingAddress.zipcode }}<br />
+        {{ shippingAddress.city }}
+      </p>
+      <p class="content" v-if="shippingAddress && shippingAddress.phoneNumber">
+        {{ shippingAddress.phoneNumber }}
       </p>
-      <p class="content">{{ shippingMethod.phoneNumber }}</p>
     </div>
     <SfButton
       class="sf-button--text accordion__edit"
@@ -19,18 +25,19 @@
 </template>
 <script>
 import { SfButton } from '@storefront-ui/vue'
+import { useSessionContext, useCheckout } from '@shopware-pwa/composables'
 export default {
   name: 'ShippingAddressSummary',
   components: {
     SfButton,
   },
   setup() {
-    // TODO: get shipping method from useContext
-    const shippingMethod = {
-      name: 'TODO: MockedShippingMethod',
-    }
+    const { shippingMethod, sessionContext } = useSessionContext()
+    const { shippingAddress } = useCheckout()
     return {
       shippingMethod,
+      sessionContext,
+      shippingAddress,
     }
   },
 }
diff --git a/packages/nuxt-module/plugins/api-client.js b/packages/nuxt-module/plugins/api-client.js
index 40efcf956..e1cb84dac 100644
--- a/packages/nuxt-module/plugins/api-client.js
+++ b/packages/nuxt-module/plugins/api-client.js
@@ -1,5 +1,10 @@
 import { setup, onConfigChange } from "@shopware-pwa/shopware-6-client";
-import { setStore, useUser, useCart } from "@shopware-pwa/composables";
+import {
+  setStore,
+  useUser,
+  useCart,
+  useSessionContext,
+} from "@shopware-pwa/composables";
 
 export default async ({ app, store }) => {
   if (!app.$cookies) {
@@ -31,8 +36,10 @@ export default async ({ app, store }) => {
   // Temporary fix for SSR and reactivity
   setStore(store);
 
+  const { refreshSessionContext } = useSessionContext();
   const { refreshUser } = useUser();
   const { refreshCart } = useCart();
+  await refreshSessionContext();
   await refreshUser();
   await refreshCart();
 };

From 239ed32590227792a8581b234f882af54b8ed09a Mon Sep 17 00:00:00 2001
From: patzick <tomczyk.patryk@gmail.com>
Date: Thu, 16 Apr 2020 12:26:08 +0200
Subject: [PATCH 2/4] feat: shopw correct billing address

---
 .../interfaces/models/system/user/User.ts     |  5 ++-
 packages/composables/src/logic/useCheckout.ts |  8 +++++
 .../steps/guest/BillingAddressGuestForm.vue   | 15 ++++----
 .../summary/BillingAddressSummary.vue         | 36 ++++++++-----------
 4 files changed, 34 insertions(+), 30 deletions(-)

diff --git a/packages/commons/interfaces/models/system/user/User.ts b/packages/commons/interfaces/models/system/user/User.ts
index e918b910d..d8e260ca0 100644
--- a/packages/commons/interfaces/models/system/user/User.ts
+++ b/packages/commons/interfaces/models/system/user/User.ts
@@ -1 +1,4 @@
-export interface User {}
+import { BillingAddress } from "../../../request/GuestOrderParams";
+export interface User {
+  activeBillingAddress?: BillingAddress;
+}
diff --git a/packages/composables/src/logic/useCheckout.ts b/packages/composables/src/logic/useCheckout.ts
index 228ad3721..8a9d1c28d 100644
--- a/packages/composables/src/logic/useCheckout.ts
+++ b/packages/composables/src/logic/useCheckout.ts
@@ -6,6 +6,7 @@ import { PaymentMethod } from "@shopware-pwa/commons/interfaces/models/checkout/
 import {
   GuestOrderParams,
   ShippingAddress,
+  BillingAddress,
 } from "@shopware-pwa/commons/interfaces/request/GuestOrderParams";
 import { Order } from "@shopware-pwa/commons/interfaces/models/checkout/order/Order";
 import {
@@ -31,6 +32,7 @@ export interface UseCheckout {
   createOrder: () => Promise<Order>;
   updateGuestOrderParams: (params: Partial<GuestOrderParams>) => void;
   shippingAddress: Readonly<Ref<ShippingAddress | undefined>>;
+  billingAddress: Readonly<Ref<BillingAddress | undefined>>;
 }
 
 const orderData: {
@@ -108,6 +110,11 @@ export const useCheckout = (): UseCheckout => {
       ? guestOrderParams.value?.shippingAddress
       : sessionContext.value?.shippingLocation?.address
   );
+  const billingAddress = computed(() =>
+    isGuestOrder.value
+      ? guestOrderParams.value?.billingAddress
+      : sessionContext.value?.customer?.activeBillingAddress
+  );
 
   return {
     isGuestOrder,
@@ -117,5 +124,6 @@ export const useCheckout = (): UseCheckout => {
     guestOrderParams,
     updateGuestOrderParams,
     shippingAddress,
+    billingAddress,
   };
 };
diff --git a/packages/default-theme/components/checkout/steps/guest/BillingAddressGuestForm.vue b/packages/default-theme/components/checkout/steps/guest/BillingAddressGuestForm.vue
index 9dbc5f2bc..e9d444369 100644
--- a/packages/default-theme/components/checkout/steps/guest/BillingAddressGuestForm.vue
+++ b/packages/default-theme/components/checkout/steps/guest/BillingAddressGuestForm.vue
@@ -73,6 +73,7 @@
         required
       />
       <SfSelect
+        v-if="getCountries.length"
         v-model="countryId"
         :valid="!validations.countryId.$error"
         error-message="This field is required"
@@ -81,11 +82,11 @@
         required
       >
         <SfSelectOption
-          v-for="countryOption in countries"
-          :key="countryOption"
-          :value="countryOption"
+          v-for="countryOption in getCountries"
+          :key="countryOption.id"
+          :value="countryOption.id"
         >
-          {{ countryOption }}
+          {{ countryOption.name }}
         </SfSelectOption>
       </SfSelect>
       <SfInput
@@ -116,6 +117,7 @@ import {
   usePaymentStepValidationRules,
 } from '@shopware-pwa/default-theme/logic/checkout/usePaymentStep'
 import { computed } from '@vue/composition-api'
+import { useCountries } from '@shopware-pwa/composables'
 
 export default {
   name: 'BillingAddressGuestForm',
@@ -146,8 +148,7 @@ export default {
       differentThanShipping,
     } = usePaymentStep()
 
-    // TODO add countries
-    const countries = computed(() => [])
+    const { getCountries } = useCountries()
 
     return {
       validations,
@@ -162,7 +163,7 @@ export default {
       countryId,
       phoneNumber,
       differentThanShipping,
-      countries
+      getCountries,
     }
   },
   watch: {
diff --git a/packages/default-theme/components/checkout/summary/BillingAddressSummary.vue b/packages/default-theme/components/checkout/summary/BillingAddressSummary.vue
index 13fcb8569..8a61e5bcd 100644
--- a/packages/default-theme/components/checkout/summary/BillingAddressSummary.vue
+++ b/packages/default-theme/components/checkout/summary/BillingAddressSummary.vue
@@ -1,19 +1,14 @@
 <template>
   <div class="accordion__item">
     <div class="accordion__content">
-      <p v-if="billingAddress.sameAsShipping" class="content">
-        Same as shipping address
+      <p class="content" v-if="billingAddress">
+        {{ billingAddress.street }} {{ billingAddress.apartment }},
+        {{ billingAddress.zipcode }}<br />
+        {{ billingAddress.city }}
+      </p>
+      <p class="content" v-if="billingAddress && billingAddress.phoneNumber">
+        {{ billingAddress.phoneNumber }}
       </p>
-      <template v-else>
-        <p class="content">
-          <span class="content__label">{{ billingAddress.shippingMethod }}</span
-          ><br />
-          {{ billingAddress.streetName }} {{ billingAddress.apartment }}, {{ billingAddress.zipCode
-          }}<br />
-          {{ billingAddress.city }}, {{ billingAddress.country }}
-        </p>
-        <p class="content">{{ billingAddress.phoneNumber }}</p>
-      </template>
     </div>
     <SfButton
       class="sf-button--text accordion__edit"
@@ -23,23 +18,20 @@
   </div>
 </template>
 <script>
-import {
-  SfButton
-} from '@storefront-ui/vue'
+import { SfButton } from '@storefront-ui/vue'
+import { useCheckout } from '@shopware-pwa/composables'
+
 export default {
   name: 'BillingAddressSummary',
   components: {
     SfButton,
   },
-  setup () {
-    // TODO: get from context or guest order step if guest order
-    const billingAddress = {
-      sameAsShipping: true
-    }
+  setup() {
+    const { billingAddress } = useCheckout()
     return {
-      billingAddress
+      billingAddress,
     }
-  }
+  },
 }
 </script>
 <style lang="scss" scoped>

From f749a427699dfb28a9fdd61ad69fe473069e2054 Mon Sep 17 00:00:00 2001
From: patzick <tomczyk.patryk@gmail.com>
Date: Thu, 16 Apr 2020 12:43:22 +0200
Subject: [PATCH 3/4] feat: show personal details

---
 .../checkout/summary/PaymentMethodSummary.vue | 11 ++++++-----
 .../summary/PersonalDetailsSummary.vue        | 19 +++++++++++++++----
 packages/default-theme/pages/checkout.vue     |  1 -
 3 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/packages/default-theme/components/checkout/summary/PaymentMethodSummary.vue b/packages/default-theme/components/checkout/summary/PaymentMethodSummary.vue
index aaba206b7..733f7748c 100644
--- a/packages/default-theme/components/checkout/summary/PaymentMethodSummary.vue
+++ b/packages/default-theme/components/checkout/summary/PaymentMethodSummary.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="accordion__item">
     <div class="accordion__content">
-      <p class="content">{{ paymentMethod.label }}</p>
+      <p class="content">{{ paymentMethod.name }}</p>
     </div>
     <SfButton
       class="sf-button--text accordion__edit"
@@ -12,18 +12,19 @@
 </template>
 <script>
 import { SfButton } from '@storefront-ui/vue'
+import { useSessionContext } from '@shopware-pwa/composables'
+import { computed } from '@vue/composition-api'
 export default {
   name: 'PaymentMethodSummary',
   components: {
     SfButton,
   },
   setup() {
-    // TODO get payment method from useSessionContext
-    const paymentMethod = {
-      label: 'TODO: payment method',
-    }
+    const { sessionContext } = useSessionContext()
+    const paymentMethod = computed(() => sessionContext.value.paymentMethod)
     return {
       paymentMethod,
+      sessionContext,
     }
   },
 }
diff --git a/packages/default-theme/components/checkout/summary/PersonalDetailsSummary.vue b/packages/default-theme/components/checkout/summary/PersonalDetailsSummary.vue
index 149bef367..e2b03e151 100644
--- a/packages/default-theme/components/checkout/summary/PersonalDetailsSummary.vue
+++ b/packages/default-theme/components/checkout/summary/PersonalDetailsSummary.vue
@@ -17,6 +17,8 @@
 import { SfButton } from '@storefront-ui/vue'
 import { usePersonalDetailsStep } from '@shopware-pwa/default-theme/logic/checkout/usePersonalDetailsStep'
 import { CHECKOUT_STEPS } from '@shopware-pwa/default-theme/logic/checkout'
+import { useCheckout, useUser } from '@shopware-pwa/composables'
+import { computed } from '@vue/composition-api'
 
 export default {
   name: 'PersonalDetailsSummary',
@@ -25,11 +27,20 @@ export default {
   },
   setup() {
     const { firstName, lastName, email } = usePersonalDetailsStep()
+    const { isGuestOrder } = useCheckout()
+    const { user } = useUser()
+
     return {
-      firstName,
-      lastName,
-      email,
-      CHECKOUT_STEPS
+      firstName: computed(() =>
+        isGuestOrder.value ? firstName.value : user.value.firstName
+      ),
+      lastName: computed(() =>
+        isGuestOrder.value ? lastName.value : user.value.lastName
+      ),
+      email: computed(() =>
+        isGuestOrder.value ? email.value : user.value.email
+      ),
+      CHECKOUT_STEPS,
     }
   },
 }
diff --git a/packages/default-theme/pages/checkout.vue b/packages/default-theme/pages/checkout.vue
index 79b136a99..de0372d89 100644
--- a/packages/default-theme/pages/checkout.vue
+++ b/packages/default-theme/pages/checkout.vue
@@ -27,7 +27,6 @@
         </SfSteps>
       </div>
       <div class="checkout__aside desktop-only">
-        <button @click="nextStep()">next</button>
         <transition name="fade">
           <SidebarOrderSummary
             v-if="currentStep < CHECKOUT_STEPS.REVIEW"

From 8627033c3cde3ddb4469dc86123d511a38cc3c0b Mon Sep 17 00:00:00 2001
From: patzick <tomczyk.patryk@gmail.com>
Date: Thu, 16 Apr 2020 14:42:21 +0200
Subject: [PATCH 4/4] chore: add tests

---
 api/composables.api.md                        |   3 +
 .../composables/__tests__/useCheckout.spec.ts | 123 +++++++++++++++++-
 packages/composables/src/logic/useCheckout.ts |   4 +-
 3 files changed, 127 insertions(+), 3 deletions(-)

diff --git a/api/composables.api.md b/api/composables.api.md
index 12cf81342..9f46cecdc 100644
--- a/api/composables.api.md
+++ b/api/composables.api.md
@@ -5,6 +5,7 @@
 ```ts
 
 import { AddressType } from '@shopware-pwa/commons/interfaces/models/checkout/customer/CustomerAddress';
+import { BillingAddress } from '@shopware-pwa/commons/interfaces/request/GuestOrderParams';
 import { Country } from '@shopware-pwa/commons/interfaces/models/system/country/Country';
 import { Customer } from '@shopware-pwa/commons/interfaces/models/checkout/customer/Customer';
 import { CustomerAddress } from '@shopware-pwa/commons/interfaces/models/checkout/customer/CustomerAddress';
@@ -89,6 +90,8 @@ export const useCategoryFilters: () => any;
 
 // @alpha (undocumented)
 export interface UseCheckout {
+    // (undocumented)
+    billingAddress: Readonly<Ref<BillingAddress | undefined>>;
     // (undocumented)
     createOrder: () => Promise<Order>;
     // (undocumented)
diff --git a/packages/composables/__tests__/useCheckout.spec.ts b/packages/composables/__tests__/useCheckout.spec.ts
index 29a1fc73b..7549b4d6f 100644
--- a/packages/composables/__tests__/useCheckout.spec.ts
+++ b/packages/composables/__tests__/useCheckout.spec.ts
@@ -1,5 +1,10 @@
 import Vue from "vue";
-import VueCompositionApi, { ref } from "@vue/composition-api";
+import VueCompositionApi, {
+  ref,
+  Ref,
+  reactive,
+  computed,
+} from "@vue/composition-api";
 Vue.use(VueCompositionApi);
 
 // // Mock API client
@@ -10,9 +15,12 @@ const mockedApiClient = shopwareClient as jest.Mocked<typeof shopwareClient>;
 const consoleErrorSpy = jest.spyOn(console, "error");
 import * as Composables from "@shopware-pwa/composables";
 import { useCheckout } from "@shopware-pwa/composables";
+import { SessionContext } from "@shopware-pwa/commons/interfaces/response/SessionContext";
 
 describe("Composables - useCheckout", () => {
   let isLoggedIn = ref(false);
+  const stateContext: Ref<Partial<SessionContext> | null> = ref(null);
+
   const refreshCartMock = jest.fn(async () => {});
   beforeEach(() => {
     jest.resetAllMocks();
@@ -20,6 +28,7 @@ describe("Composables - useCheckout", () => {
     jest.spyOn(Composables, "useUser").mockImplementation(() => {
       return {
         isLoggedIn,
+        user: ref({ firstName: "Elton" }),
       } as any;
     });
     jest.spyOn(Composables, "useCart").mockImplementation(() => {
@@ -27,6 +36,15 @@ describe("Composables - useCheckout", () => {
         refreshCart: refreshCartMock,
       } as any;
     });
+    stateContext.value = null;
+    Composables.setStore({
+      getters: reactive({
+        getSessionContext: computed(() => stateContext.value),
+      }),
+      commit: (name: string, value: SessionContext) => {
+        stateContext.value = value;
+      },
+    });
     consoleErrorSpy.mockImplementationOnce(() => {});
   });
 
@@ -51,6 +69,109 @@ describe("Composables - useCheckout", () => {
         expect(guestOrderParams.value).toEqual({});
       });
     });
+
+    describe("shippingAddress", () => {
+      it("should return guest order address if is guest order", () => {
+        const { shippingAddress, updateGuestOrderParams } = useCheckout();
+        updateGuestOrderParams({
+          shippingAddress: {
+            street: "first street",
+          },
+        } as any);
+        expect(shippingAddress.value).toEqual({ street: "first street" });
+        updateGuestOrderParams({
+          shippingAddress: undefined,
+        } as any);
+      });
+
+      it("should undefined when guest address is not set", () => {
+        const { shippingAddress } = useCheckout();
+        expect(shippingAddress.value).toBeUndefined();
+      });
+
+      it("should return user address in case of user order", async () => {
+        isLoggedIn.value = true;
+        stateContext.value = {
+          shippingLocation: {
+            address: {
+              street: "some street",
+            },
+          },
+        } as any;
+        const { shippingAddress } = useCheckout();
+        expect(shippingAddress.value).toEqual({ street: "some street" });
+      });
+
+      it("should return undefined if address is not set", async () => {
+        isLoggedIn.value = true;
+        stateContext.value = {} as any;
+        const { shippingAddress } = useCheckout();
+        expect(shippingAddress.value).toBeUndefined();
+      });
+
+      it("should return undefined if no session context", async () => {
+        isLoggedIn.value = true;
+        stateContext.value = null as any;
+        const { shippingAddress } = useCheckout();
+        expect(shippingAddress.value).toBeUndefined();
+      });
+    });
+
+    describe("billingAddress", () => {
+      it("should return guest order address if is guest order", () => {
+        const { billingAddress, updateGuestOrderParams } = useCheckout();
+        updateGuestOrderParams({
+          billingAddress: {
+            street: "thrid street",
+          },
+        } as any);
+        expect(billingAddress.value).toEqual({ street: "thrid street" });
+        updateGuestOrderParams({
+          billingAddress: undefined,
+        } as any);
+      });
+
+      it("should return undefined when guest billing address is not set", () => {
+        const { billingAddress, updateGuestOrderParams } = useCheckout();
+        updateGuestOrderParams({
+          billingAddress: {
+            street: "thrid street",
+          },
+        } as any);
+        expect(billingAddress.value).toEqual({ street: "thrid street" });
+        updateGuestOrderParams({
+          billingAddress: undefined,
+        } as any);
+      });
+
+      it("should return address in case of user order", async () => {
+        isLoggedIn.value = true;
+        stateContext.value = {
+          customer: {
+            activeBillingAddress: {
+              street: "some street",
+            },
+          },
+        } as any;
+        const { billingAddress } = useCheckout();
+        await Vue.nextTick();
+        expect(billingAddress.value).toEqual({ street: "some street" });
+      });
+
+      it("should return undefined if address is not set", async () => {
+        isLoggedIn.value = true;
+        stateContext.value = {} as any;
+        const { billingAddress } = useCheckout();
+        expect(billingAddress.value).toBeUndefined();
+      });
+
+      it("should return undefined if no session context", async () => {
+        isLoggedIn.value = true;
+        stateContext.value = null as any;
+        const { billingAddress } = useCheckout();
+        expect(billingAddress.value).toBeUndefined();
+      });
+    });
   });
 
   describe("methods", () => {
diff --git a/packages/composables/src/logic/useCheckout.ts b/packages/composables/src/logic/useCheckout.ts
index 8a9d1c28d..50d8f7a51 100644
--- a/packages/composables/src/logic/useCheckout.ts
+++ b/packages/composables/src/logic/useCheckout.ts
@@ -107,12 +107,12 @@ export const useCheckout = (): UseCheckout => {
 
   const shippingAddress = computed(() =>
     isGuestOrder.value
-      ? guestOrderParams.value?.shippingAddress
+      ? guestOrderParams.value.shippingAddress
       : sessionContext.value?.shippingLocation?.address
   );
   const billingAddress = computed(() =>
     isGuestOrder.value
-      ? guestOrderParams.value?.billingAddress
+      ? guestOrderParams.value.billingAddress
       : sessionContext.value?.customer?.activeBillingAddress
   );