@akinon/next 1.43.0-rc.7 → 1.43.0-rc.9

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # @akinon/next
 
+## 1.43.0-rc.9
+
+### Minor Changes
+
+- bc2b411: ZERO-2825: Add attribute-based shipping options to checkout page
+
+## 1.43.0-rc.8
+
+### Minor Changes
+
+- 70279e7: ZERO-2817: Add metrics endpoint in default middleware
+- 9d94f7e: ZERO-2820: update parent pk usage for menu generator
+
 ## 1.43.0-rc.7
 
 ### Minor Changes

package/data/client/checkout.ts

@@ -676,6 +676,25 @@ export const checkoutApi = api.injectEndpoints({
           notes
         }
       })
+    }),
+    setAttributeBasedShippingOptions: build.mutation<
+      CheckoutResponse,
+      Record<string, number>
+    >({
+      query: (options) => ({
+        url: buildClientRequestUrl(checkout.setAttributeBasedShippingOption, {
+          useFormData: true
+        }),
+        method: 'POST',
+        body: {
+          attribute_based_shipping_options: JSON.stringify(options)
+        }
+      }),
+      async onQueryStarted(arg, { dispatch, queryFulfilled }) {
+        dispatch(setShippingStepBusy(true));
+        await queryFulfilled;
+        dispatch(setShippingStepBusy(false));
+      }
     })
   }),
   overrideExisting: false
@@ -711,5 +730,6 @@ export const {
   useCompleteLoyaltyPaymentMutation,
   useGetCheckoutLoyaltyBalanceQuery,
   usePayWithLoyaltyBalanceMutation,
-  useSetOrderNoteMutation
+  useSetOrderNoteMutation,
+  useSetAttributeBasedShippingOptionsMutation
 } = checkoutApi;

package/data/urls.ts

@@ -110,7 +110,9 @@ export const checkout = {
   completeLoyaltyPayment: '/orders/checkout/?page=LoyaltyPaymentSelectedPage',
   loyaltyMoneyUsage: '/orders/checkout/?page=LoyaltyMoneyUsagePage',
   setOrderNote: '/orders/checkout/?page=OrderNotePage',
-  couponSelectionPage: '/orders/checkout/?page=CouponSelectionPage'
+  couponSelectionPage: '/orders/checkout/?page=CouponSelectionPage',
+  setAttributeBasedShippingOption:
+    '/orders/checkout/?page=AttributeBasedShippingOptionSelectionPage'
 };
 
 export const flatpage = {

package/middlewares/default.ts

@@ -69,6 +69,10 @@ const withPzDefault =
       return NextResponse.json({ status: 'ok' });
     }
 
+    if (url.pathname.startsWith('/metrics')) {
+      return new NextResponse(null, { status: 200 });
+    }
+
     if (req.nextUrl.pathname.startsWith('/.well-known')) {
       const url = new URL(`${Settings.commerceUrl}${req.nextUrl.pathname}`);
       const req_ = await fetch(url.toString());

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@akinon/next",
   "description": "Core package for Project Zero Next",
-  "version": "1.43.0-rc.7",
+  "version": "1.43.0-rc.9",
   "private": false,
   "license": "MIT",
   "bin": {
@@ -30,7 +30,7 @@
     "set-cookie-parser": "2.6.0"
   },
   "devDependencies": {
-    "@akinon/eslint-plugin-projectzero": "1.43.0-rc.7",
+    "@akinon/eslint-plugin-projectzero": "1.43.0-rc.9",
     "@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

@@ -18,7 +18,8 @@ import {
   setShippingOptions,
   setDataSourceShippingOptions,
   setShippingStepCompleted,
-  setCreditPaymentOptions
+  setCreditPaymentOptions,
+  setAttributeBasedShippingOptions
 } from '../../redux/reducers/checkout';
 import { RootState, TypedDispatch } from 'redux/store';
 import { checkoutApi } from '../../data/client/checkout';
@@ -77,7 +78,8 @@ export const preOrderMiddleware: Middleware = ({
       shippingOptions,
       dataSourceShippingOptions,
       paymentOptions,
-      installmentOptions
+      installmentOptions,
+      attributeBasedShippingOptions
     } = getState().checkout;
     const { endpoints: apiEndpoints } = checkoutApi;
 
@@ -144,6 +146,24 @@ export const preOrderMiddleware: Middleware = ({
       );
     }
 
+    if (
+      Object.keys(attributeBasedShippingOptions).length > 0 &&
+      !preOrder.attribute_based_shipping_options
+    ) {
+      const initialSelectedOptions: Record<string, number> = Object.fromEntries(
+        Object.entries(attributeBasedShippingOptions).map(([key, options]) => [
+          key,
+          options[0].pk
+        ])
+      );
+
+      dispatch(
+        apiEndpoints.setAttributeBasedShippingOptions.initiate(
+          initialSelectedOptions
+        )
+      );
+    }
+
     if (!preOrder.payment_option && paymentOptions.length > 0) {
       dispatch(apiEndpoints.setPaymentOption.initiate(paymentOptions[0].pk));
     }
@@ -249,6 +269,14 @@ export const contextListMiddleware: Middleware = ({
           );
         }
 
+        if (context.page_context.attribute_based_shipping_options) {
+          dispatch(
+            setAttributeBasedShippingOptions(
+              context.page_context.attribute_based_shipping_options
+            )
+          );
+        }
+
         if (context.page_context.payment_options) {
           dispatch(setPaymentOptions(context.page_context.payment_options));
         }

package/redux/reducers/checkout.ts

@@ -15,7 +15,8 @@ import {
   PreOrder,
   RetailStore,
   ShippingOption,
-  DataSource
+  DataSource,
+  AttributeBasedShippingOption
 } from '../../types';
 
 export interface CheckoutState {
@@ -48,6 +49,8 @@ export interface CheckoutState {
   selectedBankAccountPk: number;
   loyaltyBalance?: string;
   retailStores: RetailStore[];
+  attributeBasedShippingOptions: AttributeBasedShippingOption[];
+  selectedShippingOptions: Record<string, number>;
 }
 
 const initialState: CheckoutState = {
@@ -78,7 +81,9 @@ const initialState: CheckoutState = {
   installmentOptions: [],
   bankAccounts: [],
   selectedBankAccountPk: null,
-  retailStores: []
+  retailStores: [],
+  attributeBasedShippingOptions: [],
+  selectedShippingOptions: {}
 };
 
 const checkoutSlice = createSlice({
@@ -156,6 +161,12 @@ const checkoutSlice = createSlice({
     },
     setRetailStores(state, { payload }) {
       state.retailStores = payload;
+    },
+    setAttributeBasedShippingOptions(state, { payload }) {
+      state.attributeBasedShippingOptions = payload;
+    },
+    setSelectedShippingOptions: (state, { payload }) => {
+      state.selectedShippingOptions = payload;
     }
   }
 });
@@ -184,7 +195,9 @@ export const {
   setBankAccounts,
   setSelectedBankAccountPk,
   setLoyaltyBalance,
-  setRetailStores
+  setRetailStores,
+  setAttributeBasedShippingOptions,
+  setSelectedShippingOptions
 } = checkoutSlice.actions;
 
 export default checkoutSlice.reducer;

package/types/commerce/checkout.ts

@@ -96,6 +96,7 @@ export interface PreOrder {
   gift_box?: GiftBox;
   credit_payment_option?: CheckoutCreditPaymentOption;
   data_source_shipping_options: any;
+  attribute_based_shipping_options?: AttributeBasedShippingOption[];
 }
 
 export interface GuestLoginFormParams {
@@ -135,6 +136,7 @@ export interface CheckoutContext {
     redirect_url?: string;
     context_data?: any;
     balance?: string;
+    attribute_based_shipping_options?: AttributeBasedShippingOption[];
     [key: string]: any;
   };
 }
@@ -160,3 +162,13 @@ export interface BankAccount {
   pk: number;
   sort_order: number;
 }
+
+export interface AttributeBasedShippingOption {
+  pk: number;
+  shipping_amount: string | null;
+  shipping_option_name: string | null;
+  shipping_option_logo: string | null;
+  attribute_value: string | null;
+  attribute_key: string;
+  [key: string]: any;
+}

package/utils/menu-generator.ts

@@ -13,8 +13,8 @@ export const menuGenerator = (arr: MenuItemType[]) => {
     });
 
     Object.values(data).forEach((item) => {
-      if (item.parent) {
-        data[item.parent.pk].children.push(item);
+      if (item.parent_pk) {
+        data[item.parent_pk].children.push(item);
       } else {
         tree.push(item);
       }