@akinon/next 1.73.0 → 1.74.0

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @akinon/next
 
+## 1.74.0
+
+### Minor Changes
+
+- 5e3333d: ZERO-3078: get saved cards from page context
+- ed55a81: ZERO-3023: fix session cookie persistence after browser restart
+- 3bfa12a: ZERO-3003:Add fetchLoyaltyData and setLoyaltyData requests to RTK
+- 178044e: ZERO-3063: Add support for custom loader in SelectedPaymentOptionView
+- 9a50730: ZERO-3015: Add currency parameter to getOrders query
+- 31d5a71: ZERO-3078: filter valid redux middlewares
+- 56cdddc: ZERO-0000: SHOP-78125: Change unpaid_amount with total_amount_with_interest
+- f0b2f41: ZERO-3062: Update proxyRequest to handle multiple values for search parameters
+- c594b46: ZERO-3078: get saved cards from page context
+
 ## 1.73.0
 
 ### Minor Changes

package/api/auth.ts

@@ -132,9 +132,12 @@ const nextAuthOptions = (req: NextApiRequest, res: NextApiResponse) => {
           }
 
           if (sessionId) {
+            const maxAge = 30 * 24 * 60 * 60; // 30 days in seconds
+            const cookieOptions = `Path=/; HttpOnly; Secure; Max-Age=${maxAge}`;
+
             res.setHeader('Set-Cookie', [
-              `osessionid=${sessionId}; Path=/; HttpOnly; Secure;`,
-              `sessionid=${sessionId}; Path=/; HttpOnly; Secure;` // required to get 3D redirection form
+              `osessionid=${sessionId}; ${cookieOptions}`,
+              `sessionid=${sessionId}; ${cookieOptions}` // required to get 3D redirection form
             ]);
           }
 

package/api/client.ts

@@ -43,7 +43,11 @@ async function proxyRequest(...args) {
   Array.from(searchParams.keys())
     .filter((key) => !['slug', 'options'].includes(key))
     .forEach((key) => {
-      urlSearchParams.append(key, `${searchParams.get(key)}`);
+      urlSearchParams.delete(key);
+
+      searchParams.getAll(key).forEach((value) => {
+        urlSearchParams.append(key, value);
+      });
     });
 
   const extraHeaders: Record<string, string> = {};

package/components/selected-payment-option-view.tsx

@@ -2,7 +2,7 @@
 
 import { RootState } from 'redux/store';
 import { useAppSelector } from '../redux/hooks';
-import dynamic from 'next/dynamic';
+import dynamic, { DynamicOptionsLoadingProps } from 'next/dynamic';
 import { PaymentOptionViews } from 'views/checkout/steps/payment';
 import { useMemo } from 'react';
 
@@ -22,7 +22,13 @@ const paymentTypeToView = {
   // Add other mappings as needed
 };
 
-export default function SelectedPaymentOptionView() {
+interface SelectedPaymentOptionViewProps {
+  loader?: (loadingProps: DynamicOptionsLoadingProps) => JSX.Element;
+}
+
+export default function SelectedPaymentOptionView({
+  loader: Loader
+}: SelectedPaymentOptionViewProps) {
   const { payment_option, wallet_method } = useAppSelector(
     (state: RootState) => state.checkout.preOrder
   );
@@ -71,7 +77,7 @@ export default function SelectedPaymentOptionView() {
 
           return fallbackView;
         },
-        { ssr: false }
+        { ssr: false, loading: Loader || undefined }
       ),
     [payment_option?.pk]
   );

package/data/client/account.ts

@@ -21,6 +21,7 @@ interface GetOrdersParams {
   page?: number;
   createdDate?: string;
   endDate?: string;
+  currency?: 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, currency } = {}) =>
         buildClientRequestUrl(
-          account.getOrders({ page, limit, createdDate, endDate })
+          account.getOrders({ page, limit, createdDate, endDate, currency })
         )
     }),
     getOldOrders: builder.query<GetOrdersResponse, GetOrdersParams>({

package/data/client/checkout.ts

@@ -106,7 +106,7 @@ const completeMasterpassPayment = async (
     referenceNo,
     merchantId: credentials?.merchant_id ?? null,
     msisdn,
-    amount: preOrder?.unpaid_amount?.replace('.', '') ?? '',
+    amount: preOrder?.total_amount_with_interest?.replace('.', '') ?? '',
     additionalParams: additionalParams ?? extras?.additionalParams,
     language,
     installmentCount: preOrder?.installment?.installment_count ?? 1
@@ -793,6 +793,26 @@ export const checkoutApi = api.injectEndpoints({
           extra_field
         }
       })
+    }),
+    fetchLoyaltyData: build.query<CheckoutResponse, void>({
+      query: () => ({
+        url: buildClientRequestUrl(checkout.loyaltyCardPage, {
+          accept: 'application/json',
+          contentType: 'application/json'
+        }),
+        method: 'GET'
+      })
+    }),
+    setLoyaltyData: build.mutation<CheckoutResponse, number>({
+      query: (amount) => ({
+        url: buildClientRequestUrl(checkout.loyaltyCardPage, {
+          useFormData: true
+        }),
+        method: 'POST',
+        body: {
+          selected_loyalty_amount: amount
+        }
+      })
     })
   }),
   overrideExisting: false
@@ -832,6 +852,8 @@ export const {
   useSetDeliveryBagsMutation,
   useSetAttributeBasedShippingOptionsMutation,
   useSetOrderSelectionPageMutation,
+  useFetchLoyaltyDataQuery,
+  useSetLoyaltyDataMutation,
   useSetWalletSelectionPageMutation,
   useSetWalletPaymentPageMutation,
   useSetWalletCompletePageMutation

package/data/urls.ts

@@ -18,13 +18,15 @@ export const account = {
     limit,
     createdDate,
     endDate,
-    shipping_option_slug
+    shipping_option_slug,
+    currency
   }: {
     page?: number;
     limit?: number;
     createdDate?: string;
     endDate?: string;
     shipping_option_slug?: string;
+    currency?: string;
   }) =>
     `/users/orders/?page=${page || 1}&limit=${limit || 12}${
       createdDate ? `&created_date__gte=${createdDate}` : ''
@@ -32,7 +34,7 @@ export const account = {
       shipping_option_slug
         ? `&shipping_option_slug=${shipping_option_slug}`
         : ''
-    }`,
+    }${currency ? `&currency=${currency}` : ''}`,
   getOldOrders: ({ page, limit }: { page?: number; limit?: number }) =>
     `/users/old-orders/?page=${page || 1}&limit=${limit || 12}}`,
   getQuotations: (page?: number, status?: string, limit?: number) =>
@@ -125,7 +127,8 @@ export const checkout = {
   setAttributeBasedShippingOption:
     '/orders/checkout/?page=AttributeBasedShippingOptionSelectionPage',
   deliveryBagsPage: '/orders/checkout/?page=DeliveryBagsPage',
-  setOrderSelectionPage: '/orders/checkout/?page=OrderSelectionPage'
+  setOrderSelectionPage: '/orders/checkout/?page=OrderSelectionPage',
+  loyaltyCardPage: '/orders/checkout/?page=LoyaltyCardPage'
 };
 
 export const flatpage = {

package/package.json

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

package/plugins.d.ts

@@ -26,8 +26,8 @@ declare module '@akinon/pz-otp/src/redux/reducer' {
 
 declare module '@akinon/pz-saved-card' {
   export const savedCardReducer: any;
+  export const savedCardMiddleware: any;
   export const SavedCardOption: any;
-  export const savedCardReducer: any;
 }
 
 declare module '@akinon/pz-iyzico-saved-card' {

package/redux/middlewares/index.ts

@@ -13,6 +13,9 @@ import {
 import { api } from '../../data/client/api';
 import logger from '@akinon/next/utils/log';
 
+// Plugin middlewares
+import { savedCardMiddleware } from '@akinon/pz-saved-card';
+
 export const rtkQueryResponseHandler: Middleware =
   ({ dispatch }) =>
   (next) =>
@@ -48,7 +51,12 @@ const middlewares = [
   preOrderMiddleware,
   contextListMiddleware,
   hepsiPayMiddleware,
-  walletPaymentMiddleware
+  walletPaymentMiddleware,
+  savedCardMiddleware
 ];
 
-export default middlewares;
+// Filter out any non-function middleware to ensure all middlewares are valid and executable
+// This prevents runtime errors if any middleware is undefined or not properly initialized
+export default middlewares.filter(
+  (middleware) => typeof middleware === 'function'
+);