@akinon/projectzero 1.118.0 → 1.119.0-rc.1

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # @akinon/projectzero
 
+## 1.119.0-rc.1
+
+## 1.119.0-rc.0
+
+### Minor Changes
+
+- 143be2b9: ZERO-3457: Crop styles are customizable and logic improved for rendering similar products modal
+- d99a6a7d: ZERO-3457_1: Fixed the settings prop and made sure everything is customizable.
+
 ## 1.118.0
 
 ## 1.117.0

package/app-template/.env.example

@@ -7,9 +7,12 @@ NEXT_PUBLIC_URL=http://localhost:3000
 SERVICE_BACKEND_URL=https://02fde10fee4440269e695aa10707dfaf.lb.akinoncloud.com
 SITEMAP_S3_BUCKET_NAME=0fb534
 NEXT_PUBLIC_VIRTUAL_TRY_ON_API_URL=https://d2a26507c7094f359aba349b96a96881.lb.akinoncloud.com
+NEXT_PUBLIC_ENABLE_IMAGE_SEARCH=true
 
 # LOG_LEVEL_DEV=debug # For more details, please refer to the Logging documentation.
 
 # CACHE_SECRET=KhvhE1go3GDmYJ7PhZLmskqfhYNlPSm6
 # CACHE_HOST=default:redispw@localhost
 # CACHE_PORT=6379
+
+# BF_CACHE=false

package/app-template/CHANGELOG.md

@@ -1,5 +1,116 @@
 # projectzeronext
 
+## 1.119.0-rc.1
+
+### Patch Changes
+
+- Updated dependencies [c6c5c1cd]
+  - @akinon/next@1.119.0-rc.1
+  - @akinon/pz-virtual-try-on@1.119.0-rc.1
+  - @akinon/pz-akifast@1.119.0-rc.1
+  - @akinon/pz-apple-pay@1.119.0-rc.1
+  - @akinon/pz-b2b@1.119.0-rc.1
+  - @akinon/pz-basket-gift-pack@1.119.0-rc.1
+  - @akinon/pz-bkm@1.119.0-rc.1
+  - @akinon/pz-checkout-gift-pack@1.119.0-rc.1
+  - @akinon/pz-click-collect@1.119.0-rc.1
+  - @akinon/pz-credit-payment@1.119.0-rc.1
+  - @akinon/pz-cybersource-uc@1.119.0-rc.1
+  - @akinon/pz-flow-payment@1.119.0-rc.1
+  - @akinon/pz-google-pay@1.119.0-rc.1
+  - @akinon/pz-gpay@1.119.0-rc.1
+  - @akinon/pz-haso@1.119.0-rc.1
+  - @akinon/pz-hepsipay@1.119.0-rc.1
+  - @akinon/pz-masterpass@1.119.0-rc.1
+  - @akinon/pz-masterpass-rest@1.119.0-rc.1
+  - @akinon/pz-multi-basket@1.119.0-rc.1
+  - @akinon/pz-one-click-checkout@1.119.0-rc.1
+  - @akinon/pz-otp@1.119.0-rc.1
+  - @akinon/pz-pay-on-delivery@1.119.0-rc.1
+  - @akinon/pz-saved-card@1.119.0-rc.1
+  - @akinon/pz-similar-products@1.119.0-rc.1
+  - @akinon/pz-tabby-extension@1.119.0-rc.1
+  - @akinon/pz-tamara-extension@1.119.0-rc.1
+
+## 1.119.0-rc.0
+
+### Minor Changes
+
+- 6ad72e8d: ZERO-4032: Add loading state management for payment submissions across multiple components and add safe guarding
+- 4449f3a3: ZERO-3681: Add order details localization and improve order handling in AccountOrderDetail
+- 31b4a266: ZERO-4102: Add support for post-checkout redirect in middleware
+- 1a8622a9: ZERO-3392: Implemented AI Search functionality and update env
+- b55acb76: ZERO-2577: Fix pagination bug and update usePagination hook and ensure pagination controls rendering correctly
+- 36143125: ZERO-3987: Add barcode scanner functionality with modal and button
+- f7e0f646: ZERO-4032: Add bfcache-headers middleware, integrate it into the default chain, and introduce a new environment variable for control.
+- 143be2b9: ZERO-3457: Crop styles are customizable and logic improved for rendering similar products modal
+- 9f8cd3bc: ZERO-3449: AI Search Active Filters & Crop Style changes have been implemented
+- 5fb34b5c: ZERO-3955: Add aspect ratio validation and error handling for image cropping
+- d99a6a7d: ZERO-3457_1: Fixed the settings prop and made sure everything is customizable.
+- b87517ff: ZERO-3680: Enhance select component styling to ensure focus state is consistent
+- b59fdd1c: ZERO-4009: Add password reset token validation
+- d76d3255: ZERO-4011: Refactor sitemap content generation to append locale suffix based on matched locale
+- b05c3543: ZERO-2570: Category filters routes to absolute url
+- c3244a31: ZERO-4013: Update runtime version to node:25-alpine in project configuration
+
+### Patch Changes
+
+- Updated dependencies [6ad72e8d]
+- Updated dependencies [4798959a]
+- Updated dependencies [31b4a266]
+- Updated dependencies [d2c0e759]
+- Updated dependencies [aef81c5d]
+- Updated dependencies [b55acb76]
+- Updated dependencies [8a7fd0f4]
+- Updated dependencies [36143125]
+- Updated dependencies [572f4f7b]
+- Updated dependencies [0754c835]
+- Updated dependencies [f7e0f646]
+- Updated dependencies [94a86fcc]
+- Updated dependencies [143be2b9]
+- Updated dependencies [9f8cd3bc]
+- Updated dependencies [49c82e1a]
+- Updated dependencies [a9f5cdb1]
+- Updated dependencies [5fb34b5c]
+- Updated dependencies [88cb4f62]
+- Updated dependencies [d99a6a7d]
+- Updated dependencies [d7e5178b]
+- Updated dependencies [591e345e]
+- Updated dependencies [01ee41f1]
+- Updated dependencies [187208d2]
+- Updated dependencies [4de5303c]
+- Updated dependencies [63a72000]
+- Updated dependencies [b59fdd1c]
+- Updated dependencies [95b139dc]
+- Updated dependencies [3909d322]
+- Updated dependencies [6b73b050]
+  - @akinon/pz-pay-on-delivery@1.119.0-rc.0
+  - @akinon/pz-credit-payment@1.119.0-rc.0
+  - @akinon/pz-google-pay@1.119.0-rc.0
+  - @akinon/pz-masterpass@1.119.0-rc.0
+  - @akinon/pz-saved-card@1.119.0-rc.0
+  - @akinon/pz-apple-pay@1.119.0-rc.0
+  - @akinon/pz-hepsipay@1.119.0-rc.0
+  - @akinon/pz-gpay@1.119.0-rc.0
+  - @akinon/pz-bkm@1.119.0-rc.0
+  - @akinon/pz-otp@1.119.0-rc.0
+  - @akinon/pz-masterpass-rest@1.119.0-rc.0
+  - @akinon/next@1.119.0-rc.0
+  - @akinon/pz-virtual-try-on@1.119.0-rc.0
+  - @akinon/pz-similar-products@1.119.0-rc.0
+  - @akinon/pz-akifast@1.119.0-rc.0
+  - @akinon/pz-b2b@1.119.0-rc.0
+  - @akinon/pz-basket-gift-pack@1.119.0-rc.0
+  - @akinon/pz-checkout-gift-pack@1.119.0-rc.0
+  - @akinon/pz-click-collect@1.119.0-rc.0
+  - @akinon/pz-cybersource-uc@1.119.0-rc.0
+  - @akinon/pz-flow-payment@1.119.0-rc.0
+  - @akinon/pz-haso@1.119.0-rc.0
+  - @akinon/pz-multi-basket@1.119.0-rc.0
+  - @akinon/pz-one-click-checkout@1.119.0-rc.0
+  - @akinon/pz-tabby-extension@1.119.0-rc.0
+  - @akinon/pz-tamara-extension@1.119.0-rc.0
+
 ## 1.118.0
 
 ### Patch Changes

package/app-template/README.md

@@ -12,6 +12,30 @@ Run `cp .env.example .env && yarn` command at project root and all dependencies
 
 - `SITEMAP_S3_BUCKET_NAME`: S3 bucket name for XML sitemaps (e.g., "0fb534"). This is required for the sitemap route to function correctly.
 
+### Optional Environment Variables
+
+- `NEXT_PUBLIC_ENABLE_IMAGE_SEARCH`: Set to `true` to enable image search feature for all users. If not set or `false`, the feature will only be visible to users who have enabled it via localStorage.
+
+## Image Search Feature
+
+The image search functionality allows users to search for similar products by uploading images or cropping existing product images.
+
+### Feature Visibility Control
+
+The image search feature can be controlled in two ways:
+
+1. **Environment Variable (Global)**: Set `NEXT_PUBLIC_ENABLE_IMAGE_SEARCH=true` to enable for all users
+2. **localStorage (Individual Users)**: Users can enable it locally using browser developer tools
+
+````
+
+### Feature Locations
+
+When enabled, the image search feature appears in:
+
+- **Header Search**: Camera icon next to the search input
+- **Product Detail Page**: "View Similar Styles" button on product images
+
 ### Build
 
 To build the app, run the following command:
@@ -19,7 +43,7 @@ To build the app, run the following command:
 ```bash
 cd projectzeronext # Project root
 yarn build
-```
+````
 
 ### Develop
 

package/app-template/akinon.json

@@ -13,7 +13,7 @@
       "healthcheck": "/healthz"
     }
   },
-  "runtime": "node:22-alpine",
+  "runtime": "node:25-alpine",
   "addons": [
     {
       "plan": "redis"

package/app-template/docs/advanced-usage.md

@@ -41,3 +41,13 @@ const middleware: NextMiddleware = (
   return NextResponse.next();
 };
 ```
+
+## Enabling Browser Back/Forward Cache (bfcache)
+
+By default, dynamic pages may include `Cache-Control: no-store` headers, which prevents browsers from using the back/forward cache (bfcache). To enable bfcache support, set the `BF_CACHE` environment variable to `true`:
+
+```bash
+BF_CACHE=true
+```
+
+When enabled, a middleware wrapper overrides the `Cache-Control` header to `private, no-cache, max-age=0, must-revalidate`, allowing the browser to cache pages for instant back/forward navigation while still revalidating content on revisit.

package/app-template/package.json

@@ -1,6 +1,6 @@
 {
   "name": "projectzeronext",
-  "version": "1.118.0",
+  "version": "1.119.0-rc.1",
   "private": true,
   "license": "MIT",
   "scripts": {
@@ -24,32 +24,32 @@
     "test:middleware": "jest middleware-matcher.test.ts --bail"
   },
   "dependencies": {
-    "@akinon/next": "1.118.0",
-    "@akinon/pz-akifast": "1.118.0",
-    "@akinon/pz-apple-pay": "1.118.0",
-    "@akinon/pz-b2b": "1.118.0",
-    "@akinon/pz-basket-gift-pack": "1.118.0",
-    "@akinon/pz-bkm": "1.118.0",
-    "@akinon/pz-checkout-gift-pack": "1.118.0",
-    "@akinon/pz-click-collect": "1.118.0",
-    "@akinon/pz-credit-payment": "1.118.0",
-    "@akinon/pz-cybersource-uc": "1.118.0",
-    "@akinon/pz-flow-payment": "1.118.0",
-    "@akinon/pz-google-pay": "1.118.0",
-    "@akinon/pz-gpay": "1.118.0",
-    "@akinon/pz-haso": "1.118.0",
-    "@akinon/pz-hepsipay": "1.118.0",
-    "@akinon/pz-masterpass": "1.118.0",
-    "@akinon/pz-masterpass-rest": "1.118.0",
-    "@akinon/pz-multi-basket": "1.118.0",
-    "@akinon/pz-one-click-checkout": "1.118.0",
-    "@akinon/pz-otp": "1.118.0",
-    "@akinon/pz-pay-on-delivery": "1.118.0",
-    "@akinon/pz-saved-card": "1.118.0",
-    "@akinon/pz-similar-products": "1.118.0",
-    "@akinon/pz-tabby-extension": "1.118.0",
-    "@akinon/pz-tamara-extension": "1.118.0",
-    "@akinon/pz-virtual-try-on": "1.118.0",
+    "@akinon/next": "1.119.0-rc.1",
+    "@akinon/pz-akifast": "1.119.0-rc.1",
+    "@akinon/pz-apple-pay": "1.119.0-rc.1",
+    "@akinon/pz-b2b": "1.119.0-rc.1",
+    "@akinon/pz-basket-gift-pack": "1.119.0-rc.1",
+    "@akinon/pz-bkm": "1.119.0-rc.1",
+    "@akinon/pz-checkout-gift-pack": "1.119.0-rc.1",
+    "@akinon/pz-click-collect": "1.119.0-rc.1",
+    "@akinon/pz-credit-payment": "1.119.0-rc.1",
+    "@akinon/pz-cybersource-uc": "1.119.0-rc.1",
+    "@akinon/pz-flow-payment": "1.119.0-rc.1",
+    "@akinon/pz-google-pay": "1.119.0-rc.1",
+    "@akinon/pz-gpay": "1.119.0-rc.1",
+    "@akinon/pz-haso": "1.119.0-rc.1",
+    "@akinon/pz-hepsipay": "1.119.0-rc.1",
+    "@akinon/pz-masterpass": "1.119.0-rc.1",
+    "@akinon/pz-masterpass-rest": "1.119.0-rc.1",
+    "@akinon/pz-multi-basket": "1.119.0-rc.1",
+    "@akinon/pz-one-click-checkout": "1.119.0-rc.1",
+    "@akinon/pz-otp": "1.119.0-rc.1",
+    "@akinon/pz-pay-on-delivery": "1.119.0-rc.1",
+    "@akinon/pz-saved-card": "1.119.0-rc.1",
+    "@akinon/pz-similar-products": "1.119.0-rc.1",
+    "@akinon/pz-tabby-extension": "1.119.0-rc.1",
+    "@akinon/pz-tamara-extension": "1.119.0-rc.1",
+    "@akinon/pz-virtual-try-on": "1.119.0-rc.1",
     "@hookform/resolvers": "2.9.0",
     "@next/third-parties": "14.1.0",
     "@react-google-maps/api": "2.17.1",
@@ -72,7 +72,7 @@
     "yup": "0.32.11"
   },
   "devDependencies": {
-    "@akinon/eslint-plugin-projectzero": "1.118.0",
+    "@akinon/eslint-plugin-projectzero": "1.119.0-rc.1",
     "@semantic-release/changelog": "6.0.2",
     "@semantic-release/exec": "6.0.3",
     "@semantic-release/git": "10.0.1",

package/app-template/public/locales/en/account.json

@@ -242,7 +242,9 @@
       "total": "Total",
       "items": "items",
       "packages": "Packages",
-      "package_no": "Package no"
+      "package_no": "Package no",
+      "back_to_orders": "Back to Orders",
+      "no_orders_found": "No orders found"
     },
     "return": {
       "title": "Return Items",

package/app-template/public/locales/en/product.json

@@ -86,6 +86,8 @@
     "multiple_results_subtitle": "Try-on completed for {{count}} products",
     "error_incompatible": "Image Not Compatible",
     "error_auto_reported": "Error automatically reported",
+    "error_aspect_ratio_too_tall": "The image is too tall. Maximum allowed ratio is 9:16 (portrait). Please crop or use a different image.",
+    "error_aspect_ratio_too_wide": "The image is too wide. Maximum allowed ratio is 21:9 (landscape). Please crop or use a different image.",
     "feedback_question": "How was the result?",
     "feedback_success": "Success",
     "feedback_failed": "Failed",
@@ -96,5 +98,21 @@
     "starting": "Starting...",
     "will_start": "will start virtual try-on for",
     "products_count": "products"
+  },
+  "barcode_scanner": {
+    "title": "Scan Barcode",
+    "button_label": "Barcode Scanner",
+    "button_text": "Try on products in store",
+    "help_text": "Point your camera at the product barcode",
+    "scan_more_help": "To scan another product, point your camera at the new barcode.",
+    "searching": "Searching for product...",
+    "continue_to_vto": "Continue to Virtual Cabin",
+    "permission_denied_title": "Camera Permission Required",
+    "permission_denied_message": "You need to allow camera access for the barcode scanner.",
+    "try_again": "Try Again",
+    "errors": {
+      "product_not_found": "No product found for this barcode.",
+      "search_failed": "Search failed. Please try again."
+    }
   }
 }

package/app-template/public/locales/tr/account.json

@@ -242,7 +242,9 @@
       "total": "Toplam",
       "items": "adet",
       "packages": "paket",
-      "package_no": "Paket no"
+      "package_no": "Paket no",
+      "back_to_orders": "Siparişlere geri dön",
+      "no_orders_found": "Sipariş bulunamadı"
     },
     "return": {
       "title": "İade Ürünleri",

package/app-template/public/locales/tr/product.json

@@ -88,6 +88,8 @@
     "multiple_results_subtitle": "{{count}} ürün için deneme tamamlandı",
     "error_incompatible": "Görüntü Uyumlu Değil",
     "error_auto_reported": "Hata otomatik olarak bildirildi",
+    "error_aspect_ratio_too_tall": "Görsel çok uzun. Dikey görseller için izin verilen maksimum oran 9:16'dır. Lütfen kırpın veya farklı bir görsel seçin.",
+    "error_aspect_ratio_too_wide": "Görsel çok geniş. Yatay görseller için izin verilen maksimum oran 21:9'dur. Lütfen kırpın veya farklı bir görsel seçin.",
     "feedback_question": "Sonuç nasıldı?",
     "feedback_success": "Başarılı",
     "feedback_failed": "Başarısız",
@@ -98,5 +100,21 @@
     "starting": "Başlatılıyor...",
     "will_start": "için sanal deneme başlatılacak",
     "products_count": "ürün"
+  },
+  "barcode_scanner": {
+    "title": "Barkodu Okut",
+    "button_label": "Barkod Tarayıcı",
+    "button_text": "Mağazadaki ürünü üstünde dene",
+    "help_text": "Ürün barkodunu kameraya yaklaştırın",
+    "scan_more_help": "Bir ürün daha okutmak isterseniz, yeni barkodu da kameranıza yaklaştırın.",
+    "searching": "Ürün aranıyor...",
+    "continue_to_vto": "Sanal Kabine Devam Et",
+    "permission_denied_title": "Kamera İzni Gerekli",
+    "permission_denied_message": "Barkod okuyucu için kamera erişimine izin vermeniz gerekmektedir.",
+    "try_again": "Tekrar Dene",
+    "errors": {
+      "product_not_found": "Bu barkoda ait ürün bulunamadı.",
+      "search_failed": "Arama başarısız oldu. Lütfen tekrar deneyin."
+    }
   }
 }

package/app-template/src/app/[commerce]/[locale]/[currency]/account/orders/[id]/page.tsx

@@ -61,7 +61,26 @@ const AccountOrderDetail = ({ params: { id } }) => {
   }, [order, isSuccess, localeValue]);
 
   if (isLoading && isFetching) {
-    return <LoaderSpinner />;
+    return (
+      <div className="flex flex-col items-center justify-center h-96">
+        <LoaderSpinner />
+      </div>
+    );
+  }
+
+  if (!order) {
+    return (
+      <div className="flex flex-col items-center justify-center h-96">
+        <p className="mt-5 text-start text-lg mb-4">
+          {t('account.my_orders.detail.no_orders_found')}
+        </p>
+        <Link href={`/account/orders/`}>
+          <Button className="px-4" appearance="filled">
+            {t('account.my_orders.detail.back_to_orders')}
+          </Button>
+        </Link>
+      </div>
+    );
   }
 
   return (

package/app-template/src/app/[commerce]/[locale]/[currency]/users/reset/[[...id]]/page.tsx

@@ -1,11 +1,12 @@
 'use client';
 
-import { Button, Input, Link } from '@theme/components';
+import { Button, Input, Link, LoaderSpinner } from '@theme/components';
 import { useForm, SubmitHandler } from 'react-hook-form';
 import { yupResolver } from '@hookform/resolvers/yup';
 import * as yup from 'yup';
 import {
   usePasswordResetMutation,
+  useGetValidatePasswordResetTokenQuery,
   PasswordResetType
 } from '@akinon/next/data/client/account';
 import { useLocalization } from '@akinon/next/hooks';
@@ -15,6 +16,16 @@ export default function NewPassword({ params: { id } }) {
   const { t } = useLocalization();
   const [newPassword, { isSuccess: formSuccess }] = usePasswordResetMutation();
 
+  const token = id?.join('/');
+
+  const {
+    data: validationData,
+    isLoading: isValidating,
+    error: validationError
+  } = useGetValidatePasswordResetTokenQuery(token, {
+    skip: !token
+  });
+
   const newPasswordFormSchema = (t) =>
     yup.object().shape({
       password: yup
@@ -24,7 +35,10 @@ export default function NewPassword({ params: { id } }) {
           /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[^a-zA-Z\d]).{6,}$/,
           t('forgot_password.create_new_password.form.error.password_rule')
         )
-        .max(50, t('forgot_password.create_new_password.form.error.password_max')),
+        .max(
+          50,
+          t('forgot_password.create_new_password.form.error.password_max')
+        ),
       repeatPassword: yup
         .string()
         .required(t('forgot_password.create_new_password.form.error.required'))
@@ -45,6 +59,31 @@ export default function NewPassword({ params: { id } }) {
     newPassword(data);
   };
 
+  if (isValidating) {
+    return (
+      <div className="container my-12 flex flex-col items-center px-4">
+        <div className="w-full xl:w-5/12 text-center">
+          <LoaderSpinner />
+        </div>
+      </div>
+    );
+  }
+
+  if (validationError || !validationData?.validlink) {
+    return (
+      <div className="container my-12 flex flex-col items-center px-4">
+        <div className="w-full xl:w-5/12 text-center">
+          <div className="text-2xl mb-4 text-error">
+            {t('account.password_reset.expired_link_message')}
+          </div>
+          <Link href="/users/password/reset" className="underline text-primary">
+            {t('account.password_reset.continue_password_reset')}
+          </Link>
+        </div>
+      </div>
+    );
+  }
+
   return (
     <div className="container my-12 flex flex-col items-center px-4">
       <div className="w-full xl:w-5/12 text-center">
@@ -79,7 +118,10 @@ export default function NewPassword({ params: { id } }) {
                   required
                 />
 
-                <PasswordRulesFeedback password={passwordValue} isVisible={errors?.password ? true : false}/>
+                <PasswordRulesFeedback
+                  password={passwordValue}
+                  isVisible={errors?.password ? true : false}
+                />
               </div>
 
               <div className="mb-2 text-left">

package/app-template/src/app/[commerce]/[locale]/[currency]/xml-sitemap/[node]/route.ts

@@ -58,10 +58,12 @@ export async function GET(request: Request, context: { params }) {
 
   let sitemapContent = await sitemap.text();
 
-  sitemapContent = sitemapContent.replace(
-    /\.com/g,
-    `.com${matchedLocale?.[0] ?? ''}`
-  );
+  if (matchedLocale?.[0]) {
+    const localeSuffix = matchedLocale[0];
+    const domainRegex = /(?<=<loc>\s*)https?:\/\/[^/<\s]+/g;
+
+    sitemapContent = sitemapContent.replace(domainRegex, `$&${localeSuffix}`);
+  }
 
   return new Response(sitemapContent, {
     headers: {

package/app-template/src/app/api/barcode-search/route.ts

@@ -0,0 +1 @@
+export * from '@akinon/next/api/barcode-search';

package/app-template/src/components/modal.tsx

@@ -41,12 +41,14 @@ export const Modal = (props: ModalProps) => {
           'fixed top-0 left-0 w-screen h-screen bg-primary bg-opacity-60 z-50',
           overlayClassName
         )}
+        onClick={(e) => e.stopPropagation()}
       />
       <section
         className={twMerge(
           'fixed top-1/2 left-1/2 -translate-x-1/2 -translate-y-1/2 z-50 bg-white',
           className
         )}
+        onClick={(e) => e.stopPropagation()}
       >
         {(showCloseButton || title) && (
           <div

package/app-template/src/components/select.tsx

@@ -48,7 +48,7 @@ const Select = forwardRef<HTMLSelectElement, SelectProps>((props, ref) => {
             clsx(
               'cursor-pointer truncate h-10 w-40 px-2.5 shrink-0 outline-none',
               !borderless &&
-                'border border-gray-200 transition-all duration-150 hover:border-primary',
+                'border border-gray-200 transition-all duration-150 hover:border-primary focus:border-primary',
               'appearance-none bg-transparent'
             ),
             className

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

@@ -1 +1,3 @@
+export * from './use-contract';
+export * from './use-fav-button';
 export * from './use-add-product-to-basket';

package/app-template/src/middleware.ts

@@ -14,7 +14,8 @@ export const config = {
     '/((?!api|_next|[\\w-\\/*]+\\.\\w+).*)',
     '/(.*sitemap\\.xml)',
     '/(.+\\.)(html|htm|aspx|asp|php)',
-    '/(.*orders\\/checkout-with-token.*)'
+    '/(.*orders\\/checkout-with-token.*)',
+    '/(.*orders\\/post-checkout.*)'
   ]
 };
 

package/app-template/src/plugins.js

@@ -19,6 +19,7 @@ module.exports = [
   'pz-hepsipay',
   'pz-flow-payment',
   'pz-virtual-try-on',
+  'pz-similar-products',
   'pz-cybersource-uc',
   'pz-hepsipay',
   'pz-masterpass-rest',

package/app-template/src/views/account/orders/order-detail-header.tsx

@@ -21,7 +21,7 @@ export const OrderDetailHeader = ({ title, order, children }: Props) => {
         <div>
           <span>{t('account.my_orders.detail.order_number')}</span>:{' '}
           <span data-testid="account-orders-return-order-id">
-            {order.number}
+            {order?.number}
           </span>
         </div>
 

package/app-template/src/views/checkout/steps/payment/options/credit-card/index.tsx

@@ -16,7 +16,7 @@ import PaymentHeader from '../../payment-header';
 import CreditCardInstallments from './installments';
 import { useLocalization } from '@akinon/next/hooks';
 import { Image } from '@akinon/next/components/image';
-import { getPosError } from '@akinon/next/utils';
+import { getPosError, checkPaymentWillRedirect } from '@akinon/next/utils';
 import PluginModule, { Component } from '@akinon/next/components/plugin-module';
 import { PaymentOption } from '@akinon/next/types';
 
@@ -101,7 +101,7 @@ const CheckoutCreditCard = () => {
     setValue: setFormValue,
     trigger: validateInput,
     control,
-    formState: { errors },
+    formState: { errors, isSubmitting },
     setError,
     getValues,
     clearErrors
@@ -119,8 +119,12 @@ const CheckoutCreditCard = () => {
   const [years, setYears] = useState([]);
   const [formError, setFormError] = useState(null);
   const [cardBinNumber, setCardBinNumber] = useState(null);
+  const [isProcessing, setIsProcessing] = useState(false);
   const [setBinNumber] = useSetBinNumberMutation();
-  const [completeCreditCardPayment] = useCompleteCreditCardPaymentMutation();
+  const [completeCreditCardPayment, { isLoading: isCompletingPayment }] =
+    useCompleteCreditCardPaymentMutation();
+
+  const isButtonDisabled = isSubmitting || isCompletingPayment || isProcessing;
 
   const handleCardNumberChange = (value) => {
     const binNumber = value.replace(/\D/g, '').substring(0, 6);
@@ -136,9 +140,20 @@ const CheckoutCreditCard = () => {
   };
 
   const onSubmit: SubmitHandler<CreditCardForm> = async (data) => {
-    const response = await completeCreditCardPayment(data).unwrap();
+    if (isButtonDisabled) return;
+
+    setIsProcessing(true);
+
+    try {
+      const response = await completeCreditCardPayment(data).unwrap();
+      setFormError(response?.errors);
 
-    setFormError(response?.errors);
+      if (response?.errors || !checkPaymentWillRedirect(response)) {
+        setIsProcessing(false);
+      }
+    } catch (error) {
+      setIsProcessing(false);
+    }
   };
 
   useEffect(() => {
@@ -392,6 +407,7 @@ const CheckoutCreditCard = () => {
             <Button
               className="group uppercase mt-4 inline-flex items-center justify-center"
               type="submit"
+              disabled={isButtonDisabled}
               data-testid="checkout-credit-card-place-order"
             >
               <span>{t('checkout.payment.credit_card.form.button')}</span>

package/app-template/src/views/checkout/steps/payment/options/funds-transfer.tsx

@@ -12,6 +12,7 @@ import * as yup from 'yup';
 import CheckoutAgreements from '../agreements';
 import PaymentHeader from '../payment-header';
 import { useLocalization } from '@akinon/next/hooks';
+import { checkPaymentWillRedirect } from '@akinon/next/utils';
 import { Image } from '@akinon/next/components/image';
 import { Trans } from '@akinon/next/components/trans';
 
@@ -25,21 +26,39 @@ const CheckoutFundsTransfer = () => {
   const {
     handleSubmit,
     control,
-    formState: { errors }
+    formState: { errors, isSubmitting }
   } = useForm({
     resolver: yupResolver(fundsTransferFormSchema())
   });
   const [formError, setFormError] = useState(null);
+  const [isProcessing, setIsProcessing] = useState(false);
   const { bankAccounts, selectedBankAccountPk, preOrder } = useAppSelector(
     (state: RootState) => state.checkout
   );
   const [setFundsTransferOption] = useSetFundsTransferOptionMutation();
-  const [completeFundsTransfer] = useCompleteFundsTransferMutation();
+  const [completeFundsTransfer, { isLoading: isCompletingPayment }] =
+    useCompleteFundsTransferMutation();
 
-  const onSubmit: SubmitHandler<null> = async () => {
-    const response = await completeFundsTransfer().unwrap();
+  const isButtonDisabled = isSubmitting || isCompletingPayment || isProcessing;
 
-    setFormError(response?.errors?.non_field_errors);
+  const onSubmit: SubmitHandler<null> = async () => {
+    if (isButtonDisabled) return;
+
+    setIsProcessing(true);
+
+    try {
+      const response = await completeFundsTransfer().unwrap();
+      setFormError(response?.errors?.non_field_errors);
+
+      if (
+        response?.errors?.non_field_errors ||
+        !checkPaymentWillRedirect(response)
+      ) {
+        setIsProcessing(false);
+      }
+    } catch (error) {
+      setIsProcessing(false);
+    }
   };
 
   useEffect(() => {
@@ -155,6 +174,7 @@ const CheckoutFundsTransfer = () => {
           <Button
             className="group uppercase mt-4 inline-flex items-center justify-center w-full"
             type="submit"
+            disabled={isButtonDisabled}
             data-testid="checkout-bank-account-place-order"
           >
             <span> {t('checkout.payment.fund_transfer.button')}</span>

package/app-template/src/views/checkout/steps/payment/options/loyalty.tsx

@@ -1,16 +1,35 @@
 'use client';
 
+import { useState } from 'react';
 import { useCompleteLoyaltyPaymentMutation } from '@akinon/next/data/client/checkout';
 import { useAppSelector } from '@akinon/next/redux/hooks';
 import { useForm } from 'react-hook-form';
+import { checkPaymentWillRedirect } from '@akinon/next/utils';
 
 export default function LoyaltyPayment() {
   const { payment_option } = useAppSelector((state) => state.checkout.preOrder);
   const { handleSubmit } = useForm();
-  const [completeLoyaltyPayment] = useCompleteLoyaltyPaymentMutation();
+  const [completeLoyaltyPayment, { isLoading: isCompletingPayment }] =
+    useCompleteLoyaltyPaymentMutation();
+  const [isProcessing, setIsProcessing] = useState(false);
+
+  const isButtonDisabled = isCompletingPayment || isProcessing;
 
   const onSubmit = async () => {
-    completeLoyaltyPayment();
+    if (isButtonDisabled) return;
+
+    setIsProcessing(true);
+
+    try {
+      const response = await completeLoyaltyPayment().unwrap();
+
+      if (response?.errors || !checkPaymentWillRedirect(response)) {
+        setIsProcessing(false);
+      }
+    } catch (error) {
+      console.error('Error completing loyalty payment:', error);
+      setIsProcessing(false);
+    }
   };
 
   return (

package/app-template/src/views/checkout/steps/payment/options/redirection.tsx

@@ -8,7 +8,7 @@ import { useForm } from 'react-hook-form';
 import { twMerge } from 'tailwind-merge';
 import * as yup from 'yup';
 import { useEffect, useState } from 'react';
-import { getPosError } from '@akinon/next/utils';
+import { getPosError, checkPaymentWillRedirect } from '@akinon/next/utils';
 import { useMessageListener } from '@akinon/next/hooks';
 
 interface FormValues {
@@ -26,16 +26,33 @@ const formSchema = () =>
 export default function RedirectionPayment() {
   const { payment_option } = useAppSelector((state) => state.checkout.preOrder);
   const [formError, setFormError] = useState(null);
+  const [isProcessing, setIsProcessing] = useState(false);
   const {
     register,
     handleSubmit,
-    formState: { errors }
+    formState: { errors, isSubmitting }
   } = useForm<FormValues>({
     resolver: yupResolver(formSchema())
   });
-  const [completeRedirectionPayment] = useCompleteRedirectionPaymentMutation();
+  const [completeRedirectionPayment, { isLoading: isCompletingPayment }] =
+    useCompleteRedirectionPaymentMutation();
+
+  const isButtonDisabled = isSubmitting || isCompletingPayment || isProcessing;
+
   const onSubmit = async () => {
-    completeRedirectionPayment();
+    if (isButtonDisabled) return;
+
+    setIsProcessing(true);
+
+    try {
+      const response = await completeRedirectionPayment().unwrap();
+
+      if (response?.errors || !checkPaymentWillRedirect(response)) {
+        setIsProcessing(false);
+      }
+    } catch (error) {
+      setIsProcessing(false);
+    }
   };
 
   useMessageListener();
@@ -91,6 +108,7 @@ export default function RedirectionPayment() {
 
         <Button
           data-testid="checkout-submit-button"
+          disabled={isButtonDisabled}
           className={twMerge('w-full md:w-36 px-4 md:px-0')}
         >
           {payment_option.name}

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/header/search/index.tsx

@@ -4,8 +4,7 @@ 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';
@@ -42,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
@@ -67,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}`);
@@ -91,11 +98,12 @@ export default function Search() {
               <Icon
                 name="close"
                 size={14}
-                onClick={() => dispatch(closeSearch())}
+                onClick={handleCloseSearch}
                 className="cursor-pointer"
               />
             </div>
           </div>
+
           <Results searchText={searchText} />
         </div>
       </div>

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

@@ -36,53 +36,100 @@ export default function ProductInfoSlider({ product }: ProductSliderItem) {
     carouselRef.current?.next();
   };
 
-  const handleThumbnailClick = (index) => {
+  const handleThumbnailClick = (index: number) => {
     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}
+    <>
+      <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 }}
           >
-            <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) => (
+            {product?.productimage_set?.map((item, i) => (
               <Image
-                key={index}
+                key={i}
                 src={item.image}
-                alt={`Thumbnail ${index}`}
-                width={80}
-                height={128}
-                className={twMerge('cursor-pointer', [
-                  activeIndex === index && 'border-2 border-primary'
-                ])}
-                onClick={() => handleThumbnailClick(index)}
+                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
               />
             ))}
-          </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>
+          </CarouselCore>
         </div>
       </div>
 
@@ -140,6 +187,6 @@ export default function ProductInfoSlider({ product }: ProductSliderItem) {
           ))}
         </CarouselCore>
       </div>
-    </div>
+    </>
   );
 }

package/commands/plugins.ts

@@ -137,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'

package/dist/commands/plugins.js

@@ -152,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'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@akinon/projectzero",
-  "version": "1.118.0",
+  "version": "1.119.0-rc.1",
   "private": false,
   "description": "CLI tool to manage your Project Zero Next project",
   "bin": {