@redneckz/wildless-cms-uni-blocks 0.14.798 → 0.14.800

package/bundle/bundle.umd.js

@@ -4396,6 +4396,15 @@
 
     const DeliveryDateFiels = JSX(({ field, input }) => (jsx(DatePickerControl, { label: "\u0414\u0430\u0442\u0430 \u0434\u043E\u0441\u0442\u0430\u0432\u043A\u0438", ...field(input?.name ?? '') })));
 
+    const DeliveryTimeField = JSX(({ field, input }) => {
+        const { data } = useLeadFormData('COURIER_DELIVERY_TIME');
+        const deliveryTime = useMemo(() => data?.map((_) => ({
+            id: _.key,
+            text: _.value,
+        })) ?? [], [data]);
+        return (jsx(RadioButtonGroupControl, { label: "\u0412\u0440\u0435\u043C\u044F \u0434\u043E\u0441\u0442\u0430\u0432\u043A\u0438", className: "flex-row", items: deliveryTime, ...field(input?.name ?? '') }));
+    });
+
     const DependentsField = JSX(({ field, input }) => (jsx(DaDataInputControl, { label: "\u041A\u043E\u043B\u0438\u0447\u0435\u0441\u0442\u0432\u043E \u0438\u043D\u044B\u0445 \u0438\u0436\u0434\u0438\u0432\u0435\u043D\u0446\u0435\u0432", placeholder: "\u0417\u0430 \u0438\u0441\u043A\u043B\u044E\u0447\u0435\u043D\u0438\u0435\u043C \u0434\u0435\u0442\u0435\u0439 \u0434\u043E 18 \u043B\u0435\u0442", isInteger: true, maxLength: 2, ...field(input?.name ?? ''), ...input })));
 
     const DulIssueDateField = JSX(({ field, input }) => (jsx(DatePickerControl, { label: "\u0414\u0430\u0442\u0430 \u0432\u044B\u0434\u0430\u0447\u0438", ...field(input?.name ?? ''), disabled: input?.filledByEsia && isEsiaAuthorize(field, input?.name ?? '') })));
@@ -4873,6 +4882,7 @@
         deliveryDate: DeliveryDateFiels,
         latinName: LatinNameField,
         latinSurname: LatinSurnameField,
+        deliveryTime: DeliveryTimeField,
     };
 
     const CONSENT_ALL_DOCS_TEXT = 'Согласие на все документы';
@@ -6816,7 +6826,9 @@
             checkRangeByKeys(monthsValue || defaultMonth, ['minMonths', 'maxMonths'], row),
         ].every(Boolean)) || DEFAULT_DEPOSIT_CALCULATOR_PARAMS;
         const { rate } = depositCalculatorSourceBookParams;
-        const income = getDepositIncome(rate, userInputParams);
+        const extraPercent = userInputParams?.extraPercent?.key;
+        const totalRate = Number(rate) + Number(extraPercent);
+        const income = getDepositIncome(totalRate, userInputParams);
         const finalSum = moneyValue + income;
         const sourceBookRows = rows || [DEFAULT_DEPOSIT_CALCULATOR_PARAMS];
         return {
@@ -7903,15 +7915,16 @@
     };
 
     const getDeliveryData$1 = (formData) => {
-        const { methodObtain, deliveryDate = '' } = formData;
+        const { methodObtain, deliveryDate = '', deliveryTime } = formData;
         const isCourierDelivery = methodObtain === 'courier';
+        const deliveryTimeCd = deliveryTime ? { deliveryTimeCd: { key: deliveryTime } } : {};
         return isCourierDelivery
             ? {
                 courierDeliveryFlg: isCourierDelivery,
                 deliveryDate: dateToISO(deliveryDate.toString().replace(/(GMT)[+-]\d{4}/, 'GMT+0000')),
-                deliveryTimeCd: { value: 'TIME_2' },
                 //TODO временный хардкод для тестирования, не забыть удалить
                 office: { id: '3' },
+                ...deliveryTimeCd,
             }
             : {};
     };
@@ -8395,6 +8408,11 @@
                     },
                     required: true,
                 },
+            ],
+        },
+        {
+            columns: 2,
+            inputs: [
                 {
                     name: 'deliveryDate',
                     condition: {
@@ -8403,6 +8421,17 @@
                     },
                     required: true,
                 },
+                {
+                    name: 'deliveryTime',
+                    condition: {
+                        name: 'methodObtain',
+                        values: ['courier'],
+                    },
+                },
+            ],
+        },
+        {
+            inputs: [
                 {
                     name: 'comment',
                     condition: {
@@ -9021,16 +9050,17 @@
     ];
 
     const getDeliveryData = (formData) => {
-        const { methodObtain, regionRetail, comment, deliveryDate = '' } = formData;
+        const { methodObtain, regionRetail, comment, deliveryDate = '', deliveryTime } = formData;
         const isCourierDelivery = methodObtain === 'courier';
+        const deliveryTimeCd = deliveryTime ? { deliveryTimeCd: { key: deliveryTime } } : {};
         return isCourierDelivery
             ? {
                 cardServiceRegionCd: regionRetail,
                 courierDeliveryFlg: true,
-                deliveryComments: comment,
+                deliveryComment: comment,
                 deliveryDate: dateToISO(deliveryDate.toString().replace(/(GMT)[+-]\d{4}/, 'GMT+0000')),
-                deliveryTimeCd: { key: 'TIME_2' },
                 office: { id: '' },
+                ...deliveryTimeCd,
             }
             : {};
     };
@@ -11431,7 +11461,7 @@
         slots: () => [HEADER_SLOT, FOOTER_SLOT, STICKY_FOOTER_SLOT],
     });
 
-    const packageVersion = "0.14.797";
+    const packageVersion = "0.14.799";
 
     exports.Blocks = Blocks;
     exports.ContentPage = ContentPage;