@akinon/projectzero 1.102.0 → 1.103.0-rc.81

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) => {

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

@@ -31,13 +31,13 @@ export const ContentHeader = (props: Props) => {
       </h3>
       <Select
         onChange={handleChange}
-        className="w-full mb-4 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',
+          'w-full md:w-56 md:ms-4',
           isButtonDisabled &&
             'hover:bg-black hover:text-white disabled:opacity-75'
         )}

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/basket/basket-content.tsx

@@ -0,0 +1,106 @@
+'use client';
+
+import { useLocalization } from '@akinon/next/hooks';
+import { Basket } from '@akinon/next/types';
+import { Button, LoaderSpinner, Link } from '@theme/components';
+import { BasketItem, Summary } from '@theme/views/basket';
+import { ROUTES } from '@theme/routes';
+import PluginModule, { Component } from '@akinon/next/components/plugin-module';
+import { useEffect, useState } from 'react';
+import { pushCartView } from '@theme/utils/gtm';
+
+interface BasketContentProps {
+  initialBasket: Basket;
+  multiBasket: boolean;
+}
+
+export function BasketContent({
+  initialBasket,
+  multiBasket
+}: BasketContentProps) {
+  const { t } = useLocalization();
+  const [basket, setBasket] = useState<Basket>(initialBasket);
+
+  useEffect(() => {
+    if (basket) {
+      const products = basket.basketitem_set.map((basketItem) => ({
+        ...basketItem.product
+      }));
+      pushCartView(products);
+    }
+  }, [basket]);
+
+  const handleBasketUpdate = (updatedBasket: Basket) => {
+    setBasket(updatedBasket);
+  };
+
+  if (!basket) {
+    return (
+      <div className="flex justify-center w-full">
+        <LoaderSpinner />
+      </div>
+    );
+  }
+
+  return (
+    <div className="max-w-screen-xl p-4 flex flex-col text-primary-800 lg:p-8 xl:flex-row xl:mx-auto">
+      {basket.basketitem_set && basket.basketitem_set.length > 0 ? (
+        <>
+          <div className="flex-1 xl:mr-16">
+            <div className="flex items-center justify-between py-2 border-b border-gray-200 lg:py-3">
+              <h2 className="text-xl lg:text-2xl font-light">
+                {t('basket.my_cart')}
+              </h2>
+              <Link
+                href={ROUTES.HOME}
+                className="text-xs hover:text-secondary-500"
+              >
+                {t('basket.back_to_shopping')}
+              </Link>
+            </div>
+            <ul>
+              {multiBasket ? (
+                <PluginModule
+                  component={Component.MultiBasket}
+                  props={{
+                    BasketItem,
+                    onBasketUpdate: handleBasketUpdate
+                  }}
+                />
+              ) : (
+                basket.basketitem_set.map((basketItem, index) => (
+                  <BasketItem
+                    key={index}
+                    basketItem={basketItem}
+                    onBasketUpdate={handleBasketUpdate}
+                  />
+                ))
+              )}
+            </ul>
+          </div>
+          <Summary basket={basket} onBasketUpdate={handleBasketUpdate} />
+        </>
+      ) : (
+        <div className="flex flex-col items-center container max-w-screen-sm py-4 px-4 xs:py-6 xs:px-6 sm:py-8 sm:px-8 lg:max-w-screen-xl">
+          <h1
+            className="w-full text-xl font-light text-secondary text-center sm:text-2xl"
+            data-testid="basket-empty"
+          >
+            {t('basket.empty.title')}
+          </h1>
+
+          <div className="w-full text-sm text-black-800 text-center my-4 mb-2 sm:text-base">
+            <p>{t('basket.empty.content_first')}</p>
+            <p>{t('basket.empty.content_second')}.</p>
+          </div>
+
+          <Link href={ROUTES.HOME} passHref>
+            <Button className="px-10 mt-2" appearance="filled">
+              {t('basket.empty.button')}
+            </Button>
+          </Link>
+        </div>
+      )}
+    </div>
+  );
+}

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

@@ -3,7 +3,7 @@ import {
   useUpdateQuantityMutation
 } from '@akinon/next/data/client/basket';
 import { useAppDispatch } from '@akinon/next/redux/hooks';
-import { BasketItem as BasketItemType } from '@akinon/next/types';
+import { Basket, BasketItem as BasketItemType } from '@akinon/next/types';
 import { Price, Button, Icon, Modal, Select, Link } from '@theme/components';
 import { useState } from 'react';
 import { useAddFavoriteMutation } from '@akinon/next/data/client/wishlist';
@@ -19,11 +19,12 @@ import { pushRemoveFromCart } from '@theme/utils/gtm';
 interface Props {
   basketItem?: BasketItemType;
   namespace?: string;
+  onBasketUpdate?: (basket: Basket) => void;
 }
 
 export const BasketItem = (props: Props) => {
   const { t } = useLocalization();
-  const { basketItem, namespace } = props;
+  const { basketItem, namespace, onBasketUpdate } = props;
   const [updateQuantityMutation] = useUpdateQuantityMutation();
   const dispatch = useAppDispatch();
   const [isRemoveBasketModalOpen, setRemoveBasketModalOpen] = useState(false);
@@ -39,7 +40,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
@@ -49,19 +55,21 @@ export const BasketItem = (props: Props) => {
       requestParams.namespace = namespace;
     }
 
-    await updateQuantityMutation(requestParams)
-      .unwrap()
-      .then((data) =>
-        dispatch(
-          basketApi.util.updateQueryData(
-            'getBasket',
-            undefined,
-            (draftBasket) => {
-              Object.assign(draftBasket, data.basket);
-            }
-          )
+    try {
+      const response = await updateQuantityMutation(requestParams).unwrap();
+      dispatch(
+        basketApi.util.updateQueryData(
+          'getBasket',
+          undefined,
+          (draftBasket) => {
+            Object.assign(draftBasket, response.basket);
+          }
         )
       );
+      onBasketUpdate?.(response.basket);
+    } catch (error) {
+      console.error('Error updating quantity:', error);
+    }
   };
 
   const deleteProduct = async (productPk?: number) => {

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

@@ -18,6 +18,7 @@ import clsx from 'clsx';
 
 interface Props {
   basket: Basket;
+  onBasketUpdate?: (basket: Basket) => void;
 }
 
 const voucherCodeFormSchema = (t) =>
@@ -27,7 +28,7 @@ const voucherCodeFormSchema = (t) =>
 
 export const Summary = (props: Props) => {
   const { t } = useLocalization();
-  const { basket } = props;
+  const { basket, onBasketUpdate } = props;
   const router = useRouter();
   const {
     register,
@@ -53,7 +54,7 @@ export const Summary = (props: Props) => {
   const removeVoucherCode = () => {
     removeVoucherCodeMutation()
       .unwrap()
-      .then((basket) =>
+      .then((basket) => {
         dispatch(
           basketApi.util.updateQueryData(
             'getBasket',
@@ -62,8 +63,9 @@ export const Summary = (props: Props) => {
               Object.assign(draftBasket, basket);
             }
           )
-        )
-      )
+        );
+        onBasketUpdate?.(basket);
+      })
       .catch((error: Error) => {
         setError('voucherCode', { message: error.data.non_field_errors });
       });
@@ -74,7 +76,7 @@ export const Summary = (props: Props) => {
       voucher_code: data.voucherCode
     })
       .unwrap()
-      .then((basket) =>
+      .then((basket) => {
         dispatch(
           basketApi.util.updateQueryData(
             'getBasket',
@@ -83,8 +85,9 @@ export const Summary = (props: Props) => {
               Object.assign(draftBasket, basket);
             }
           )
-        )
-      )
+        );
+        onBasketUpdate?.(basket);
+      })
       .catch((error: Error) => {
         setError('voucherCode', { message: error.data.non_field_errors });
       });

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();

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/steps/payment/options/store-credit.tsx

@@ -0,0 +1,121 @@
+import clsx from 'clsx';
+import {
+  useGetCheckoutLoyaltyBalanceQuery,
+  usePayWithLoyaltyBalanceMutation
+} from '@akinon/next/data/client/checkout';
+import { useAppSelector } from '@akinon/next/redux/hooks';
+import { useMemo, useState } from 'react';
+import { useLocalization } from '@akinon/next/hooks';
+import { twMerge } from 'tailwind-merge';
+import { Icon, Price } from '@theme/components';
+import { Trans } from '@akinon/next/components';
+import { LoaderSpinner } from '@theme/components';
+
+export const StoreCredits = () => {
+  const { t } = useLocalization();
+
+  const [payWithLoyaltyBalance, { isLoading: isPayWithLoyaltyBalanceLoading }] =
+    usePayWithLoyaltyBalanceMutation();
+
+  const { loyaltyBalance, preOrder } = useAppSelector(
+    (state) => state.checkout
+  );
+
+  const { isLoading: isLoyaltyBalanceLoading } =
+    useGetCheckoutLoyaltyBalanceQuery(undefined, {
+      refetchOnMountOrArgChange: true,
+      skip: !preOrder?.payment_option
+    });
+
+  const isLoyaltyBalanceUsed = useMemo(() => {
+    return parseFloat(preOrder?.loyalty_money ?? '0') > 0;
+  }, [preOrder?.loyalty_money]);
+
+  const [isLoading, setIsLoading] = useState(false);
+
+  const handleClick = async () => {
+    if (isLoading) return;
+    setIsLoading(true);
+
+    try {
+      await payWithLoyaltyBalance(isLoyaltyBalanceUsed ? '0' : loyaltyBalance);
+    } finally {
+      setIsLoading(false);
+    }
+  };
+
+  if (preOrder?.is_guest) {
+    return null;
+  }
+
+  if (isLoyaltyBalanceLoading) {
+    return (
+      <div className="mb-3 px-4 py-3 xs:px-0">
+        <LoaderSpinner />
+      </div>
+    );
+  }
+
+  if (parseFloat(loyaltyBalance) <= 0) {
+    return null;
+  }
+  return (
+    <div
+      className={twMerge(
+        'hidden  flex-col w-full mb-4 border border-solid border-gray-400 px-0 md:p-4',
+        isPayWithLoyaltyBalanceLoading && 'pointer-events-none opacity-30',
+        parseFloat(loyaltyBalance) > 0 && 'block'
+      )}
+    >
+      <div className="flex w-full items-center">
+        <button onClick={handleClick}>
+          <span
+            className={clsx(
+              'flex h-5 w-5 items-center justify-center rounded border border-solid border-primary',
+              isLoyaltyBalanceUsed ? 'bg-primary' : 'bg-white'
+            )}
+          >
+            <Icon
+              name={isLoyaltyBalanceUsed ? 'check' : ''}
+              size={10}
+              className={clsx({ 'text-white': isLoyaltyBalanceUsed })}
+            />
+          </span>
+        </button>
+
+        <div className="w-full pl-4">
+          <p className="cursor-pointer text-sm" onClick={handleClick}>
+            {t('checkout.payment.store_credit.use_my_store_credits')}
+          </p>
+          <p className="flex text-sm text-[#606060]">
+            {t('checkout.payment.store_credit.available_balance')}:
+            <Price
+              value={loyaltyBalance}
+              currencyCode={preOrder?.currency_type_label}
+              className="pe-1 font-bold"
+            />
+          </p>
+        </div>
+      </div>
+
+      {isLoyaltyBalanceUsed && parseFloat(preOrder?.unpaid_amount) > 0 && (
+        <p className="my-4 text-[15px] font-light italic text-[#707070] max-xs:text-xs">
+          <Trans
+            i18nKey="checkout.payment.store_credit.insufficient_balance"
+            components={{
+              Amount: (
+                <div className="inline-flex">
+                  <Price
+                    value={preOrder?.unpaid_amount}
+                    currencyCode={preOrder?.currency_type_label}
+                    className="text-primary"
+                  />
+                </div>
+              )
+            }}
+          />
+        </p>
+      )}
+    </div>
+  );
+};

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

@@ -8,6 +8,7 @@ import PluginModule, { Component } from '@akinon/next/components/plugin-module';
 import { twMerge } from 'tailwind-merge';
 import { Image } from '@akinon/next/components/image';
 import { Trans } from '@akinon/next/components/trans';
+import { StoreCredits } from './steps/payment/options/store-credit';
 
 export const Summary = () => {
   const { t } = useLocalization();
@@ -38,6 +39,7 @@ export const Summary = () => {
             'flex flex-col w-full mb-4 border border-solid border-gray-400'
         }}
       />
+      <StoreCredits />
       <div className="flex flex-col w-full border border-solid border-gray-400">
         <div className="flex justify-between items-center flex-row border-b border-solid border-gray-400 px-4 py-2 sm:px-5 sm:py-4 sm:min-h-15">
           <span className="text-black-800 text-xl font-light sm:text-2xl">
@@ -118,6 +120,14 @@ export const Summary = () => {
               <Price value={preOrder?.shipping_amount} />
             </span>
           </div>
+          {parseFloat(preOrder?.loyalty_money) > 0 && (
+            <div className="flex items-center justify-between w-full text-xs text-black-800 py-1 px-4 sm:px-5">
+              <span>{t('checkout.summary.loyalty_money_total')}</span>
+              <span>
+                <Price value={preOrder?.loyalty_money} />
+              </span>
+            </div>
+          )}
           <div className="flex items-center justify-between w-full text-xs text-black-800 py-1 px-4 sm:px-5">
             <span>{t('checkout.summary.discounts_total')}</span>
             <span>

package/app-template/src/views/guest-login/index.tsx

@@ -51,9 +51,14 @@ const GuestLogin = () => {
       ).unwrap();
 
       Object.keys(response?.errors || {}).forEach((key) => {
+        const errorValue = response?.errors[key];
+        const message = Array.isArray(errorValue)
+          ? errorValue.join(', ')
+          : errorValue || '';
+
         setError(key as keyof GuestLoginFormParams, {
           type: 'custom',
-          message: response?.errors[key]?.join(', ')
+          message
         });
       });
     } catch (error) {

package/app-template/src/views/header/action-menu.tsx

@@ -76,7 +76,7 @@ export default function ActionMenu() {
               : 'bg-secondary-500 text-white'
           )}
         >
-          {totalQuantity}
+          <span data-testid="header-basket-count">{totalQuantity}</span>
         </Badge>
       ),
       miniBasket: <MiniBasket />

package/app-template/src/views/header/search/index.tsx

@@ -4,11 +4,11 @@ import { useEffect, useRef, useState } from 'react';
 import { useAppDispatch, useAppSelector } from '@akinon/next/redux/hooks';
 import { closeSearch } from '@akinon/next/redux/reducers/header';
 import clsx from 'clsx';
-
-import { Icon } from '@theme/components';
+import { Icon, Input } from '@theme/components';
 import Results from './results';
 import { ROUTES } from '@theme/routes';
 import { useLocalization, useRouter } from '@akinon/next/hooks';
+import PluginModule, { Component } from '@akinon/next/components/plugin-module';
 
 export default function Search() {
   const { t } = useLocalization();
@@ -41,6 +41,14 @@ export default function Search() {
     };
   }, [isSearchOpen, dispatch]);
 
+  const handleSearchTextChange = (e: React.ChangeEvent<HTMLInputElement>) => {
+    setSearchText(e.target.value);
+  };
+
+  const handleCloseSearch = () => {
+    dispatch(closeSearch());
+  };
+
   return (
     <>
       <div
@@ -66,9 +74,9 @@ export default function Search() {
               {t('common.search.results_for')}
             </span>
             <div className="flex items-center">
-              <input
+              <Input
                 value={searchText}
-                onChange={(e) => setSearchText(e.target.value)}
+                onChange={handleSearchTextChange}
                 onKeyDown={(e) => {
                   if (e.key === 'Enter' && searchText.trim() !== '') {
                     router.push(`${ROUTES.LIST}/?search_text=${searchText}`);
@@ -78,14 +86,18 @@ export default function Search() {
                 placeholder={t('common.search.placeholder')}
                 ref={inputRef}
               />
+
+              <PluginModule component={Component.HeaderImageSearchFeature} />
+
               <Icon
                 name="close"
                 size={14}
-                onClick={() => dispatch(closeSearch())}
+                onClick={handleCloseSearch}
                 className="cursor-pointer"
               />
             </div>
           </div>
+
           <Results searchText={searchText} />
         </div>
       </div>