@redneckz/wildless-cms-uni-blocks 0.14.821 → 0.14.823

package/mobile/src/components/CreditCardForm/CreditCardFormStep.tsx

@@ -5,6 +5,7 @@ import { type SectionsRetailProps } from '../../retail/model/InputSectionsType';
 import { type LeadFormState } from '../../retail/model/LeadFormState';
 import { calculateInputs } from '../../retail/utils/calculateInputs';
 import { renderStep } from '../../retail/utils/renderStep';
+import { getLimitedBirthdayValidation } from '../../retail/validator/getLimitedBirthdayValidation';
 import { validatorObj } from '../../retail/validator/validatorObj';
 import { getFormValidator } from '../../ui-kit/FormField/getObjectValidator';
 import { StepsNavigationButtons } from './StepsNavigationButtons';
@@ -18,6 +19,13 @@ export interface CreditCardFormStepProps {
   onFinish?: () => void;
 }
 
+const PRODUCT_TYPE = 'creditCard';
+
+const extendedValidatorObj = {
+  ...validatorObj,
+  limitedBirthday: getLimitedBirthdayValidation(PRODUCT_TYPE),
+};
+
 export const CreditCardFormStep = JSX<CreditCardFormStepProps>(
   ({ step, sections, onPrevStep, onNextStep, onFinish }) => {
     const inputs = useMemo(
@@ -30,7 +38,7 @@ export const CreditCardFormStep = JSX<CreditCardFormStepProps>(
         // TODO Слишком сложно
         getFormValidator(
           calculateInputs((_) => formState[_])(inputs, step),
-          validatorObj,
+          extendedValidatorObj,
         )(formState),
       [inputs],
     );

package/mobile/src/components/CreditForm/CreditFormStep.tsx

@@ -6,6 +6,7 @@ import { type SectionsRetailProps } from '../../retail/model/InputSectionsType';
 import { type LeadFormState } from '../../retail/model/LeadFormState';
 import { calculateInputs } from '../../retail/utils/calculateInputs';
 import { renderStep } from '../../retail/utils/renderStep';
+import { getLimitedBirthdayValidation } from '../../retail/validator/getLimitedBirthdayValidation';
 import { validatorObj } from '../../retail/validator/validatorObj';
 import { getFormValidator } from '../../ui-kit/FormField/getObjectValidator';
 import { type ProgramsSourceProps } from './ProgramsSourceProps';
@@ -21,6 +22,13 @@ export interface CreditFormStepProps {
   onFinish?: () => void;
 }
 
+const PRODUCT_TYPE = 'credit';
+
+const extendedValidatorObj = {
+  ...validatorObj,
+  limitedBirthday: getLimitedBirthdayValidation(PRODUCT_TYPE),
+};
+
 export const CreditFormStep = JSX<CreditFormStepProps>(
   ({ step, sections, programsSource, onPrevStep, onNextStep, onFinish }) => {
     const { programId } = useRetailFormStore();
@@ -30,12 +38,13 @@ export const CreditFormStep = JSX<CreditFormStepProps>(
       () => sections?.flatMap((_: SectionsRetailProps) => _?.inputs ?? []),
       [sections],
     );
+
     const formValidator = useCallback(
       (formState: LeadFormState) =>
         // TODO Слишком сложно
         getFormValidator(
           calculateInputs((_) => formState[_])(inputs, step),
-          validatorObj,
+          extendedValidatorObj,
         )(formState),
       [inputs],
     );

package/mobile/src/components/DebitForm/DebitFormStep.tsx

@@ -5,6 +5,7 @@ import { type SectionsRetailProps } from '../../retail/model/InputSectionsType';
 import type { LeadFormState } from '../../retail/model/LeadFormState';
 import { calculateInputs } from '../../retail/utils/calculateInputs';
 import { renderStep } from '../../retail/utils/renderStep';
+import { getLimitedBirthdayValidation } from '../../retail/validator/getLimitedBirthdayValidation';
 import { validatorObj } from '../../retail/validator/validatorObj';
 import { getFormValidator } from '../../ui-kit/FormField/getObjectValidator';
 import { StepsNavigationButtons } from './StepsNavigationButtons';
@@ -18,6 +19,13 @@ export interface DebitFormStepProps {
   onFinish?: () => void;
 }
 
+const PRODUCT_TYPE = 'debitCard';
+
+const extendedValidatorObj = {
+  ...validatorObj,
+  limitedBirthday: getLimitedBirthdayValidation(PRODUCT_TYPE),
+};
+
 export const DebitFormStep = JSX<DebitFormStepProps>(
   ({ step, sections, onPrevStep, onNextStep, onFinish }) => {
     const inputs = useMemo(
@@ -30,7 +38,7 @@ export const DebitFormStep = JSX<DebitFormStepProps>(
         // TODO Слишком сложно
         getFormValidator(
           calculateInputs((_) => formState[_])(inputs, step),
-          validatorObj,
+          extendedValidatorObj,
         )(formState),
       [inputs],
     );

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

@@ -3,5 +3,5 @@ import { DatePickerControl } from '../../../ui-kit/DatePicker/DatePickerControl'
 import { type CustomFieldProps } from '../../../ui-kit/FormField/CustomFieldProps';
 
 export const DeliveryDateFiels = JSX<CustomFieldProps>(({ field, input }) => (
-  <DatePickerControl label="Дата доставки" {...field(input?.name ?? '')} />
+  <DatePickerControl label="Дата доставки" {...field(input?.name ?? '')} minDate={new Date()} />
 ));

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

@@ -1,12 +1,22 @@
 import { JSX } from '@redneckz/uni-jsx';
+import { useMemo } from '@redneckz/uni-jsx/lib/hooks';
 import { DatePickerControl } from '../../../ui-kit/DatePicker/DatePickerControl';
 import { type CustomFieldProps } from '../../../ui-kit/FormField/CustomFieldProps';
 import { isEsiaAuthorize } from '../../utils/isEsiaAuthorize';
 
-export const DulIssueDateField = JSX<CustomFieldProps>(({ field, input }) => (
-  <DatePickerControl
-    label="Дата выдачи"
-    {...field(input?.name ?? '')}
-    disabled={input?.filledByEsia && isEsiaAuthorize(field, input?.name ?? '')}
-  />
-));
+export const DulIssueDateField = JSX<CustomFieldProps>(({ field, input }) => {
+  const birthDate = field('limitedBirthday')?.value as Date;
+  const startDulIssueDate = useMemo(
+    () => new Date(birthDate.getFullYear() + 14, birthDate.getMonth(), birthDate.getDate()),
+    [birthDate],
+  );
+
+  return (
+    <DatePickerControl
+      label="Дата выдачи"
+      {...field(input?.name ?? '')}
+      disabled={input?.filledByEsia && isEsiaAuthorize(field, input?.name ?? '')}
+      minDate={startDulIssueDate}
+    />
+  );
+});

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

@@ -1,14 +1,28 @@
 import { JSX } from '@redneckz/uni-jsx';
+import { useCallback } from '@redneckz/uni-jsx/lib/hooks';
 import { type CustomFieldProps } from '../../../ui-kit/FormField/CustomFieldProps';
 import { isEsiaAuthorize } from '../../utils/isEsiaAuthorize';
+import { retailCyrillicPattern } from '../../validator/validators';
 import { DaDataInputControl } from '../DaDataInputControl/DaDataInputControl';
 
-export const MiddleNameField = JSX<CustomFieldProps>(({ field, input }) => (
-  <DaDataInputControl
-    label="Отчество (Обязательно, при наличии)"
-    maxLength={60}
-    disabled={input?.filledByEsia && isEsiaAuthorize(field, input?.name ?? '')}
-    {...field(input?.name ?? '')}
-    {...input}
-  />
-));
+export const MiddleNameField = JSX<CustomFieldProps>(({ field, input }) => {
+  const onChange = useCallback(
+    (value: string) => {
+      if (retailCyrillicPattern.test(value) || value.length === 0) {
+        field('middleName')?.onChange?.(value);
+      }
+    },
+    [field],
+  );
+
+  return (
+    <DaDataInputControl
+      label="Отчество (Обязательно, при наличии)"
+      maxLength={60}
+      disabled={input?.filledByEsia && isEsiaAuthorize(field, input?.name ?? '')}
+      {...field(input?.name ?? '')}
+      {...input}
+      onChange={onChange}
+    />
+  );
+});

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

@@ -1,14 +1,28 @@
 import { JSX } from '@redneckz/uni-jsx';
+import { useCallback } from '@redneckz/uni-jsx/lib/hooks';
 import { type CustomFieldProps } from '../../../ui-kit/FormField/CustomFieldProps';
 import { isEsiaAuthorize } from '../../utils/isEsiaAuthorize';
+import { retailCyrillicPattern } from '../../validator/validators';
 import { DaDataInputControl } from '../DaDataInputControl/DaDataInputControl';
 
-export const NameField = JSX<CustomFieldProps>(({ field, input }) => (
-  <DaDataInputControl
-    label="Имя"
-    maxLength={60}
-    disabled={input?.filledByEsia && isEsiaAuthorize(field, input.name ?? '')}
-    {...field(input?.name ?? '')}
-    {...input}
-  />
-));
+export const NameField = JSX<CustomFieldProps>(({ field, input }) => {
+  const onChange = useCallback(
+    (value: string) => {
+      if (retailCyrillicPattern.test(value) || value.length === 0) {
+        field('name')?.onChange?.(value);
+      }
+    },
+    [field],
+  );
+
+  return (
+    <DaDataInputControl
+      label="Имя"
+      maxLength={60}
+      disabled={input?.filledByEsia && isEsiaAuthorize(field, input.name ?? '')}
+      {...field(input?.name ?? '')}
+      {...input}
+      onChange={onChange}
+    />
+  );
+});

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

@@ -1,16 +1,30 @@
 import { JSX } from '@redneckz/uni-jsx';
+import { useCallback } from '@redneckz/uni-jsx/lib/hooks';
 import { type CustomFieldProps } from '../../../ui-kit/FormField/CustomFieldProps';
 import { isEsiaAuthorize } from '../../utils/isEsiaAuthorize';
+import { retailCyrillicPattern } from '../../validator/validators';
 import { DaDataInputControl } from '../DaDataInputControl/DaDataInputControl';
 
 const FIELD_NAME = 'surname';
 
-export const SurnameField = JSX<CustomFieldProps>(({ field, input }) => (
-  <DaDataInputControl
-    label="Фамилия"
-    maxLength={60}
-    disabled={input?.filledByEsia && isEsiaAuthorize(field, FIELD_NAME)}
-    {...field(input?.name ?? '')}
-    {...input}
-  />
-));
+export const SurnameField = JSX<CustomFieldProps>(({ field, input }) => {
+  const onChange = useCallback(
+    (value: string) => {
+      if (retailCyrillicPattern.test(value) || value.length === 0) {
+        field('surname')?.onChange?.(value);
+      }
+    },
+    [field],
+  );
+
+  return (
+    <DaDataInputControl
+      label="Фамилия"
+      maxLength={60}
+      disabled={input?.filledByEsia && isEsiaAuthorize(field, FIELD_NAME)}
+      {...field(input?.name ?? '')}
+      {...input}
+      onChange={onChange}
+    />
+  );
+});

package/mobile/src/retail/validator/getLimitedBirthdayValidation.ts

@@ -0,0 +1,21 @@
+import { type ProductType } from '../../components/ApplicationLeadForm/ApplicationLeadFormContent';
+import { limitedBirthdayValidator, type LimitedBirthdayValidationParams } from './validators';
+
+const limitedBirthdayValidationData: Record<ProductType, LimitedBirthdayValidationParams> = {
+  credit: {
+    minAge: 23,
+    maxAge: 75,
+    errorMessage: 'Допустимый возраст заёмщика - от 23 до 75 лет',
+  },
+  creditCard: {
+    minAge: 21,
+    errorMessage: 'Допустимый возраст заёмщика - от 21 года',
+  },
+  debitCard: {
+    minAge: 18,
+    errorMessage: 'Допустимый возраст - от 18 лет',
+  },
+};
+
+export const getLimitedBirthdayValidation = (productType: ProductType) =>
+  limitedBirthdayValidator(limitedBirthdayValidationData[productType]);

package/mobile/src/retail/validator/validatorObj.ts

@@ -11,7 +11,7 @@ import {
   codeWordValidator,
   jobNumberValidator,
   lengthStringValidator,
-  limitedBirthdayValidator,
+  nameRetailValidator,
   numberValidator,
   serieValidator,
   snilsValidator,
@@ -53,7 +53,6 @@ const validatorRetailObj: Record<string, Validator> = {
   addressRetail: defaultSelectValidator('Выберите адрес банка'),
   addressMatch: defaultValidator(),
   sex: defaultValidator('Укажите свой пол'),
-  limitedBirthday: limitedBirthdayValidator(),
   birthPlace: defaultValidator('Укажите место рождения'),
   education: defaultSelectValidator('Выберите ваше образование'),
   housing: defaultSelectValidator('Выберите тип жилья'),
@@ -88,6 +87,9 @@ const validatorRetailObj: Record<string, Validator> = {
   partInBusiness: defaultValidator(),
   regionRetail: defaultSelectValidator('Выберите регион'),
   latinSurname: defaultValidator('Укажите фамилию'),
+  surname: nameRetailValidator('Укажите свою фамилию на кириллице'),
+  name: nameRetailValidator('Укажите своё имя на кириллице'),
+  middleName: nameRetailValidator('Укажите своё отчество на кириллице'),
 };
 
 export const validatorObj = {

package/mobile/src/retail/validator/validators.ts

@@ -6,9 +6,13 @@ const ERROR_MESSAGE = 'Некорректно заполненное поле';
 
 const ADDRESS_ERROR_MESSAGE = 'Укажите регион, город/населенный пункт, улицу, дом';
 
-const MIN_AGE = 23;
-const MAX_AGE = 75;
-const AGE_ERROR_MESSAGE = 'Допустимый возраст заёмщика - от 23 до 75 лет';
+export interface LimitedBirthdayValidationParams {
+  minAge: number;
+  maxAge?: number;
+  errorMessage: string;
+}
+
+export const retailCyrillicPattern = /^[\u0400-\u04FF-\s]+$/u;
 
 const addressDaDataValidate = (address: Address) =>
   Boolean(address.region && (address.city || address.locality) && address.house);
@@ -25,6 +29,11 @@ export const codeWordValidator = (errorMsg?: string) =>
     errorMsg ?? ERROR_MESSAGE,
   );
 
+export const nameRetailValidator = (errorMsg?: string) =>
+  validator((_) => typeof _ === 'string' && _.length > 1 && retailCyrillicPattern.test(_))(
+    errorMsg ?? ERROR_MESSAGE,
+  );
+
 export const jobNumberValidator = (errorMsg?: string) =>
   validator((_) => typeof _ === 'string' && /^[0-9]{1,2}$/g.test(_))(errorMsg ?? ERROR_MESSAGE);
 
@@ -33,20 +42,29 @@ export const lengthStringValidator = (inputLength: number, errorMsg?: string) =>
     errorMsg ?? ERROR_MESSAGE,
   );
 
-const limitedBirthdayValidate = (date?: Date) => {
-  const today = new Date();
+const limitedBirthdayValidate =
+  ({ minAge, maxAge }: LimitedBirthdayValidationParams) =>
+  (date?: Date) => {
+    const today = new Date();
 
-  const minDate = new Date(today.getFullYear() - MIN_AGE, today.getMonth(), today.getDate());
-  const maxDate = new Date(today.getFullYear() - MAX_AGE, today.getMonth(), today.getDate());
+    const minDate = new Date(today.getFullYear() - minAge, today.getMonth(), today.getDate());
+    const maxDate = maxAge
+      ? new Date(today.getFullYear() - maxAge, today.getMonth(), today.getDate())
+      : null;
 
-  if (!date || date > minDate || date < maxDate) {
-    return false;
-  }
+    if (!date || date > minDate) {
+      return false;
+    }
 
-  return true;
-};
+    if (maxDate && date < maxDate) {
+      return false;
+    }
+
+    return true;
+  };
 
-export const limitedBirthdayValidator = () => validator(limitedBirthdayValidate)(AGE_ERROR_MESSAGE);
+export const limitedBirthdayValidator = (params: LimitedBirthdayValidationParams) =>
+  validator(limitedBirthdayValidate(params))(params.errorMessage);
 
 export const numberValidator = (errorMsg: string) =>
   validator((_) => typeof _ === 'string' && _.length === 6)(errorMsg);

package/mobile/src/ui-kit/DatePicker/DatePickerControl.tsx

@@ -6,7 +6,9 @@ import { type ControlProps } from '../ControlProps';
 import { renderErrorText } from '../Input/renderErrorText';
 import { DatePicker } from './DatePicker';
 
-export interface DatePickerControlProps extends DefaultControlType, ControlProps<Date> {}
+export interface DatePickerControlProps extends DefaultControlType, ControlProps<Date> {
+  minDate?: Date;
+}
 
 export const DatePickerControl = JSX<DatePickerControlProps>(
   ({ className, label, error, errors, ...rest }) => (

package/package.json

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

package/src/components/ApplicationLeadForm/ApplicationLeadForm.tsx

@@ -2,7 +2,9 @@ import { JSX } from '@redneckz/uni-jsx';
 import { useEffect, useMemo } from '@redneckz/uni-jsx/lib/hooks';
 import { useBool } from '@redneckz/uni-jsx/lib/hooks/useBool';
 import { useForm } from '../../hooks/useForm/useForm';
+import { type SectionsRetailProps } from '../../retail/model/InputSectionsType';
 import { type FieldRetailDef } from '../../retail/model/RetailFormContent';
+import { getLimitedBirthdayValidation } from '../../retail/validator/getLimitedBirthdayValidation';
 import { validatorObj } from '../../retail/validator/validatorObj';
 import { ApplicationFormLayout } from '../../ui-kit/ApplicationFormLayout/ApplicationFormLayout';
 import { useDialog } from '../../ui-kit/DialogManager/useDialog';
@@ -15,7 +17,7 @@ import { Text } from '../../ui-kit/Text/Text';
 import { type UniBlockProps } from '../../UniBlock/UniBlockProps';
 import { style } from '../../utils/style';
 import { getApplicationFormData } from './applicationFormData';
-import { type ApplicationLeadFormContent } from './ApplicationLeadFormContent';
+import { type ApplicationLeadFormContent, type ProductType } from './ApplicationLeadFormContent';
 import { renderInputs } from './renderInputs';
 import { renderSubmitButton } from './renderSubmitButton';
 import { useApplicationLeadApi } from './useApplicationLeadApi';
@@ -36,12 +38,13 @@ export const ApplicationLeadForm = JSX<ApplicationLeadFormProps>(
   }) => {
     const [esiaError, { setTrue: setEsiaError }] = useBool(false);
     const applicationFormData = useMemo(() => getApplicationFormData(productType), [productType]);
-    const inputs = useMemo(
-      () => (applicationFormData?.flatMap((_) => _?.inputs) || []) as FieldRetailDef[],
-      [applicationFormData],
-    );
+    const inputs = useMemo(() => getInputs(applicationFormData), [applicationFormData]);
 
-    const formValidator = useMemo(() => getFormValidator(inputs, validatorObj), [inputs]);
+    const extendedValidatorObj = useMemo(() => getExtendedValidatorObj(productType), [productType]);
+    const formValidator = useMemo(
+      () => getFormValidator(inputs, extendedValidatorObj),
+      [inputs, extendedValidatorObj],
+    );
 
     const [initialFormState, { isLoading }] = useInitApplicationLead({
       inputs,
@@ -98,3 +101,11 @@ export const ApplicationLeadForm = JSX<ApplicationLeadFormProps>(
     );
   },
 );
+
+const getInputs = (applicationFormData?: SectionsRetailProps[]) =>
+  (applicationFormData?.flatMap((_) => _?.inputs) || []) as FieldRetailDef[];
+
+const getExtendedValidatorObj = (productType: ProductType) => ({
+  ...validatorObj,
+  limitedBirthday: getLimitedBirthdayValidation(productType),
+});

package/src/components/ApplicationLeadForm/useApplicationLeadApi.tsx

@@ -59,16 +59,17 @@ export const useApplicationLeadApi = ({
       }
       try {
         startSending();
+        const transformedFormData = transformFormData(formData);
         const profileId = await createUserProfile({
-          profile: { phone: formatPhone(formData.phone as string) },
+          profile: { phone: formatPhone(transformedFormData.phone as string) },
         });
 
-        if (profileId && formData?.phone) {
+        if (profileId && transformedFormData?.phone) {
           const sendCurrentTask = async () => {
             await updateUserData({
               programId,
               profileId,
-              formData,
+              formData: transformedFormData,
               productType,
               saveUserData,
               sendAspects,
@@ -77,7 +78,7 @@ export const useApplicationLeadApi = ({
             if (productType === 'debitCard') {
               openEsiaLoginDialog();
             } else {
-              consentBkiDialog.open(formData.phone, profileId);
+              consentBkiDialog.open(transformedFormData.phone, profileId);
             }
           };
           const handleSuccessVerify = async () => {
@@ -104,7 +105,7 @@ export const useApplicationLeadApi = ({
           const acceptedConsents = getAcceptedConsents(formData, productType);
 
           verifyPhoneDialog.open({
-            phone: formData?.phone,
+            phone: transformedFormData?.phone,
             consents: acceptedConsents,
             onSuccess: handleSuccessVerify,
           });
@@ -224,3 +225,10 @@ const transformConsentsFields = (
     consentAssignmentClaimsFlg: consentOthersFlg,
   };
 };
+
+const transformFormData = (formData: LeadFormState): LeadFormState => ({
+  ...formData,
+  surname: formData.surname?.trim(),
+  name: formData.name?.trim(),
+  middleName: formData.middleName?.trim(),
+});

package/src/components/CreditCardForm/CreditCardFormStep.tsx

@@ -5,6 +5,7 @@ import { type SectionsRetailProps } from '../../retail/model/InputSectionsType';
 import { type LeadFormState } from '../../retail/model/LeadFormState';
 import { calculateInputs } from '../../retail/utils/calculateInputs';
 import { renderStep } from '../../retail/utils/renderStep';
+import { getLimitedBirthdayValidation } from '../../retail/validator/getLimitedBirthdayValidation';
 import { validatorObj } from '../../retail/validator/validatorObj';
 import { getFormValidator } from '../../ui-kit/FormField/getObjectValidator';
 import { StepsNavigationButtons } from './StepsNavigationButtons';
@@ -18,6 +19,13 @@ export interface CreditCardFormStepProps {
   onFinish?: () => void;
 }
 
+const PRODUCT_TYPE = 'creditCard';
+
+const extendedValidatorObj = {
+  ...validatorObj,
+  limitedBirthday: getLimitedBirthdayValidation(PRODUCT_TYPE),
+};
+
 export const CreditCardFormStep = JSX<CreditCardFormStepProps>(
   ({ step, sections, onPrevStep, onNextStep, onFinish }) => {
     const inputs = useMemo(
@@ -30,7 +38,7 @@ export const CreditCardFormStep = JSX<CreditCardFormStepProps>(
         // TODO Слишком сложно
         getFormValidator(
           calculateInputs((_) => formState[_])(inputs, step),
-          validatorObj,
+          extendedValidatorObj,
         )(formState),
       [inputs],
     );

package/src/components/CreditForm/CreditFormStep.tsx

@@ -6,6 +6,7 @@ import { type SectionsRetailProps } from '../../retail/model/InputSectionsType';
 import { type LeadFormState } from '../../retail/model/LeadFormState';
 import { calculateInputs } from '../../retail/utils/calculateInputs';
 import { renderStep } from '../../retail/utils/renderStep';
+import { getLimitedBirthdayValidation } from '../../retail/validator/getLimitedBirthdayValidation';
 import { validatorObj } from '../../retail/validator/validatorObj';
 import { getFormValidator } from '../../ui-kit/FormField/getObjectValidator';
 import { type ProgramsSourceProps } from './ProgramsSourceProps';
@@ -21,6 +22,13 @@ export interface CreditFormStepProps {
   onFinish?: () => void;
 }
 
+const PRODUCT_TYPE = 'credit';
+
+const extendedValidatorObj = {
+  ...validatorObj,
+  limitedBirthday: getLimitedBirthdayValidation(PRODUCT_TYPE),
+};
+
 export const CreditFormStep = JSX<CreditFormStepProps>(
   ({ step, sections, programsSource, onPrevStep, onNextStep, onFinish }) => {
     const { programId } = useRetailFormStore();
@@ -30,12 +38,13 @@ export const CreditFormStep = JSX<CreditFormStepProps>(
       () => sections?.flatMap((_: SectionsRetailProps) => _?.inputs ?? []),
       [sections],
     );
+
     const formValidator = useCallback(
       (formState: LeadFormState) =>
         // TODO Слишком сложно
         getFormValidator(
           calculateInputs((_) => formState[_])(inputs, step),
-          validatorObj,
+          extendedValidatorObj,
         )(formState),
       [inputs],
     );

package/src/components/DebitForm/DebitFormStep.tsx

@@ -5,6 +5,7 @@ import { type SectionsRetailProps } from '../../retail/model/InputSectionsType';
 import type { LeadFormState } from '../../retail/model/LeadFormState';
 import { calculateInputs } from '../../retail/utils/calculateInputs';
 import { renderStep } from '../../retail/utils/renderStep';
+import { getLimitedBirthdayValidation } from '../../retail/validator/getLimitedBirthdayValidation';
 import { validatorObj } from '../../retail/validator/validatorObj';
 import { getFormValidator } from '../../ui-kit/FormField/getObjectValidator';
 import { StepsNavigationButtons } from './StepsNavigationButtons';
@@ -18,6 +19,13 @@ export interface DebitFormStepProps {
   onFinish?: () => void;
 }
 
+const PRODUCT_TYPE = 'debitCard';
+
+const extendedValidatorObj = {
+  ...validatorObj,
+  limitedBirthday: getLimitedBirthdayValidation(PRODUCT_TYPE),
+};
+
 export const DebitFormStep = JSX<DebitFormStepProps>(
   ({ step, sections, onPrevStep, onNextStep, onFinish }) => {
     const inputs = useMemo(
@@ -30,7 +38,7 @@ export const DebitFormStep = JSX<DebitFormStepProps>(
         // TODO Слишком сложно
         getFormValidator(
           calculateInputs((_) => formState[_])(inputs, step),
-          validatorObj,
+          extendedValidatorObj,
         )(formState),
       [inputs],
     );

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

@@ -3,5 +3,5 @@ import { DatePickerControl } from '../../../ui-kit/DatePicker/DatePickerControl'
 import { type CustomFieldProps } from '../../../ui-kit/FormField/CustomFieldProps';
 
 export const DeliveryDateFiels = JSX<CustomFieldProps>(({ field, input }) => (
-  <DatePickerControl label="Дата доставки" {...field(input?.name ?? '')} />
+  <DatePickerControl label="Дата доставки" {...field(input?.name ?? '')} minDate={new Date()} />
 ));

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

@@ -1,12 +1,22 @@
 import { JSX } from '@redneckz/uni-jsx';
+import { useMemo } from '@redneckz/uni-jsx/lib/hooks';
 import { DatePickerControl } from '../../../ui-kit/DatePicker/DatePickerControl';
 import { type CustomFieldProps } from '../../../ui-kit/FormField/CustomFieldProps';
 import { isEsiaAuthorize } from '../../utils/isEsiaAuthorize';
 
-export const DulIssueDateField = JSX<CustomFieldProps>(({ field, input }) => (
-  <DatePickerControl
-    label="Дата выдачи"
-    {...field(input?.name ?? '')}
-    disabled={input?.filledByEsia && isEsiaAuthorize(field, input?.name ?? '')}
-  />
-));
+export const DulIssueDateField = JSX<CustomFieldProps>(({ field, input }) => {
+  const birthDate = field('limitedBirthday')?.value as Date;
+  const startDulIssueDate = useMemo(
+    () => new Date(birthDate.getFullYear() + 14, birthDate.getMonth(), birthDate.getDate()),
+    [birthDate],
+  );
+
+  return (
+    <DatePickerControl
+      label="Дата выдачи"
+      {...field(input?.name ?? '')}
+      disabled={input?.filledByEsia && isEsiaAuthorize(field, input?.name ?? '')}
+      minDate={startDulIssueDate}
+    />
+  );
+});