@akinon/next 1.83.0 → 1.84.0

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @akinon/next
 
+## 1.84.0
+
+### Minor Changes
+
+- 757ee53: ZERO-3207: Add SMS send & verify endpoints with state management
+- c0c1962: ZERO-3258: Add new API endpoints for fetching Bukalemun image URL and bundle product data
+- 0e05135: ZERO-3244: Encode URL search parameters
+
 ## 1.83.0
 
 ## 1.82.0

package/data/client/checkout.ts

@@ -13,7 +13,9 @@ import {
   ExtraField,
   GuestLoginFormParams,
   Order,
-  PreOrder
+  PreOrder,
+  SendSmsType,
+  VerifySmsType
 } from '../../types';
 import { buildClientRequestUrl } from '../../utils';
 import { api } from './api';
@@ -847,6 +849,24 @@ export const checkoutApi = api.injectEndpoints({
           selected_loyalty_amount: amount
         }
       })
+    }),
+    sendSms: build.mutation<CheckoutResponse, SendSmsType>({
+      query: (body) => ({
+        url: buildClientRequestUrl(checkout.sendSmsPage, {
+          useFormData: true
+        }),
+        method: 'POST',
+        body
+      })
+    }),
+    verifySms: build.mutation<CheckoutResponse, VerifySmsType>({
+      query: (body) => ({
+        url: buildClientRequestUrl(checkout.verifySmsPage, {
+          useFormData: true
+        }),
+        method: 'POST',
+        body
+      })
     })
   }),
   overrideExisting: false
@@ -892,5 +912,7 @@ export const {
   useSetWalletSelectionPageMutation,
   useSetWalletPaymentPageMutation,
   useSetWalletCompletePageMutation,
+  useSendSmsMutation,
+  useVerifySmsMutation,
   useResetCheckoutStateQuery
 } = checkoutApi;

package/data/client/misc.ts

@@ -92,6 +92,29 @@ export const miscApi = api.injectEndpoints({
       transformResponse: (response: { menu: MenuItemType[] }) => {
         return response.menu;
       }
+    }),
+    getBukalemunImageUrl: builder.query<
+      any,
+      { current_chapter: string; sku: string; selected_attributes: any }
+    >({
+      query: ({ current_chapter, sku, selected_attributes }) => {
+        const data = {
+          ...selected_attributes,
+          current_chapter,
+          sku
+        };
+
+        const params = new URLSearchParams(data);
+
+        return {
+          url: buildClientRequestUrl(
+            misc.bukalemunImageUrl(params.toString()),
+            {
+              responseType: 'json'
+            }
+          )
+        };
+      }
     })
   }),
   overrideExisting: true
@@ -102,5 +125,6 @@ export const {
   useEmailSubscriptionMutation,
   useSetLanguageMutation,
   useGetWidgetQuery,
-  useGetMenuQuery
+  useGetMenuQuery,
+  useGetBukalemunImageUrlQuery
 } = miscApi;

package/data/client/product.ts

@@ -75,6 +75,21 @@ export const productApi = api.injectEndpoints({
       query: (productPk) => ({
         url: buildClientRequestUrl(product.installments(productPk))
       })
+    }),
+    getBundleProductData: build.query<
+      any,
+      { productPk: string; queryString: string }
+    >({
+      query: ({ productPk, queryString }) => {
+        return {
+          url: buildClientRequestUrl(
+            product.bundleProduct(productPk, queryString),
+            {
+              responseType: 'json'
+            }
+          )
+        };
+      }
     })
   }),
   overrideExisting: true
@@ -85,5 +100,6 @@ export const {
   useGetProductByPkQuery,
   useGetRetailStoreStockMutation,
   useGetInstallmentsQuery,
-  useGetProductByParamsQuery
+  useGetProductByParamsQuery,
+  useGetBundleProductDataQuery
 } = productApi;

package/data/urls.ts

@@ -137,7 +137,9 @@ export const checkout = {
     '/orders/checkout/?page=AttributeBasedShippingOptionSelectionPage',
   deliveryBagsPage: '/orders/checkout/?page=DeliveryBagsPage',
   setOrderSelectionPage: '/orders/checkout/?page=OrderSelectionPage',
-  loyaltyCardPage: '/orders/checkout/?page=LoyaltyCardPage'
+  loyaltyCardPage: '/orders/checkout/?page=LoyaltyCardPage',
+  sendSmsPage: '/orders/checkout/?page=SendSmsPage',
+  verifySmsPage: '/orders/checkout/?page=VerifySmsPage'
 };
 
 export const flatpage = {
@@ -160,7 +162,8 @@ export const misc = {
       parent ? `&parent=${parent}` : ''
     }`,
   cmsSeo: (slug: string | string[]) => `/cms/seo/?url=${slug ? slug : '/'}`,
-  setCurrency: '/users/activate-currency/'
+  setCurrency: '/users/activate-currency/',
+  bukalemunImageUrl: (params: string) => `/bukalemun/?${params}`
 };
 
 export const product = {
@@ -174,7 +177,9 @@ export const product = {
   slug: (slug: string) => `/${slug}/`,
   categoryUrl: (pk: number) => `/products/${pk}/category_nodes/?limit=1`,
   breadcrumbUrl: (menuitemmodel: string) =>
-    `/menus/generate_breadcrumb/?item=${menuitemmodel}&generator_name=menu_item`
+    `/menus/generate_breadcrumb/?item=${menuitemmodel}&generator_name=menu_item`,
+  bundleProduct: (productPk: string, queryString: string) =>
+    `/bundle-product/${productPk}/?${queryString}`
 };
 
 export const wishlist = {

package/middlewares/default.ts

@@ -285,7 +285,9 @@ const withPzDefault =
                                 url.pathname =
                                   url.pathname +
                                   (/\/$/.test(url.pathname) ? '' : '/') +
-                                  `searchparams|${url.searchParams.toString()}`;
+                                  `searchparams|${encodeURIComponent(
+                                    url.searchParams.toString()
+                                  )}`;
                               }
 
                               if (

package/package.json

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

@@ -21,7 +21,8 @@ import {
   setShippingOptions,
   setShippingStepCompleted,
   setHepsipayAvailability,
-  setWalletPaymentData
+  setWalletPaymentData,
+  setPayOnDeliveryOtpModalActive
 } from '../../redux/reducers/checkout';
 import { RootState, TypedDispatch } from 'redux/store';
 import { checkoutApi } from '../../data/client/checkout';
@@ -203,8 +204,9 @@ export const contextListMiddleware: Middleware = ({
   getState
 }: MiddlewareParams) => {
   return (next) => (action) => {
-    const { isMobileApp } = getState().root;
+    const { isMobileApp, userPhoneNumber } = getState().root;
     const result: CheckoutResult = next(action);
+    const preOrder = result?.payload?.pre_order;
 
     if (result?.payload?.context_list) {
       result.payload.context_list.forEach((context) => {
@@ -323,6 +325,18 @@ export const contextListMiddleware: Middleware = ({
         if (context.page_context.retail_stores) {
           dispatch(setRetailStores(context.page_context.retail_stores));
         }
+
+        if (context.page_name === 'SendSmsPage' && !preOrder?.phone_number) {
+          dispatch(
+            checkoutApi.endpoints.sendSms.initiate({
+              phone_number: userPhoneNumber ?? preOrder?.user_phone_number
+            })
+          );
+        }
+
+        if (context.page_name === 'VerifySmsPage') {
+          dispatch(setPayOnDeliveryOtpModalActive(true));
+        }
       });
     }
 

package/redux/reducers/checkout.ts

@@ -70,6 +70,7 @@ export interface CheckoutState {
     };
     supportedMethods: string;
   };
+  payOnDeliveryOtpModalActive: boolean;
 }
 
 const initialState: CheckoutState = {
@@ -103,7 +104,8 @@ const initialState: CheckoutState = {
   retailStores: [],
   attributeBasedShippingOptions: [],
   selectedShippingOptions: {},
-  hepsipayAvailability: false
+  hepsipayAvailability: false,
+  payOnDeliveryOtpModalActive: false
 };
 
 const checkoutSlice = createSlice({
@@ -193,6 +195,9 @@ const checkoutSlice = createSlice({
     },
     setWalletPaymentData(state, { payload }) {
       state.walletPaymentData = payload;
+    },
+    setPayOnDeliveryOtpModalActive(state, { payload }) {
+      state.payOnDeliveryOtpModalActive = payload;
     }
   }
 });
@@ -225,7 +230,8 @@ export const {
   setAttributeBasedShippingOptions,
   setSelectedShippingOptions,
   setHepsipayAvailability,
-  setWalletPaymentData
+  setWalletPaymentData,
+  setPayOnDeliveryOtpModalActive
 } = checkoutSlice.actions;
 
 export default checkoutSlice.reducer;

package/redux/reducers/root.ts

@@ -14,7 +14,8 @@ const initialState = {
     open: false,
     title: null,
     content: null
-  }
+  },
+  userPhoneNumber: null
 };
 
 const rootSlice = createSlice({
@@ -45,6 +46,9 @@ const rootSlice = createSlice({
       state.rootModal.open = false;
       state.rootModal.title = null;
       state.rootModal.content = null;
+    },
+    setUserPhoneNumber(state, { payload }) {
+      state.userPhoneNumber = payload;
     }
   }
 });
@@ -55,7 +59,8 @@ export const {
   toggleMiniBasket,
   setHighlightedItem,
   openRootModal,
-  closeRootModal
+  closeRootModal,
+  setUserPhoneNumber
 } = rootSlice.actions;
 
 export default rootSlice.reducer;

package/types/commerce/checkout.ts

@@ -107,6 +107,7 @@ export interface PreOrder {
   context_extras?: ExtraField;
   token?: string;
   agreement_confirmed?: boolean;
+  phone_number?: string;
 }
 
 export type ExtraField = Record<string, any>;
@@ -199,3 +200,11 @@ export interface MiddlewareParams {
   getState: () => RootState;
   dispatch: TypedDispatch;
 }
+
+export type SendSmsType = {
+  phone_number: string;
+};
+
+export type VerifySmsType = {
+  verify_code: string;
+};