@redneckz/wildless-cms-uni-blocks 0.14.699 → 0.14.700

package/bundle/api/RetailAPI/getPaymentSystems.d.ts

@@ -1,4 +1,2 @@
-export declare const getPaymentSystems: (creditProgramId: string) => Promise<{
-    id: string;
-    text: string;
-}[]>;
+import { type PaymentSystem } from './updateUserTask';
+export declare const getPaymentSystems: (creditProgramId: string) => Promise<PaymentSystem[]>;

package/bundle/api/RetailAPI/updateUserTask.d.ts

@@ -28,6 +28,10 @@ export declare type PaymentType = {
     key: 'ANNUITY' | 'DIFFERENTIAL';
     value: string;
 };
+export declare type PaymentSystem = {
+    name: string;
+    type: string;
+};
 export declare type Participant = {
     birthDate?: string;
     id: number;
@@ -94,7 +98,7 @@ export declare type Participant = {
     currencyCode?: {
         key: string;
     };
-    paymentSystemTypeCd?: string;
+    paymentSystemTypeCd?: PaymentSystem;
     classCard?: Option;
     codeWord?: string;
 };

package/bundle/bundle.umd.js

@@ -1202,7 +1202,7 @@
 
     const ApplicationFormLayout = JSX((props) => {
         const { className, title, children, ...rest } = props;
-        return (jsx(BlockWrapper, { className: className, defaultPadding: "p-6xl", ...rest, children: jsxs("div", { className: "container max-w-[978px] space-y-lg", children: [title ? jsx(Heading, { headingType: "h3", title: title, className: "@xl:text-center" }) : null, children] }) }));
+        return (jsx(BlockWrapper, { className: className, defaultPadding: "p-6xl", ...rest, children: jsxs("div", { className: "container space-y-lg", children: [title ? jsx(Heading, { headingType: "h3", title: title, className: "@xl:text-center" }) : null, children] }) }));
     });
 
     function useDialog(Dialog, initialProps = {}) {
@@ -1624,14 +1624,14 @@
         birthday: defaultValidator('Укажите дату рождения'),
         limitedBirthday: limitedBirthdayValidator(),
         birthPlace: defaultValidator('Укажите место рождения'),
-        education: defaultValidator('Выберите ваше образование'),
-        housing: defaultValidator('Выберите тип жилья'),
-        employment: defaultValidator('Выберите информацию о трудоустройстве'),
-        organization: defaultValidator('Выберите тип организации'),
-        amountWorkers: defaultValidator('Выберите информацию о количестве сотрудников'),
-        employerActivities: defaultValidator('Выберите вид деятельности организации'),
-        employerOrganization: defaultValidator('Выберите вид организации'),
-        positionOrganization: defaultValidator('Выберите вашу должность'),
+        education: defaultSelectValidator('Выберите ваше образование'),
+        housing: defaultSelectValidator('Выберите тип жилья'),
+        employment: defaultSelectValidator('Выберите информацию о трудоустройстве'),
+        organization: defaultSelectValidator('Выберите тип организации'),
+        amountWorkers: defaultSelectValidator('Выберите информацию о количестве сотрудников'),
+        employerActivities: defaultSelectValidator('Выберите вид деятельности организации'),
+        employerOrganization: defaultSelectValidator('Выберите вид организации'),
+        positionOrganization: defaultSelectValidator('Выберите вашу должность'),
         dulSerie: serieValidator('Укажите серию паспорта'),
         dulNumber: numberValidator('Укажите номер паспорта'),
         dulIssueDateField: defaultValidator('Укажите дату выдачи паспорта'),
@@ -1667,7 +1667,7 @@
         consentPfrFlg: agreementValidator,
         consentOthersFlg: agreementValidator,
         consentInformFlg: agreementValidator,
-        familyStatus: defaultValidator('Выберите семейное положение'),
+        familyStatus: defaultSelectValidator('Выберите семейное положение'),
         children: lengthStringValidator(2, 'Укажите количество детей'),
         familyMembers: lengthStringValidator(2, 'Укажите количество членов семьи'),
         dependents: lengthStringValidator(2, 'Укажите количество иждивенцев'),
@@ -1693,7 +1693,7 @@
         addressRetail: defaultSelectValidator('Выберите адрес банка'),
         addressMatch: defaultValidator(),
         codeWord: codeWordValidator('Необходимо ввести кодовое слово'),
-        confirmationIncome: defaultValidator(),
+        confirmationIncome: defaultSelectValidator(),
         deliveryDate: defaultValidator('Укажите дату доставки'),
         addressCourier: addressDaDataValidator(),
         cardCategory: defaultValidator('Укажите категорию карты'),
@@ -3157,7 +3157,7 @@
         const [cardTypes, setCardTypes] = useState([]);
         const [programId] = useLocalStorage('programId');
         const { value: selectedCardCategory, onChange: cardCategoryChange } = field('cardCategory');
-        const selectedPaymentSystem = field('paymentSystem').value;
+        const selectedPaymentSystem = field('paymentSystem')?.value?.type;
         useEffect(() => {
             if (selectedPaymentSystem && programId) {
                 (async () => {
@@ -3939,10 +3939,7 @@
         const data = await fetchRetailJSON('/public-data/creditProgramConditions', 'POST', {
             creditProgramId,
         });
-        return (data?.paymentSystems?.map((paymentSystem) => ({
-            id: paymentSystem.type,
-            text: paymentSystem.name,
-        })) ?? []);
+        return data?.paymentSystems || [];
     };
 
     const PaymentSystemField = JSX(({ field, input }) => {
@@ -3957,8 +3954,10 @@
                 })();
             }
         }, []);
-        return (jsx(RadioButtonGroupControl, { label: "\u041F\u043B\u0430\u0442\u0435\u0436\u043D\u0430\u044F \u0441\u0438\u0441\u0442\u0435\u043C\u0430", orientation: "horizontal", items: paymentSystemOptions, value: value, onChange: (_) => onChange?.(_), ...getValidation(field('paymentSystem'), validatorObj.paymentSystem, input?.required) }));
+        const handleChange = useCallback((type) => onChange?.(paymentSystemOptions?.find((_) => _.type === type)), [paymentSystemOptions, onChange]);
+        return (jsx(RadioButtonGroupControl, { label: "\u041F\u043B\u0430\u0442\u0435\u0436\u043D\u0430\u044F \u0441\u0438\u0441\u0442\u0435\u043C\u0430", orientation: "horizontal", items: formatPaymentSystems(paymentSystemOptions), ...getValidation(field('paymentSystem'), validatorObj.paymentSystem, input?.required), value: value?.type, onChange: handleChange }));
     });
+    const formatPaymentSystems = (paymentSystems) => paymentSystems?.map((_) => ({ id: _.type, text: _.name })) ?? [];
 
     const isPlaceholder = (_) => _ === '_';
     const isDigit = (_) => /\d/.test(_);
@@ -5019,7 +5018,7 @@
         addressRegistration: '',
         participantDateRegistration: undefined,
         currency: '',
-        paymentSystem: '',
+        paymentSystem: { name: '', type: '' },
         cardCategory: { key: '', text: '' },
         codeWord: '',
         addressRetail: { key: '', text: '' },
@@ -6680,7 +6679,7 @@
 
     const formStateMap$1 = [
         {
-            paymentSystem: '',
+            paymentSystem: { name: '', type: '' },
             currency: '810',
             codeWord: '',
         },
@@ -8921,7 +8920,7 @@
         });
         const regionHref = regions?.find((_) => _.name === region.key)?.href;
         const buttonText = button?.text ? button.text : 'Перейти';
-        return (jsx(BlockWrapper, { className: className, defaultPadding: "p-6xl", ...rest, children: jsxs("div", { className: "container max-w-[978px] space-y-m", children: [title ? jsx(Heading, { headingType: "h3", title: title, className: "@xl:text-center" }) : null, regions ? (jsx(SelectControl, { label: "\u0412\u0430\u0448 \u0440\u0435\u0433\u0438\u043E\u043D", placeholder: "\u0412\u044B\u0431\u0435\u0440\u0438\u0442\u0435 \u0440\u0435\u0433\u0438\u043E\u043D", isSearch: true, options: regions.map(({ name = '' }) => ({ key: name, text: name })), value: region, onChange: setRegion })) : null, regionHref ? (jsx("div", { className: "text-center", children: jsx(LinkButton, { href: regionHref, target: "_blank", className: style('p-m w-full @xl:w-auto', buttonStyle), data: getAspectsWithInclude(data, region?.key), children: buttonText }) })) : null] }) }));
+        return (jsx(BlockWrapper, { className: className, defaultPadding: "p-6xl", ...rest, children: jsxs("div", { className: "container space-y-m", children: [title ? jsx(Heading, { headingType: "h3", title: title, className: "@xl:text-center" }) : null, regions ? (jsx(SelectControl, { label: "\u0412\u0430\u0448 \u0440\u0435\u0433\u0438\u043E\u043D", placeholder: "\u0412\u044B\u0431\u0435\u0440\u0438\u0442\u0435 \u0440\u0435\u0433\u0438\u043E\u043D", isSearch: true, options: regions.map(({ name = '' }) => ({ key: name, text: name })), value: region, onChange: setRegion })) : null, regionHref ? (jsx("div", { className: "text-center", children: jsx(LinkButton, { href: regionHref, target: "_blank", className: style('p-m w-full @xl:w-auto', buttonStyle), data: getAspectsWithInclude(data, region?.key), children: buttonText }) })) : null] }) }));
     });
 
     function useActiveRoute(items = []) {
@@ -10545,7 +10544,7 @@
         slots: () => [HEADER_SLOT, FOOTER_SLOT, STICKY_FOOTER_SLOT],
     });
 
-    const packageVersion = "0.14.698";
+    const packageVersion = "0.14.699";
 
     exports.Blocks = Blocks;
     exports.ContentPage = ContentPage;