@akinon/next 1.60.0-rc.19 → 1.60.0-rc.21

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @akinon/next
 
+## 1.60.0-rc.21
+
+### Minor Changes
+
+- 663bda9b: ZERO-2990: Refactor account API to include shipping option slug in getOrders query
+
+## 1.60.0-rc.20
+
+### Minor Changes
+
+- Revert ZERO-2938
+
 ## 1.60.0-rc.19
 
 ### Minor Changes

package/data/client/account.ts

@@ -21,6 +21,7 @@ interface GetOrdersParams {
   page?: number;
   createdDate?: string;
   endDate?: string;
+  shipping_option_slug?: string;
 }
 
 export interface GetQuotationsResponse {
@@ -114,9 +115,9 @@ const accountApi = api.injectEndpoints({
       query: (id) => buildClientRequestUrl(account.orderId(id))
     }),
     getOrders: builder.query<GetOrdersResponse, GetOrdersParams>({
-      query: ({ page, limit, createdDate, endDate } = {}) =>
+      query: ({ page, limit, createdDate, endDate, shipping_option_slug } = {}) =>
         buildClientRequestUrl(
-          account.getOrders({ page, limit, createdDate, endDate })
+          account.getOrders({ page, limit, createdDate, endDate, shipping_option_slug })
         )
     }),
     getQuotations: builder.query<GetQuotationsResponse, GetQuotationsParams>({

package/data/urls.ts

@@ -17,16 +17,22 @@ export const account = {
     page,
     limit,
     createdDate,
-    endDate
+    endDate,
+    shipping_option_slug
   }: {
     page?: number;
     limit?: number;
     createdDate?: string;
     endDate?: string;
+    shipping_option_slug?: string;
   }) =>
-    `/users/orders/?page=${page || 1}&limit=${limit || 12} ${
+    `/users/orders/?page=${page || 1}&limit=${limit || 12}${
       createdDate ? `&created_date__gte=${createdDate}` : ''
-    } ${endDate ? `&created_date__lte=${endDate}` : ''}`,
+    }${endDate ? `&created_date__lte=${endDate}` : ''}${
+      shipping_option_slug
+        ? `&shipping_option_slug=${shipping_option_slug}`
+        : ''
+    }`,
   getQuotations: (page?: number, status?: string, limit?: number) =>
     `/b2b/my-quotations/?page=${page || 1}` +
     (status ? `&status=${status}` : '') +

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@akinon/next",
   "description": "Core package for Project Zero Next",
-  "version": "1.60.0-rc.19",
+  "version": "1.60.0-rc.21",
   "private": false,
   "license": "MIT",
   "bin": {
@@ -30,7 +30,7 @@
     "set-cookie-parser": "2.6.0"
   },
   "devDependencies": {
-    "@akinon/eslint-plugin-projectzero": "1.60.0-rc.19",
+    "@akinon/eslint-plugin-projectzero": "1.60.0-rc.21",
     "@types/react-redux": "7.1.30",
     "@types/set-cookie-parser": "2.4.7",
     "@typescript-eslint/eslint-plugin": "6.7.4",

package/redux/middlewares/checkout.ts

@@ -24,7 +24,7 @@ import {
 import { RootState, TypedDispatch } from 'redux/store';
 import { checkoutApi } from '../../data/client/checkout';
 import { CheckoutContext, PreOrder } from '../../types';
-import { getCookie } from '../../utils';
+import { getCookie, setCookie } from '../../utils';
 import settings from 'settings';
 import { LocaleUrlStrategy } from '../../localization';
 import { showMobile3dIframe } from '../../utils/mobile-3d-iframe';