@akinon/projectzero 1.108.0-rc.87 → 1.108.0-snapshot-ZERO-3875-occasion-20251229071759

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

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

@@ -85,7 +85,7 @@ const AddressBox = ({
   };
 
   const onSubmit = (data) => {
-    editAddress({ ...data, invalidateTag: 'Addresses' })
+    editAddress({ ...data, invalidateTag: 'Checkout' })
       .unwrap()
       .then((editAddressResponse) => {
         handleAddressClick(addressType, editAddressResponse);
@@ -96,7 +96,7 @@ const AddressBox = ({
   };
 
   const handleRemoveAddress = async (addressPk: number) => {
-    await removeAddress({ id: addressPk, invalidateTag: 'Addresses' });
+    await removeAddress({ id: addressPk, invalidateTag: 'Checkout' });
     setRemoveAddressModalOpen(false);
     dispatch(resetCheckoutState());
 
@@ -168,7 +168,10 @@ const AddressBox = ({
         <Button
           appearance="ghost"
           className="italic underline hover:text-secondary-500 hover:!bg-white hover:!border-white p-0 h-auto"
-          onClick={() => setIsEditAddressModalOpen(true)}
+          onClick={(e) => {
+            e.stopPropagation();
+            setIsEditAddressModalOpen(true);
+          }}
           data-testid="checkout-address-edit"
         >
           {t('checkout.address.box.edit')}
@@ -180,21 +183,26 @@ const AddressBox = ({
           setOpen={setIsEditAddressModalOpen}
           className="w-full sm:w-[28rem] max-h-[90vh] overflow-y-auto"
         >
-          <AddressForm
-            data={{
-              ...address,
-              country: address.country?.pk,
-              city: address.city?.pk,
-              township: address.township?.pk,
-              district: address.district?.pk
-            }}
-            onSubmit={onSubmit}
-          />
+          <div onClick={(e) => e.stopPropagation()}>
+            <AddressForm
+              data={{
+                ...address,
+                country: address.country?.pk,
+                city: address.city?.pk,
+                township: address.township?.pk,
+                district: address.district?.pk
+              }}
+              onSubmit={onSubmit}
+            />
+          </div>
         </Modal>
         <Button
           appearance="ghost"
           className="italic underline hover:text-secondary-500 hover:!bg-white hover:!border-white p-0 h-auto"
-          onClick={() => setRemoveAddressModalOpen(true)}
+          onClick={(e) => {
+            e.stopPropagation();
+            setRemoveAddressModalOpen(true);
+          }}
           data-testid="checkout-address-remove"
         >
           {t('checkout.address.box.remove')}
@@ -207,14 +215,18 @@ const AddressBox = ({
         setOpen={setRemoveAddressModalOpen}
         showCloseButton={false}
       >
-        <div className="text-center px-6 py-10">
+        <div
+          className="text-center px-6 py-10"
+          onClick={(e) => e.stopPropagation()}
+        >
           <p className="mb-4">
             {t('account.address_book.modal.delete_description')}
           </p>
           <div className="space-x-3 flex justify-center">
             <Button
               appearance="outlined"
-              onClick={() => {
+              onClick={(e) => {
+                e.stopPropagation();
                 setRemoveAddressModalOpen(false);
               }}
               data-testid="remove-address-modal-cancel"
@@ -224,7 +236,8 @@ const AddressBox = ({
             <Button
               appearance="filled"
               disabled={removeAddressLoading}
-              onClick={() => {
+              onClick={(e) => {
+                e.stopPropagation();
                 handleRemoveAddress(address.pk);
               }}
               className={

package/app-template/src/views/checkout/steps/shipping/addresses.tsx

@@ -77,7 +77,7 @@ const Addresses = () => {
   }, [billing_and_shipping_same]);
 
   const onSubmit = (data) => {
-    addAddress({ ...data, invalidateTag: 'Addresses' })
+    addAddress({ ...data, invalidateTag: 'Checkout' })
       .unwrap()
       .then((addAddressResponse) => {
         if (addressList.length === 0) {

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

@@ -51,14 +51,9 @@ 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
+          message: response?.errors[key]?.join(', ')
         });
       });
     } catch (error) {

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, Input } from '@theme/components';
+
+import { Icon } 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,14 +41,6 @@ export default function Search() {
     };
   }, [isSearchOpen, dispatch]);
 
-  const handleSearchTextChange = (e: React.ChangeEvent<HTMLInputElement>) => {
-    setSearchText(e.target.value);
-  };
-
-  const handleCloseSearch = () => {
-    dispatch(closeSearch());
-  };
-
   return (
     <>
       <div
@@ -74,9 +66,9 @@ export default function Search() {
               {t('common.search.results_for')}
             </span>
             <div className="flex items-center">
-              <Input
+              <input
                 value={searchText}
-                onChange={handleSearchTextChange}
+                onChange={(e) => setSearchText(e.target.value)}
                 onKeyDown={(e) => {
                   if (e.key === 'Enter' && searchText.trim() !== '') {
                     router.push(`${ROUTES.LIST}/?search_text=${searchText}`);
@@ -86,18 +78,14 @@ export default function Search() {
                 placeholder={t('common.search.placeholder')}
                 ref={inputRef}
               />
-
-              <PluginModule component={Component.HeaderImageSearchFeature} />
-
               <Icon
                 name="close"
                 size={14}
-                onClick={handleCloseSearch}
+                onClick={() => dispatch(closeSearch())}
                 className="cursor-pointer"
               />
             </div>
           </div>
-
           <Results searchText={searchText} />
         </div>
       </div>

package/app-template/src/views/product/layout.tsx

@@ -22,6 +22,16 @@ export default async function ProductLayout({
   breadcrumbData,
   children
 }: ProductPageProps) {
+  const categoryIds = breadcrumbData
+    ?.map((item) => item.extra_context?.attributes?.category_id)
+    .filter(Boolean)
+    .join(',');
+
+  const categoryPaths = breadcrumbData
+    ?.map((item) => item.path)
+    .filter(Boolean)
+    .join(',');
+
   return (
     <div className="container mx-auto">
       <div className="max-w-5xl mx-auto my-5 px-7">
@@ -31,7 +41,11 @@ export default async function ProductLayout({
         <div className="col-span-5 lg:col-span-3">
           <ProductInfoSlider product={data.product} />
         </div>
-        <div className="flex flex-col items-center col-span-5 lg:col-span-2">
+        <div
+          className="flex flex-col items-center col-span-5 lg:col-span-2"
+          data-category-ids={categoryIds}
+          data-category-paths={categoryPaths}
+        >
           <div className="w-full">{children}</div>
         </div>
       </div>

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

@@ -13,6 +13,7 @@ import { useStockAlert } from '../../hooks/use-stock-alert';
 import { ProductVariants } from './product-variants';
 import { ProductActions } from './product-actions';
 import { ProductShare } from './product-share';
+import PluginModule, { Component } from '@akinon/next/components/plugin-module';
 
 export default function ProductInfo({ data }: ProductPageProps) {
   const { data: session } = useSession();
@@ -105,6 +106,13 @@ export default function ProductInfo({ data }: ProductPageProps) {
         onCloseModal={closeModal}
       />
 
+      <PluginModule
+        component={Component.VirtualTryOnPlugin}
+        props={{
+          product: data.product
+        }}
+      />
+
       <MiscButtons
         productName={data.product.name}
         productPk={data.product.pk}

package/app-template/src/views/product/slider.tsx

@@ -7,7 +7,6 @@ import { Product } from '@akinon/next/types';
 import { Image } from '@akinon/next/components/image';
 import useFavButton from '../../hooks/use-fav-button';
 import { twMerge } from 'tailwind-merge';
-import PluginModule, { Component } from '@akinon/next/components/plugin-module';
 
 type ProductSliderItem = {
   product: Product;
@@ -36,102 +35,90 @@ export default function ProductInfoSlider({ product }: ProductSliderItem) {
     carouselRef.current?.next();
   };
 
-  const handleThumbnailClick = (index: number) => {
+  const handleThumbnailClick = (index) => {
     setActiveIndex(index);
     carouselRef.current?.goToSlide(index);
   };
 
   return (
-    <>
-      <div className="lg:grid lg:grid-cols-6">
-        <div className="lg:col-span-1">
-          <div className="flex flex-col items-center justify-center md:mr-[6px]">
-            <button
-              onClick={goToPrev}
-              className={twMerge(
-                'hidden justify-center p-2 mb-3 border border-gray-100 rounded-full cursor-pointer lg:block',
-                [activeIndex === 0 && 'cursor-not-allowed opacity-45']
-              )}
-              disabled={activeIndex === 0}
-            >
-              <Icon name="chevron-up" size={15} className="fill-[#000000]" />
-            </button>
-            <div className="hidden flex-col items-center overflow-scroll w-[80px] max-h-[620px] lg:block">
-              {product?.productimage_set?.map((item, index) => (
-                <Image
-                  key={index}
-                  src={item.image}
-                  alt={`Thumbnail ${index}`}
-                  width={80}
-                  height={128}
-                  aspectRatio={80 / 128}
-                  className={twMerge('cursor-pointer', [
-                    activeIndex === index && 'border-2 border-primary'
-                  ])}
-                  onClick={() => handleThumbnailClick(index)}
-                />
-              ))}
-            </div>
-            <button
-              onClick={goToNext}
-              className={twMerge(
-                'hidden justify-center p-2 mt-3 border border-gray-100 rounded-full cursor-pointer lg:block',
-                [
-                  activeIndex === product.productimage_set.length - 1 &&
-                    'cursor-not-allowed opacity-45'
-                ]
-              )}
-              disabled={activeIndex === product.productimage_set.length - 1}
-            >
-              <Icon name="chevron-down" size={15} className="fill-[#000000]" />
-            </button>
-          </div>
-        </div>
-
-        <div className="relative lg:col-span-5">
-          <FavButton className="absolute right-8 top-6 z-[20] sm:hidden" />
-
-          <PluginModule
-            component={Component.ProductImageSearchFeature}
-            props={{
-              product,
-              activeIndex,
-              showResetButton: true
-            }}
-          />
-
-          <CarouselCore
-            responsive={{
-              all: {
-                breakpoint: { max: 5000, min: 0 },
-                items: 1
-              }
-            }}
-            arrows={false}
-            swipeable={true}
-            ref={carouselRef}
-            afterChange={(previousSlide, { currentSlide }) => {
-              setActiveIndex(currentSlide);
-            }}
-            containerAspectRatio={{ mobile: 520 / 798, desktop: 484 / 726 }}
+    <div className="lg:grid lg:grid-cols-6">
+      <div className="lg:col-span-1">
+        <div className="flex flex-col items-center justify-center md:mr-[6px]">
+          <button
+            onClick={goToPrev}
+            className={twMerge(
+              'hidden justify-center p-2 mb-3 border border-gray-100 rounded-full cursor-pointer lg:block',
+              [activeIndex === 0 && 'cursor-not-allowed opacity-45']
+            )}
+            disabled={activeIndex === 0}
           >
-            {product?.productimage_set?.map((item, i) => (
+            <Icon name="chevron-up" size={15} className="fill-[#000000]" />
+          </button>
+          <div className="hidden flex-col items-center overflow-scroll w-[80px] max-h-[620px] lg:block">
+            {product?.productimage_set?.map((item, index) => (
               <Image
-                key={i}
+                key={index}
                 src={item.image}
-                alt={product?.name || 'Product image'}
-                draggable={false}
-                aspectRatio={484 / 726}
-                sizes="(min-width: 425px) 512px,
-              (min-width: 601px) 576px,
-              (min-width: 768px) 336px,
-              (min-width: 1024px) 484px, 368px"
-                fill
+                alt={`Thumbnail ${index}`}
+                width={80}
+                height={128}
+                className={twMerge('cursor-pointer', [
+                  activeIndex === index && 'border-2 border-primary'
+                ])}
+                onClick={() => handleThumbnailClick(index)}
               />
             ))}
-          </CarouselCore>
+          </div>
+          <button
+            onClick={goToNext}
+            className={twMerge(
+              'hidden justify-center p-2 mt-3 border border-gray-100 rounded-full cursor-pointer lg:block',
+              [
+                activeIndex === product.productimage_set.length - 1 &&
+                  'cursor-not-allowed opacity-45'
+              ]
+            )}
+            disabled={activeIndex === product.productimage_set.length - 1}
+          >
+            <Icon name="chevron-down" size={15} className="fill-[#000000]" />
+          </button>
         </div>
       </div>
-    </>
+
+      <div className="relative lg:col-span-5">
+        <FavButton className="absolute right-8 top-6 z-[20] sm:hidden" />
+
+        <CarouselCore
+          responsive={{
+            all: {
+              breakpoint: { max: 5000, min: 0 },
+              items: 1
+            }
+          }}
+          arrows={false}
+          swipeable={true}
+          ref={carouselRef}
+          afterChange={(previousSlide, { currentSlide }) => {
+            setActiveIndex(currentSlide);
+          }}
+          containerAspectRatio={{ mobile: 520 / 798, desktop: 484 / 726 }}
+        >
+          {product?.productimage_set?.map((item, i) => (
+            <Image
+              key={i}
+              src={item.image}
+              alt={product.name}
+              draggable={false}
+              aspectRatio={484 / 726}
+              sizes="(min-width: 425px) 512px,
+            (min-width: 601px) 576px,
+            (min-width: 768px) 336px,
+            (min-width: 1024px) 484px, 368px"
+              fill
+            />
+          ))}
+        </CarouselCore>
+      </div>
+    </div>
   );
 }

package/commands/plugins.ts

@@ -29,14 +29,7 @@ async function checkVersion(pkg: PackageJson) {
 
     if (!semver.satisfies(pkg.dependencies['@akinon/next'], latestVersion)) {
       console.warn(
-        `\x1b[43m Warning: The "${packageName}" package is currently at`,
-        `\x1b[41m version ${pkg.dependencies['@akinon/next']}`,
-        `\x1b[43m Please upgrade it to the latest version (${latestVersion}) to ensure plugin compatibility.`,
-        '\x1b[0m\n'
-      );
-    } else {
-      console.log(
-        `\x1b[42m Info: The package "${packageName}" is currently in the current version (${latestVersion}).`,
+        `\x1b[43mWarning: The "${packageName}" package is currently at version ${pkg.dependencies['@akinon/next']}. Please upgrade it to the latest version (${latestVersion}) to ensure plugin compatibility.`,
         '\x1b[0m\n'
       );
     }
@@ -61,27 +54,7 @@ export default async () => {
     }
   }
 
-  function findPackageJson(): PackageJson {
-    const packageJsonPaths = [
-      path.resolve(rootDir, './package.json'),
-      path.resolve(rootDir, './apps/projectzeronext/package.json')
-    ];
-
-    for (const packageJsonPath of packageJsonPaths) {
-      try {
-        const pkg = require(packageJsonPath);
-        if (pkg.dependencies['@akinon/next']) {
-          return pkg;
-        }
-      } catch (error) {
-        continue;
-      }
-    }
-
-    throw new Error('Could not find package.json with @akinon/next dependency');
-  }
-
-  const pkg = findPackageJson();
+  const pkg: PackageJson = require(path.resolve(rootDir, './package.json'));
   await checkVersion(pkg);
 
   const pluginsFilePath = findPluginsFilePath();
@@ -164,6 +137,10 @@ export default async () => {
       name: 'Tamara Payment Extension',
       value: 'pz-tamara-extension'
     },
+    {
+      name: 'Similar Products',
+      value: 'pz-similar-products'
+    },
     {
       name: 'Hepsipay',
       value: 'pz-hepsipay'
@@ -171,6 +148,14 @@ export default async () => {
     {
       name: 'Flow Payment',
       value: 'pz-flow-payment'
+    },
+    {
+      name: 'Virtual Try-On',
+      value: 'pz-virtual-try-on'
+    },
+    {
+      name: 'CyberSource UC',
+      value: 'pz-cybersource-uc'
     }
   ];
 

package/dist/commands/plugins.js

@@ -50,10 +50,7 @@ function checkVersion(pkg) {
             const pkgInfo = (yield response.json());
             const latestVersion = pkgInfo['dist-tags'].latest;
             if (!semver_1.default.satisfies(pkg.dependencies['@akinon/next'], latestVersion)) {
-                console.warn(`\x1b[43m Warning: The "${packageName}" package is currently at`, `\x1b[41m version ${pkg.dependencies['@akinon/next']}`, `\x1b[43m Please upgrade it to the latest version (${latestVersion}) to ensure plugin compatibility.`, '\x1b[0m\n');
-            }
-            else {
-                console.log(`\x1b[42m Info: The package "${packageName}" is currently in the current version (${latestVersion}).`, '\x1b[0m\n');
+                console.warn(`\x1b[43mWarning: The "${packageName}" package is currently at version ${pkg.dependencies['@akinon/next']}. Please upgrade it to the latest version (${latestVersion}) to ensure plugin compatibility.`, '\x1b[0m\n');
             }
         }
         catch (error) {
@@ -75,25 +72,7 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
             throw new Error('plugins.js was not found in either of the expected locations.');
         }
     }
-    function findPackageJson() {
-        const packageJsonPaths = [
-            path_1.default.resolve(rootDir, './package.json'),
-            path_1.default.resolve(rootDir, './apps/projectzeronext/package.json')
-        ];
-        for (const packageJsonPath of packageJsonPaths) {
-            try {
-                const pkg = require(packageJsonPath);
-                if (pkg.dependencies['@akinon/next']) {
-                    return pkg;
-                }
-            }
-            catch (error) {
-                continue;
-            }
-        }
-        throw new Error('Could not find package.json with @akinon/next dependency');
-    }
-    const pkg = findPackageJson();
+    const pkg = require(path_1.default.resolve(rootDir, './package.json'));
     yield checkVersion(pkg);
     const pluginsFilePath = findPluginsFilePath();
     let installedPlugins = [];
@@ -173,6 +152,10 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
             name: 'Tamara Payment Extension',
             value: 'pz-tamara-extension'
         },
+        {
+            name: 'Similar Products',
+            value: 'pz-similar-products'
+        },
         {
             name: 'Hepsipay',
             value: 'pz-hepsipay'
@@ -180,6 +163,14 @@ exports.default = () => __awaiter(void 0, void 0, void 0, function* () {
         {
             name: 'Flow Payment',
             value: 'pz-flow-payment'
+        },
+        {
+            name: 'Virtual Try-On',
+            value: 'pz-virtual-try-on'
+        },
+        {
+            name: 'CyberSource UC',
+            value: 'pz-cybersource-uc'
         }
     ];
     try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@akinon/projectzero",
-  "version": "1.108.0-rc.87",
+  "version": "1.108.0-snapshot-ZERO-3875-occasion-20251229071759",
   "private": false,
   "description": "CLI tool to manage your Project Zero Next project",
   "bin": {