@redneckz/wildless-cms-uni-blocks 0.14.1065 → 0.14.1066

package/bundle/bundle.umd.js

@@ -6243,9 +6243,6 @@
 
     const MIN_DATE = new Date(Date.now() + 1 * 24 * 60 * 60 * 1000);
     const DeliveryDateField = JSX(({ field, input }) => {
-        const { productType } = useRetailFormStore();
-        const isDebit = productType === 'debitCard';
-        const minDate = isDebit ? MIN_DATE : new Date();
         const { data } = useLeadFormData('DAYS_DELIVERY_SETTINGS');
         const weekends = useMemo(() => {
             const weekendItem = data?.find((item) => item.key === 'WEEKEND');
@@ -6254,7 +6251,7 @@
             }
             return [];
         }, [data]);
-        return (jsx(DatePickerControl, { label: "\u0414\u0430\u0442\u0430 \u0434\u043E\u0441\u0442\u0430\u0432\u043A\u0438", ...field(input?.name ?? ''), ...input, minDate: minDate, weekends: isDebit ? weekends : [] }));
+        return (jsx(DatePickerControl, { label: "\u0414\u0430\u0442\u0430 \u0434\u043E\u0441\u0442\u0430\u0432\u043A\u0438", ...field(input?.name ?? ''), ...input, minDate: MIN_DATE, weekends: weekends }));
     });
 
     const DeliveryTimeField = JSX(({ field, input }) => {
@@ -6267,6 +6264,7 @@
             const allowedTimes = isDebit ? debitDeliveryTime : creditDeliveryTime;
             return (data || [])
                 .filter((item) => item.key && allowedTimes.includes(item.key))
+                .sort((a, b) => (a.displayOrder || 0) - (b.displayOrder || 0))
                 .map((item) => ({
                 id: item.key,
                 text: item.value,
@@ -10828,12 +10826,17 @@
 
     const getDeliveryData$1 = (formData) => {
         const { methodObtain, deliveryDate = '', deliveryTime } = formData;
+        const isNewMicroservice = checkNewMicroservice();
+        //TODO временный хардкод для тестирования, требуется чтобы отработал ЕФР
+        const oficeId = isNewMicroservice ? { id: '92fc8b67-2648-43ad-a441-5ca827021186' } : { id: '3' };
         const isCourierDelivery = methodObtain === 'courier';
         const deliveryTimeCd = deliveryTime ? { deliveryTimeCd: { key: deliveryTime } } : {};
         return isCourierDelivery
             ? {
                 courierDeliveryFlg: isCourierDelivery,
                 deliveryDate: dateToISO(deliveryDate.toString().replace(/(GMT)[+-]\d{4}/, 'GMT+0000')),
+                //TODO временный хардкод для тестирования, не забыть удалить
+                office: oficeId,
                 ...deliveryTimeCd,
             }
             : {};
@@ -10929,7 +10932,8 @@
                     cardCategory: leadForm?.cardCategory?.text,
                     deliveryDate: leadForm?.deliveryDate,
                 };
-                retailFormStore.leadForm = initialState;
+                const resetState = { ...initialState, methodObtain: undefined };
+                retailFormStore.leadForm = resetState;
             }
         }, [isFinalStep, initialState]);
         const handleSubmit = useCallback(async (formData) => {
@@ -14845,7 +14849,7 @@
         slots: () => [HEADER_SLOT, FOOTER_SLOT, STICKY_FOOTER_SLOT],
     });
 
-    const packageVersion = "0.14.1064";
+    const packageVersion = "0.14.1065";
 
     exports.Blocks = Blocks;
     exports.ContentPage = ContentPage;