@redneckz/wildless-cms-uni-blocks 0.14.755 → 0.14.757

package/mobile/src/services/retail/adaptors/getPersonalInfoData.tsx

@@ -1,9 +1,9 @@
 import { type Participant } from '../../../api/RetailAPI/updateUserTask';
-import { type LeadFormState } from '../../../services/retail/model/LeadFormState';
 import {
   getParticipantAddresses,
   getParticipantContacts,
 } from '../../../components/CreditForm/utils';
+import { type LeadFormState } from '../../../services/retail/model/LeadFormState';
 import { formatDate } from '../../../utils/formatDate';
 import { formatPhone } from '../../../utils/formatPhone';
 
@@ -17,7 +17,7 @@ export const getPersonalInfoData = (formData: LeadFormState): Partial<Participan
     email,
     sex,
     birthPlace,
-    dulIssueDateField = '',
+    dulIssueDate = '',
     dulIssuedBy,
     dulNumber,
     dulSerie,
@@ -35,7 +35,7 @@ export const getPersonalInfoData = (formData: LeadFormState): Partial<Participan
     name,
     surname,
     birthPlace,
-    dulIssueDate: formatDate(dulIssueDateField, true),
+    dulIssueDate: formatDate(dulIssueDate, true),
     dulIssuedBy,
     dulNumber,
     dulSerie,

package/mobile/src/services/retail/content.tsx

@@ -27,7 +27,7 @@ const PERSONAL_INFO_CONTENT: CreditCardSectionsProps[] = [
     inputs: [
       { name: 'dulSerie', required: true, filledByEsia: true },
       { name: 'dulNumber', required: true, filledByEsia: true },
-      { name: 'dulIssueDateField', required: true, filledByEsia: true },
+      { name: 'dulIssueDate', required: true, filledByEsia: true },
       {
         name: 'dulSubdivisionCode',
         required: true,

package/mobile/src/services/retail/inputs.tsx

@@ -107,7 +107,7 @@ export const InputsRetailMap = {
   armyIdFlg: ArmyIdFlgField,
   dulSerie: DulSerieField,
   dulNumber: DulNumberField,
-  dulIssueDateField: DulIssueDateField,
+  dulIssueDate: DulIssueDateField,
   dulSubdivisionCode: DulSubdivisionCodeField,
   dulIssuedBy: DulIssuedByField,
   participantDateRegistration: ParticipantDateRegistrationField,

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

@@ -73,7 +73,7 @@ export interface LeadFormState extends FormRetailConsents, FormStateDeliveryType
   positionOrganization?: Option;
   dulSerie?: string;
   dulNumber?: string;
-  dulIssueDateField?: Date | string;
+  dulIssueDate?: Date | string;
   dulSubdivisionCode?: string;
   dulIssuedBy?: string;
   email?: string;

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

@@ -59,7 +59,7 @@ type NameFieldRetailDef =
   | 'armyIdFlg'
   | 'dulSerie'
   | 'dulNumber'
-  | 'dulIssueDateField'
+  | 'dulIssueDate'
   | 'dulSubdivisionCode'
   | 'dulIssuedBy'
   | 'participantDateRegistration'

package/mobile/src/ui-kit/DraftDialog/parseDraftTask.ts

@@ -28,7 +28,7 @@ export const parseDraftTask = (task: Task): LeadFormState => {
     name,
     surname,
     birthPlace,
-    dulIssueDate: dulIssueDateField,
+    dulIssueDate: dulIssueDate,
     dulIssuedBy,
     dulNumber,
     dulSerie,
@@ -80,7 +80,7 @@ export const parseDraftTask = (task: Task): LeadFormState => {
     name,
     surname,
     birthPlace,
-    dulIssueDateField,
+    dulIssueDate,
     dulIssuedBy,
     dulNumber,
     dulSerie,

package/mobile/src/ui-kit/FormField/Fields/SituationDescriptionField.tsx

@@ -0,0 +1,7 @@
+import { JSX } from '@redneckz/uni-jsx';
+import { InputControl } from '../../Input/InputControl';
+import { type CustomFieldProps } from '../CustomFieldProps';
+
+export const SituationDescriptionField = JSX<CustomFieldProps>(({ field, input }) => (
+  <InputControl label="Описание ситуации" {...input} {...field('situationDescription')} />
+));

package/mobile/src/ui-kit/FormField/Fields/SufferedFromField.tsx

@@ -0,0 +1,7 @@
+import { JSX } from '@redneckz/uni-jsx';
+import { InputControl } from '../../Input/InputControl';
+import { type CustomFieldProps } from '../CustomFieldProps';
+
+export const SufferedFromField = JSX<CustomFieldProps>(({ field, input }) => (
+  <InputControl label="Пострадал в" {...input} {...field('sufferedFrom')} />
+));

package/mobile/src/ui-kit/FormField/NameFieldDef.ts

@@ -31,6 +31,8 @@ type NameFieldApplicationDef =
   | 'product'
   | 'localities'
   | 'partnerComments'
+  | 'sufferedFrom'
+  | 'situationDescription'
   | 'consentToReceiveMaterials'
   | 'consentDataProcessing';
 

package/mobile/src/ui-kit/FormField/getField.tsx

@@ -31,6 +31,8 @@ import { RegionField } from './Fields/RegionField';
 import { RegionPremiumField } from './Fields/RegionPremiumField';
 import { SecondaryPhoneField } from './Fields/SecondaryPhoneField';
 import { ServiceDirectionField } from './Fields/ServiceDirectionField';
+import { SituationDescriptionField } from './Fields/SituationDescriptionField';
+import { SufferedFromField } from './Fields/SufferedFromField';
 import { SurnameField } from './Fields/SurnameField';
 import { TermField } from './Fields/TermField';
 import { UltraPremiumField } from './Fields/UltraPremiumField';
@@ -73,7 +75,8 @@ const InputsMap = {
       <RegionField {...props} />
     ),
   consentToReceiveMaterials: ConsentToReceiveMaterialsField,
-
+  sufferedFrom: SufferedFromField,
+  situationDescription: SituationDescriptionField,
   surname: SurnameField,
   name: NameField,
   middleName: MiddleNameField,

package/mobile/src/ui-kit/FormField/getObjectValidator.tsx

@@ -75,7 +75,7 @@ const validatorRetailObj: Record<string, Validator> = {
   armyIdFlg: agreementValidator,
   dulSerie: serieValidator('Укажите серию паспорта'),
   dulNumber: numberValidator('Укажите номер паспорта'),
-  dulIssueDateField: defaultValidator('Укажите дату выдачи паспорта'),
+  dulIssueDate: defaultValidator('Укажите дату выдачи паспорта'),
   dulSubdivisionCode: numberValidator('Укажите код подразделения'),
   dulIssuedBy: defaultValidator('Укажите организацию, выдавшую паспорт'),
   participantDateRegistration: defaultValidator('Укажите дату регистрации'),

package/package.json

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

package/src/components/ApplicationForm/ApplicationForm.example.json

@@ -1093,5 +1093,61 @@
         }
       }
     }
+  ],
+  [
+    "Меры поддержки",
+    {
+      "content": {
+        "version": "primary",
+        "padding": "",
+        "title": "Меры поддержки",
+        "typeForm": "SUPPORT",
+        "endpoint": "lead",
+        "sections": [
+          {
+            "inputs": [
+              {
+                "name": "fullName",
+                "required": true,
+                "label": "ФИО клиента/представителя"
+              },
+              {
+                "name": "birthday",
+                "required": true
+              },
+              {
+                "name": "phone",
+                "required": true
+              },
+              {
+                "name": "sufferedFrom",
+                "required": true
+              },
+              {
+                "name": "situationDescription",
+                "required": true
+              }
+            ]
+          },
+          {
+            "inputs": [
+              {
+                "name": "consentDataProcessing",
+                "required": true
+              }
+            ]
+          }
+        ],
+        "button": {
+          "text": "Отправить заявку",
+          "version": "primary"
+        },
+        "link": {
+          "text": "Согласен на обработку персональных данных",
+          "href": "/privacy-policy",
+          "target": "_blank"
+        }
+      }
+    }
   ]
 ]

package/src/components/ApplicationForm/ApplicationForm.fixture.mobile.tsx

@@ -652,4 +652,60 @@ export default {
       <DialogManager />
     </div>
   ),
+  receiptForBusiness: (
+    <div className="container grid grid-cols-12">
+      <ApplicationForm
+        className="col-span-12"
+        title="Заявка по акции 'Рецепт для бизнеса'"
+        typeForm="RFB"
+        endpoint="sendcorporatelead"
+        sections={[
+          {
+            inputs: [{ name: 'name', required: true }],
+          },
+          {
+            columns: 2,
+            inputs: [
+              { name: 'phone', required: true },
+              { name: 'inn', required: true },
+            ],
+          },
+        ]}
+        button={button}
+        link={linkCorp}
+      />
+      <PopupManager />
+      <DialogManager />
+    </div>
+  ),
+  support: (
+    <div className="container grid grid-cols-12">
+      <ApplicationForm
+        className="col-span-12"
+        title="Меры поддержки"
+        typeForm="SUPPORT"
+        endpoint="lead"
+        sections={[
+          {
+            inputs: [
+              {
+                name: 'fullName',
+                required: true,
+                label: 'ФИО клиента/представителя',
+              },
+              { name: 'birthday', required: true },
+              { name: 'phone', required: true },
+              { name: 'sufferedFrom', required: true },
+              { name: 'situationDescription', required: true },
+            ],
+          },
+          { inputs: [{ name: 'consentDataProcessing', required: true }] },
+        ]}
+        button={button}
+        link={link}
+      />
+      <PopupManager />
+      <DialogManager />
+    </div>
+  ),
 };

package/src/components/ApplicationForm/ApplicationForm.fixture.tsx

@@ -673,4 +673,34 @@ export default {
       <DialogManager />
     </div>
   ),
+  support: (
+    <div className="container grid grid-cols-12">
+      <ApplicationForm
+        className="col-span-12"
+        title="Меры поддержки"
+        typeForm="SUPPORT"
+        endpoint="lead"
+        sections={[
+          {
+            inputs: [
+              {
+                name: 'fullName',
+                required: true,
+                label: 'ФИО клиента/представителя',
+              },
+              { name: 'birthday', required: true },
+              { name: 'phone', required: true },
+              { name: 'sufferedFrom', required: true },
+              { name: 'situationDescription', required: true },
+            ],
+          },
+          { inputs: [{ name: 'consentDataProcessing', required: true }] },
+        ]}
+        button={button}
+        link={link}
+      />
+      <PopupManager />
+      <DialogManager />
+    </div>
+  ),
 };

package/src/components/ApplicationForm/getFormatData.tsx

@@ -17,6 +17,8 @@ export const getFormatData = (data: FormState): Record<string, any> => {
     vedTypes,
     region,
     inn,
+    sufferedFrom,
+    situationDescription,
     ...usedData
   } = data;
   const partnerComments = acquiringType || annualRevenue ? getPartnerComments(data) : null;
@@ -27,6 +29,7 @@ export const getFormatData = (data: FormState): Record<string, any> => {
     ...(inn && { inn }),
     ...(partnerComments ? { partnerComments } : {}),
     ...(serviceType ? { typeForm: serviceType } : {}),
+    ...getIncidentComment(sufferedFrom, situationDescription),
   };
 
   return Object.fromEntries(
@@ -34,6 +37,11 @@ export const getFormatData = (data: FormState): Record<string, any> => {
   );
 };
 
+const getIncidentComment = (sufferedFrom?: string, situationDescription?: string) =>
+  sufferedFrom || situationDescription
+    ? { comment: `${sufferedFrom || ''};${situationDescription || ''}` }
+    : {};
+
 const getRegion = (region?: Option): Record<string, string> =>
   region?.key || region?.text ? { region: region?.text || region?.key } : {};
 

package/src/components/ApplicationForm/getInitialFormState.tsx

@@ -29,6 +29,8 @@ export interface FormState {
   annualRevenue?: string;
   consentDataProcessing?: boolean;
   addressRetail?: Option;
+  sufferedFrom?: string;
+  situationDescription?: string;
 }
 
 const initialFormState = {

package/src/components/ApplicationLeadForm/pasreEsiaProfile.ts

@@ -12,7 +12,7 @@ export const parseEsiaProfile = (esiaProfile: UpdateProfileEsiaResponse): LeadFo
     limitedBirthday: profile?.birthDate,
     phone: normalizePhone(profile?.phone),
     email: profile?.email,
-    dulIssueDateField: document?.dulIssueDate,
+    dulIssueDate: document?.dulIssueDate,
     dulIssuedBy: document?.dulIssuedBy,
     dulNumber: document?.dulNumber,
     dulSerie: document?.dulSerie,

package/src/components/CreditCardForm/formStateMap.tsx

@@ -17,7 +17,7 @@ export const formStateMap: Partial<LeadFormState>[] = [
     email: '',
     dulSerie: undefined,
     dulNumber: undefined,
-    dulIssueDateField: undefined,
+    dulIssueDate: undefined,
     dulSubdivisionCode: '',
     dulIssuedBy: '',
     addressRegistration: {

package/src/components/CreditCardForm/getInitialFormState.tsx

@@ -8,7 +8,7 @@ export const getInitialFormState = (
   ...formStateMap[step],
   ...formState,
   limitedBirthday: transformStringToData(formState?.limitedBirthday as string),
-  dulIssueDateField: transformStringToData(formState?.dulIssueDateField as string),
+  dulIssueDate: transformStringToData(formState?.dulIssueDate as string),
   participantDateRegistration: transformStringToData(
     formState?.participantDateRegistration as string,
   ),

package/src/components/CreditForm/formStateMap.tsx

@@ -23,7 +23,7 @@ export const formStateMap: Partial<LeadFormState>[] = [
     email: '',
     dulSerie: undefined,
     dulNumber: undefined,
-    dulIssueDateField: undefined,
+    dulIssueDate: undefined,
     dulSubdivisionCode: '',
     dulIssuedBy: '',
     addressRegistration: {

package/src/components/CreditForm/getInitialFormState.tsx

@@ -8,7 +8,7 @@ export const getInitialFormState = (
   ...formStateMap[step],
   ...formState,
   limitedBirthday: transformStringToData(formState?.limitedBirthday as string),
-  dulIssueDateField: transformStringToData(formState?.dulIssueDateField as string),
+  dulIssueDate: transformStringToData(formState?.dulIssueDate as string),
   participantDateRegistration: transformStringToData(
     formState?.participantDateRegistration as string,
   ),

package/src/model/FormTypeFieldDef.ts

@@ -18,4 +18,5 @@ export type FormTypeFieldDef =
   | 'FEEDBACK'
   | 'FEEDBACK_QS'
   | 'OUTSERVICE'
-  | 'RFB';
+  | 'RFB'
+  | 'SUPPORT';

package/src/services/retail/adaptors/getPersonalInfoData.tsx

@@ -1,9 +1,9 @@
 import { type Participant } from '../../../api/RetailAPI/updateUserTask';
-import { type LeadFormState } from '../../../services/retail/model/LeadFormState';
 import {
   getParticipantAddresses,
   getParticipantContacts,
 } from '../../../components/CreditForm/utils';
+import { type LeadFormState } from '../../../services/retail/model/LeadFormState';
 import { formatDate } from '../../../utils/formatDate';
 import { formatPhone } from '../../../utils/formatPhone';
 
@@ -17,7 +17,7 @@ export const getPersonalInfoData = (formData: LeadFormState): Partial<Participan
     email,
     sex,
     birthPlace,
-    dulIssueDateField = '',
+    dulIssueDate = '',
     dulIssuedBy,
     dulNumber,
     dulSerie,
@@ -35,7 +35,7 @@ export const getPersonalInfoData = (formData: LeadFormState): Partial<Participan
     name,
     surname,
     birthPlace,
-    dulIssueDate: formatDate(dulIssueDateField, true),
+    dulIssueDate: formatDate(dulIssueDate, true),
     dulIssuedBy,
     dulNumber,
     dulSerie,

package/src/services/retail/content.tsx

@@ -27,7 +27,7 @@ const PERSONAL_INFO_CONTENT: CreditCardSectionsProps[] = [
     inputs: [
       { name: 'dulSerie', required: true, filledByEsia: true },
       { name: 'dulNumber', required: true, filledByEsia: true },
-      { name: 'dulIssueDateField', required: true, filledByEsia: true },
+      { name: 'dulIssueDate', required: true, filledByEsia: true },
       {
         name: 'dulSubdivisionCode',
         required: true,

package/src/services/retail/inputs.tsx

@@ -107,7 +107,7 @@ export const InputsRetailMap = {
   armyIdFlg: ArmyIdFlgField,
   dulSerie: DulSerieField,
   dulNumber: DulNumberField,
-  dulIssueDateField: DulIssueDateField,
+  dulIssueDate: DulIssueDateField,
   dulSubdivisionCode: DulSubdivisionCodeField,
   dulIssuedBy: DulIssuedByField,
   participantDateRegistration: ParticipantDateRegistrationField,

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

@@ -73,7 +73,7 @@ export interface LeadFormState extends FormRetailConsents, FormStateDeliveryType
   positionOrganization?: Option;
   dulSerie?: string;
   dulNumber?: string;
-  dulIssueDateField?: Date | string;
+  dulIssueDate?: Date | string;
   dulSubdivisionCode?: string;
   dulIssuedBy?: string;
   email?: string;

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

@@ -59,7 +59,7 @@ type NameFieldRetailDef =
   | 'armyIdFlg'
   | 'dulSerie'
   | 'dulNumber'
-  | 'dulIssueDateField'
+  | 'dulIssueDate'
   | 'dulSubdivisionCode'
   | 'dulIssuedBy'
   | 'participantDateRegistration'

package/src/ui-kit/DraftDialog/parseDraftTask.ts

@@ -28,7 +28,7 @@ export const parseDraftTask = (task: Task): LeadFormState => {
     name,
     surname,
     birthPlace,
-    dulIssueDate: dulIssueDateField,
+    dulIssueDate: dulIssueDate,
     dulIssuedBy,
     dulNumber,
     dulSerie,
@@ -80,7 +80,7 @@ export const parseDraftTask = (task: Task): LeadFormState => {
     name,
     surname,
     birthPlace,
-    dulIssueDateField,
+    dulIssueDate,
     dulIssuedBy,
     dulNumber,
     dulSerie,

package/src/ui-kit/FormField/Fields/SituationDescriptionField.tsx

@@ -0,0 +1,7 @@
+import { JSX } from '@redneckz/uni-jsx';
+import { InputControl } from '../../Input/InputControl';
+import { type CustomFieldProps } from '../CustomFieldProps';
+
+export const SituationDescriptionField = JSX<CustomFieldProps>(({ field, input }) => (
+  <InputControl label="Описание ситуации" {...input} {...field('situationDescription')} />
+));

package/src/ui-kit/FormField/Fields/SufferedFromField.tsx

@@ -0,0 +1,7 @@
+import { JSX } from '@redneckz/uni-jsx';
+import { InputControl } from '../../Input/InputControl';
+import { type CustomFieldProps } from '../CustomFieldProps';
+
+export const SufferedFromField = JSX<CustomFieldProps>(({ field, input }) => (
+  <InputControl label="Пострадал в" {...input} {...field('sufferedFrom')} />
+));

package/src/ui-kit/FormField/NameFieldDef.ts

@@ -31,6 +31,8 @@ type NameFieldApplicationDef =
   | 'product'
   | 'localities'
   | 'partnerComments'
+  | 'sufferedFrom'
+  | 'situationDescription'
   | 'consentToReceiveMaterials'
   | 'consentDataProcessing';
 

package/src/ui-kit/FormField/getField.tsx

@@ -31,6 +31,8 @@ import { RegionField } from './Fields/RegionField';
 import { RegionPremiumField } from './Fields/RegionPremiumField';
 import { SecondaryPhoneField } from './Fields/SecondaryPhoneField';
 import { ServiceDirectionField } from './Fields/ServiceDirectionField';
+import { SituationDescriptionField } from './Fields/SituationDescriptionField';
+import { SufferedFromField } from './Fields/SufferedFromField';
 import { SurnameField } from './Fields/SurnameField';
 import { TermField } from './Fields/TermField';
 import { UltraPremiumField } from './Fields/UltraPremiumField';
@@ -73,7 +75,8 @@ const InputsMap = {
       <RegionField {...props} />
     ),
   consentToReceiveMaterials: ConsentToReceiveMaterialsField,
-
+  sufferedFrom: SufferedFromField,
+  situationDescription: SituationDescriptionField,
   surname: SurnameField,
   name: NameField,
   middleName: MiddleNameField,

package/src/ui-kit/FormField/getObjectValidator.tsx

@@ -75,7 +75,7 @@ const validatorRetailObj: Record<string, Validator> = {
   armyIdFlg: agreementValidator,
   dulSerie: serieValidator('Укажите серию паспорта'),
   dulNumber: numberValidator('Укажите номер паспорта'),
-  dulIssueDateField: defaultValidator('Укажите дату выдачи паспорта'),
+  dulIssueDate: defaultValidator('Укажите дату выдачи паспорта'),
   dulSubdivisionCode: numberValidator('Укажите код подразделения'),
   dulIssuedBy: defaultValidator('Укажите организацию, выдавшую паспорт'),
   participantDateRegistration: defaultValidator('Укажите дату регистрации'),