@redneckz/wildless-cms-uni-blocks 0.14.211 → 0.14.213

package/src/components/ApplicationForm/ApplicationFormContent.ts

@@ -19,12 +19,6 @@ export type CommonApplicationFormProps = TitleProps & {
   link?: LinkProps;
 };
 
-/**
- * @title Тип обслуживания по умолчанию
- * @enumNames ['Ультра', 'Премиум']
- */
-export type UltraPremiumTypeProps = 'ULTRASERVICE' | 'PREMIUMSERVICE';
-
 /**
  * @title ВЭД
  */
@@ -34,33 +28,6 @@ export type WedFormParamsDef = TitleProps &
     formType: 'ApplicationFormWed';
   };
 
-/**
- * @title Депозит
- */
-export type DepositFormParamsDef = TitleProps &
-  CommonApplicationFormProps & {
-    /** @default ApplicationFormDeposit */
-    formType: 'ApplicationFormDeposit';
-  };
-
-/**
- * @title Кредит
- */
-export type CreditFormParamsDef = TitleProps &
-  CommonApplicationFormProps & {
-    /** @default ApplicationFormCredit */
-    formType: 'ApplicationFormCredit';
-  };
-
-/**
- * @title Эквайринг
- */
-export type AcquiringFormParamsDef = TitleProps &
-  CommonApplicationFormProps & {
-    /** @default ApplicationFormAcquiring */
-    formType: 'ApplicationFormAcquiring';
-  };
-
 /**
  * @title Грантовая поддержка
  */
@@ -72,17 +39,6 @@ export type GrantSupportFormParamsDef = TitleProps &
     regionSource?: JSONRefObject;
   };
 
-/**
- * @title Заявка для ФЛ
- */
-export type IndividualsFormParamsDef = TitleProps &
-  CommonApplicationFormProps & {
-    /** @default ApplicationFormIndividuals */
-    formType: 'ApplicationFormIndividuals';
-    /** @title Выберите продукт */
-    product?: string;
-  };
-
 /**
  * @title Форма обратной связи
  */
@@ -92,28 +48,13 @@ export type FeedbackFormParamsDef = TitleProps &
     formType: 'ApplicationFormFeedback';
   };
 
-/**
- * @title Заявка Ультра и Премиум
- */
-export type UltraPremiumFormParamsDef = TitleProps &
-  CommonApplicationFormProps & {
-    /** @default ApplicationUltraPremium */
-    formType: 'ApplicationFormUltraPremium';
-    defaultType?: UltraPremiumTypeProps;
-  };
-
 /**
  * @title Настройки формы
  */
 export type ApplicationFormBlockDef =
   | WedFormParamsDef
-  | DepositFormParamsDef
-  | CreditFormParamsDef
-  | AcquiringFormParamsDef
   | GrantSupportFormParamsDef
-  | IndividualsFormParamsDef
-  | FeedbackFormParamsDef
-  | UltraPremiumFormParamsDef;
+  | FeedbackFormParamsDef;
 
 /**
  * @title Форма заявки

package/src/components/ApplicationForm/ApplicationFormFeedback.tsx

@@ -3,21 +3,21 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { useCallback } from '@redneckz/uni-jsx/lib/hooks';
 import { useForm } from '../../hooks/useForm';
+import { DatePickerControl } from '../../ui-kit/DatePicker/DatePickerControl';
 import { InputControl } from '../../ui-kit/Input/InputControl';
+import { InputPhoneControl } from '../../ui-kit/Input/InputPhoneControl';
 import { type Option } from '../../ui-kit/Select/Option';
 import { SelectControl } from '../../ui-kit/Select/SelectControl';
 import { objectValidator } from '../../validation/objectValidator';
 import { isValidationSuccess, type Validator } from '../../validation/validator';
 import { withValidator } from '../../validation/withValidator';
-import { AddressBranchField } from './AddressBranchField';
+import { AddressBranchField } from '../ApplicationFormCustom/AddressBranchField';
+import { RegionField } from '../ApplicationFormCustom/RegionField';
 import { ApplicationFieldsetLayout } from './ApplicationFieldsetLayout';
 import { type ApplicationFormsProps } from './ApplicationFormsProps';
 import { FEEDBACK_METHOD, FEEDBACK_TYPES, SERVICE_DIRECTIONS } from './feedbackTypes';
 import { formStyle, oneColumnFormStyle } from './formStyle';
-import { PhoneInputControl } from './PhoneInputControl';
-import { RegionField } from './RegionField';
 import { renderAgreementSubmit } from './renderAgreementSubmit';
-import { initialUserFormState, renderUserData, type UserDataState } from './renderUserData';
 import {
   checkboxValidator,
   defaultValidator,
@@ -26,9 +26,13 @@ import {
   phoneValidator,
 } from './validators';
 
-export type FeedbackFormState = UserDataState & {
+export type FeedbackFormState = {
   typeForm: Option;
   region?: Option;
+  surname: string;
+  name: string;
+  middleName?: string;
+  birthday?: Date | undefined;
   serviceDirection?: Option;
   addressBranch?: Option;
   inn?: string;
@@ -44,7 +48,9 @@ export type FeedbackFormState = UserDataState & {
 };
 
 const initialFormState: FeedbackFormState = {
-  ...initialUserFormState,
+  surname: '',
+  name: '',
+  middleName: '',
   typeForm: { key: 'FEEDBACK', text: 'Задать вопрос по продуктам и услугам' },
   serviceDirection: { key: 'Физическое лицо' },
   birthday: undefined,
@@ -81,7 +87,7 @@ export const ApplicationFormFeedback = JSX<ApplicationFormsProps>(({ button, lin
     [onSubmit],
   );
 
-  const [formState, { field, ...formProps }] = useForm(initialFormState, {
+  const [, { field, ...formProps }] = useForm(initialFormState, {
     onSubmit: handleSubmit,
   });
 
@@ -110,10 +116,18 @@ export const ApplicationFormFeedback = JSX<ApplicationFormsProps>(({ button, lin
             />
           ) : null}
           <RegionField field={field} />
-          {isQualityService ? (
-            <AddressBranchField field={field} regionKey={formState?.region?.key} />
-          ) : null}
-          {renderUserData<FeedbackFormState>(field, true)}
+          {isQualityService ? <AddressBranchField field={field} /> : null}
+          {
+            <div className="space-y-s">
+              <InputControl label="Фамилия" {...withValidator(field('surname'), nameValidator)} />
+              <InputControl label="Имя" {...withValidator(field('name'), nameValidator)} />
+              <InputControl label="Отчество (Обязательно, при наличии)" {...field('middleName')} />
+              <DatePickerControl
+                label="Дата рождения"
+                {...withValidator(field('birthday'), defaultValidator)}
+              />
+            </div>
+          }
           {isLegalEntity ? (
             <div>
               <InputControl label="ИНН" {...withValidator(field('inn'), innValidator)} />
@@ -125,10 +139,10 @@ export const ApplicationFormFeedback = JSX<ApplicationFormsProps>(({ button, lin
             options={FEEDBACK_METHOD}
             {...withValidator(field('feedbackMethod'), defaultValidator)}
           />
-          <PhoneInputControl label="Телефон" {...withValidator(field('phone'), phoneValidator)} />
+          <InputPhoneControl label="Телефон" {...withValidator(field('phone'), phoneValidator)} />
           {isQualityService ? (
             <div>
-              <PhoneInputControl
+              <InputPhoneControl
                 label="Дополнительный телефон"
                 {...(!field('secondaryPhone').value || field('secondaryPhone').value === '+7 ('
                   ? field('secondaryPhone')

package/src/components/ApplicationForm/ApplicationFormsProps.ts

@@ -1,6 +1,6 @@
 import { type JSONRefObject } from '../../data/JSONRefObject';
 import { type LinkProps } from '../../model/LinkProps';
-import { type SubmitButtonProps, type UltraPremiumTypeProps } from './ApplicationFormContent';
+import { type SubmitButtonProps } from './ApplicationFormContent';
 
 export type RegionGrand = { name: string; href: string };
 export interface ApplicationFormsProps<S extends Record<string, any> = Record<string, any>> {
@@ -9,5 +9,4 @@ export interface ApplicationFormsProps<S extends Record<string, any> = Record<st
   regionSource?: { regions?: RegionGrand[] } & JSONRefObject;
   product?: string;
   onSubmit: (data: S, isIndividualType?: boolean) => void;
-  defaultType?: UltraPremiumTypeProps;
 }

package/src/components/ApplicationForm/EmbeddableForms.tsx

@@ -1,19 +1,9 @@
-import { ApplicationFormAcquiring } from './ApplicationFormAcquiring';
-import { ApplicationFormCredit } from './ApplicationFormCredit';
-import { ApplicationFormDeposit } from './ApplicationFormDeposit';
 import { ApplicationFormFeedback } from './ApplicationFormFeedback';
 import { ApplicationFormGrantSupport } from './ApplicationFormGrantSupport';
-import { ApplicationFormIndividuals } from './ApplicationFormIndividuals';
-import { ApplicationFormUltraPremium } from './ApplicationFormUltraPremium';
 import { ApplicationFormWed } from './ApplicationFormWed';
 
 export const EmbeddableForms = {
   ApplicationFormWed,
-  ApplicationFormDeposit,
-  ApplicationFormCredit,
-  ApplicationFormAcquiring,
   ApplicationFormGrantSupport,
-  ApplicationFormIndividuals,
   ApplicationFormFeedback,
-  ApplicationFormUltraPremium,
 };

package/src/components/ApplicationForm/renderWedDataOrganization.tsx

@@ -1,9 +1,9 @@
 import { type FormFieldRegisterer } from '../../hooks/useForm';
 import { InputControl } from '../../ui-kit/Input/InputControl';
+import { InputPhoneControl } from '../../ui-kit/Input/InputPhoneControl';
 import { withValidator } from '../../validation/withValidator';
+import { RegionField } from '../ApplicationFormCustom/RegionField';
 import { type WedFormState } from './ApplicationFormWed';
-import { PhoneInputControl } from './PhoneInputControl';
-import { RegionField } from './RegionField';
 import { defaultValidator, innValidator, nameValidator, phoneValidator } from './validators';
 
 interface WedDataOrganizationProps {
@@ -25,7 +25,7 @@ export const renderWedDataOrganization = ({ field }: WedDataOrganizationProps) =
           {...withValidator(field('fullName'), defaultValidator)}
         />
         <InputControl label="ФИО" {...withValidator(field('name'), nameValidator)} />
-        <PhoneInputControl label="Телефон" {...withValidator(field('phone'), phoneValidator)} />
+        <InputPhoneControl label="Телефон" {...withValidator(field('phone'), phoneValidator)} />
         {!isCurrencyControl ? <InputControl label="Электронная почта" {...field('email')} /> : null}
       </div>
     </div>

package/src/components/ApplicationFormCustom/AcquiringField.tsx

@@ -0,0 +1,36 @@
+import { JSX } from '@redneckz/uni-jsx';
+import { type Option } from '../../ui-kit/Select/Option';
+import { SelectControl } from '../../ui-kit/Select/SelectControl';
+import { type CustomFieldProps } from './CustomFieldProps';
+import { getValidation } from './getField';
+import { validatorObj } from './getObjectValidator';
+
+export const ACQUIRING_TYPES: Option[] = [
+  {
+    text: 'Торговый эквайринг',
+    key: 'trade',
+  },
+  {
+    text: 'СБП-эквайринг',
+    key: 'sbp',
+  },
+  {
+    text: 'Интернет-эквайринг',
+    key: 'internet',
+  },
+  {
+    text: 'Все виды эквайринга',
+    key: 'all',
+  },
+];
+
+export const AcquiringField = JSX<CustomFieldProps>(({ field, input }) => (
+  <SelectControl
+    label="Вид эквайринга"
+    placeholder="Выберите эквайринг"
+    options={ACQUIRING_TYPES}
+    {...getValidation(field('acquiringType'), validatorObj.acquiringType, input?.required)}
+  />
+));
+
+export const isAcquiringTrade = (key = ''): boolean => Boolean(key === 'trade' || key === 'all');

package/{mobile/src/components/ApplicationForm → src/components/ApplicationFormCustom}/AddressBranchField.tsx

@@ -1,23 +1,29 @@
 import { JSX } from '@redneckz/uni-jsx';
+import { useEffect } from '@redneckz/uni-jsx/lib/hooks';
 import { useBranches } from '../../hooks/useBranches';
-import { type FormFieldRegisterer } from '../../hooks/useForm';
 import { usePremiumBranchesByRegions } from '../../hooks/usePremiumBranchesByRegions';
 import { SelectControl } from '../../ui-kit/Select/SelectControl';
-import { withValidator } from '../../validation/withValidator';
-import { defaultSelectValidator } from './validators';
+import type { CustomFieldProps } from './CustomFieldProps';
+import { getValidation } from './getField';
+import { validatorObj } from './getObjectValidator';
 
-interface RegionFieldProps {
-  field: FormFieldRegisterer<any>;
-  regionKey?: string;
+interface RegionFieldProps extends CustomFieldProps {
   isPremium?: boolean;
 }
 
-export const AddressBranchField = JSX<RegionFieldProps>(({ field, isPremium = false }) => {
-  const regionKey = field('region')?.value?.key as string;
+export const AddressBranchField = JSX<RegionFieldProps>(({ field, input, isPremium = false }) => {
+  const regionKey = field('region')?.value?.text as string;
   const addressBranch = isPremium
     ? usePremiumBranchesByRegions().find((_) => _?.region === regionKey)?.branches
     : useBranches(regionKey).filter((branch) => branch?.address);
 
+  const { value, onChange } = field?.('addressBranch') || {};
+  useEffect(() => {
+    if (value?.key !== '') {
+      onChange?.('');
+    }
+  }, [value]);
+
   return (
     <SelectControl
       label="Адрес"
@@ -26,7 +32,7 @@ export const AddressBranchField = JSX<RegionFieldProps>(({ field, isPremium = fa
         key: address,
         text: address,
       }))}
-      {...withValidator(field('addressBranch'), defaultSelectValidator)}
+      {...getValidation(field('addressBranch'), validatorObj.addressBranch, input?.required)}
     />
   );
 });

package/src/components/ApplicationFormCustom/AmountField.tsx

@@ -0,0 +1,17 @@
+import { JSX } from '@redneckz/uni-jsx';
+import { InputRange } from '../../ui-kit/InputRange/InputRange';
+import { type CustomFieldProps } from './CustomFieldProps';
+
+const MIN_CREDIT_AMOUNT = 1000;
+const MAX_CREDIT_AMOUNT = 1000000000;
+const ITEMS_CREDIT_AMOUNT = ['От 1 000 ₽', 'До 1 000 000 000 ₽'];
+
+export const AmountField = JSX<CustomFieldProps>(({ field }) => (
+  <InputRange
+    title="Сумма, ₽"
+    items={ITEMS_CREDIT_AMOUNT}
+    min={MIN_CREDIT_AMOUNT}
+    max={MAX_CREDIT_AMOUNT}
+    {...field('amount')}
+  />
+));

package/src/components/ApplicationFormCustom/ApplicationFormCustom.example.json

@@ -1,6 +1,47 @@
 [
   [
-    "Мошенничество",
+    "Эквайринг ЮЛ",
+    {
+      "content": {
+        "title": "Заполните онлайн-заявку на эквайринг",
+        "typeForm": "ACQR",
+        "endpoint": "sendcorporatelead",
+        "sections": [
+          {
+            "title": "Вид эквайринга и регион",
+            "columns": 2,
+            "inputs": [
+              { "name": "acquiringType", "required": true },
+              { "name": "region", "required": true }
+            ]
+          },
+          {
+            "title": "Данные организации",
+            "columns": 2,
+            "inputs": [
+              { "name": "fullName", "required": true },
+              { "name": "inn", "required": true },
+              { "name": "name", "required": true },
+              { "name": "phone", "required": true }
+            ]
+          },
+          { "inputs": [{ "name": "onlineCheckout" }] },
+          { "inputs": [{ "name": "posTerminal" }] }
+        ],
+        "button": {
+          "text": "Отправить заявку",
+          "version": "primary"
+        },
+        "link": {
+          "text": "обработкой персональных данных",
+          "href": "/privacy-policy",
+          "target": "_blank"
+        }
+      }
+    }
+  ],
+  [
+    "Предупреждение о мошенничестве ФЛ",
     {
       "content": {
         "title": "Сообщить о возможных мошеннических действиях",
@@ -55,14 +96,16 @@
     }
   ],
   [
-    "Брокерское обслуживание",
+    "Бизнес-карта ЮЛ",
     {
       "content": {
-        "title": "Заполните онлайн-заявку на открытие брокерского счёта",
-        "typeForm": "BROKACCOUNT",
-        "endpoint": "lead",
+        "title": "Заявка на выпуск бизнес-карты",
+        "typeForm": "BCRD",
+        "endpoint": "sendcorporatelead",
         "sections": [
+          { "inputs": [{ "name": "region", "required": true }] },
           {
+            "columns": 2,
             "inputs": [
               {
                 "name": "name",
@@ -73,10 +116,11 @@
                 "required": true
               },
               {
-                "name": "isClient"
+                "name": "inn",
+                "required": true
               },
               {
-                "name": "consentDataProcessing",
+                "name": "email",
                 "required": true
               }
             ]
@@ -87,7 +131,7 @@
           "version": "primary"
         },
         "link": {
-          "text": "Согласен на обработку персональных данных",
+          "text": "условиями передачи данных",
           "href": "/privacy-policy",
           "target": "_blank"
         }
@@ -95,16 +139,14 @@
     }
   ],
   [
-    "Бизнес-карта",
+    "Брокерский счет ФЛ",
     {
       "content": {
-        "title": "Заявка на выпуск бизнес-карты",
-        "typeForm": "BCRD",
-        "endpoint": "sendcorporatelead",
+        "title": "Заполните онлайн-заявку на открытие брокерского счёта",
+        "typeForm": "BROKACCOUNT",
+        "endpoint": "lead",
         "sections": [
-          { "inputs": [{ "name": "region", "required": true }] },
           {
-            "columns": 2,
             "inputs": [
               {
                 "name": "name",
@@ -115,11 +157,10 @@
                 "required": true
               },
               {
-                "name": "inn",
-                "required": true
+                "name": "isClient"
               },
               {
-                "name": "email",
+                "name": "consentDataProcessing",
                 "required": true
               }
             ]
@@ -130,7 +171,7 @@
           "version": "primary"
         },
         "link": {
-          "text": "условиями передачи данных",
+          "text": "Согласен на обработку персональных данных",
           "href": "/privacy-policy",
           "target": "_blank"
         }
@@ -138,7 +179,7 @@
     }
   ],
   [
-    "Инкассация",
+    "Инкассация ЮЛ",
     {
       "content": {
         "title": "Заполните заявку на консультацию",
@@ -184,7 +225,53 @@
     }
   ],
   [
-    "Коррупция",
+    "Кредит ЮЛ",
+    {
+      "content": {
+        "title": "Оформите заявку на кредит прямо сейчас",
+        "typeForm": "CRED",
+        "endpoint": "sendcorporatelead",
+        "sections": [
+          {
+            "title": "Параметры кредита",
+            "columns": 2,
+            "inputs": [{ "name": "amount" }, { "name": "term" }]
+          },
+          {
+            "title": "Данные организации",
+            "columns": 2,
+            "inputs": [
+              { "name": "fullName", "required": true, "label": "Наименование организации" },
+              { "name": "annualRevenue", "required": true },
+              { "name": "inn", "required": true },
+              { "name": "name", "required": true, "label": "Контактное лицо" },
+              { "name": "phone", "required": true },
+              { "name": "email", "required": true }
+            ]
+          },
+          {
+            "title": "Офис банка",
+            "columns": 2,
+            "inputs": [
+              { "name": "region", "required": true },
+              { "name": "addressBranch", "required": true }
+            ]
+          }
+        ],
+        "button": {
+          "text": "Отправить заявку",
+          "version": "primary"
+        },
+        "link": {
+          "text": "условиями передачи данных",
+          "href": "/privacy-policy",
+          "target": "_blank"
+        }
+      }
+    }
+  ],
+  [
+    "Факты коррупции ФЛ",
     {
       "content": {
         "title": "Сообщить о коррупции",
@@ -239,7 +326,44 @@
     }
   ],
   [
-    "Самоинкассация",
+    "Депозит ЮЛ",
+    {
+      "content": {
+        "title": "Форма заявка",
+        "typeForm": "DPST",
+        "endpoint": "sendcorporatelead",
+        "sections": [
+          {
+            "inputs": [
+              {
+                "name": "name",
+                "required": true
+              },
+              {
+                "name": "phone",
+                "required": true
+              },
+              {
+                "name": "consentDataProcessing",
+                "required": true
+              }
+            ]
+          }
+        ],
+        "button": {
+          "text": "Отправить заявку",
+          "version": "primary"
+        },
+        "link": {
+          "text": "Согласен на обработку персональных данных",
+          "href": "/privacy-policy",
+          "target": "_blank"
+        }
+      }
+    }
+  ],
+  [
+    "Самоинкассация ЮЛ",
     {
       "content": {
         "title": "Заполните заявку на консультацию",
@@ -278,5 +402,81 @@
         }
       }
     }
+  ],
+  [
+    "Консультация по продукту ФЛ",
+    {
+      "content": {
+        "title": "Заполните форму",
+        "typeForm": "PRODUCT",
+        "endpoint": "lead",
+        "sections": [
+          {
+            "columns": 2,
+            "inputs": [
+              { "name": "surname", "required": true },
+              { "name": "name", "required": true },
+              { "name": "middleName" },
+              { "name": "birthday", "required": true },
+              { "name": "phone", "required": true },
+              { "name": "email", "required": true },
+              { "name": "consentDataProcessing" }
+            ]
+          }
+        ],
+        "button": {
+          "text": "Отправить заявку",
+          "version": "primary"
+        },
+        "link": {
+          "text": "Согласен на обработку персональных данных",
+          "href": "/privacy-policy",
+          "target": "_blank"
+        }
+      }
+    }
+  ],
+  [
+    "Ультра/Премиум ФЛ",
+    {
+      "content": {
+        "title": "Стать клиентом",
+        "typeForm": "ULTRASERVICE",
+        "endpoint": "lead",
+        "sections": [
+          {
+            "title": "Ваши данные",
+            "columns": 2,
+            "inputs": [
+              { "name": "surname", "required": true },
+              { "name": "name", "required": true },
+              { "name": "middleName" },
+              { "name": "phone", "required": true },
+              { "name": "email", "required": true },
+              { "name": "serviceType", "required": true }
+            ]
+          },
+          {
+            "title": "Офис банка",
+            "columns": 2,
+            "inputs": [
+              { "name": "region", "required": true },
+              { "name": "addressBranch", "required": true }
+            ]
+          },
+          { "inputs": [{ "name": "comment" }] },
+          { "inputs": [{ "name": "consentDataProcessing" }] }
+        ],
+        "button": {
+          "text": "Отправить заявку",
+          "version": "primary"
+        },
+        "link": {
+          "text": "Согласен на обработку персональных данных",
+          "href": "/privacy-policy",
+          "target": "_blank"
+        }
+      }
+    }
   ]
 ]