@redneckz/wildless-cms-uni-blocks 0.14.684 → 0.14.685

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

@@ -5,4 +5,4 @@ export declare type CardTypeData = {
     displayOrder: number;
     description: string;
 };
-export declare const getCardTypes: (paymentSystemType: string) => Promise<CardTypeData[]>;
+export declare const getCardTypes: (paymentSystemTypeCd: string, creditProgramId: string) => Promise<CardTypeData[]>;

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

@@ -1,4 +1,4 @@
-export declare const getPaymentSystems: () => Promise<{
+export declare const getPaymentSystems: (creditProgramId: string) => Promise<{
     id: string;
     text: string;
 }[]>;

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

@@ -1,4 +1,3 @@
-import { type CreateUserProfileResponse } from './updateUserTask';
 export declare type UpdateUserProfileBody = {
     profile: {
         id: number;
@@ -19,4 +18,4 @@ export declare type UpdateUserProfileBody = {
         smsConsentBki?: string;
     };
 };
-export declare const updateUserProfile: (body: UpdateUserProfileBody) => Promise<CreateUserProfileResponse | null>;
+export declare const updateUserProfile: (body: UpdateUserProfileBody) => Promise<Response>;

package/bundle/bundle.umd.js

@@ -1675,6 +1675,8 @@
         confirmationIncome: defaultValidator(),
         deliveryDate: defaultValidator('Укажите дату доставки'),
         addressCourier: addressDaDataValidator(),
+        cardCategory: defaultValidator('Укажите категорию карты'),
+        paymentSystem: defaultValidator('Укажите тип платежной системы'),
     };
     const getObjectValidator = (inputs) => {
         const requiredInputs = getNamesFromInput(inputs.filter((_) => Boolean(_?.required)));
@@ -2916,26 +2918,42 @@
     const FIELD_NAME$a = 'birthPlace';
     const BirthPlaceField = JSX(({ field, input }) => (jsx(InputControl, { label: "\u041C\u0435\u0441\u0442\u043E \u0440\u043E\u0436\u0434\u0435\u043D\u0438\u044F", ...getValidation(field('birthPlace'), validatorObj.birthPlace, input?.required), ...input, disabled: input?.filledByEsia && isEsiaAuthorize(field, FIELD_NAME$a) })));
 
-    const getCardTypes = async (paymentSystemType) => {
-        const response = await doRequest('/dictionaryFiltered', 'POST', {
+    const getCardTypes = async (paymentSystemTypeCd, creditProgramId) => {
+        const data = await fetchRetailJSON('/dictionaryFiltered', 'POST', {
             type: 'CARD_TYPE',
-            presets: { paymentSystemType, creditProgramId: 13 },
+            presets: { paymentSystemTypeCd, creditProgramId },
         });
-        const data = await response?.json();
         return Array.isArray(data) ? data : [];
     };
 
+    function useLocalStorage(key) {
+        const [storedValue, setStoredValue] = useState(JSON.parse(globalThis.localStorage?.getItem(key) || 'null'));
+        const setValue = useCallback((value) => {
+            globalThis.localStorage?.setItem(key, JSON.stringify(value));
+            setStoredValue(value);
+        }, [key, globalThis.localStorage]);
+        return [storedValue, setValue];
+    }
+
     const CardCategoryField = JSX(({ field, input }) => {
         const [cardTypes, setCardTypes] = useState([]);
+        const [programId] = useLocalStorage('programId');
+        const { value: selectedCardCategory, onChange: cardCategoryChange } = field('cardCategory');
         const selectedPaymentSystem = field('paymentSystem').value;
         useEffect(() => {
-            (async () => {
-                const fetchedCardTypes = await getCardTypes(selectedPaymentSystem);
-                setCardTypes(fetchedCardTypes);
-            })();
+            if (selectedPaymentSystem && programId) {
+                (async () => {
+                    const fetchedCardTypes = await getCardTypes(selectedPaymentSystem, programId);
+                    setCardTypes(fetchedCardTypes);
+                    if (!isValidCardCategory(fetchedCardTypes, selectedCardCategory)) {
+                        cardCategoryChange && cardCategoryChange(null);
+                    }
+                })();
+            }
         }, [selectedPaymentSystem]);
         return (jsx(SelectField, { field: field, source: cardTypes, label: "\u041A\u0430\u0442\u0435\u0433\u043E\u0440\u0438\u044F \u043A\u0430\u0440\u0442\u044B", fieldName: "cardCategory", input: input }));
     });
+    const isValidCardCategory = (cardTypes, selectedCardCategory) => cardTypes.some((cardType) => cardType.key === selectedCardCategory?.key);
 
     const ChildrenField = JSX(({ field, input }) => (jsx(InputControl, { label: "\u041A\u043E\u043B\u0438\u0447\u0435\u0441\u0442\u0432\u043E \u0434\u0435\u0442\u0435\u0439 \u0434\u043E 18 \u043B\u0435\u0442", placeholder: "\u0412\u0432\u0435\u0434\u0438\u0442\u0435 \u0437\u043D\u0430\u0447\u0435\u043D\u0438\u0435", isInteger: true, ...getValidation(field('children'), validatorObj.children, input?.required), ...input })));
 
@@ -3582,11 +3600,10 @@
         return (jsx(InputControl, { ...getValidation(field('partnerComments'), validatorObj.partnerComments, required), placeholder: "\u0423\u043A\u0430\u0436\u0438\u0442\u0435 \u0438\u043D\u0442\u0435\u0440\u0435\u0441\u0443\u044E\u0449\u0438\u0439 \u0432\u0430\u0441 \u0432\u043E\u043F\u0440\u043E\u0441", isTextarea: true, ...rest }));
     });
 
-    const getPaymentSystems = async () => {
-        const response = await doRequest('/public-data/creditProgramConditions', 'POST', {
-            creditProgramId: 13,
+    const getPaymentSystems = async (creditProgramId) => {
+        const data = await fetchRetailJSON('/public-data/creditProgramConditions', 'POST', {
+            creditProgramId,
         });
-        const data = await response?.json();
         return (data?.paymentSystems?.map((paymentSystem) => ({
             id: paymentSystem.type,
             text: paymentSystem.name,
@@ -3595,12 +3612,15 @@
 
     const PaymentSystemField = JSX(({ field, input }) => {
         const { value, onChange } = field('paymentSystem');
+        const [programId] = useLocalStorage('programId');
         const [paymentSystemOptions, setPaymentSystemOptions] = useState([]);
         useEffect(() => {
-            (async () => {
-                const fetchedPaymentSystems = await getPaymentSystems();
-                setPaymentSystemOptions(fetchedPaymentSystems || []);
-            })();
+            if (programId) {
+                (async () => {
+                    const fetchedPaymentSystems = await getPaymentSystems(programId);
+                    setPaymentSystemOptions(fetchedPaymentSystems || []);
+                })();
+            }
         }, []);
         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) }));
     });
@@ -4027,15 +4047,6 @@
             return _ === (dataValue?.key ?? dataValue);
         }));
 
-    function useLocalStorage(key) {
-        const [storedValue, setStoredValue] = useState(JSON.parse(globalThis.localStorage?.getItem(key) || 'null'));
-        const setValue = useCallback((value) => {
-            globalThis.localStorage?.setItem(key, JSON.stringify(value));
-            setStoredValue(value);
-        }, [key, globalThis.localStorage]);
-        return [storedValue, setValue];
-    }
-
     const CONSENT_ALL_DOCS_TEXT = 'Согласие на все документы';
     const CONSENT_REQUIRED = 'Отметьте все обязательные соглашения';
     const GroupedConsents = JSX(({ inputs = [], typeForm = '', field, key }) => {
@@ -4123,19 +4134,19 @@
 
     const createUserProfile = (body) => fetchRetailJSON('/public-data/createUserProfile', 'POST', body).then((res) => res?.profile?.id || null);
 
-    const updateUserProfile = (body) => fetchRetailJSON('/user-data/updateUserProfile', 'PUT', body);
+    const updateUserProfile = (body) => doRequest('/user-data/updateUserProfile', 'PUT', body);
 
     const updateUserTask = (body) => doRequest('/user-data/updateUserTask', 'PUT', body);
 
     const getUpdateUserProfileData = (profileId, formData) => {
-        const { name = '', surname = '', middleName = '', birthday = '', phone = '', email = '', processPersonalDataFlg, consentProviderFlg, consentPfrFlg, consentPhotoFlg, consentAssignmentClaimsFlg, consentCollectionFlg, consentInformFlg, } = formData;
+        const { name = '', surname = '', middleName = '', limitedBirthday = '', phone = '', email = '', processPersonalDataFlg, consentProviderFlg, consentPfrFlg, consentPhotoFlg, consentAssignmentClaimsFlg, consentCollectionFlg, consentInformFlg, } = formData;
         return {
             profile: {
                 id: profileId,
                 name,
                 surname,
                 midname: middleName,
-                birthDate: birthday && formatDate(birthday, true),
+                birthDate: limitedBirthday && formatDate(limitedBirthday, true),
                 email,
                 phone: formatPhone(phone),
                 processPersonalDataFlg: Boolean(processPersonalDataFlg),
@@ -4645,12 +4656,17 @@
             profileId,
             programId,
         });
-        await updateUserTask(getLeadFormTaskData({
-            participantId,
-            taskId,
-            profileId,
-            formData: transformedForm,
-        }));
+        try {
+            await updateUserTask(getLeadFormTaskData({
+                participantId,
+                taskId,
+                profileId,
+                formData: transformedForm,
+            }));
+        }
+        catch (ex) {
+            console.log(ex);
+        }
         saveUserData({ participantId, taskId, profileId, programId });
         saveForm(formData);
     };
@@ -10369,7 +10385,7 @@
         slots: () => [HEADER_SLOT, FOOTER_SLOT, STICKY_FOOTER_SLOT],
     });
 
-    const packageVersion = "0.14.683";
+    const packageVersion = "0.14.684";
 
     exports.Blocks = Blocks;
     exports.ContentPage = ContentPage;