@redneckz/wildless-cms-uni-blocks 0.14.913 → 0.14.915

package/src/api/getSubmitBody.ts

@@ -5,10 +5,7 @@ import { formatPhone } from '../utils/formatPhone';
 import { type LeadRequest } from './LeadServiceAPI';
 
 type PFFormData = {
-  innDadata?: string;
   fullRegion?: string;
-  partnerSymbolCode?: string;
-  companyNameByInn?: string;
   partnerName?: string;
 };
 
@@ -21,14 +18,11 @@ export const getSubmitBody = (body: LeadRequest, isNaturalPerson: boolean, route
     birthday,
     desiredMeetingDate,
     inn,
-    innDadata,
     fullRegion,
     addressBranch,
     secondaryPhone = '',
     bankEmpolee,
     applicationDate,
-    partnerSymbolCode,
-    companyNameByInn,
     partnerName,
     ...staticBody
   } = body;
@@ -50,10 +44,7 @@ export const getSubmitBody = (body: LeadRequest, isNaturalPerson: boolean, route
         }),
     ...addPageSlug(typeForm, router),
     ...formatPFForm(typeForm, {
-      innDadata,
       fullRegion,
-      partnerSymbolCode,
-      companyNameByInn,
       partnerName,
     }),
     ...staticBody,
@@ -87,10 +78,8 @@ const getSecondaryPhone = (secondaryPhone = '') =>
 const formatPFForm = (typeForm?: string, data?: PFFormData) =>
   typeForm === 'PF'
     ? {
-        inn: data?.innDadata,
         region: data?.fullRegion,
         partner: data?.partnerName,
-        fullName: data?.companyNameByInn,
       }
     : {};
 

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

@@ -28,12 +28,12 @@
             "columns": 2,
             "inputs": [
               {
-                "name": "fullName",
+                "name": "dadataPartyNameSelect",
                 "required": true,
                 "label": "Наименование организации"
               },
               {
-                "name": "inn",
+                "name": "dadataPartyInnSelect",
                 "required": true
               },
               {
@@ -205,7 +205,7 @@
                 "required": true
               },
               {
-                "name": "inn",
+                "name": "dadataPartyInnSelect",
                 "required": true
               },
               {
@@ -339,7 +339,7 @@
           {
             "inputs": [
               {
-                "name": "fullName",
+                "name": "companyNameDadata",
                 "required": true,
                 "label": "Наименование организации"
               }
@@ -407,7 +407,7 @@
             "columns": 2,
             "inputs": [
               {
-                "name": "fullName",
+                "name": "dadataPartyNameSelect",
                 "required": true,
                 "label": "Наименование организации"
               },
@@ -416,7 +416,7 @@
                 "required": true
               },
               {
-                "name": "inn",
+                "name": "dadataPartyInnSelect",
                 "required": true
               },
               {
@@ -659,9 +659,7 @@
                 "required": true,
                 "condition": {
                   "name": "serviceDirection",
-                  "values": [
-                    "Юридическое лицо / ИП"
-                  ]
+                  "values": ["Юридическое лицо / ИП"]
                 }
               },
               {
@@ -669,9 +667,7 @@
                 "label": "Наименование организации",
                 "condition": {
                   "name": "serviceDirection",
-                  "values": [
-                    "Юридическое лицо / ИП"
-                  ]
+                  "values": ["Юридическое лицо / ИП"]
                 }
               },
               {
@@ -926,9 +922,7 @@
                 "required": true,
                 "condition": {
                   "name": "vedTypes",
-                  "values": [
-                    "currencyControl"
-                  ]
+                  "values": ["currencyControl"]
                 }
               }
             ]
@@ -937,18 +931,15 @@
             "columns": 2,
             "inputs": [
               {
-                "name": "inn",
+                "name": "innDadata",
                 "required": true,
                 "condition": {
                   "name": "vedTypes",
-                  "values": [
-                    "currencyControl",
-                    "documentOperations"
-                  ]
+                  "values": ["currencyControl", "documentOperations"]
                 }
               },
               {
-                "name": "fullName",
+                "name": "dadataPartyNameSelect",
                 "required": true,
                 "label": "Наименование организации"
               },
@@ -966,11 +957,7 @@
                 "required": true,
                 "condition": {
                   "name": "vedTypes",
-                  "values": [
-                    "documentOperations",
-                    "conversionTransactions",
-                    "otherIssues"
-                  ]
+                  "values": ["documentOperations", "conversionTransactions", "otherIssues"]
                 }
               }
             ]
@@ -1137,7 +1124,7 @@
                 "required": true
               },
               {
-                "name": "inn",
+                "name": "dadataPartyInnSelect",
                 "required": true
               }
             ]
@@ -1181,7 +1168,7 @@
                 "required": true
               },
               {
-                "name": "inn"
+                "name": "dadataPartyInnSelect"
               }
             ]
           }
@@ -1354,9 +1341,7 @@
                 "required": true,
                 "condition": {
                   "name": "serviceDirection",
-                  "values": [
-                    "Юридическое лицо / ИП"
-                  ]
+                  "values": ["Юридическое лицо / ИП"]
                 }
               },
               {
@@ -1364,9 +1349,7 @@
                 "label": "Наименование организации",
                 "condition": {
                   "name": "serviceDirection",
-                  "values": [
-                    "Юридическое лицо / ИП"
-                  ]
+                  "values": ["Юридическое лицо / ИП"]
                 }
               },
               {
@@ -1383,9 +1366,7 @@
                 "label": "Ваше сообщение",
                 "condition": {
                   "name": "serviceDirection",
-                  "values": [
-                    "Физическое лицо"
-                  ]
+                  "values": ["Физическое лицо"]
                 }
               },
               {
@@ -1394,9 +1375,7 @@
                 "required": true,
                 "condition": {
                   "name": "serviceDirection",
-                  "values": [
-                    "Юридическое лицо / ИП"
-                  ]
+                  "values": ["Юридическое лицо / ИП"]
                 }
               }
             ]
@@ -1448,11 +1427,11 @@
             "columns": 2,
             "inputs": [
               {
-                "name": "innDadata",
+                "name": "dadataPartyNameSelect",
                 "required": true
               },
               {
-                "name": "companyNameByInn",
+                "name": "dadataPartyInnSelect",
                 "required": true
               }
             ]
@@ -1553,4 +1532,4 @@
       }
     }
   ]
-]
+]

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

@@ -74,11 +74,11 @@ export default {
             columns: 2,
             inputs: [
               {
-                name: 'fullName',
+                name: 'dadataPartyNameSelect',
                 required: true,
                 label: 'Наименование организации',
               },
-              { name: 'inn', required: true },
+              { name: 'dadataPartyInnSelect', required: true },
               { name: 'name', required: true, label: 'Контактное лицо' },
               { name: 'phone', required: true },
             ],
@@ -229,7 +229,7 @@ export default {
             inputs: [
               { name: 'name', required: true },
               { name: 'phone', required: true },
-              { name: 'inn', required: true },
+              { name: 'dadataPartyInnSelect', required: true },
               { name: 'email', required: true },
             ],
           },
@@ -252,7 +252,7 @@ export default {
           {
             inputs: [
               {
-                name: 'fullName',
+                name: 'dadataPartyNameSelect',
                 required: true,
                 label: 'Наименование организации',
               },
@@ -297,12 +297,12 @@ export default {
             columns: 2,
             inputs: [
               {
-                name: 'fullName',
+                name: 'dadataPartyNameSelect',
                 required: true,
                 label: 'Наименование организации',
               },
               { name: 'annualRevenue', required: true },
-              { name: 'inn', required: true },
+              { name: 'dadataPartyInnSelect', required: true },
               { name: 'name', required: true, label: 'Контактное лицо' },
               { name: 'phone', required: true },
               { name: 'email', required: true },
@@ -569,6 +569,7 @@ export default {
             inputs: [
               {
                 name: 'vedTypes',
+                required: true,
                 defaultValue: 'currencyControl',
               },
             ],
@@ -587,7 +588,7 @@ export default {
             columns: 2,
             inputs: [
               {
-                name: 'inn',
+                name: 'dadataPartyInnSelect',
                 required: true,
                 condition: {
                   name: 'vedTypes',
@@ -595,7 +596,7 @@ export default {
                 },
               },
               {
-                name: 'fullName',
+                name: 'dadataPartyNameSelect',
                 required: true,
                 label: 'Наименование организации',
               },
@@ -698,7 +699,7 @@ export default {
             columns: 2,
             inputs: [
               { name: 'phone', required: true },
-              { name: 'inn', required: true },
+              { name: 'dadataPartyInnSelect', required: true },
             ],
           },
         ]}
@@ -722,7 +723,7 @@ export default {
           },
           {
             columns: 2,
-            inputs: [{ name: 'phone', required: true }, { name: 'inn' }],
+            inputs: [{ name: 'phone', required: true }, { name: 'dadataPartyInnSelect' }],
           },
         ]}
         button={button}
@@ -859,14 +860,14 @@ export default {
         sections={[
           {
             title: 'Информация о партнере',
-            inputs: [{ name: 'partnerSymbolCode', required: true }],
+            inputs: [{ name: 'partnerSymbolCode', required: true }, { name: 'partnerName' }],
           },
           {
             title: 'Информация о компании',
             columns: 2,
             inputs: [
-              { name: 'innDadata', required: true },
-              { name: 'companyNameByInn', required: true },
+              { name: 'dadataPartyInnSelect', required: true },
+              { name: 'dadataPartyNameSelect', required: true },
             ],
           },
           {
@@ -896,6 +897,28 @@ export default {
       <DialogManager />
     </div>
   ),
+  withSms: (
+    <div className="container grid grid-cols-12">
+      <ApplicationForm
+        className="col-span-12"
+        title="Онлайн-заявка от партнера"
+        typeForm="PF"
+        endpoint="initcorporatelead"
+        sections={[
+          {
+            inputs: [
+              { name: 'name', required: true },
+              { name: 'phone', required: true },
+            ],
+          },
+        ]}
+        button={button}
+        link={linkCorp}
+      />
+      <PopupManager />
+      <DialogManager />
+    </div>
+  ),
   rkoApk: (
     <div className="container grid grid-cols-12">
       <ApplicationForm

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

@@ -74,11 +74,11 @@ export default {
             columns: 2,
             inputs: [
               {
-                name: 'fullName',
+                name: 'dadataPartyNameSelect',
                 required: true,
                 label: 'Наименование организации',
               },
-              { name: 'inn', required: true },
+              { name: 'dadataPartyInnSelect', required: true },
               { name: 'name', required: true, label: 'Контактное лицо' },
               { name: 'phone', required: true },
             ],
@@ -225,7 +225,7 @@ export default {
             inputs: [
               { name: 'name', required: true },
               { name: 'phone', required: true },
-              { name: 'inn', required: true },
+              { name: 'dadataPartyInnSelect', required: true },
               { name: 'email', required: true },
             ],
           },
@@ -248,7 +248,7 @@ export default {
           {
             inputs: [
               {
-                name: 'fullName',
+                name: 'dadataPartyNameSelect',
                 required: true,
                 label: 'Наименование организации',
               },
@@ -293,12 +293,12 @@ export default {
             columns: 2,
             inputs: [
               {
-                name: 'fullName',
+                name: 'dadataPartyNameSelect',
                 required: true,
                 label: 'Наименование организации',
               },
               { name: 'annualRevenue', required: true },
-              { name: 'inn', required: true },
+              { name: 'dadataPartyInnSelect', required: true },
               { name: 'name', required: true, label: 'Контактное лицо' },
               { name: 'phone', required: true },
               { name: 'email', required: true },
@@ -358,6 +358,7 @@ export default {
         sections={[
           {
             title: 'Оставьте заявку и мы ответим на любые вопросы по депозитам',
+            columns: 1,
             inputs: [
               { name: 'name', required: true },
               { name: 'phone', required: true },
@@ -582,7 +583,7 @@ export default {
             columns: 2,
             inputs: [
               {
-                name: 'inn',
+                name: 'dadataPartyInnSelect',
                 required: true,
                 condition: {
                   name: 'vedTypes',
@@ -590,7 +591,7 @@ export default {
                 },
               },
               {
-                name: 'fullName',
+                name: 'dadataPartyNameSelect',
                 required: true,
                 label: 'Наименование организации',
               },
@@ -693,7 +694,7 @@ export default {
             columns: 2,
             inputs: [
               { name: 'phone', required: true },
-              { name: 'inn', required: true },
+              { name: 'dadataPartyInnSelect', required: true },
             ],
           },
         ]}
@@ -717,7 +718,7 @@ export default {
           },
           {
             columns: 2,
-            inputs: [{ name: 'phone', required: true }, { name: 'inn' }],
+            inputs: [{ name: 'phone', required: true }, { name: 'dadataPartyInnSelect' }],
           },
         ]}
         button={button}
@@ -860,8 +861,8 @@ export default {
             title: 'Информация о компании',
             columns: 2,
             inputs: [
-              { name: 'innDadata', required: true },
-              { name: 'companyNameByInn', required: true },
+              { name: 'dadataPartyInnSelect', required: true, dadataValue: 'DaDataInn' },
+              { name: 'dadataPartyNameSelect', required: true, dadataValue: 'DaDataPartyName' },
             ],
           },
           {

package/src/components/ApplicationForm/getFormatData.tsx

@@ -22,6 +22,9 @@ export const getFormatData = (data: FormState): Record<string, any> => {
     situationDescription,
     applierType,
     isPremium,
+    dadataPartyNameSelect,
+    partnerSymbolCode,
+    dadataPartyInnSelect,
     ...usedData
   } = data;
   const partnerComments = acquiringType || annualRevenue ? getPartnerComments(data) : null;
@@ -34,6 +37,10 @@ export const getFormatData = (data: FormState): Record<string, any> => {
     ...(serviceType ? { typeForm: serviceType } : {}),
     ...getIncidentComment(sufferedFrom?.text, situationDescription),
     ...getIsClient(applierType),
+    ...getDadataValues([
+      [dadataPartyInnSelect, 'inn'],
+      [dadataPartyNameSelect, 'fullName'],
+    ]),
   };
 
   return Object.fromEntries(
@@ -58,3 +65,12 @@ const getVedTypes = (vedTypes?: string): { vedTypes?: Record<string, boolean> }
         vedTypes: Object.fromEntries(VED_TYPES.map(({ id }) => [id, id === vedTypes])),
       }
     : {};
+
+const getDadataValues = (fields: [Option | undefined, string][]): Record<string, string> =>
+  fields.reduce((acc, [field, name]) => {
+    if (field?.text && name) {
+      acc[name] = field.text;
+    }
+
+    return acc;
+  }, {});

package/src/components/ApplicationForm/getInitialFormState.tsx

@@ -34,6 +34,9 @@ export interface FormState {
   situationDescription?: string;
   applierType?: ApplierType;
   isPremium?: boolean;
+  partnerSymbolCode?: string;
+  dadataPartyInnSelect?: Option;
+  dadataPartyNameSelect?: Option;
 }
 
 const initialFormState = {

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

@@ -10,7 +10,7 @@ import { TARIFFS_CARD, TARIFFS_CARD_HIT } from '../CarouselTariffsCard/CarouselT
 import { type ProductBlockContent } from '../ProductBlock/ProductBlockContent';
 import { Carousel } from './Carousel';
 
-const catalogImage: Picture = {
+const CATALOG_IMAGE: Picture = {
   src: 'pay-ring.png',
   format: 'webp',
   size: {
@@ -20,7 +20,7 @@ const catalogImage: Picture = {
   title: 'pay-ring',
 };
 
-const productBlock: ProductBlockContent = {
+const PRODUCT_BLOCK: ProductBlockContent = {
   isFullWidthTitle: true,
   version: 'secondary',
   image: {
@@ -39,7 +39,7 @@ const productBlock: ProductBlockContent = {
   ],
 };
 
-const options = {
+const OPTIONS = {
   blocksRegistry: Blocks,
 } as BlockRendererOptions;
 
@@ -53,19 +53,19 @@ export default {
           blocks: [
             {
               type: 'CarouselCatalogCard',
-              content: { ...CATALOG_CARD, image: catalogImage },
+              content: { ...CATALOG_CARD, image: CATALOG_IMAGE },
             },
             {
               type: 'CarouselCatalogCard',
-              content: { ...CATALOG_CARD_NEW, image: catalogImage },
+              content: { ...CATALOG_CARD_NEW, image: CATALOG_IMAGE },
             },
             {
               type: 'CarouselCatalogCard',
-              content: { ...CATALOG_CARD, image: catalogImage },
+              content: { ...CATALOG_CARD, image: CATALOG_IMAGE },
             },
           ],
         }}
-        options={options}
+        options={OPTIONS}
       />
     </div>
   ),
@@ -90,7 +90,7 @@ export default {
             },
           ],
         }}
-        options={options}
+        options={OPTIONS}
       />
     </div>
   ),
@@ -105,7 +105,7 @@ export default {
             content: CAROUSEL_RECOMMENDATION_CARD,
           }),
         }}
-        options={options}
+        options={OPTIONS}
       />
     </div>
   ),
@@ -120,7 +120,7 @@ export default {
             content: { version: 'secondary', ...CAROUSEL_RECOMMENDATION_CARD },
           }),
         }}
-        options={options}
+        options={OPTIONS}
       />
     </div>
   ),
@@ -137,7 +137,7 @@ export default {
             content: CAROUSEL_RECOMMENDATION_CARD_BENEFITS,
           }),
         }}
-        options={options}
+        options={OPTIONS}
       />
     </div>
   ),
@@ -153,28 +153,28 @@ export default {
         block={{
           type: 'Carousel',
           blocks: [
-            { type: 'ProductBlock', content: { ...productBlock } },
+            { type: 'ProductBlock', content: { ...PRODUCT_BLOCK } },
             {
               type: 'ProductBlock',
               content: {
-                ...productBlock,
+                ...PRODUCT_BLOCK,
                 title: 'Вклад «Доходный»',
                 description: 'Получайте максимальный доход даже при небольшой сумме вклада',
                 additionalDescription: 'Ставка до 16% годовых',
               },
             },
-            { type: 'ProductBlock', content: { ...productBlock, title: 'Карта Своя' } },
+            { type: 'ProductBlock', content: { ...PRODUCT_BLOCK, title: 'Карта Своя' } },
             {
               type: 'ProductBlock',
               content: {
-                ...productBlock,
+                ...PRODUCT_BLOCK,
                 title: 'Сельская ипотека',
                 additionalDescription: 'до 6 млн. ₽',
               },
             },
           ],
         }}
-        options={options}
+        options={OPTIONS}
       />
     </div>
   ),