@redneckz/wildless-cms-uni-blocks 0.14.954 → 0.14.956

package/mobile/src/components/Header/HeaderQuickActionsMenu.tsx

@@ -83,15 +83,15 @@ const renderQuickActionsDropdown = ({
 }: renderDropdownItemProps) => {
   const quickActionsMapping = {
     call: {
-      handler: () => {
-        handlers?.call();
+      handler: (ev: PreventableEventWithTarget) => {
+        handlers?.call(ev);
         closeDropdown();
       },
       text: 'Заказать звонок',
     },
     chat: {
-      handler: () => {
-        handlers?.chat();
+      handler: (ev: PreventableEventWithTarget) => {
+        handlers?.call(ev);
         closeDropdown();
       },
       text: 'Написать в чат',
@@ -120,10 +120,12 @@ export const useHandlers = () => {
 
   const aspects = useAspects();
 
-  const handleChatClick = useCallback((ev?: PreventableEventWithTarget) => {
+  const handleChatClick = useCallback((ev: PreventableEventWithTarget) => {
     const openChatBot = aspects[CHAT_BOT_ASPECT_NAME];
     if (openChatBot && ev) {
-      openChatBot(ev).finally();
+      if (openChatBot) {
+        openChatBot(ev).finally();
+      }
     }
   }, []);
 

package/mobile/src/retail/components/Fields/CardCategoryField.tsx

@@ -12,6 +12,7 @@ export const CardCategoryField = JSX<CustomFieldProps>(({ field, input }) => {
   const [programId] = useLocalStorage<string>('programId');
   const { value: selectedCardCategory, onChange: cardCategoryChange } = field('cardCategory');
   const selectedPaymentSystem = field('paymentSystem')?.value?.key;
+  const handleChangeIsMomentDebitCard = field('isMomentDebitCard')?.onChange;
 
   const getCardCategoryValue = useCallback(
     (fetchedCardTypes: CardTypeData[]) =>
@@ -24,6 +25,11 @@ export const CardCategoryField = JSX<CustomFieldProps>(({ field, input }) => {
     [],
   );
 
+  const onChange = useCallback((value: Option) => {
+    cardCategoryChange?.(value);
+    handleChangeIsMomentDebitCard?.(value?.text?.toLowerCase()?.includes('момент'));
+  }, []);
+
   useEffect(() => {
     if (selectedPaymentSystem && programId) {
       (async () => {
@@ -50,6 +56,7 @@ export const CardCategoryField = JSX<CustomFieldProps>(({ field, input }) => {
         label="Категория карты"
         fieldName="cardCategory"
         input={input}
+        onChange={onChange}
       />
       {description ? <InfoCard __html={description} /> : null}
     </div>

package/mobile/src/retail/components/Fields/DeliveryDateFiels.tsx

@@ -1,7 +1,16 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { DatePickerControl } from '../../../ui-kit/DatePicker/DatePickerControl';
 import { type CustomFieldProps } from '../../../ui-kit/FormField/CustomFieldProps';
+import { useRetailFormStore } from '../../hooks/useRetailFormStore';
 
-export const DeliveryDateFiels = JSX<CustomFieldProps>(({ field, input }) => (
-  <DatePickerControl label="Дата доставки" {...field(input?.name ?? '')} minDate={new Date()} />
-));
+const MIN_DATE = new Date(Date.now() + 1 * 24 * 60 * 60 * 1000);
+
+export const DeliveryDateFiels = JSX<CustomFieldProps>(({ field, input }) => {
+  const { productType } = useRetailFormStore();
+  const isDebit = productType === 'debitCard';
+  const minDate = isDebit ? MIN_DATE : new Date();
+
+  return (
+    <DatePickerControl label="Дата доставки" {...field(input?.name ?? '')} minDate={minDate} />
+  );
+});

package/mobile/src/retail/components/Fields/DeliveryTimeField.tsx

@@ -4,15 +4,26 @@ import { type CustomFieldProps } from '../../../ui-kit/FormField/CustomFieldProp
 import { type RadioButtonItem } from '../../../ui-kit/RadioButtonGroup/RadioButtonGroup';
 import { RadioButtonGroupControl } from '../../../ui-kit/RadioButtonGroup/RadioButtonGroupControl';
 import { useLeadFormData } from '../../hooks/useLeadFormData';
+import { useRetailFormStore } from '../../hooks/useRetailFormStore';
 
 export const DeliveryTimeField = JSX<CustomFieldProps>(({ field, input }) => {
+  const { productType } = useRetailFormStore();
+  const isDebit = productType === 'debitCard';
   const { data } = useLeadFormData('COURIER_DELIVERY_TIME');
+
+  const deliveryTimeDebit = [
+    { id: 'TIME_1', text: '10:00-14:00' },
+    { id: 'TIME_2', text: '14:00-18:00' },
+  ];
+
   const deliveryTime: RadioButtonItem[] = useMemo(
     () =>
-      data?.map((_) => ({
-        id: _.key as string,
-        text: _.value,
-      })) ?? [],
+      isDebit
+        ? deliveryTimeDebit
+        : data?.map((_) => ({
+            id: _.key as string,
+            text: _.value,
+          })) ?? [],
     [data],
   );
 

package/mobile/src/retail/components/Fields/RegionRetailField.tsx

@@ -14,12 +14,12 @@ export const RegionRetailField = JSX<CustomFieldProps>(({ field, input }) => {
   const { data: regions } = useLeadFormData('REGION_RF');
   const { data: regionsDelivery } = useAsyncData('regionsDelivery', getRegionsCardDelivery);
   const { data: productSettings } = useLeadFormData(getCurrentProductSettings(productType));
+  const isEsiaAuth = field('esiaAccountTypeCd')?.value?.key;
 
   const isSalaryCard = programId === '38';
   const formatRegions = regions?.map(({ key, value }) => ({ key, text: value }));
   const isDeliveryActive =
     productSettings?.find((_) => _?.key === 'DELIVERY_ACTIVE')?.value === 'true';
-
   const handleChangeRegion = field('regionRetail')?.onChange;
   const handleChangeRegionHasDelivery = field('regionHasDelivery')?.onChange;
   const handleChangeMethodObtain = field('methodObtain')?.onChange;
@@ -29,7 +29,8 @@ export const RegionRetailField = JSX<CustomFieldProps>(({ field, input }) => {
       const regionHasDelivery =
         isDeliveryActive &&
         regionsDelivery?.find((_) => _.regionCode === value.key)?.deliveryFlg &&
-        !isSalaryCard;
+        !isSalaryCard &&
+        Boolean(isEsiaAuth);
       handleChangeRegionHasDelivery?.(regionHasDelivery);
       handleChangeMethodObtain?.(regionHasDelivery ? 'courier' : 'office');
       handleChangeRegion?.(value);

package/mobile/src/retail/components/Fields/SelectField.tsx

@@ -18,6 +18,7 @@ export interface SelectFieldProps
   fieldName: string;
   isSearch?: boolean;
   isManualInput?: boolean;
+  onChange?: (value: Option) => void;
 }
 
 export const SelectField = UniBlock<SelectFieldProps>(
@@ -28,6 +29,7 @@ export const SelectField = UniBlock<SelectFieldProps>(
     placeholder = 'Выберите из списка',
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
     options,
+    onChange,
     ...rest
   }) => {
     const leadOptions: Option[] =
@@ -42,6 +44,7 @@ export const SelectField = UniBlock<SelectFieldProps>(
         options={leadOptions}
         {...field(fieldName)}
         {...rest}
+        onChange={onChange ?? field(fieldName)?.onChange}
       />
     );
   },

package/mobile/src/retail/model/LeadFormState.ts

@@ -186,6 +186,7 @@ export interface LeadFormState extends FormRetailConsents, FormStateDeliveryType
   latinName?: string;
   latinSurname?: string;
   regionHasDelivery?: boolean;
+  isMomentDebitCard?: boolean;
   files?: File[];
   deliveryTime?: string;
 }

package/mobile/src/retail/model/NameFieldDef.ts

@@ -27,6 +27,7 @@ type NameFieldCreditCardDef =
   | 'methodObtain'
   | 'deliveryDate'
   | 'regionHasDelivery'
+  | 'isMomentDebitCard'
   | 'latinName'
   | 'latinSurname';
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@redneckz/wildless-cms-uni-blocks",
-  "version": "0.14.954",
+  "version": "0.14.956",
   "private": false,
   "license": "MIT",
   "author": "ЦК",

package/src/components/DebitForm/DebitFormStatusTracker.tsx

@@ -13,7 +13,6 @@ import { SuccessStatusContent } from './SuccessStatusContent';
 export const DebitFormStatusTracker = JSX(() => {
   const [status, setStatus] = useState(STATUS_TYPE.process);
   const { taskId, statusInfo, programId } = useRetailFormStore();
-
   const isSalaryCard = programId === '38';
   const isOffice = statusInfo?.methodObtain === 'office';
 
@@ -23,11 +22,10 @@ export const DebitFormStatusTracker = JSX(() => {
         signalType: 'FIND_PERSON_SIGNAL',
         taskId,
       });
-      isOffice &&
-        (await sendSignalToProcess({
-          signalType: 'SET_PERSON_SIGNAL',
-          taskId,
-        }));
+      await sendSignalToProcess({
+        signalType: 'SET_PERSON_SIGNAL',
+        taskId,
+      });
 
       setStatus(statusCd || STATUS_TYPE.notFound);
     })();

package/src/components/DebitForm/DebitFormStepsData.tsx

@@ -67,6 +67,30 @@ export const DELIVERY_DEBIT_CARD_CONTENT: SectionsRetailProps[] = [
       },
     ],
   },
+  {
+    inputs: [
+      {
+        name: 'deliveryDate',
+        condition: {
+          name: 'methodObtain',
+          values: ['courier'],
+        },
+        required: true,
+      },
+    ],
+  },
+  {
+    inputs: [
+      {
+        name: 'deliveryTime',
+        condition: {
+          name: 'methodObtain',
+          values: ['courier'],
+        },
+        required: true,
+      },
+    ],
+  },
   {
     inputs: [
       {
@@ -143,6 +167,20 @@ const DEBIT_PERSONAL_INFO_CONTENT: SectionsRetailProps[] = [
       },
     ],
   },
+  {
+    inputs: [
+      {
+        name: 'infoCard',
+        condition: {
+          name: 'methodObtain',
+          values: ['courier'],
+        },
+        label:
+          // eslint-disable-next-line max-len
+          'Проверьте полученные данные с портала Государственных услуг. При наличии ошибки, закройте заявку и оформите заявку заново без авторизации через портал Государственных услуг.',
+      },
+    ],
+  },
 ];
 const DEBIT_CARD_CONTENT: SectionsRetailProps[] = [
   {
@@ -159,16 +197,40 @@ const DEBIT_CARD_CONTENT: SectionsRetailProps[] = [
   {
     title: 'Отображение на карте',
     inputs: [],
+    condition: {
+      name: 'isMomentDebitCard',
+      values: [false],
+    },
   },
   {
     columns: 2,
-    inputs: [{ name: 'latinName' }, { name: 'latinSurname', required: true }],
+    inputs: [
+      {
+        name: 'latinName',
+        condition: {
+          name: 'isMomentDebitCard',
+          values: [false],
+        },
+      },
+      {
+        name: 'latinSurname',
+        required: true,
+        condition: {
+          name: 'isMomentDebitCard',
+          values: [false],
+        },
+      },
+    ],
   },
   {
     inputs: [
       {
         name: 'infoCard',
         label: 'Проверьте корректность заполненных полей, при необходимости внесите изменения.',
+        condition: {
+          name: 'isMomentDebitCard',
+          values: [false],
+        },
       },
     ],
   },
@@ -182,6 +244,10 @@ const DEBIT_CARD_CONTENT: SectionsRetailProps[] = [
         label:
           // eslint-disable-next-line max-len
           'Количество символов ограничивается 20. При этом, если фамилия и имя на карте содержит более 21 символа, то необходимо сократить имя и указывать на карте только первую букву имени и фамилию, если при таком сокращении фамилия и имя не умещается в количество символов – 20, то указывать только фамилию.',
+        condition: {
+          name: 'isMomentDebitCard',
+          values: [false],
+        },
       },
     ],
   },

package/src/components/DebitForm/formStateMap.tsx

@@ -38,6 +38,7 @@ export const formStateMap: Partial<LeadFormState>[] = [
   },
   {
     paymentSystem: { key: '', text: '' },
+    isMomentDebitCard: true,
     currency: '810',
     codeWord: '',
     latinName: '',

package/src/components/DebitForm/useDebitFormAPI.tsx

@@ -55,7 +55,7 @@ export const useDebitFormAPI = ({
           );
         }
 
-        if (isFinalStep || formData.methodObtain === 'courier') {
+        if (isFinalStep) {
           onFinish?.();
           resetForm();
         } else {

package/src/components/Header/DropdownMenu.tsx

@@ -13,7 +13,7 @@ export interface DropdownMenuProps extends ComponentType {
   activeItem?: LinkProps;
   ariaLabel?: string;
   renderDropdownItem?: ({ item, i, activeItem, handlers }: renderDropdownItemProps) => void;
-  handlers?: Record<string, (ev?: PreventableEventWithTarget) => void>;
+  handlers?: Record<string, (ev: PreventableEventWithTarget) => void>;
   onItemClick?: () => void;
 }
 
@@ -21,7 +21,7 @@ export type renderDropdownItemProps = {
   item?: LinkProps;
   i?: number;
   activeItem?: LinkProps;
-  handlers?: Record<string, (ev?: PreventableEventWithTarget) => void>;
+  handlers?: Record<string, (ev: PreventableEventWithTarget) => void>;
   closeDropdown?: () => void;
 };
 

package/src/components/Header/HeaderQuickActionsMenu.tsx

@@ -83,15 +83,15 @@ const renderQuickActionsDropdown = ({
 }: renderDropdownItemProps) => {
   const quickActionsMapping = {
     call: {
-      handler: () => {
-        handlers?.call();
+      handler: (ev: PreventableEventWithTarget) => {
+        handlers?.call(ev);
         closeDropdown();
       },
       text: 'Заказать звонок',
     },
     chat: {
-      handler: () => {
-        handlers?.chat();
+      handler: (ev: PreventableEventWithTarget) => {
+        handlers?.call(ev);
         closeDropdown();
       },
       text: 'Написать в чат',
@@ -120,10 +120,12 @@ export const useHandlers = () => {
 
   const aspects = useAspects();
 
-  const handleChatClick = useCallback((ev?: PreventableEventWithTarget) => {
+  const handleChatClick = useCallback((ev: PreventableEventWithTarget) => {
     const openChatBot = aspects[CHAT_BOT_ASPECT_NAME];
     if (openChatBot && ev) {
-      openChatBot(ev).finally();
+      if (openChatBot) {
+        openChatBot(ev).finally();
+      }
     }
   }, []);
 

package/src/retail/components/Fields/CardCategoryField.tsx

@@ -12,6 +12,7 @@ export const CardCategoryField = JSX<CustomFieldProps>(({ field, input }) => {
   const [programId] = useLocalStorage<string>('programId');
   const { value: selectedCardCategory, onChange: cardCategoryChange } = field('cardCategory');
   const selectedPaymentSystem = field('paymentSystem')?.value?.key;
+  const handleChangeIsMomentDebitCard = field('isMomentDebitCard')?.onChange;
 
   const getCardCategoryValue = useCallback(
     (fetchedCardTypes: CardTypeData[]) =>
@@ -24,6 +25,11 @@ export const CardCategoryField = JSX<CustomFieldProps>(({ field, input }) => {
     [],
   );
 
+  const onChange = useCallback((value: Option) => {
+    cardCategoryChange?.(value);
+    handleChangeIsMomentDebitCard?.(value?.text?.toLowerCase()?.includes('момент'));
+  }, []);
+
   useEffect(() => {
     if (selectedPaymentSystem && programId) {
       (async () => {
@@ -50,6 +56,7 @@ export const CardCategoryField = JSX<CustomFieldProps>(({ field, input }) => {
         label="Категория карты"
         fieldName="cardCategory"
         input={input}
+        onChange={onChange}
       />
       {description ? <InfoCard __html={description} /> : null}
     </div>

package/src/retail/components/Fields/DeliveryDateFiels.tsx

@@ -1,7 +1,16 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { DatePickerControl } from '../../../ui-kit/DatePicker/DatePickerControl';
 import { type CustomFieldProps } from '../../../ui-kit/FormField/CustomFieldProps';
+import { useRetailFormStore } from '../../hooks/useRetailFormStore';
 
-export const DeliveryDateFiels = JSX<CustomFieldProps>(({ field, input }) => (
-  <DatePickerControl label="Дата доставки" {...field(input?.name ?? '')} minDate={new Date()} />
-));
+const MIN_DATE = new Date(Date.now() + 1 * 24 * 60 * 60 * 1000);
+
+export const DeliveryDateFiels = JSX<CustomFieldProps>(({ field, input }) => {
+  const { productType } = useRetailFormStore();
+  const isDebit = productType === 'debitCard';
+  const minDate = isDebit ? MIN_DATE : new Date();
+
+  return (
+    <DatePickerControl label="Дата доставки" {...field(input?.name ?? '')} minDate={minDate} />
+  );
+});

package/src/retail/components/Fields/DeliveryTimeField.tsx

@@ -4,15 +4,26 @@ import { type CustomFieldProps } from '../../../ui-kit/FormField/CustomFieldProp
 import { type RadioButtonItem } from '../../../ui-kit/RadioButtonGroup/RadioButtonGroup';
 import { RadioButtonGroupControl } from '../../../ui-kit/RadioButtonGroup/RadioButtonGroupControl';
 import { useLeadFormData } from '../../hooks/useLeadFormData';
+import { useRetailFormStore } from '../../hooks/useRetailFormStore';
 
 export const DeliveryTimeField = JSX<CustomFieldProps>(({ field, input }) => {
+  const { productType } = useRetailFormStore();
+  const isDebit = productType === 'debitCard';
   const { data } = useLeadFormData('COURIER_DELIVERY_TIME');
+
+  const deliveryTimeDebit = [
+    { id: 'TIME_1', text: '10:00-14:00' },
+    { id: 'TIME_2', text: '14:00-18:00' },
+  ];
+
   const deliveryTime: RadioButtonItem[] = useMemo(
     () =>
-      data?.map((_) => ({
-        id: _.key as string,
-        text: _.value,
-      })) ?? [],
+      isDebit
+        ? deliveryTimeDebit
+        : data?.map((_) => ({
+            id: _.key as string,
+            text: _.value,
+          })) ?? [],
     [data],
   );
 

package/src/retail/components/Fields/RegionRetailField.tsx

@@ -14,12 +14,12 @@ export const RegionRetailField = JSX<CustomFieldProps>(({ field, input }) => {
   const { data: regions } = useLeadFormData('REGION_RF');
   const { data: regionsDelivery } = useAsyncData('regionsDelivery', getRegionsCardDelivery);
   const { data: productSettings } = useLeadFormData(getCurrentProductSettings(productType));
+  const isEsiaAuth = field('esiaAccountTypeCd')?.value?.key;
 
   const isSalaryCard = programId === '38';
   const formatRegions = regions?.map(({ key, value }) => ({ key, text: value }));
   const isDeliveryActive =
     productSettings?.find((_) => _?.key === 'DELIVERY_ACTIVE')?.value === 'true';
-
   const handleChangeRegion = field('regionRetail')?.onChange;
   const handleChangeRegionHasDelivery = field('regionHasDelivery')?.onChange;
   const handleChangeMethodObtain = field('methodObtain')?.onChange;
@@ -29,7 +29,8 @@ export const RegionRetailField = JSX<CustomFieldProps>(({ field, input }) => {
       const regionHasDelivery =
         isDeliveryActive &&
         regionsDelivery?.find((_) => _.regionCode === value.key)?.deliveryFlg &&
-        !isSalaryCard;
+        !isSalaryCard &&
+        Boolean(isEsiaAuth);
       handleChangeRegionHasDelivery?.(regionHasDelivery);
       handleChangeMethodObtain?.(regionHasDelivery ? 'courier' : 'office');
       handleChangeRegion?.(value);

package/src/retail/components/Fields/SelectField.tsx

@@ -18,6 +18,7 @@ export interface SelectFieldProps
   fieldName: string;
   isSearch?: boolean;
   isManualInput?: boolean;
+  onChange?: (value: Option) => void;
 }
 
 export const SelectField = UniBlock<SelectFieldProps>(
@@ -28,6 +29,7 @@ export const SelectField = UniBlock<SelectFieldProps>(
     placeholder = 'Выберите из списка',
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
     options,
+    onChange,
     ...rest
   }) => {
     const leadOptions: Option[] =
@@ -42,6 +44,7 @@ export const SelectField = UniBlock<SelectFieldProps>(
         options={leadOptions}
         {...field(fieldName)}
         {...rest}
+        onChange={onChange ?? field(fieldName)?.onChange}
       />
     );
   },

package/src/retail/model/LeadFormState.ts

@@ -186,6 +186,7 @@ export interface LeadFormState extends FormRetailConsents, FormStateDeliveryType
   latinName?: string;
   latinSurname?: string;
   regionHasDelivery?: boolean;
+  isMomentDebitCard?: boolean;
   files?: File[];
   deliveryTime?: string;
 }

package/src/retail/model/NameFieldDef.ts

@@ -27,6 +27,7 @@ type NameFieldCreditCardDef =
   | 'methodObtain'
   | 'deliveryDate'
   | 'regionHasDelivery'
+  | 'isMomentDebitCard'
   | 'latinName'
   | 'latinSurname';