feat: #49 (theme) update vue components

vuestorefront-community · Aug 21, 2021 · 7187b4c · 7187b4c
1 parent 61bfd68
commit 7187b4c
Show file tree

Hide file tree

Showing 7 changed files with 784 additions and 2 deletions.
diff --git a/packages/api-client/src/fragments/cart.ts b/packages/api-client/src/fragments/cart.ts
@@ -12,8 +12,23 @@ export const AssetFragment = `
     }
 `;
 
+export const OrderAddressFragment = `
+    fragment OrderAddress on OrderAddress {
+        fullName
+        company
+        streetLine1
+        streetLine2
+        city
+        province
+        postalCode
+        country
+        phoneNumber
+    }
+`;
+
 export const CartFragment = `
     ${AssetFragment}
+    ${OrderAddressFragment}
 
     fragment Cart on Order {
         id
@@ -57,6 +72,12 @@ export const CartFragment = `
         total
         totalWithTax
         shipping
+        shippingAddress {
+            ...OrderAddress
+        }
+        billingAddress {
+            ...OrderAddress
+        }
         shippingWithTax
         shippingLines {
             priceWithTax

diff --git a/packages/composables/src/composables/useBilling/index.ts b/packages/composables/src/composables/useBilling/index.ts
@@ -18,7 +18,7 @@ const params: UseBillingParams<OrderAddress, AddParams> = {
   },
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
   load: async (context: Context, { customQuery }) => {
-    if (!context.cart.cart?.value?.billingAddress) {
+    if (!context.cart?.cart?.value?.billingAddress) {
       await context.cart.load({ customQuery });
     }
     return context.cart.cart.value.billingAddress;

diff --git a/packages/composables/src/composables/useShipping/index.ts b/packages/composables/src/composables/useShipping/index.ts
@@ -17,7 +17,7 @@ const params: UseShippingParams<OrderAddress, AddParams> = {
   },
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
   load: async (context: Context, { customQuery }) => {
-    if (!context.cart.cart?.value?.shippingAddress) {
+    if (!context.cart?.cart?.value?.shippingAddress) {
       await context.cart.load({ customQuery });
     }
     return context.cart.cart.value.shippingAddress;

diff --git a/packages/theme/helpers/index.ts b/packages/theme/helpers/index.ts
@@ -1,2 +1,3 @@
 export * from './category';
 export * from './checkout';
+export * from './shipping-billing';
diff --git a/packages/theme/helpers/shipping-billing.ts b/packages/theme/helpers/shipping-billing.ts
@@ -0,0 +1,22 @@
+import { OrderAddress } from "~/../api-client/lib";
+
+interface AddressForm {
+  firstName: string,
+  lastName: string,
+  streetName: string,
+  apartment: string,
+  city: string,
+  state: string,
+  country: string,
+  postalCode: string,
+  phone: string
+}
+
+export const mapAddressFormToOrderAddress = (addressForm: AddressForm): OrderAddress => ({
+  fullName: `${addressForm.firstName} ${addressForm.lastName}`,
+  streetLine1: `${addressForm.streetName} ${addressForm.apartment}`,
+  city: addressForm.city,
+  postalCode: addressForm.postalCode,
+  countryCode: addressForm.country,
+  phoneNumber: addressForm.phone,
+})