@akinon/projectzero 1.41.0 → 1.42.0-rc.0

package/app-template/src/views/category/filters/index.tsx

@@ -1,26 +1,14 @@
 'use client';
 
-import { WIDGET_TYPE } from '@theme/types';
 import clsx from 'clsx';
 
-import { Accordion, Button, Checkbox, Icon, Radio } from '@theme/components';
-import { SizeFilter } from './size-filter';
-
-import { useLocalization, useRouter } from '@akinon/next/hooks';
-import { Facet, FacetChoice } from '@akinon/next/types';
+import { Button, Icon } from '@theme/components';
+import { useLocalization } from '@akinon/next/hooks';
 import { useAppDispatch, useAppSelector } from '@akinon/next/redux/hooks';
-import {
-  resetSelectedFacets,
-  toggleFacet
-} from '@theme/redux/reducers/category';
+import { resetSelectedFacets } from '@theme/redux/reducers/category';
 import CategoryActiveFilters from '@theme/views/category/category-active-filters';
 import { useMemo } from 'react';
-import { commonProductAttributes } from '@theme/settings';
-
-const COMPONENT_TYPES = {
-  [WIDGET_TYPE.category]: Radio,
-  [WIDGET_TYPE.multiselect]: Checkbox
-};
+import { FilterItem } from './filter-item';
 
 interface Props {
   isMenuOpen: boolean;
@@ -28,31 +16,11 @@ interface Props {
 }
 
 export const Filters = (props: Props) => {
-  const router = useRouter();
   const facets = useAppSelector((state) => state.category.facets);
   const dispatch = useAppDispatch();
   const { t } = useLocalization();
   const { isMenuOpen, setIsMenuOpen } = props;
 
-  const handleSelectFilter = ({
-    facet,
-    choice
-  }: {
-    facet: Facet;
-    choice: FacetChoice;
-  }) => {
-    if (facet.key === 'category_ids') {
-      router.push(choice.url);
-    } else {
-      dispatch(
-        toggleFacet({
-          facet,
-          choice
-        })
-      );
-    }
-  };
-
   const haveFilter = useMemo(() => {
     return (
       facets.filter(
@@ -66,10 +34,6 @@ export const Filters = (props: Props) => {
     dispatch(resetSelectedFacets());
   };
 
-  const sizeKey = commonProductAttributes.find(
-    (item) => item.translationKey === 'size'
-  ).key;
-
   return (
     <div
       className={clsx(
@@ -88,71 +52,7 @@ export const Filters = (props: Props) => {
         <span>{t('category.filters.ready_to_wear')}</span>
       </div>
       {facets.map((facet) => {
-        let Component = null;
-        const choices = [...facet.data.choices];
-
-        if (facet.key === sizeKey) {
-          // If it's a size facet, use the custom size filter component
-          Component = SizeFilter;
-
-          const order = ['xs', 's', 'm', 'l', 'xl'];
-          choices.sort((a, b) => {
-            return (
-              order.indexOf(a.label.toLowerCase()) -
-              order.indexOf(b.label.toLowerCase())
-            );
-          });
-        } else {
-          Component =
-            COMPONENT_TYPES[facet.widget_type] ||
-            COMPONENT_TYPES[WIDGET_TYPE.category];
-        }
-
-        return (
-          <Accordion
-            key={facet.key}
-            title={facet.name}
-            isCollapse={choices.some((choice) => choice.is_selected)}
-            dataTestId={`filter-${facet.name}`}
-          >
-            <div
-              className={clsx(
-                'flex gap-4 flex-wrap',
-                facet.key === sizeKey ? 'flex-row' : 'flex-col' // TODO: This condition must be refactor to a better way
-              )}
-            >
-              {choices.map((choice, index) => (
-                <Component // TODO: This dynamic component can be a hook or higher order component so it props can be standardized
-                  key={choice.label}
-                  data={choice}
-                  name={facet.key}
-                  onChange={() => {
-                    if (facet.key !== sizeKey) {
-                      // TODO: This condition must be refactor to a better way
-                      handleSelectFilter({ facet, choice });
-                    }
-                  }}
-                  onClick={() => {
-                    if (facet.key === sizeKey) {
-                      // TODO: This condition must be refactor to a better way
-                      handleSelectFilter({ facet, choice });
-                    }
-                  }}
-                  checked={choice.is_selected}
-                  data-testid={`${choice.label.trim()}`}
-                >
-                  {choice.label} (
-                  <span
-                    data-testid={`filter-count-${facet.name.toLowerCase()}-${index}`}
-                  >
-                    {choice.quantity}
-                  </span>
-                  )
-                </Component>
-              ))}
-            </div>
-          </Accordion>
-        );
+        return <FilterItem key={facet.key} facet={facet} />;
       })}
       <div className="lg:hidden">
         <CategoryActiveFilters />

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

@@ -23,13 +23,29 @@ import { PaymentOption } from '@akinon/next/types';
 const creditCardFormSchema = (
   t,
   payment_option: PaymentOption,
-  isMasterpassDirectPurchase?: boolean
+  isMasterpassDirectPurchase?: boolean,
+  isMasterpassCvcRequired?: boolean
 ) => {
   if (
     payment_option?.payment_type === 'masterpass' &&
     isMasterpassDirectPurchase === false
   ) {
     return yup.object().shape({
+      card_cvv: yup
+        .string()
+        .transform((value: string) => value.replace(/_/g, '').replace(/ /g, ''))
+        .when('*', (_, schema) => {
+          if (isMasterpassCvcRequired) {
+            return schema
+              .length(
+                3,
+                t('checkout.payment.credit_card.form.error.cvv_length')
+              )
+              .required(t('checkout.payment.credit_card.form.error.required'));
+          }
+
+          return schema;
+        }),
       agreement: yup
         .boolean()
         .oneOf([true], t('checkout.payment.credit_card.form.error.required'))
@@ -87,10 +103,16 @@ const CheckoutCreditCard = () => {
     control,
     formState: { errors },
     setError,
-    getValues
+    getValues,
+    clearErrors
   } = useForm<CreditCardForm>({
     resolver: yupResolver(
-      creditCardFormSchema(t, payment_option, masterpass?.isDirectPurchase)
+      creditCardFormSchema(
+        t,
+        payment_option,
+        masterpass?.isDirectPurchase,
+        masterpass?.cvcRequired
+      )
     )
   });
   const [months, setMonths] = useState([]);
@@ -317,7 +339,14 @@ const CheckoutCreditCard = () => {
         <PluginModule
           component={Component.MasterpassCardList}
           props={{
-            className: 'p-10'
+            className: 'p-10',
+            form: {
+              control,
+              register,
+              errors,
+              setFormValue,
+              clearErrors
+            }
           }}
         />
 

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/app-template/src/views/checkout/steps/shipping/shipping-options.tsx

@@ -1,20 +1,69 @@
 import { useAppDispatch, useAppSelector } from '@akinon/next/redux/hooks';
 import { setCurrentStep } from '@akinon/next/redux/reducers/checkout';
 import { RootState } from '@theme/redux/store';
-import { useSetShippingOptionMutation } from '@akinon/next/data/client/checkout';
+import {
+  useSetShippingOptionMutation,
+  useSetDataSourceShippingOptionsMutation
+} from '@akinon/next/data/client/checkout';
 import { Price, Button, Radio } from '@theme/components';
 import { CheckoutStep } from '@akinon/next/types';
 import { useLocalization } from '@akinon/next/hooks';
+import { useEffect, useState } from 'react';
 
 const ShippingOptions = () => {
   const { t } = useLocalization();
-  const { steps, shippingOptions, preOrder, addressList } = useAppSelector(
-    (state: RootState) => state.checkout
-  );
-  const { shipping_option, shipping_address } = preOrder ?? {};
+  const {
+    steps,
+    shippingOptions,
+    dataSourceShippingOptions,
+    preOrder,
+    addressList
+  } = useAppSelector((state: RootState) => state.checkout);
+  const { shipping_option, shipping_address, data_source_shipping_options } =
+    preOrder ?? {};
+
+  const [selectedPks, setSelectedPks] = useState<
+    { dataSourcePk: number; optionPk: number }[] | null
+  >(null);
+
   const [setShippingOption] = useSetShippingOptionMutation();
+  const [setDataSourceShippingOption] =
+    useSetDataSourceShippingOptionsMutation();
+
   const dispatch = useAppDispatch();
 
+  useEffect(() => {
+    if (!data_source_shipping_options) return;
+
+    const initialSelectedPks = data_source_shipping_options.map((option) => ({
+      dataSourcePk: option.data_source.pk,
+      optionPk: option.pk
+    }));
+
+    setSelectedPks(initialSelectedPks);
+  }, [data_source_shipping_options]);
+
+  const updateData = (dataSourcePk: number, newPk: number) => {
+    const updatedSelectedPks = selectedPks?.map((item) =>
+      item.dataSourcePk === dataSourcePk ? { ...item, optionPk: newPk } : item
+    );
+
+    if (!updatedSelectedPks) return;
+
+    setSelectedPks(updatedSelectedPks);
+
+    const pks = updatedSelectedPks.map((item) => item.optionPk);
+    setDataSourceShippingOption(pks);
+  };
+
+  const handleRadioChange = (
+    e: React.ChangeEvent<HTMLInputElement>,
+    dataSourcePk: number
+  ) => {
+    const newPk = parseInt(e.currentTarget.value);
+    updateData(dataSourcePk, newPk);
+  };
+
   return (
     <div className="w-full lg:w-2/5">
       <div className="border-b border-gray-400 px-8 py-4">
@@ -32,37 +81,81 @@ const ShippingOptions = () => {
             {t('checkout.address.shipping.chosen_address')}:{' '}
             {shipping_address?.city.name}
           </p>
-          {shippingOptions.map((option) => (
-            <div
-              key={option.pk}
-              className="py-4 border-t border-gray-400 flex justify-between"
-            >
-              <Radio
-                name="shipping"
-                checked={option.pk === shipping_option?.pk}
-                onChange={() => {
-                  setShippingOption(option.pk);
-                }}
-                onClick={() => {
-                  setShippingOption(option?.pk);
-                }}
-                data-testid={`checkout-shipping-option-${option.pk}`}
+          {}
+          {shippingOptions && shippingOptions.length > 0 && (
+            <>
+              {shippingOptions.map((option) => (
+                <div
+                  key={option.pk}
+                  className="py-4 border-t border-gray-400 flex justify-between"
+                >
+                  <Radio
+                    name="shipping"
+                    checked={option.pk === shipping_option?.pk}
+                    onChange={() => {
+                      setShippingOption(option.pk);
+                    }}
+                    data-testid={`checkout-shipping-option-${option.pk}`}
+                  >
+                    {option.name}
+                  </Radio>
+                  <span className="text-xs">
+                    <Price value={option.shipping_amount} />
+                  </span>
+                </div>
+              ))}
+              <Button
+                className="mt-2 w-full"
+                disabled={!steps.shipping.completed}
+                onClick={() => dispatch(setCurrentStep(CheckoutStep.Payment))}
+                data-testid="checkout-shipping-save"
+              >
+                {t('checkout.address.shipping.button')}
+              </Button>
+            </>
+          )}
+          {dataSourceShippingOptions && dataSourceShippingOptions.length > 0 && (
+            <>
+              {dataSourceShippingOptions.map((option) => (
+                <div key={option.pk}>
+                  <h3 className="text-lg font-bold">{option?.name}</h3>
+                  {option.data_source_shipping_options.map((opt) => (
+                    <div
+                      key={opt.pk}
+                      className="py-4 border-t border-gray-400 flex justify-between"
+                    >
+                      <Radio
+                        name={`data-source-shipping-${option.pk}`}
+                        checked={
+                          selectedPks?.some(
+                            (item) => item.optionPk === opt.pk
+                          ) || false
+                        }
+                        onChange={(e: React.ChangeEvent<HTMLInputElement>) =>
+                          handleRadioChange(e, option.pk)
+                        }
+                        value={opt.pk}
+                        data-testid={`checkout-data-source-shipping-${opt.pk}`}
+                      >
+                        {opt?.shipping_option_name}
+                      </Radio>
+                      <span className="text-xs">
+                        <Price value={opt?.shipping_amount} />
+                      </span>
+                    </div>
+                  ))}
+                </div>
+              ))}
+              <Button
+                className="mt-2 w-full"
+                disabled={!steps.shipping.completed}
+                onClick={() => dispatch(setCurrentStep(CheckoutStep.Payment))}
+                data-testid="checkout-shipping-save"
               >
-                {option.name}
-              </Radio>
-              <span className="text-xs">
-                <Price value={option.shipping_amount} />
-              </span>
-            </div>
-          ))}
-          <Button
-            className="mt-2 w-full"
-            disabled={!steps.shipping.completed}
-            onClick={() => dispatch(setCurrentStep(CheckoutStep.Payment))}
-            data-testid="checkout-shipping-save"
-          >
-            {t('checkout.address.shipping.button')}
-          </Button>
+                {t('checkout.address.shipping.button')}
+              </Button>
+            </>
+          )}
         </div>
       )}
     </div>

package/app-template/tsconfig.json

@@ -3,7 +3,19 @@
   "display": "Default",
   "compilerOptions": {
     "baseUrl": "./src",
-    "paths": { "@theme/*": ["./*"] },
+    "paths": {
+      "@theme/*": ["./*"],
+      "@root/*": ["./app/[commerce]/[locale]/[currency]/*"],
+      "@product/*": ["./app/[commerce]/[locale]/[currency]/product/*"],
+      "@group-product/*": [
+        "./app/[commerce]/[locale]/[currency]/group-product/*"
+      ],
+      "@category/*": ["./app/[commerce]/[locale]/[currency]/category/*"],
+      "@special-page/*": [
+        "./app/[commerce]/[locale]/[currency]/special-page/*"
+      ],
+      "@flat-page/*": ["./app/[commerce]/[locale]/[currency]/flat-page/*"]
+    },
     "allowSyntheticDefaultImports": true,
     "composite": false,
     "declaration": true,
@@ -40,7 +52,5 @@
     ".next/types/**/*.ts",
     "../../packages/**/*"
   ],
-  "exclude": ["node_modules",
-    "../../packages/projectzero/app-template"
-  ]
+  "exclude": ["node_modules", "../../packages/projectzero/app-template"]
 }