fix(composables): create address flow (SWF-245)

shopware · Jan 24, 2023 · f364da4 · f364da4
1 parent cf78d81
commit f364da4
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/.changeset/swift-apricots-dress.md b/.changeset/swift-apricots-dress.md
@@ -0,0 +1,5 @@
+---
+"@shopware-pwa/composables-next": patch
+---
+
+Remove setting default address in createCustomerAddress function
diff --git a/packages/composables/src/useAddress.ts b/packages/composables/src/useAddress.ts
@@ -81,12 +81,6 @@ export function useAddress(): UseAddressReturn {
   ): Promise<CustomerAddress> {
     const result = await apiCreateCustomerAddress(customerAddress, apiInstance);
     await loadCustomerAddresses();
-    if (isGuestSession.value) {
-      return result;
-    }
-
-    await setDefaultCustomerBillingAddress(result.id);
-    await setDefaultCustomerShippingAddress(result.id);
     return result;
   }
 

diff --git a/templates/vue-demo-store/pages/checkout/index.vue b/templates/vue-demo-store/pages/checkout/index.vue
@@ -68,6 +68,8 @@ const selectedShippingAddress = computed({
   async set(shippingAddressId: string) {
     isLoading[`shipping-${shippingAddressId}`] = true;
     await setActiveShippingAddress({ id: shippingAddressId });
+    if (shippingAddressId === selectedBillingAddress.value)
+      state.customShipping = false;
     isLoading[`shipping-${shippingAddressId}`] = false;
   },
 });
@@ -79,6 +81,8 @@ const selectedBillingAddress = computed({
   async set(billingAddressId: string) {
     isLoading[`billing-${billingAddressId}`] = true;
     await setActiveBillingAddress({ id: billingAddressId });
+    if (billingAddressId === selectedShippingAddress.value)
+      state.customShipping = false;
     isLoading[`billing-${billingAddressId}`] = false;
   },
 });