From 34083ccb2d53f2c623a32eaed92422423da62136 Mon Sep 17 00:00:00 2001 From: mkucmus Date: Fri, 19 Jun 2020 23:01:45 +0200 Subject: [PATCH 1/3] fix(helpers): correct datetime format --- packages/default-theme/helpers/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/default-theme/helpers/index.js b/packages/default-theme/helpers/index.js index 83a1bf36f..83ba3d278 100644 --- a/packages/default-theme/helpers/index.js +++ b/packages/default-theme/helpers/index.js @@ -33,7 +33,7 @@ export const getSortingLabel = (sorting) => { return `${sorting.field} ${label}` } -export const formatDate = (date, format = `DD-MM-YYYY H:m:s`) => +export const formatDate = (date, format = `DD-MM-YYYY HH:mm:ss`) => dayjs(date).format(format) export const getSearchPageUrl = (searchTerm) => From 7ef50284f05aa8322cfbf2cdc511dd1566f1d20e Mon Sep 17 00:00:00 2001 From: mkucmus Date: Fri, 19 Jun 2020 23:02:48 +0200 Subject: [PATCH 2/3] fix(client): sort orders by creation date at my account --- packages/shopware-6-client/src/services/customerService.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/shopware-6-client/src/services/customerService.ts b/packages/shopware-6-client/src/services/customerService.ts index fc14b2a59..cd72eec69 100644 --- a/packages/shopware-6-client/src/services/customerService.ts +++ b/packages/shopware-6-client/src/services/customerService.ts @@ -121,7 +121,9 @@ export async function getCustomerAddresses( export async function getCustomerOrders( contextInstance: ShopwareApiInstance = defaultInstance ): Promise { - const resp = await contextInstance.invoke.get(getCustomerOrderEndpoint()); + const resp = await contextInstance.invoke.get( + `${getCustomerOrderEndpoint()}?sort=-createdAt` + ); return resp.data.orders?.elements || []; } From beae3413377cba76d43faceefcdf609f42b31ac6 Mon Sep 17 00:00:00 2001 From: mkucmus Date: Fri, 19 Jun 2020 23:07:41 +0200 Subject: [PATCH 3/3] test(client): add sort param --- .../services/CustomerService/getCustomerOrders.spec.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/shopware-6-client/__tests__/services/CustomerService/getCustomerOrders.spec.ts b/packages/shopware-6-client/__tests__/services/CustomerService/getCustomerOrders.spec.ts index 7c82971c2..259fbfd48 100644 --- a/packages/shopware-6-client/__tests__/services/CustomerService/getCustomerOrders.spec.ts +++ b/packages/shopware-6-client/__tests__/services/CustomerService/getCustomerOrders.spec.ts @@ -43,7 +43,9 @@ describe("CustomerService - getCustomerOrders", () => { }); const result = await getCustomerOrders(); expect(mockedGet).toBeCalledTimes(1); - expect(mockedGet).toBeCalledWith(getCustomerOrderEndpoint()); + expect(mockedGet).toBeCalledWith( + `${getCustomerOrderEndpoint()}?sort=-createdAt` + ); expect(result).toMatchObject([ { orderNumber: "1234",