@akinon/projectzero 1.64.0 → 1.66.0

package/CHANGELOG.md

@@ -1,5 +1,9 @@
 # @akinon/projectzero
 
+## 1.66.0
+
+## 1.65.0
+
 ## 1.64.0
 
 ## 1.63.0

package/app-template/CHANGELOG.md

@@ -1,5 +1,67 @@
 # projectzeronext
 
+## 1.66.0
+
+### Minor Changes
+
+- 572d2e8: ZERO-2667: Add iframe support for redirection payment methods
+- 2e6104d: ZERO-2888:Edit the numbering in the pagination and the visibility of the prev and next buttons
+
+### Patch Changes
+
+- Updated dependencies [572d2e8]
+- Updated dependencies [2e6104d]
+- Updated dependencies [7b05522]
+- Updated dependencies [29ead87]
+- Updated dependencies [12a873e]
+- Updated dependencies [f2c325c]
+  - @akinon/next@1.66.0
+  - @akinon/pz-otp@1.66.0
+  - @akinon/pz-akifast@1.66.0
+  - @akinon/pz-b2b@1.66.0
+  - @akinon/pz-basket-gift-pack@1.66.0
+  - @akinon/pz-bkm@1.66.0
+  - @akinon/pz-checkout-gift-pack@1.66.0
+  - @akinon/pz-click-collect@1.66.0
+  - @akinon/pz-credit-payment@1.66.0
+  - @akinon/pz-gpay@1.66.0
+  - @akinon/pz-masterpass@1.66.0
+  - @akinon/pz-one-click-checkout@1.66.0
+  - @akinon/pz-pay-on-delivery@1.66.0
+  - @akinon/pz-saved-card@1.66.0
+  - @akinon/pz-tabby-extension@1.66.0
+
+## 1.65.0
+
+### Minor Changes
+
+- 5a4c607: ZERO-2764: Add case-warning rule to eslint-plugin-projectzero
+- 74a1269: ZERO-2658:Edit product name clickability on completed order page
+- d13fd36: ZERO-2614: Refactor Price component to remove unnecessary code and improve readability also fix the decimal scale
+- 902d828: ZERO-2621:edit position of loaderSpinner in favorites page
+- 4614eee: ZERO-2602: The script that checks the build for standalone projects
+- 86d2531: ZERO-2693: resolve dependency collision warning for eslint-config-next
+
+### Patch Changes
+
+- Updated dependencies [d13fd36]
+- Updated dependencies [86d2531]
+  - @akinon/next@1.65.0
+  - @akinon/pz-akifast@1.65.0
+  - @akinon/pz-b2b@1.65.0
+  - @akinon/pz-basket-gift-pack@1.65.0
+  - @akinon/pz-bkm@1.65.0
+  - @akinon/pz-checkout-gift-pack@1.65.0
+  - @akinon/pz-click-collect@1.65.0
+  - @akinon/pz-credit-payment@1.65.0
+  - @akinon/pz-gpay@1.65.0
+  - @akinon/pz-masterpass@1.65.0
+  - @akinon/pz-one-click-checkout@1.65.0
+  - @akinon/pz-otp@1.65.0
+  - @akinon/pz-pay-on-delivery@1.65.0
+  - @akinon/pz-saved-card@1.65.0
+  - @akinon/pz-tabby-extension@1.65.0
+
 ## 1.64.0
 
 ### Minor Changes

package/app-template/package.json

@@ -1,6 +1,6 @@
 {
   "name": "projectzeronext",
-  "version": "1.64.0",
+  "version": "1.66.0",
   "private": true,
   "license": "MIT",
   "scripts": {
@@ -22,27 +22,26 @@
     "prestart": "pz-prestart"
   },
   "dependencies": {
-    "@akinon/next": "1.64.0",
-    "@akinon/pz-akifast": "1.64.0",
-    "@akinon/pz-b2b": "1.64.0",
-    "@akinon/pz-basket-gift-pack": "1.64.0",
-    "@akinon/pz-bkm": "1.64.0",
-    "@akinon/pz-checkout-gift-pack": "1.64.0",
-    "@akinon/pz-click-collect": "1.64.0",
-    "@akinon/pz-credit-payment": "1.64.0",
-    "@akinon/pz-gpay": "1.64.0",
-    "@akinon/pz-masterpass": "1.64.0",
-    "@akinon/pz-one-click-checkout": "1.64.0",
-    "@akinon/pz-otp": "1.64.0",
-    "@akinon/pz-pay-on-delivery": "1.64.0",
-    "@akinon/pz-saved-card": "1.64.0",
-    "@akinon/pz-tabby-extension": "1.64.0",
+    "@akinon/next": "1.66.0",
+    "@akinon/pz-akifast": "1.66.0",
+    "@akinon/pz-b2b": "1.66.0",
+    "@akinon/pz-basket-gift-pack": "1.66.0",
+    "@akinon/pz-bkm": "1.66.0",
+    "@akinon/pz-checkout-gift-pack": "1.66.0",
+    "@akinon/pz-click-collect": "1.66.0",
+    "@akinon/pz-credit-payment": "1.66.0",
+    "@akinon/pz-gpay": "1.66.0",
+    "@akinon/pz-masterpass": "1.66.0",
+    "@akinon/pz-one-click-checkout": "1.66.0",
+    "@akinon/pz-otp": "1.66.0",
+    "@akinon/pz-pay-on-delivery": "1.66.0",
+    "@akinon/pz-saved-card": "1.66.0",
+    "@akinon/pz-tabby-extension": "1.66.0",
     "@hookform/resolvers": "2.9.0",
     "@next/third-parties": "14.1.0",
     "@react-google-maps/api": "2.17.1",
     "@sentry/nextjs": "7.116.0",
     "dayjs": "1.11.5",
-    "eslint-config-next": "14.2.2",
     "lossless-json": "2.0.5",
     "next": "14.2.5",
     "next-auth": "4.24.5",
@@ -61,7 +60,7 @@
     "yup": "0.32.11"
   },
   "devDependencies": {
-    "@akinon/eslint-plugin-projectzero": "1.64.0",
+    "@akinon/eslint-plugin-projectzero": "1.66.0",
     "@semantic-release/changelog": "6.0.2",
     "@semantic-release/exec": "6.0.3",
     "@semantic-release/git": "10.0.1",
@@ -81,7 +80,7 @@
     "clsx": "1.1.1",
     "currency-symbol-map": "5.1.0",
     "eslint": "8.14.0",
-    "eslint-config-next": "14.0.3",
+    "eslint-config-next": "14.2.3",
     "eslint-config-prettier": "8.5.0",
     "husky": "8.0.0",
     "jest": "29.7.0",

package/app-template/src/app/[commerce]/[locale]/[currency]/orders/completed/[token]/page.tsx

@@ -182,21 +182,25 @@ const CheckoutCompleted = ({
                     }}
                   >
                     {data.order.orderitem_set.map((item) => (
-                      <div key={`order-item-${item.id}`} className="flex">
-                        <Link href={item.product.absolute_url} passHref>
+                      <div
+                        key={`order-item-${item.id}`}
+                        className="flex justify-between gap-x-4 w-full"
+                      >
+                        <Link
+                          className="flex justify-between gap-x-4 flex-1 items-center transition-all text-xs text-black-800 hover:text-secondary"
+                          href={item.product.absolute_url}
+                          passHref
+                        >
                           <Image
                             src={item.product.image}
                             alt={item.product.name}
                             width={64}
                             height={96}
                           />
+
+                          <span>{item.product.name}</span>
                         </Link>
-                        <div className="flex justify-between flex-1 items-center ml-4">
-                          <>
-                            <div className="text-xs text-black-800 transition-all w-full hover:text-secondary">
-                              {item.product.name}
-                            </div>
-                          </>
+                        <div className="flex justify-end items-center">
                           <div>
                             {item.retail_price !== item.price && (
                               <div className="text-black-800 line-through text-xs min-w-max sm:text-sm">

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

@@ -1,8 +1,8 @@
-import { MouseEvent, useCallback, useEffect, useState } from 'react';
+import { useCallback, useEffect, useState } from 'react';
 import { PaginationProps } from '@theme/components/types';
 import { twMerge } from 'tailwind-merge';
 import clsx from 'clsx';
-import { Link, Button } from '@theme/components';
+import { Button } from '@theme/components';
 import usePagination from '@akinon/next/hooks/use-pagination';
 import { useLocalization } from '@akinon/next/hooks';
 import { useRouter } from '@akinon/next/hooks';
@@ -92,9 +92,7 @@ export const Pagination = (props: PaginationProps) => {
     }
   }, [numberOfPages, page, pageList, threshold]);
 
-  const handleClick = (e: MouseEvent<HTMLAnchorElement>, url: string) => {
-    e.preventDefault();
-
+  const handleClick = (url: string) => {
     const newUrl = new URL(url, window.location.origin);
     const page = newUrl.searchParams.get('page');
 
@@ -129,7 +127,7 @@ export const Pagination = (props: PaginationProps) => {
     if (type === 'list') {
       createListItems();
     }
-  }, []); // eslint-disable-line react-hooks/exhaustive-deps
+  }, [createListItems, type]);
 
   useEffect(() => {
     if (total && total !== paginationTotal) {
@@ -200,9 +198,8 @@ export const Pagination = (props: PaginationProps) => {
         >
           {prev && currentPage !== 1 && (
             <li>
-              <Link
-                onClick={(e) => handleClick(e, prev)}
-                href={prev}
+              <button
+                onClick={() => handleClick(prev)}
                 className={twMerge(
                   'flex cursor-pointer text-sm px-2',
                   prevClassName
@@ -212,16 +209,15 @@ export const Pagination = (props: PaginationProps) => {
                 <span className="hidden lg:inline-block ms-4">
                   {t('category.pagination.previous')}
                 </span>
-              </Link>
+              </button>
             </li>
           )}
 
           {paginationItems.map((item, i) => (
             <li key={i}>
               {item?.url != '#' ? (
-                <Link
-                  onClick={(e) => handleClick(e, item.url)}
-                  href={item.url}
+                <button
+                  onClick={() => handleClick(item.url)}
                   className={twMerge(
                     clsx(
                       'text-xs px-2 cursor-pointer',
@@ -234,7 +230,7 @@ export const Pagination = (props: PaginationProps) => {
                   )}
                 >
                   {item?.page}
-                </Link>
+                </button>
               ) : (
                 <span className="cursor-default text-xs flex items-center justify-center">
                   {item?.page}
@@ -245,9 +241,8 @@ export const Pagination = (props: PaginationProps) => {
 
           {showNext && (
             <li>
-              <Link
-                onClick={(e) => handleClick(e, next)}
-                href={next}
+              <button
+                onClick={() => handleClick(next)}
                 className={twMerge(
                   'flex cursor-pointer text-xs px-2',
                   nextClassName
@@ -257,7 +252,7 @@ export const Pagination = (props: PaginationProps) => {
                   {t('category.pagination.next')}
                 </span>
                 <span>&gt;</span>
-              </Link>
+              </button>
             </li>
           )}
         </ul>

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

@@ -1,8 +1,8 @@
 import { useMemo } from 'react';
 import NumberFormat, { NumberFormatProps } from 'react-number-format';
 import { getCurrency } from '@akinon/next/utils';
-import { PriceProps } from '@theme/types';
 import { useLocalization } from '@akinon/next/hooks';
+import { PriceProps } from '../types';
 import Settings from '@theme/settings';
 
 export const Price = (props: NumberFormatProps & PriceProps) => {
@@ -21,12 +21,10 @@ export const Price = (props: NumberFormatProps & PriceProps) => {
     fixedDecimalScale = true,
     ...rest
   } = props;
+
   const { currency: selectedCurrencyCode } = useLocalization();
   const currencyCode_ = currencyCode || selectedCurrencyCode;
 
-  // TODO: This is very bad practice. It broke decimalScale.
-  const _value = value?.toString().replace('.', ',');
-
   const currency = useMemo(
     () =>
       getCurrency({
@@ -38,21 +36,39 @@ export const Price = (props: NumberFormatProps & PriceProps) => {
     [currencyCode_, useCurrencySymbol, useCurrencyAfterPrice, useCurrencySpace]
   );
 
+  const numericValue =
+    typeof value === 'string'
+      ? parseFloat(value)
+      : typeof value === 'number'
+      ? value
+      : 0;
+
+  const formattedValue = Number.isFinite(numericValue)
+    ? numericValue.toFixed(decimalScale)
+    : '0';
+
+  const displayValue =
+    useNegative && numericValue < 0
+      ? `-${useNegativeSpace ? ' ' : ''}${Math.abs(numericValue).toFixed(
+          decimalScale
+        )}`
+      : formattedValue;
+
   const currentCurrencyDecimalScale = Settings.localization.currencies.find(
     (currency) => currency.code === currencyCode_
   ).decimalScale;
 
   return (
     <NumberFormat
-      value={useNegative ? `-${useNegativeSpace}${_value}` : _value}
-      {...{
-        [useCurrencyAfterPrice ? 'suffix' : 'prefix']: currency
-      }}
+      value={displayValue}
       displayType={displayType}
       thousandSeparator={thousandSeparator}
       decimalScale={currentCurrencyDecimalScale ?? decimalScale}
       decimalSeparator={decimalSeparator}
       fixedDecimalScale={fixedDecimalScale}
+      prefix={!useCurrencyAfterPrice ? currency : undefined}
+      suffix={useCurrencyAfterPrice ? currency : undefined}
+      isNumericString={true}
       {...rest}
     />
   );

package/app-template/src/views/account/favourite-products/favourite-products-list.tsx

@@ -30,7 +30,11 @@ const FavoriteProductsList = () => {
   }
 
   if (isLoading || isFetching) {
-    return <LoaderSpinner />; // TODO: Fix loader spinner position
+    return (
+      <div className="flex items-center justify-center h-80">
+        <LoaderSpinner />
+      </div>
+    );
   }
 
   return (

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

@@ -9,6 +9,7 @@ import { twMerge } from 'tailwind-merge';
 import * as yup from 'yup';
 import { useEffect, useState } from 'react';
 import { getPosError } from '@akinon/next/utils';
+import { useMessageListener } from '@akinon/next/hooks';
 
 interface FormValues {
   agreement: boolean;
@@ -25,7 +26,6 @@ const formSchema = () =>
 export default function RedirectionPayment() {
   const { payment_option } = useAppSelector((state) => state.checkout.preOrder);
   const [formError, setFormError] = useState(null);
-
   const {
     register,
     handleSubmit,
@@ -34,11 +34,12 @@ export default function RedirectionPayment() {
     resolver: yupResolver(formSchema())
   });
   const [completeRedirectionPayment] = useCompleteRedirectionPaymentMutation();
-
   const onSubmit = async () => {
     completeRedirectionPayment();
   };
 
+  useMessageListener();
+
   useEffect(() => {
     const posErrors = getPosError();
 
@@ -48,44 +49,49 @@ export default function RedirectionPayment() {
   }, []);
 
   return (
-    <form onSubmit={handleSubmit(onSubmit)} className="lg-5 space-y-5 lg:p-10">
-      <h1 className="text-2xl font-bold px-4 md:px-0">
-        Pay With {payment_option.name}
-      </h1>
-
-      <p className="px-4 md:px-0">
-        You can quickly and easily pay and complete your order with{' '}
-        {payment_option.name}.
-      </p>
-
-      <Checkbox
-        className="px-4 md:px-0"
-        {...register('agreement')}
-        error={errors.agreement}
+    <div className="checkout-redirection-payment-wrapper">
+      <form
+        onSubmit={handleSubmit(onSubmit)}
+        className="lg-5 space-y-5 lg:p-10"
       >
-        Check here to indicate that you have read and agree to the all terms.
-      </Checkbox>
+        <h1 className="text-2xl font-bold px-4 md:px-0">
+          Pay With {payment_option.name}
+        </h1>
 
-      {formError?.non_field_errors && (
-        <div
-          className="w-full text-xs text-start px-1 mt-3 text-error"
-          data-testid="checkout-form-error"
-        >
-          {formError.non_field_errors}
-        </div>
-      )}
-      {formError?.status && (
-        <div
-          className="w-full text-xs text-start px-1 mt-3 text-error"
-          data-testid="checkout-form-error"
+        <p className="px-4 md:px-0">
+          You can quickly and easily pay and complete your order with{' '}
+          {payment_option.name}.
+        </p>
+
+        <Checkbox
+          className="px-4 md:px-0"
+          {...register('agreement')}
+          error={errors.agreement}
         >
-          {formError.status}
-        </div>
-      )}
+          Check here to indicate that you have read and agree to the all terms.
+        </Checkbox>
+
+        {formError?.non_field_errors && (
+          <div
+            className="w-full text-xs text-start px-1 mt-3 text-error"
+            data-testid="checkout-form-error"
+          >
+            {formError.non_field_errors}
+          </div>
+        )}
+        {formError?.status && (
+          <div
+            className="w-full text-xs text-start px-1 mt-3 text-error"
+            data-testid="checkout-form-error"
+          >
+            {formError.status}
+          </div>
+        )}
 
-      <Button className={twMerge('w-full md:w-36 px-4 md:px-0')}>
-        {payment_option.name}
-      </Button>
-    </form>
+        <Button className={twMerge('w-full md:w-36 px-4 md:px-0')}>
+          {payment_option.name}
+        </Button>
+      </form>
+    </div>
   );
 }

package/package.json

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