Add orders history to my account

.eslintrc.json

@@ -114,7 +114,12 @@
     "no-mixed-operators": 2,
     "no-multi-assign": 2,
     "no-unneeded-ternary": 2,
-    "object-property-newline": 0,
+    "object-property-newline": [
+      2,
+      {
+        "allowAllPropertiesOnSameLine": true
+      }
+    ],
     "operator-linebreak": 2,
     "quote-props": [
       2,

.travis.yml

@@ -13,7 +13,6 @@ cache:
     - packages/commercetools/theme/.nuxt
     - packages/commercetools/theme/node_modules
     - packages/core/utils/node_modules
-    - packages/core/utils/lib
     - packages/prismic/node_modules
     - packages/prismic/lib
 

packages/commercetools/api-client/src/api/getMe/defaultQuery.ts

@@ -1,5 +1,5 @@
 import gql from 'graphql-tag';
-import { CartFragment, CustomerFragment } from './../../fragments';
+import { CartFragment, CustomerFragment, OrderFragment } from './../../fragments';
 
 const basicProfile = gql`
   ${CartFragment}
@@ -16,6 +16,7 @@ const basicProfile = gql`
 const fullProfile = gql`
   ${CartFragment}
   ${CustomerFragment}
+  ${OrderFragment}
 
   query getMe($locale: Locale!) {
     me {
@@ -25,6 +26,11 @@ const fullProfile = gql`
       customer {
         ...DefaultCustomer
       }
+      orders {
+        results {
+          ...DefaultOrder
+        }
+      }
     }
   }
 `;

packages/commercetools/api-client/src/fragments/index.ts

@@ -143,6 +143,7 @@ export const OrderFragment = `
     orderState
     id
     version
+    createdAt
   }
 `;
 

packages/commercetools/composables/src/useUser/index.ts

@@ -1,6 +1,11 @@
 import { ref, Ref, watch, computed } from '@vue/composition-api';
 import { UseUser } from '@vue-storefront/interfaces';
-import { Customer, CustomerSignMeUpDraft, CustomerSignMeInDraft } from '@vue-storefront/commercetools-api/lib/src/types/GraphQL';
+import {
+  Customer,
+  CustomerSignMeUpDraft,
+  CustomerSignMeInDraft,
+  Order
+} from '@vue-storefront/commercetools-api/lib/src/types/GraphQL';
 import {
   customerSignMeUp,
   customerSignMeIn,
@@ -12,8 +17,10 @@ import { cart } from './../useCart';
 type UserData = CustomerSignMeUpDraft | CustomerSignMeInDraft
 
 const user: Ref<Customer> = ref({});
+const orders: Ref<Order[]> = ref([]);
 const loading: Ref<boolean> = ref(false);
 const error: Ref<any> = ref(null);
+
 const isAuthenticated = computed(() => user.value && Object.keys(user.value).length > 0);
 
 const authenticate = async (userData: UserData, fn) => {
@@ -29,7 +36,7 @@ const authenticate = async (userData: UserData, fn) => {
   loading.value = false;
 };
 
-export default function useUser(): UseUser<Customer> {
+export default function useUser(): UseUser<Customer, Order> {
   watch(user, async () => {
     if (isAuthenticated.value) {
       return;
@@ -40,7 +47,9 @@ export default function useUser(): UseUser<Customer> {
     try {
       const profile = await getMe({ customer: true });
       user.value = profile.data.me.customer;
-    } catch (err) {} // eslint-disable-line
+      orders.value = profile.data.me.orders.results;
+    // eslint-disable-next-line no-empty
+    } catch (err) {}
 
     loading.value = false;
   });
@@ -63,6 +72,7 @@ export default function useUser(): UseUser<Customer> {
 
   return {
     user: computed(() => user.value),
+    orders: computed(() => orders.value),
     register,
     login,
     logout,

packages/commercetools/composables/tests/useUser/useUser.spec.ts

@@ -6,8 +6,19 @@ jest.mock('@vue-storefront/commercetools-api', () => ({
   customerSignMeUp: jest.fn(),
   customerSignMeIn: jest.fn(),
   customerSignOut: jest.fn(),
-  getMe: () => ({ data: { me: { customer: { firstName: 'loaded customer',
-    lastName: 'loaded customer' } } } })
+  getMe: () => ({
+    data: {
+      me: {
+        customer: {
+          firstName: 'loaded customer',
+          lastName: 'loaded customer'
+        },
+        orders: {
+          results: []
+        }
+      }
+    }
+  })
 }));
 
 describe('[commercetools-composables] useUser', () => {
@@ -16,15 +27,20 @@ describe('[commercetools-composables] useUser', () => {
   });
 
   it('creates properties', () => {
-    const { loading, error } = useUser();
+    const { loading, error, orders } = useUser();
 
     expect(loading.value).toEqual(true);
     expect(error.value).toEqual(null);
+    expect(orders.value).toEqual([]);
   });
 
   it('registers new customer', async () => {
-    const user = { customer: { firstName: 'john',
-      lastName: 'doe' } };
+    const user = {
+      customer: {
+        firstName: 'john',
+        lastName: 'doe'
+      }
+    };
     (customerSignMeUp as any).mockReturnValue(Promise.resolve({ data: { user } }));
 
     const wrapper = mountComposable(useUser);
@@ -40,16 +56,22 @@ describe('[commercetools-composables] useUser', () => {
   });
 
   it('login customer and log out', async () => {
-    const user = { customer: { firstName: 'john',
-      lastName: 'doe' } };
+    const user = {
+      customer: {
+        firstName: 'john',
+        lastName: 'doe'
+      }
+    };
     (customerSignMeIn as any).mockReturnValue(Promise.resolve({ data: { user } }));
 
     const wrapper = mountComposable(useUser);
     await wrapper.vm.$nextTick();
     await wrapper.vm.$nextTick();
 
-    wrapper.vm.$data.login({ email: '[email protected]',
-      password: '123' });
+    wrapper.vm.$data.login({
+      email: '[email protected]',
+      password: '123'
+    });
 
     expect(wrapper.vm.$data.loading).toBeTruthy();
     await wrapper.vm.$nextTick();
@@ -78,4 +100,12 @@ describe('[commercetools-composables] useUser', () => {
       lastName: 'loaded customer'
     });
   });
+
+  it('loads current customer with orders', async () => {
+    const wrapper = mountComposable(useUser);
+    await wrapper.vm.$nextTick();
+    await wrapper.vm.$nextTick();
+    expect(wrapper.vm.$data.orders).toEqual([]);
+  });
+
 });

packages/commercetools/helpers/src/index.ts

@@ -1,11 +1,25 @@
 import {
-  UiMediaGalleryItem,
-  UiCategory,
+  AgnosticOrderStatus,
   AgnosticProductAttribute,
-  AgnosticTotals
+  AgnosticTotals,
+  UiCategory,
+  UiMediaGalleryItem
 } from '@vue-storefront/interfaces';
-import { ProductVariant, Image, Category, Cart, LineItem, ShippingMethod, Customer } from './types/GraphQL';
-import { formatAttributeList, getVariantByAttributes } from './_utils';
+import {
+  Cart,
+  Category,
+  Customer,
+  Image,
+  LineItem,
+  Order,
+  OrderState,
+  ProductVariant,
+  ShippingMethod
+} from './types/GraphQL';
+import {
+  formatAttributeList,
+  getVariantByAttributes
+} from './_utils';
 
 interface ProductVariantFilters {
   master?: boolean;
@@ -71,8 +85,10 @@ export const getProductAttributes = (products: ProductVariant[] | ProductVariant
     ...prev,
     [curr.name]: isSingleProduct ? curr.value : [
       ...(prev[curr.name] || []),
-      { value: curr.value,
-        label: curr.label }
+      {
+        value: curr.value,
+        label: curr.label
+      }
     ]
   });
 
@@ -196,3 +212,20 @@ export const getUserFirstName = (user: Customer): string => user ? user.firstNam
 export const getUserLastName = (user: Customer): string => user ? user.lastName : '';
 
 export const getUserFullName = (user: Customer): string => user ? `${user.firstName} ${user.lastName}` : '';
+
+// Order
+
+export const getOrderDate = (order: Order): string => order?.createdAt || '';
+
+export const getOrderNumber = (order: Order): string => order?.id || '';
+
+const orderStatusMap = {
+  [OrderState.Open]: AgnosticOrderStatus.Open,
+  [OrderState.Confirmed]: AgnosticOrderStatus.Confirmed,
+  [OrderState.Complete]: AgnosticOrderStatus.Complete,
+  [OrderState.Cancelled]: AgnosticOrderStatus.Cancelled
+};
+
+export const getOrderStatus = (order: Order): AgnosticOrderStatus | '' => order?.orderState ? orderStatusMap[order.orderState] : '';
+
+export const getOrderTotal = (order: Order): number | null => order ? order.totalPrice.centAmount / 100 : null;

packages/commercetools/helpers/tests/orderHelpers.spec.ts

@@ -0,0 +1,42 @@
+import {
+  getOrderDate,
+  getOrderNumber,
+  getOrderStatus,
+  getOrderTotal
+} from '../src';
+import { OrderState, Order } from '../src/types/GraphQL';
+
+const order: Order = {
+  createdAt: 123456789,
+  id: '645ygdf',
+  orderState: OrderState.Complete,
+  totalPrice: {
+    centAmount: 12345,
+    currencyCode: 'USD'
+  }
+} as any;
+
+describe('[commercetools-helpers] order helpers', () => {
+  it('returns default values', () => {
+    expect(getOrderDate(null)).toBe('');
+    expect(getOrderNumber(null)).toBe('');
+    expect(getOrderStatus(null)).toBe('');
+    expect(getOrderTotal(null)).toBe(null);
+  });
+
+  it('returns date', () => {
+    expect(getOrderDate(order)).toEqual(123456789);
+  });
+
+  it('returns order number', () => {
+    expect(getOrderNumber(order)).toEqual('645ygdf');
+  });
+
+  it('returns status', () => {
+    expect(getOrderStatus(order)).toEqual(OrderState.Complete);
+  });
+
+  it('returns total gross', () => {
+    expect(getOrderTotal(order)).toEqual(123.45);
+  });
+});

packages/core/interfaces/index.ts

@@ -13,9 +13,11 @@ export interface UseProduct<PRODUCT> {
 
 export interface UseUser
 <
-  USER
+  USER,
+  ORDER
 > {
   user: Readonly<Ref<Readonly<USER>>>;
+  orders: Readonly<Ref<Readonly<ORDER[]>>>;
   register: (user: {
     email: string;
     password: string;
@@ -176,3 +178,13 @@ export interface AgnosticProductAttribute {
   value: string | Record<string, any>;
   label: string;
 }
+
+export enum AgnosticOrderStatus {
+  Open = 'Open',
+  Pending = 'Pending',
+  Confirmed = 'Confirmed',
+  Shipped = 'Shipped',
+  Complete = 'Complete',
+  Cancelled = 'Cancelled',
+  Refunded = 'Refunded'
+}

packages/core/theme-module/theme/pages/Checkout.vue

@@ -51,7 +51,7 @@ export default {
     CartPreview,
     OrderReview
   },
-  setup(context) {
+  setup(props, context) {
     const showCartPreview = ref(true);
     const currentStep = ref(0);
 

packages/core/theme-module/theme/pages/MyAccount.vue

@@ -33,7 +33,7 @@
       </SfContentCategory>
       <SfContentCategory title="Order details">
         <SfContentPage title="Order history">
-          <OrderHistory :account="account" />
+          <OrderHistory />
         </SfContentPage>
         <SfContentPage title="My reviews">
           <MyReviews />