@akinon/projectzero 2.0.0-beta.12 → 2.0.0-beta.14

package/app-template/src/hooks/use-stock-alert.ts

@@ -0,0 +1,74 @@
+import React, { useState } from 'react';
+import { useAddStockAlertMutation } from '@akinon/next/data/client/wishlist';
+import { Trans } from '@akinon/next/components/trans';
+import { useLocalization } from '@akinon/next/hooks';
+
+interface UseStockAlertProps {
+  productPk: number;
+  userEmail?: string;
+}
+
+export const useStockAlert = ({ productPk, userEmail }: UseStockAlertProps) => {
+  const { t } = useLocalization();
+  const [isModalOpen, setIsModalOpen] = useState(false);
+  const [stockAlertResponseMessage, setStockAlertResponseMessage] = useState<React.ReactNode | null>(null);
+  const [productError, setProductError] = useState<React.ReactNode | null>(null);
+  
+  const [addStockAlert, { isLoading: isAddToStockAlertLoading }] = useAddStockAlertMutation();
+
+  const handleSuccess = () => {
+    setStockAlertResponseMessage(React.createElement(
+      Trans,
+      {
+        i18nKey: "product.stock_alert.success_description",
+        components: {
+          Email: React.createElement('span', {}, userEmail)
+        }
+      }
+    ));
+    setIsModalOpen(true);
+    setProductError(null);
+  };
+
+  const handleError = (err: any) => {
+    if (err.status !== 401) {
+      setStockAlertResponseMessage(
+        t('product.stock_alert.error_description').toString()
+      );
+      setIsModalOpen(true);
+    }
+  };
+
+  const addProductToStockAlertList = async () => {
+    try {
+      await addStockAlert({
+        productPk,
+        email: userEmail
+      })
+        .unwrap()
+        .then(handleSuccess)
+        .catch(handleError);
+    } catch (error: any) {
+      setProductError(error?.data?.non_field_errors || null);
+    }
+  };
+
+  const closeModal = () => {
+    setIsModalOpen(false);
+  };
+
+  const clearError = () => {
+    setProductError(null);
+  };
+
+  return {
+    addProductToStockAlertList,
+    isModalOpen,
+    setIsModalOpen,
+    stockAlertResponseMessage,
+    productError,
+    isAddToStockAlertLoading,
+    closeModal,
+    clearError
+  };
+};

package/app-template/src/plugins.js

@@ -1,4 +1,3 @@
-// we are holding all of the plugins because of the development enviroment.
 module.exports = [
   'pz-basket-gift-pack',
   'pz-click-collect',
@@ -12,7 +11,18 @@ module.exports = [
   'pz-masterpass',
   'pz-b2b',
   'pz-akifast',
+  'pz-multi-basket',
   'pz-saved-card',
   'pz-tabby-extension',
-  'pz-tamara-extension'
+  'pz-apple-pay',
+  'pz-tamara-extension',
+  'pz-hepsipay',
+  'pz-flow-payment',
+  'pz-virtual-try-on',
+  'pz-cybersource-uc',
+  'pz-hepsipay',
+  'pz-masterpass-rest',
+  'pz-similar-products',
+  'pz-haso',
+  'pz-google-pay'
 ];

package/app-template/src/redux/middlewares/category.ts

@@ -1,5 +1,5 @@
 import { Facet } from '@akinon/next/types';
-import { Middleware } from '@reduxjs/toolkit';
+import { Middleware, UnknownAction } from '@reduxjs/toolkit';
 import { setSelectedFacets } from '@theme/redux/reducers/category';
 
 const getSelectedFacets = (facets: Array<Facet>) => {
@@ -21,13 +21,14 @@ const getSelectedFacets = (facets: Array<Facet>) => {
 const categoryMiddleware: Middleware = ({ dispatch, getState }) => {
   return (next) => (action) => {
     const result = next(action);
+    const act = action as UnknownAction;
 
-    if (action.type === 'category/setFacets') {
-      const facets: Array<Facet> = result.payload;
+    if (act.type === 'category/setFacets') {
+      const facets: Array<Facet> = (result as { payload: Array<Facet> }).payload;
       const selectedFacets = getSelectedFacets(facets);
 
       dispatch(setSelectedFacets(selectedFacets));
-    } else if (action.type === 'category/toggleFacet') {
+    } else if (act.type === 'category/toggleFacet') {
       const selectedFacets = getSelectedFacets(
         getState().category.selectedFacets
       );

package/app-template/src/redux/store.ts

@@ -14,6 +14,11 @@ import {
 import categoryReducer from '@theme/redux/reducers/category';
 import categoryMiddleware from '@theme/redux/middlewares/category';
 
+// Import all action creators from akinon-next
+import * as defaultActions from '@akinon/next/redux/actions';
+import { rtkApiActionCreators } from '@akinon/next/redux/actions';
+import * as categorySlice from './reducers/category';
+
 const _middlewares: Middleware[] = [...middlewares, categoryMiddleware];
 
 const _reducers = {
@@ -21,13 +26,28 @@ const _reducers = {
   category: categoryReducer
 };
 
+const actionCreators = {
+  // Slice actions (automatically extracted from akinon-next)
+  ...defaultActions,
+  // RTK Query API endpoints from akinon-next
+  ...rtkApiActionCreators,
+  // Local category slice actions
+  ...categorySlice
+};
+
 export const makeStore = (): Store<{
   [key in keyof typeof _reducers]: ReturnType<typeof _reducers[key]>;
 }> =>
   configureStore({
     reducer: _reducers,
     middleware: (getDefaultMiddleware) =>
-      getDefaultMiddleware().concat(_middlewares)
+      getDefaultMiddleware().concat(_middlewares),
+    devTools:
+      process.env.NODE_ENV !== 'production'
+        ? {
+            actionCreators
+          }
+        : false
   });
 
 export type AppStore = ReturnType<typeof makeStore>;

package/app-template/src/routes/index.ts

@@ -27,7 +27,8 @@ enum ACCOUNT_ROUTES {
 
 enum ORDER_ROUTES {
   CHECKOUT = '/orders/checkout',
-  CHECKOUT_COMPLETED = '/orders/completed'
+  CHECKOUT_COMPLETED = '/orders/completed',
+  PAYMENT_GATEWAY_HASO = '/payment-gateway/haso'
 }
 
 enum FLATPAGE_ROUTES {

package/app-template/src/settings.js

@@ -62,5 +62,7 @@ module.exports = {
   redis: {
     defaultExpirationTime: 900 // 15 min
   },
-  customNotFoundEnabled: false
+  customNotFoundEnabled: false,
+  usePzSegment: true,
+  commerceRedirectionIgnoreList: ['/users/reset']
 };

package/app-template/src/types/index.ts

@@ -1,4 +1,58 @@
 export * from '@theme/types/widgets';
+import { SignInOptions } from 'next-auth/react';
+
+/**
+ * Form types for authentication
+ */
+export enum FormType {
+  login = 'login',
+  register = 'register',
+  loyaltyRegister = 'loyaltyRegister',
+  otpLogin = 'otpLogin'
+}
+
+/**
+ * Extended SignInOptions with additional form type support for Project Zero Next authentication
+ *
+ * @example
+ * ```typescript
+ * // For standard login
+ * signIn('default', {
+ *   ...data,
+ *   formType: FormType.login
+ * } as PzSignInOptions);
+ *
+ * // For standard user registration
+ * signIn('default', {
+ *   ...data,
+ *   formType: FormType.register
+ * } as PzSignInOptions);
+ *
+ * // For loyalty program registration
+ * signIn('default', {
+ *   ...data,
+ *   formType: FormType.loyaltyRegister
+ * } as PzSignInOptions);
+ *
+ * // For OTP login
+ * signIn('default', {
+ *   ...data,
+ *   formType: FormType.otpLogin
+ * } as PzSignInOptions);
+ * ```
+ */
+export interface PzSignInOptions extends SignInOptions<boolean> {
+  /**
+   * Type of the authentication form being submitted
+   *
+   * Available options:
+   * - `FormType.login` - Standard email/password login
+   * - `FormType.register` - Standard user registration
+   * - `FormType.loyaltyRegister` - Loyalty program registration (use this for loyalty signups)
+   * - `FormType.otpLogin` - OTP-based login via SMS
+   */
+  formType?: FormType;
+}
 
 export type RegisterFormType = {
   email: string;
@@ -10,14 +64,14 @@ export type RegisterFormType = {
   kvkk_confirm: boolean;
   email_allowed: boolean;
   sms_allowed: boolean;
-  formType: string;
+  formType: FormType;
   locale: string;
 };
 
 export type LoginFormType = {
   email: string;
   password: string;
-  formType: string;
+  formType: FormType;
   locale: string;
 };
 
@@ -25,7 +79,7 @@ export type OtpLoginFormType = {
   phone: string;
   code?: string;
   locale: string;
-  formType: string;
+  formType: FormType;
 };
 
 export enum WIDGET_TYPE {
@@ -71,3 +125,20 @@ export interface SeoProps {
   ogPriceAmount?: string;
   ogPriceCurrency?: string;
 }
+
+export interface ModalProps {
+  portalId: string;
+  children?: React.ReactNode;
+  open?: boolean;
+  setOpen?: (open: boolean) => void;
+  title?: React.ReactNode;
+  showCloseButton?: React.ReactNode;
+  className?: string;
+  overlayClassName?: string;
+  headerWrapperClassName?: string;
+  titleClassName?: string;
+  closeButtonClassName?: string;
+  iconName?: string;
+  iconSize?: number;
+  iconClassName?: string;
+}

package/app-template/src/types/next-auth.d.ts

@@ -1,9 +1,9 @@
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
-import NextAuth from 'next-auth';
+import 'next-auth';
 
 declare module 'next-auth' {
   interface User {
-    id?: number;
+    id?: string;
     pk: number;
     firstName: string;
     lastName: string;

package/app-template/src/utils/variant-validation.ts

@@ -0,0 +1,41 @@
+import React from 'react';
+import { Trans } from '@akinon/next/components/trans';
+import { VariantType } from '@akinon/next/types';
+
+export const isVariantSelectionComplete = (variants: VariantType[]): boolean => {
+  return variants?.every((variant) =>
+    variant?.options.some((opt) => opt.is_selected)
+  );
+};
+
+export const getUnselectedVariant = (variants: VariantType[]): VariantType | undefined => {
+  return variants.find((variant) =>
+    variant.options.every((opt) => !opt.is_selected)
+  );
+};
+
+export const createVariantErrorMessage = (unselectedVariant: VariantType) => {
+  const TransComponent = Trans as any;
+  return React.createElement(
+    TransComponent,
+    {
+      i18nKey: "product.please_select_variant",
+      components: {
+        VariantName: React.createElement('span', {}, unselectedVariant.attribute_name)
+      }
+    }
+  );
+};
+
+export const validateVariantSelection = (variants: VariantType[]) => {
+  const unselectedVariant = getUnselectedVariant(variants);
+  
+  if (unselectedVariant) {
+    return {
+      isValid: false,
+      errorMessage: createVariantErrorMessage(unselectedVariant)
+    };
+  }
+
+  return { isValid: true, errorMessage: null };
+};

package/app-template/src/views/account/address-form.tsx

@@ -259,23 +259,25 @@ export const AddressForm = (props: Props) => {
       {/* TODO: Fix select and textarea components */}
 
       <Select
-        className="w-full border-gray-500 text-sm mt-2"
+        className="w-full border-gray-500 text-sm"
         options={countryOptions}
         {...register('country')}
         error={errors.country}
         data-testid="address-form-country"
         label={t('account.address_book.form.country.title')}
+        labelClassName="mb-3"
         required
       />
 
       {city && (
         <Select
-          className="w-full border-gray-500 text-sm mt-2"
+          className="w-full border-gray-500 text-sm"
           options={cityOptions}
           {...register('city')}
           error={errors.city}
           data-testid="address-form-city"
           label={t('account.address_book.form.province.title')}
+          labelClassName="mb-3"
           required
         />
       )}
@@ -283,24 +285,26 @@ export const AddressForm = (props: Props) => {
         <div className="flex gap-4">
           <div className="flex-1">
             <Select
-              className="w-full border-gray-500 text-sm mt-2"
+              className="w-full border-gray-500 text-sm"
               options={townshipOptions}
               {...register('township')}
               error={errors.township}
               data-testid="address-form-township"
               label={t('account.address_book.form.township.title')}
+              labelClassName="mb-3"
               required
             />
           </div>
           {district && (
             <div className="flex-1">
               <Select
-                className="w-full border-gray-500 text-sm mt-2"
+                className="w-full border-gray-500 text-sm"
                 options={districtOptions}
                 {...register('district')}
                 error={errors.district}
                 data-testid="address-form-district"
                 label={t('account.address_book.form.district.title')}
+                labelClassName="mb-3"
                 required
               />
             </div>

package/app-template/src/views/account/contact-form.tsx

@@ -111,7 +111,7 @@ const ContactForm = () => {
     resolver: yupResolver(contactFormSchema(t))
   });
 
-  const onSubmit: SubmitHandler<ContactFormType> = (data, event) => {
+  const onSubmit: SubmitHandler<ContactFormType> = (data) => {
     const formData = new FormData();
 
     Object.keys(data ?? {}).forEach((key) => {
@@ -242,7 +242,7 @@ const ContactForm = () => {
               <span className="text-secondary">*</span>
             </label>
             <textarea
-              className="border-gray-500 border w-full text-xs p-2.5 focus-visible:outline-hidden focus:border-black hover:border-black"
+              className="border-gray-500 border w-full text-xs p-2.5 focus-visible:outline-none focus:border-black hover:border-black"
               rows={7}
               name="message"
               // eslint-disable-next-line @typescript-eslint/ban-ts-comment

package/app-template/src/views/account/content-header.tsx

@@ -31,14 +31,15 @@ export const ContentHeader = (props: Props) => {
       </h3>
       <Select
         onChange={handleChange}
-        className="w-full mb-4 bg-white md:mb-0 md:w-56 md:mr-4 text-xs"
+        className="w-full mb-4 md:mb-0 md:w-56 text-xs"
         options={orders}
         data-testid="account-orders-header-select"
       ></Select>
       <Button
         className={clsx(
-          'w-full md:w-56',
-          isButtonDisabled && 'hover:bg-black/75 hover:text-white'
+          'w-full md:w-56 md:ms-4',
+          isButtonDisabled &&
+            'hover:bg-black hover:text-white disabled:opacity-75'
         )}
         onClick={handleClick}
         data-testid="account-orders-header-button"

package/app-template/src/views/account/faq/faq-tabs.tsx

@@ -3,6 +3,7 @@
 import { Accordion, LoaderSpinner, TabPanel, Tabs } from '@theme/components';
 import React from 'react';
 import { useGetWidgetQuery } from '@akinon/next/data/client/misc';
+import { useLocalization } from '@akinon/next/hooks';
 
 interface Props {
   searchKey?: string;
@@ -11,6 +12,7 @@ interface Props {
 export function FaqTabs(props: Props) {
   const { searchKey } = props;
   const { data, isLoading } = useGetWidgetQuery('faq');
+  const { locale } = useLocalization();
 
   if (isLoading) {
     return <LoaderSpinner className="mt-4" />;
@@ -29,8 +31,12 @@ export function FaqTabs(props: Props) {
               {data?.attributes?.faq_contents
                 ?.filter(
                   (faq) =>
-                    faq.value.content.toLocaleLowerCase().includes(searchKey) ||
-                    faq.value.title.toLocaleLowerCase().includes(searchKey)
+                    faq.value.content
+                      .toLocaleLowerCase(locale)
+                      .includes(searchKey) ||
+                    faq.value.title
+                      .toLocaleLowerCase(locale)
+                      .includes(searchKey)
                 )
                 .map((faq, index) => {
                   if (faq.value.category == item.value.category_id) {

package/app-template/src/views/account/order.tsx

@@ -60,7 +60,7 @@ export const Order = (props) => {
           <ul className="flex flex-wrap gap-3.5 mb-6 items-center md:mb-0">
             {props?.orderitem_set?.slice(0, 3).map((item, index) => (
               // TODO: Static image will change (TR)
-              <li className="shrink-0" key={index}>
+              <li className="flex-shrink-0" key={index}>
                 <Image
                   src={
                     item?.product?.image ? item.product.image : '/noimage.jpg'

package/app-template/src/views/account/orders/order-cancellation-item.tsx

@@ -45,7 +45,7 @@ export const OrderCancellationItem = ({
             onClick={handleClick}
           />
         )}
-        <div className="shrink-0">
+        <div className="flex-shrink-0">
           <Link href={item.product.absolute_url}>
             <Image
               src={item.product.image ? item.product.image : '/noimage.jpg'}

package/app-template/src/views/anonymous-tracking/order-detail/index.tsx

@@ -136,7 +136,7 @@ export const AnonymousTrackingOrderDetail = ({ order }) => {
                           key={index}
                         >
                           <div className="flex gap-3 mb-5 lg:mb-0">
-                            <div className="shrink-0">
+                            <div className="flex-shrink-0">
                               <Link
                                 className="block"
                                 href={item?.product?.absolute_url}

package/app-template/src/views/basket/basket-item.tsx

@@ -39,7 +39,12 @@ export const BasketItem = (props: Props) => {
     quantity: number,
     attributes: object = {}
   ) => {
-    const requestParams: any = {
+    const requestParams: {
+      product: number;
+      quantity: number;
+      attributes: object;
+      namespace?: string;
+    } = {
       product: productPk,
       quantity,
       attributes

package/app-template/src/views/basket/summary.tsx

@@ -223,6 +223,22 @@ export const Summary = (props: Props) => {
           component={Component.OneClickCheckoutButtons}
           props={checkoutProviderProps}
         />
+
+        <div className="mt-4">
+          <PluginModule
+            component={Component.BasketVirtualTryOn}
+            props={{
+              basketItems: basket.basketitem_set.map((item) => ({
+                pk: item.product.pk,
+                sku: item.product.sku,
+                name: item.product.name,
+                productimage_set: item.product.productimage_set,
+                attributes: item.product.attributes,
+                category: (item.product as any).category
+              }))
+            }}
+          />
+        </div>
       </div>
     </div>
   );

package/app-template/src/views/breadcrumb.tsx

@@ -12,7 +12,7 @@ export interface BreadcrumbProps {
 }
 
 export default function Breadcrumb(props: BreadcrumbProps) {
-  const { t } = useLocalization();
+  const { t, locale } = useLocalization();
   const { breadcrumbList = [] } = props;
 
   const list = [
@@ -28,7 +28,7 @@ export default function Breadcrumb(props: BreadcrumbProps) {
       {list.map((item, index) => (
         <Fragment key={index}>
           <Link href={item.url}>
-            {capitalize(item.text.toLocaleLowerCase())}
+            {capitalize(item.text.toLocaleLowerCase(locale))}
           </Link>
           {index !== list.length - 1 && <Icon name="chevron-end" size={8} />}
         </Fragment>

package/app-template/src/views/category/category-info.tsx

@@ -57,6 +57,7 @@ export default function ListPage(props: ListPageProps) {
       newUrl.searchParams.delete('page');
       router.push(newUrl.pathname + newUrl.search, undefined);
     }
+    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [searchParams, data.products, page]);
 
   const { t } = useLocalization();
@@ -79,7 +80,7 @@ export default function ListPage(props: ListPageProps) {
             className={clsx(
               'transition-opacity duration-300 ease-linear lg:hidden',
               isMenuOpen
-                ? 'fixed bg-black/60 inset-0 z-10 opacity-100'
+                ? 'fixed bg-black bg-opacity-60 inset-0 z-10 opacity-100'
                 : 'opacity-0'
             )}
           ></div>

package/app-template/src/views/category/filters/index.tsx

@@ -6,7 +6,7 @@ import { useLocalization } from '@akinon/next/hooks';
 import { useAppDispatch, useAppSelector } from '@akinon/next/redux/hooks';
 import { resetSelectedFacets } from '@theme/redux/reducers/category';
 import CategoryActiveFilters from '@theme/views/category/category-active-filters';
-import { useMemo, useState, useTransition } from 'react';
+import { useMemo, useTransition } from 'react';
 import { FilterItem } from './filter-item';
 
 interface Props {

package/app-template/src/views/checkout/auth.tsx

@@ -24,7 +24,7 @@ const CheckoutAuth = () => {
 
   return (
     <div className="flex flex-col w-full my-5 lg:flex-row">
-      <div className="flex-1 shrink-0">
+      <div className="flex-1 flex-shrink-0">
         <Login />
         <div className="text-center text-sm text-gray-600 uppercase mt-5">
           <span>

package/app-template/src/views/checkout/layout/header.tsx

@@ -6,7 +6,7 @@ import { Image } from '@akinon/next/components/image';
 
 const CheckoutHeader = () => {
   return (
-    <div className="relative border-b border-gray-100 shadow-sm">
+    <div className="relative border-b border-gray-100 shadow">
       <header
         className={clsx(['py-8', 'px-4', 'mx-auto', 'container', 'md:px-0'])}
       >