From bf6ca2826d08c10aa6eb8880b61baa14d48a6914 Mon Sep 17 00:00:00 2001 From: Artur Tagisow Date: Wed, 18 May 2022 15:24:42 +0200 Subject: [PATCH 1/3] refactor: remove useless order getters refactor: remove getItems aswell --- .../modules/checkout/getters/orderGetters.ts | 18 ------------------ .../MyAccount/OrderHistory/OrderHistory.vue | 2 +- 2 files changed, 1 insertion(+), 19 deletions(-) diff --git a/packages/theme/modules/checkout/getters/orderGetters.ts b/packages/theme/modules/checkout/getters/orderGetters.ts index a9aba451a..eed20ca4b 100644 --- a/packages/theme/modules/checkout/getters/orderGetters.ts +++ b/packages/theme/modules/checkout/getters/orderGetters.ts @@ -3,24 +3,12 @@ import { CustomerOrder, OrderItemInterface } from '~/modules/GraphQL/types'; export const getDate = (order: CustomerOrder): string => new Date(order?.order_date?.replace(/ /g, 'T')).toLocaleDateString() || ''; -export const getId = (order: CustomerOrder): string => order?.number || ''; - export const getStatus = (order: CustomerOrder): string => order?.status || 'Failed'; export const getPrice = (order: CustomerOrder): number | null => order?.total?.base_grand_total?.value || 0; -export const getItems = (order: CustomerOrder): OrderItemInterface[] => order?.items || []; - -export const getItemSku = (item: OrderItemInterface): string => item?.product_sku || ''; - -export const getItemName = (item: OrderItemInterface): string => item?.product_name || ''; - -export const getItemQty = (item: OrderItemInterface): number => item?.quantity_ordered || 0; - export const getItemPrice = (item: OrderItemInterface): number => item?.product_sale_price?.value || 0; -export const getFormattedPrice = (price: OrderItemInterface) => String(price); - const getPagination = (orders: any): AgnosticPagination => ({ currentPage: orders?.page_info?.current_page || 1, totalPages: orders?.page_info?.total_pages || 1, @@ -31,15 +19,9 @@ const getPagination = (orders: any): AgnosticPagination => ({ const orderGetters = { getDate, - getId, getStatus, getPrice, - getItems, - getItemSku, - getItemName, - getItemQty, getItemPrice, - getFormattedPrice, getPagination, }; diff --git a/packages/theme/modules/customer/pages/MyAccount/OrderHistory/OrderHistory.vue b/packages/theme/modules/customer/pages/MyAccount/OrderHistory/OrderHistory.vue index 52d6fcabf..d9fe30f8d 100644 --- a/packages/theme/modules/customer/pages/MyAccount/OrderHistory/OrderHistory.vue +++ b/packages/theme/modules/customer/pages/MyAccount/OrderHistory/OrderHistory.vue @@ -191,7 +191,7 @@ export default defineComponent({ loading, orderGetters, // @ts-expect-error Wrong type returned by useUserOrder. See M2-579 in VSF Jira - orders: computed(() => orderGetters.getItems(orders.value)), + orders: computed(() => orders.value.items), pagination, tableHeaders, th, From 1a73205e2ba36bb09db16720784c719063947c60 Mon Sep 17 00:00:00 2001 From: Artur Tagisow Date: Wed, 18 May 2022 15:26:44 +0200 Subject: [PATCH 2/3] chore: set getPagination type --- packages/theme/modules/checkout/getters/orderGetters.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/theme/modules/checkout/getters/orderGetters.ts b/packages/theme/modules/checkout/getters/orderGetters.ts index eed20ca4b..2ab791b20 100644 --- a/packages/theme/modules/checkout/getters/orderGetters.ts +++ b/packages/theme/modules/checkout/getters/orderGetters.ts @@ -1,5 +1,5 @@ import { AgnosticPagination } from '~/composables/types'; -import { CustomerOrder, OrderItemInterface } from '~/modules/GraphQL/types'; +import { CustomerOrders, CustomerOrder, OrderItemInterface } from '~/modules/GraphQL/types'; export const getDate = (order: CustomerOrder): string => new Date(order?.order_date?.replace(/ /g, 'T')).toLocaleDateString() || ''; @@ -9,7 +9,7 @@ export const getPrice = (order: CustomerOrder): number | null => order?.total?.b export const getItemPrice = (item: OrderItemInterface): number => item?.product_sale_price?.value || 0; -const getPagination = (orders: any): AgnosticPagination => ({ +const getPagination = (orders: CustomerOrders): AgnosticPagination => ({ currentPage: orders?.page_info?.current_page || 1, totalPages: orders?.page_info?.total_pages || 1, totalItems: orders?.total_count || 0, From 7dc327de56841f0cff63da36d198480c86523d98 Mon Sep 17 00:00:00 2001 From: Artur Tagisow Date: Thu, 19 May 2022 10:05:58 +0200 Subject: [PATCH 3/3] refactor: pr fixes --- .../theme/modules/checkout/getters/orderGetters.ts | 13 +++++-------- .../pages/MyAccount/OrderHistory/OrderHistory.vue | 6 ++---- .../pages/MyAccount/OrderHistory/SingleOrder.vue | 3 +-- 3 files changed, 8 insertions(+), 14 deletions(-) diff --git a/packages/theme/modules/checkout/getters/orderGetters.ts b/packages/theme/modules/checkout/getters/orderGetters.ts index 2ab791b20..e965e582f 100644 --- a/packages/theme/modules/checkout/getters/orderGetters.ts +++ b/packages/theme/modules/checkout/getters/orderGetters.ts @@ -1,13 +1,11 @@ -import { AgnosticPagination } from '~/composables/types'; -import { CustomerOrders, CustomerOrder, OrderItemInterface } from '~/modules/GraphQL/types'; +import type { AgnosticPagination } from '~/composables/types'; +import type { CustomerOrders, CustomerOrder, OrderItemInterface } from '~/modules/GraphQL/types'; -export const getDate = (order: CustomerOrder): string => new Date(order?.order_date?.replace(/ /g, 'T')).toLocaleDateString() || ''; +export const getDate = (order: CustomerOrder): string => new Date(order?.order_date?.replace(/ /g, 'T')).toLocaleDateString(); -export const getStatus = (order: CustomerOrder): string => order?.status || 'Failed'; +export const getPrice = (order: CustomerOrder): number => order?.total?.base_grand_total?.value ?? 0; -export const getPrice = (order: CustomerOrder): number | null => order?.total?.base_grand_total?.value || 0; - -export const getItemPrice = (item: OrderItemInterface): number => item?.product_sale_price?.value || 0; +export const getItemPrice = (item: OrderItemInterface): number => item?.product_sale_price?.value ?? 0; const getPagination = (orders: CustomerOrders): AgnosticPagination => ({ currentPage: orders?.page_info?.current_page || 1, @@ -19,7 +17,6 @@ const getPagination = (orders: CustomerOrders): AgnosticPagination => ({ const orderGetters = { getDate, - getStatus, getPrice, getItemPrice, getPagination, diff --git a/packages/theme/modules/customer/pages/MyAccount/OrderHistory/OrderHistory.vue b/packages/theme/modules/customer/pages/MyAccount/OrderHistory/OrderHistory.vue index d9fe30f8d..4055ded18 100644 --- a/packages/theme/modules/customer/pages/MyAccount/OrderHistory/OrderHistory.vue +++ b/packages/theme/modules/customer/pages/MyAccount/OrderHistory/OrderHistory.vue @@ -47,7 +47,7 @@ {{ orderGetters.getDate(order) }} {{ $fc(orderGetters.getPrice(order)) }} - {{ orderGetters.getStatus(order) }} + {{ order.status }} { - const status = orderGetters.getStatus(order); - switch (status) { + switch (order.status) { case AgnosticOrderStatus.Open: return 'text-warning'; case AgnosticOrderStatus.Complete: @@ -190,7 +189,6 @@ export default defineComponent({ getStatusTextClass, loading, orderGetters, - // @ts-expect-error Wrong type returned by useUserOrder. See M2-579 in VSF Jira orders: computed(() => orders.value.items), pagination, tableHeaders, diff --git a/packages/theme/modules/customer/pages/MyAccount/OrderHistory/SingleOrder.vue b/packages/theme/modules/customer/pages/MyAccount/OrderHistory/SingleOrder.vue index 27b5e418a..af61a6a0a 100644 --- a/packages/theme/modules/customer/pages/MyAccount/OrderHistory/SingleOrder.vue +++ b/packages/theme/modules/customer/pages/MyAccount/OrderHistory/SingleOrder.vue @@ -64,7 +64,7 @@ {{ $t('Status') }} @@ -170,7 +170,6 @@ export default defineComponent({ ordersRoute, asyncData, getDate: orderGetters.getDate, - getStatus: orderGetters.getStatus, }; }, });