@akinon/projectzero 1.101.0-rc.73 → 1.101.0-rc.74

package/CHANGELOG.md

@@ -1,5 +1,7 @@
 # @akinon/projectzero
 
+## 1.101.0-rc.74
+
 ## 1.101.0-rc.73
 
 ### Minor Changes

package/app-template/CHANGELOG.md

@@ -1,5 +1,33 @@
 # projectzeronext
 
+## 1.101.0-rc.74
+
+### Minor Changes
+
+- e9e902b: ZERO-3650: Add Loyalty
+
+### Patch Changes
+
+- Updated dependencies [a2fbee6]
+  - @akinon/next@1.101.0-rc.74
+  - @akinon/pz-akifast@1.101.0-rc.74
+  - @akinon/pz-b2b@1.101.0-rc.74
+  - @akinon/pz-basket-gift-pack@1.101.0-rc.74
+  - @akinon/pz-bkm@1.101.0-rc.74
+  - @akinon/pz-checkout-gift-pack@1.101.0-rc.74
+  - @akinon/pz-click-collect@1.101.0-rc.74
+  - @akinon/pz-credit-payment@1.101.0-rc.74
+  - @akinon/pz-gpay@1.101.0-rc.74
+  - @akinon/pz-hepsipay@1.101.0-rc.74
+  - @akinon/pz-masterpass@1.101.0-rc.74
+  - @akinon/pz-one-click-checkout@1.101.0-rc.74
+  - @akinon/pz-otp@1.101.0-rc.74
+  - @akinon/pz-pay-on-delivery@1.101.0-rc.74
+  - @akinon/pz-saved-card@1.101.0-rc.74
+  - @akinon/pz-similar-products@1.101.0-rc.74
+  - @akinon/pz-tabby-extension@1.101.0-rc.74
+  - @akinon/pz-tamara-extension@1.101.0-rc.74
+
 ## 1.101.0-rc.73
 
 ### Minor Changes

package/app-template/package.json

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

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

@@ -37,6 +37,7 @@
     "subtotal": "Subtotal",
     "shipping": "Shipping",
     "discounts_total": "Discounts Total",
+    "loyalty_money_total": "Loyalty Money Total",
     "total": "Total",
     "delivery_info": "Delivery Info",
     "change": "change",
@@ -138,6 +139,11 @@
       "payments": "Payments",
       "per_month": "Per Month",
       "total": "Total"
+    },
+    "store_credit": {
+      "use_my_store_credits": "Use my pz-zero credits",
+      "available_balance": "Available Balance",
+      "insufficient_balance": "Your pz-zero credits are not sufficient to pay for the order, please select an additional payment method to cover the balance of <Amount/>"
     }
   },
   "agreement": {

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

@@ -37,6 +37,7 @@
     "subtotal": "Ara toplam",
     "shipping": "Kargo",
     "discounts_total": "İndirimler Toplamı",
+    "loyalty_money_total": "Sadakat Parası Toplamı",
     "total": "Toplam",
     "delivery_info": "Teslimat Bilgileri",
     "change": "değiştir",
@@ -138,6 +139,11 @@
       "payments": "Ödemeler",
       "per_month": "Her ay",
       "total": "Toplam"
+    },
+    "store_credit": {
+      "use_my_store_credits": "pz-zero kredilerimi kullan",
+      "available_balance": "Mevcut Bakiyem",
+      "insufficient_balance": "pz-zero kredileriniz siparişi ödemek için yeterli değil, lütfen <Amount/> tutarını karşılamak için ek bir ödeme yöntemi seçin."
     }
   },
   "agreement": {

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

@@ -56,7 +56,7 @@ export const Price = (props: NumericFormatProps & PriceProps) => {
 
   const currentCurrencyDecimalScale = Settings.localization.currencies.find(
     (currency) => currency.code === currencyCode_
-  ).decimalScale;
+  )?.decimalScale;
 
   return (
     <NumericFormat

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/package.json

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