@redneckz/wildless-cms-uni-blocks 0.14.1065 → 0.14.1066
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/bundle/bundle.umd.js +10 -6
- package/bundle/bundle.umd.min.js +1 -1
- package/dist/components/CreditCardForm/getDeliveryCreditCardData.js +6 -0
- package/dist/components/CreditCardForm/getDeliveryCreditCardData.js.map +1 -1
- package/dist/components/CreditCardForm/useCreditCardFormAPI.js +2 -1
- package/dist/components/CreditCardForm/useCreditCardFormAPI.js.map +1 -1
- package/dist/retail/components/Fields/DeliveryDateField.js +1 -5
- package/dist/retail/components/Fields/DeliveryDateField.js.map +1 -1
- package/dist/retail/components/Fields/DeliveryTimeField.js +1 -0
- package/dist/retail/components/Fields/DeliveryTimeField.js.map +1 -1
- package/lib/components/CreditCardForm/getDeliveryCreditCardData.js +6 -0
- package/lib/components/CreditCardForm/getDeliveryCreditCardData.js.map +1 -1
- package/lib/components/CreditCardForm/useCreditCardFormAPI.js +2 -1
- package/lib/components/CreditCardForm/useCreditCardFormAPI.js.map +1 -1
- package/lib/components/OfficesAtmsMap/OfficesAtmsMapLayout.d.ts +1 -1
- package/lib/retail/components/Fields/DeliveryDateField.js +1 -5
- package/lib/retail/components/Fields/DeliveryDateField.js.map +1 -1
- package/lib/retail/components/Fields/DeliveryTimeField.js +1 -0
- package/lib/retail/components/Fields/DeliveryTimeField.js.map +1 -1
- package/mobile/bundle/bundle.umd.js +10 -6
- package/mobile/bundle/bundle.umd.min.js +1 -1
- package/mobile/dist/components/CreditCardForm/getDeliveryCreditCardData.js +6 -0
- package/mobile/dist/components/CreditCardForm/getDeliveryCreditCardData.js.map +1 -1
- package/mobile/dist/components/CreditCardForm/useCreditCardFormAPI.js +2 -1
- package/mobile/dist/components/CreditCardForm/useCreditCardFormAPI.js.map +1 -1
- package/mobile/dist/retail/components/Fields/DeliveryDateField.js +1 -5
- package/mobile/dist/retail/components/Fields/DeliveryDateField.js.map +1 -1
- package/mobile/dist/retail/components/Fields/DeliveryTimeField.js +1 -0
- package/mobile/dist/retail/components/Fields/DeliveryTimeField.js.map +1 -1
- package/mobile/lib/components/CreditCardForm/getDeliveryCreditCardData.js +6 -0
- package/mobile/lib/components/CreditCardForm/getDeliveryCreditCardData.js.map +1 -1
- package/mobile/lib/components/CreditCardForm/useCreditCardFormAPI.js +2 -1
- package/mobile/lib/components/CreditCardForm/useCreditCardFormAPI.js.map +1 -1
- package/mobile/lib/retail/components/Fields/DeliveryDateField.js +1 -5
- package/mobile/lib/retail/components/Fields/DeliveryDateField.js.map +1 -1
- package/mobile/lib/retail/components/Fields/DeliveryTimeField.js +1 -0
- package/mobile/lib/retail/components/Fields/DeliveryTimeField.js.map +1 -1
- package/mobile/src/components/CreditCardForm/getDeliveryCreditCardData.ts +6 -0
- package/mobile/src/components/CreditCardForm/useCreditCardFormAPI.tsx +2 -1
- package/mobile/src/retail/components/Fields/DeliveryDateField.tsx +2 -6
- package/mobile/src/retail/components/Fields/DeliveryTimeField.tsx +1 -0
- package/package.json +1 -1
- package/src/components/CreditCardForm/getDeliveryCreditCardData.ts +6 -0
- package/src/components/CreditCardForm/useCreditCardFormAPI.tsx +2 -1
- package/src/retail/components/Fields/DeliveryDateField.tsx +2 -6
- package/src/retail/components/Fields/DeliveryTimeField.tsx +1 -0
|
@@ -1,15 +1,21 @@
|
|
|
1
1
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
2
2
|
exports.getDeliveryCreditCardData = exports.getOfficeCode = exports.getDeliveryData = void 0;
|
|
3
3
|
const utils_1 = require("../../retail/adaptors/utils");
|
|
4
|
+
const checkNewMicroservice_1 = require("../../retail/utils/checkNewMicroservice");
|
|
4
5
|
const dateToISO_1 = require("../../utils/dateToISO");
|
|
5
6
|
const getDeliveryData = (formData) => {
|
|
6
7
|
const { methodObtain, deliveryDate = '', deliveryTime } = formData;
|
|
8
|
+
const isNewMicroservice = (0, checkNewMicroservice_1.checkNewMicroservice)();
|
|
9
|
+
//TODO временный хардкод для тестирования, требуется чтобы отработал ЕФР
|
|
10
|
+
const oficeId = isNewMicroservice ? { id: '92fc8b67-2648-43ad-a441-5ca827021186' } : { id: '3' };
|
|
7
11
|
const isCourierDelivery = methodObtain === 'courier';
|
|
8
12
|
const deliveryTimeCd = deliveryTime ? { deliveryTimeCd: { key: deliveryTime } } : {};
|
|
9
13
|
return isCourierDelivery
|
|
10
14
|
? {
|
|
11
15
|
courierDeliveryFlg: isCourierDelivery,
|
|
12
16
|
deliveryDate: (0, dateToISO_1.dateToISO)(deliveryDate.toString().replace(/(GMT)[+-]\d{4}/, 'GMT+0000')),
|
|
17
|
+
//TODO временный хардкод для тестирования, не забыть удалить
|
|
18
|
+
office: oficeId,
|
|
13
19
|
...deliveryTimeCd,
|
|
14
20
|
}
|
|
15
21
|
: {};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getDeliveryCreditCardData.js","sourceRoot":"","sources":["../../../src/components/CreditCardForm/getDeliveryCreditCardData.ts"],"names":[],"mappings":";;AAAA,uDAAsE;AAEtE,qDAAkD;AAE3C,MAAM,eAAe,GAAG,CAAC,QAAuB,EAAE,EAAE;IACzD,MAAM,EAAE,YAAY,EAAE,YAAY,GAAG,EAAE,EAAE,YAAY,EAAE,GAAG,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"getDeliveryCreditCardData.js","sourceRoot":"","sources":["../../../src/components/CreditCardForm/getDeliveryCreditCardData.ts"],"names":[],"mappings":";;AAAA,uDAAsE;AAEtE,kFAA+E;AAC/E,qDAAkD;AAE3C,MAAM,eAAe,GAAG,CAAC,QAAuB,EAAE,EAAE;IACzD,MAAM,EAAE,YAAY,EAAE,YAAY,GAAG,EAAE,EAAE,YAAY,EAAE,GAAG,QAAQ,CAAC;IACnE,MAAM,iBAAiB,GAAG,IAAA,2CAAoB,GAAE,CAAC;IACjD,wEAAwE;IACxE,MAAM,OAAO,GAAG,iBAAiB,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,sCAAsC,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,GAAG,EAAE,CAAC;IAEjG,MAAM,iBAAiB,GAAG,YAAY,KAAK,SAAS,CAAC;IACrD,MAAM,cAAc,GAAG,YAAY,CAAC,CAAC,CAAC,EAAE,cAAc,EAAE,EAAE,GAAG,EAAE,YAAY,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;IAErF,OAAO,iBAAiB;QACtB,CAAC,CAAC;YACE,kBAAkB,EAAE,iBAAiB;YACrC,YAAY,EAAE,IAAA,qBAAS,EAAC,YAAY,CAAC,QAAQ,EAAE,CAAC,OAAO,CAAC,gBAAgB,EAAE,UAAU,CAAC,CAAC;YACtF,4DAA4D;YAC5D,MAAM,EAAE,OAAO;YACf,GAAG,cAAc;SAClB;QACH,CAAC,CAAC,EAAE,CAAC;AACT,CAAC,CAAC;AAlBW,QAAA,eAAe,mBAkB1B;AAEK,MAAM,aAAa,GAAG,CAAC,QAAuB,EAAE,EAAE;IACvD,MAAM,EAAE,aAAa,EAAE,YAAY,EAAE,GAAG,QAAQ,CAAC;IAEjD,MAAM,cAAc,GAAG,aAAa,EAAE,GAAG,IAAI,YAAY,KAAK,QAAQ,CAAC;IAEvE,OAAO,cAAc;QACnB,CAAC,CAAC;YACE,MAAM,EAAE,EAAE,EAAE,EAAE,aAAa,CAAC,GAAG,EAAE;SAClC;QACH,CAAC,CAAC,EAAE,CAAC;AACT,CAAC,CAAC;AAVW,QAAA,aAAa,iBAUxB;AAEK,MAAM,yBAAyB,GAAG,CAAC,QAAuB,EAAE,EAAE;IACnE,MAAM,EAAE,cAAc,EAAE,YAAY,EAAE,GAAG,QAAQ,CAAC;IAElD,MAAM,iBAAiB,GAAG,YAAY,KAAK,SAAS,CAAC;IAErD,OAAO,iBAAiB;QACtB,CAAC,CAAC;YACE,oBAAoB,EAAE,IAAA,+BAAuB,EAAC,EAAE,cAAc,EAAE,CAAC;SAClE;QACH,CAAC,CAAC,EAAE,CAAC;AACT,CAAC,CAAC;AAVW,QAAA,yBAAyB,6BAUpC"}
|
|
@@ -22,7 +22,8 @@ const useCreditCardFormAPI = ({ step, onNextStep, onFinish, }) => {
|
|
|
22
22
|
cardCategory: leadForm?.cardCategory?.text,
|
|
23
23
|
deliveryDate: leadForm?.deliveryDate,
|
|
24
24
|
};
|
|
25
|
-
|
|
25
|
+
const resetState = { ...initialState, methodObtain: undefined };
|
|
26
|
+
retailFormStore.leadForm = resetState;
|
|
26
27
|
}
|
|
27
28
|
}, [isFinalStep, initialState]);
|
|
28
29
|
const handleSubmit = (0, hooks_1.useCallback)(async (formData) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useCreditCardFormAPI.js","sourceRoot":"","sources":["../../../src/components/CreditCardForm/useCreditCardFormAPI.tsx"],"names":[],"mappings":";;AAAA,uDAAmE;AACnE,iEAA8D;AAC9D,oEAAiE;AACjE,8EAA2E;AAE3E,gFAA6E;AAC7E,iDAA8C;AAC9C,2EAAwE;AAQjE,MAAM,oBAAoB,GAAG,CAAC,EACnC,IAAI,EACJ,UAAU,EACV,QAAQ,GACW,EAA+D,EAAE;IACpF,MAAM,CAAC,SAAS,EAAE,EAAE,OAAO,EAAE,YAAY,EAAE,QAAQ,EAAE,UAAU,EAAE,CAAC,GAAG,IAAA,iBAAO,EAAC,KAAK,CAAC,CAAC;IACpF,MAAM,WAAW,GAAG,IAAI,KAAK,CAAC,CAAC;IAE/B,MAAM,eAAe,GAAG,IAAA,uCAAkB,GAAE,CAAC;IAE7C,MAAM,YAAY,GAAG,IAAA,eAAO,EAC1B,GAAG,EAAE,CAAC,IAAA,yCAAmB,EAAC,IAAI,EAAE,eAAe,CAAC,QAAQ,EAAE,2BAAY,CAAC,EACvE,CAAC,IAAI,EAAE,eAAe,CAAC,QAAQ,CAAC,CACjC,CAAC;IACF,MAAM,SAAS,GAAG,IAAA,mBAAW,EAC3B,CAAC,QAAkB,EAAE,EAAE;QACrB,MAAM,EAAE,QAAQ,EAAE,GAAG,eAAe,CAAC;QACrC,IAAI,WAAW,IAAI,QAAQ,CAAC,EAAE,IAAI,QAAQ,EAAE;YAC1C,eAAe,CAAC,UAAU,GAAG;gBAC3B,YAAY,EAAE,QAAQ,EAAE,YAAY,EAAE,IAAI;gBAC1C,aAAa,EAAE,QAAQ,EAAE,aAAa,EAAE,IAAI;gBAC5C,eAAe,EAAE,QAAQ,EAAE,cAAc,EAAE,WAAW;gBACtD,YAAY,EAAE,QAAQ,EAAE,YAAY,EAAE,IAAI;gBAC1C,YAAY,EAAE,QAAQ,EAAE,YAAY;aACrC,CAAC;YACF,eAAe,CAAC,QAAQ,GAAG,
|
|
1
|
+
{"version":3,"file":"useCreditCardFormAPI.js","sourceRoot":"","sources":["../../../src/components/CreditCardForm/useCreditCardFormAPI.tsx"],"names":[],"mappings":";;AAAA,uDAAmE;AACnE,iEAA8D;AAC9D,oEAAiE;AACjE,8EAA2E;AAE3E,gFAA6E;AAC7E,iDAA8C;AAC9C,2EAAwE;AAQjE,MAAM,oBAAoB,GAAG,CAAC,EACnC,IAAI,EACJ,UAAU,EACV,QAAQ,GACW,EAA+D,EAAE;IACpF,MAAM,CAAC,SAAS,EAAE,EAAE,OAAO,EAAE,YAAY,EAAE,QAAQ,EAAE,UAAU,EAAE,CAAC,GAAG,IAAA,iBAAO,EAAC,KAAK,CAAC,CAAC;IACpF,MAAM,WAAW,GAAG,IAAI,KAAK,CAAC,CAAC;IAE/B,MAAM,eAAe,GAAG,IAAA,uCAAkB,GAAE,CAAC;IAE7C,MAAM,YAAY,GAAG,IAAA,eAAO,EAC1B,GAAG,EAAE,CAAC,IAAA,yCAAmB,EAAC,IAAI,EAAE,eAAe,CAAC,QAAQ,EAAE,2BAAY,CAAC,EACvE,CAAC,IAAI,EAAE,eAAe,CAAC,QAAQ,CAAC,CACjC,CAAC;IACF,MAAM,SAAS,GAAG,IAAA,mBAAW,EAC3B,CAAC,QAAkB,EAAE,EAAE;QACrB,MAAM,EAAE,QAAQ,EAAE,GAAG,eAAe,CAAC;QACrC,IAAI,WAAW,IAAI,QAAQ,CAAC,EAAE,IAAI,QAAQ,EAAE;YAC1C,eAAe,CAAC,UAAU,GAAG;gBAC3B,YAAY,EAAE,QAAQ,EAAE,YAAY,EAAE,IAAI;gBAC1C,aAAa,EAAE,QAAQ,EAAE,aAAa,EAAE,IAAI;gBAC5C,eAAe,EAAE,QAAQ,EAAE,cAAc,EAAE,WAAW;gBACtD,YAAY,EAAE,QAAQ,EAAE,YAAY,EAAE,IAAI;gBAC1C,YAAY,EAAE,QAAQ,EAAE,YAAY;aACrC,CAAC;YACF,MAAM,UAAU,GAAG,EAAE,GAAG,YAAY,EAAE,YAAY,EAAE,SAAS,EAAE,CAAC;YAChE,eAAe,CAAC,QAAQ,GAAG,UAAU,CAAC;SACvC;IACH,CAAC,EACD,CAAC,WAAW,EAAE,YAAY,CAAC,CAC5B,CAAC;IAEF,MAAM,YAAY,GAAG,IAAA,mBAAW,EAC9B,KAAK,EAAE,QAAuB,EAAE,EAAE;QAChC,YAAY,EAAE,CAAC;QACf,eAAe,CAAC,QAAQ,GAAG,QAAQ,CAAC;QAEpC,IAAI;YACF,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,aAAa,EAAE,GAAG,eAAe,CAAC;YAC7D,IAAI,MAAM,EAAE;gBACV,MAAM,QAAQ,GAAG,MAAM,IAAA,+BAAc,EACnC,IAAA,qDAAyB,EAAC;oBACxB,aAAa;oBACb,MAAM;oBACN,SAAS;oBACT,IAAI;oBACJ,QAAQ,EAAE,QAAe;iBAC1B,CAAC,CACH,CAAC;gBACF,SAAS,CAAC,QAAQ,CAAC,CAAC;aACrB;YAED,WAAW,CAAC,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,EAAE,CAAC;SAC3C;QAAC,OAAO,EAAE,EAAE;YACX,aAAa;SACd;gBAAS;YACR,UAAU,EAAE,CAAC;SACd;IACH,CAAC,EACD,CAAC,WAAW,EAAE,SAAS,CAAC,CACzB,CAAC;IAEF,OAAO,CAAC,YAAY,EAAE,YAAY,EAAE,SAAS,CAAC,CAAC;AACjD,CAAC,CAAC;AA/DW,QAAA,oBAAoB,wBA+D/B"}
|
|
@@ -5,12 +5,8 @@ const uni_jsx_1 = require("@redneckz/uni-jsx");
|
|
|
5
5
|
const hooks_1 = require("@redneckz/uni-jsx/lib/hooks");
|
|
6
6
|
const DatePickerControl_1 = require("../../../ui-kit/DatePicker/DatePickerControl");
|
|
7
7
|
const useLeadFormData_1 = require("../../hooks/useLeadFormData");
|
|
8
|
-
const useRetailFormStore_1 = require("../../hooks/useRetailFormStore");
|
|
9
8
|
const MIN_DATE = new Date(Date.now() + 1 * 24 * 60 * 60 * 1000);
|
|
10
9
|
exports.DeliveryDateField = (0, uni_jsx_1.JSX)(({ field, input }) => {
|
|
11
|
-
const { productType } = (0, useRetailFormStore_1.useRetailFormStore)();
|
|
12
|
-
const isDebit = productType === 'debitCard';
|
|
13
|
-
const minDate = isDebit ? MIN_DATE : new Date();
|
|
14
10
|
const { data } = (0, useLeadFormData_1.useLeadFormData)('DAYS_DELIVERY_SETTINGS');
|
|
15
11
|
const weekends = (0, hooks_1.useMemo)(() => {
|
|
16
12
|
const weekendItem = data?.find((item) => item.key === 'WEEKEND');
|
|
@@ -19,6 +15,6 @@ exports.DeliveryDateField = (0, uni_jsx_1.JSX)(({ field, input }) => {
|
|
|
19
15
|
}
|
|
20
16
|
return [];
|
|
21
17
|
}, [data]);
|
|
22
|
-
return ((0, jsx_runtime_1.jsx)(DatePickerControl_1.DatePickerControl, { label: "\u0414\u0430\u0442\u0430 \u0434\u043E\u0441\u0442\u0430\u0432\u043A\u0438", ...field(input?.name ?? ''), ...input, minDate:
|
|
18
|
+
return ((0, jsx_runtime_1.jsx)(DatePickerControl_1.DatePickerControl, { label: "\u0414\u0430\u0442\u0430 \u0434\u043E\u0441\u0442\u0430\u0432\u043A\u0438", ...field(input?.name ?? ''), ...input, minDate: MIN_DATE, weekends: weekends }));
|
|
23
19
|
});
|
|
24
20
|
//# sourceMappingURL=DeliveryDateField.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DeliveryDateField.js","sourceRoot":"","sources":["../../../../src/retail/components/Fields/DeliveryDateField.tsx"],"names":[],"mappings":";;;AAAA,+CAAwC;AACxC,uDAAsD;AACtD,oFAAiF;AAEjF,iEAA8D;
|
|
1
|
+
{"version":3,"file":"DeliveryDateField.js","sourceRoot":"","sources":["../../../../src/retail/components/Fields/DeliveryDateField.tsx"],"names":[],"mappings":";;;AAAA,+CAAwC;AACxC,uDAAsD;AACtD,oFAAiF;AAEjF,iEAA8D;AAE9D,MAAM,QAAQ,GAAG,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC;AAEnD,QAAA,iBAAiB,GAAG,IAAA,aAAG,EAAmB,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,EAAE;IAC1E,MAAM,EAAE,IAAI,EAAE,GAAG,IAAA,iCAAe,EAAC,wBAAwB,CAAC,CAAC;IAE3D,MAAM,QAAQ,GAAa,IAAA,eAAO,EAAC,GAAG,EAAE;QACtC,MAAM,WAAW,GAAG,IAAI,EAAE,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,KAAK,SAAS,CAAC,CAAC;QACjE,IAAI,WAAW,IAAI,WAAW,CAAC,KAAK,EAAE;YACpC,OAAO,WAAW,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;SACjD;QAED,OAAO,EAAE,CAAC;IACZ,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC;IAEX,OAAO,CACL,uBAAC,qCAAiB,IAChB,KAAK,EAAC,2EAAe,KACjB,KAAK,CAAC,KAAK,EAAE,IAAI,IAAI,EAAE,CAAC,KACxB,KAAK,EACT,OAAO,EAAE,QAAQ,EACjB,QAAQ,EAAE,QAAQ,GAClB,CACH,CAAC;AACJ,CAAC,CAAC,CAAC"}
|
|
@@ -16,6 +16,7 @@ exports.DeliveryTimeField = (0, uni_jsx_1.JSX)(({ field, input }) => {
|
|
|
16
16
|
const allowedTimes = isDebit ? debitDeliveryTime : creditDeliveryTime;
|
|
17
17
|
return (data || [])
|
|
18
18
|
.filter((item) => item.key && allowedTimes.includes(item.key))
|
|
19
|
+
.sort((a, b) => (a.displayOrder || 0) - (b.displayOrder || 0))
|
|
19
20
|
.map((item) => ({
|
|
20
21
|
id: item.key,
|
|
21
22
|
text: item.value,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DeliveryTimeField.js","sourceRoot":"","sources":["../../../../src/retail/components/Fields/DeliveryTimeField.tsx"],"names":[],"mappings":";;;AAAA,+CAAwC;AACxC,uDAAsD;AAGtD,sGAAmG;AACnG,iEAA8D;AAC9D,uEAAoE;AAEvD,QAAA,iBAAiB,GAAG,IAAA,aAAG,EAAmB,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,EAAE;IAC1E,MAAM,EAAE,WAAW,EAAE,GAAG,IAAA,uCAAkB,GAAE,CAAC;IAC7C,MAAM,OAAO,GAAG,WAAW,KAAK,WAAW,CAAC;IAC5C,MAAM,EAAE,IAAI,EAAE,GAAG,IAAA,iCAAe,EAAC,uBAAuB,CAAC,CAAC;IAC1D,MAAM,kBAAkB,GAAG,CAAC,QAAQ,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC;IAC1D,MAAM,iBAAiB,GAAG,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;IAE/C,MAAM,YAAY,GAAsB,IAAA,eAAO,EAAC,GAAG,EAAE;QACnD,MAAM,YAAY,GAAG,OAAO,CAAC,CAAC,CAAC,iBAAiB,CAAC,CAAC,CAAC,kBAAkB,CAAC;QAEtE,OAAO,CAAC,IAAI,IAAI,EAAE,CAAC;aAChB,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,IAAI,YAAY,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;aAC7D,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;YACd,EAAE,EAAE,IAAI,CAAC,GAAa;YACtB,IAAI,EAAE,IAAI,CAAC,KAAK;SACjB,CAAC,CAAC,CAAC;IACR,CAAC,EAAE,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC;IAEpB,OAAO,CACL,uBAAC,iDAAuB,IACtB,KAAK,EAAC,iFAAgB,EACtB,SAAS,EAAC,UAAU,EACpB,KAAK,EAAE,YAAY,KACf,KAAK,CAAC,KAAK,EAAE,IAAI,IAAI,EAAE,CAAC,GAC5B,CACH,CAAC;AACJ,CAAC,CAAC,CAAC"}
|
|
1
|
+
{"version":3,"file":"DeliveryTimeField.js","sourceRoot":"","sources":["../../../../src/retail/components/Fields/DeliveryTimeField.tsx"],"names":[],"mappings":";;;AAAA,+CAAwC;AACxC,uDAAsD;AAGtD,sGAAmG;AACnG,iEAA8D;AAC9D,uEAAoE;AAEvD,QAAA,iBAAiB,GAAG,IAAA,aAAG,EAAmB,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,EAAE;IAC1E,MAAM,EAAE,WAAW,EAAE,GAAG,IAAA,uCAAkB,GAAE,CAAC;IAC7C,MAAM,OAAO,GAAG,WAAW,KAAK,WAAW,CAAC;IAC5C,MAAM,EAAE,IAAI,EAAE,GAAG,IAAA,iCAAe,EAAC,uBAAuB,CAAC,CAAC;IAC1D,MAAM,kBAAkB,GAAG,CAAC,QAAQ,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC;IAC1D,MAAM,iBAAiB,GAAG,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;IAE/C,MAAM,YAAY,GAAsB,IAAA,eAAO,EAAC,GAAG,EAAE;QACnD,MAAM,YAAY,GAAG,OAAO,CAAC,CAAC,CAAC,iBAAiB,CAAC,CAAC,CAAC,kBAAkB,CAAC;QAEtE,OAAO,CAAC,IAAI,IAAI,EAAE,CAAC;aAChB,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,IAAI,YAAY,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;aAC7D,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,YAAY,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,YAAY,IAAI,CAAC,CAAC,CAAC;aAC7D,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;YACd,EAAE,EAAE,IAAI,CAAC,GAAa;YACtB,IAAI,EAAE,IAAI,CAAC,KAAK;SACjB,CAAC,CAAC,CAAC;IACR,CAAC,EAAE,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC;IAEpB,OAAO,CACL,uBAAC,iDAAuB,IACtB,KAAK,EAAC,iFAAgB,EACtB,SAAS,EAAC,UAAU,EACpB,KAAK,EAAE,YAAY,KACf,KAAK,CAAC,KAAK,EAAE,IAAI,IAAI,EAAE,CAAC,GAC5B,CACH,CAAC;AACJ,CAAC,CAAC,CAAC"}
|
|
@@ -1,13 +1,19 @@
|
|
|
1
1
|
import { getParticipantAddresses } from '../../retail/adaptors/utils.js';
|
|
2
|
+
import { checkNewMicroservice } from '../../retail/utils/checkNewMicroservice.js';
|
|
2
3
|
import { dateToISO } from '../../utils/dateToISO.js';
|
|
3
4
|
export const getDeliveryData = (formData) => {
|
|
4
5
|
const { methodObtain, deliveryDate = '', deliveryTime } = formData;
|
|
6
|
+
const isNewMicroservice = checkNewMicroservice();
|
|
7
|
+
//TODO временный хардкод для тестирования, требуется чтобы отработал ЕФР
|
|
8
|
+
const oficeId = isNewMicroservice ? { id: '92fc8b67-2648-43ad-a441-5ca827021186' } : { id: '3' };
|
|
5
9
|
const isCourierDelivery = methodObtain === 'courier';
|
|
6
10
|
const deliveryTimeCd = deliveryTime ? { deliveryTimeCd: { key: deliveryTime } } : {};
|
|
7
11
|
return isCourierDelivery
|
|
8
12
|
? {
|
|
9
13
|
courierDeliveryFlg: isCourierDelivery,
|
|
10
14
|
deliveryDate: dateToISO(deliveryDate.toString().replace(/(GMT)[+-]\d{4}/, 'GMT+0000')),
|
|
15
|
+
//TODO временный хардкод для тестирования, не забыть удалить
|
|
16
|
+
office: oficeId,
|
|
11
17
|
...deliveryTimeCd,
|
|
12
18
|
}
|
|
13
19
|
: {};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getDeliveryCreditCardData.js","sourceRoot":"","sources":["../../../src/components/CreditCardForm/getDeliveryCreditCardData.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,uBAAuB,EAAE,MAAM,6BAA6B,CAAC;AAEtE,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAElD,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,QAAuB,EAAE,EAAE;IACzD,MAAM,EAAE,YAAY,EAAE,YAAY,GAAG,EAAE,EAAE,YAAY,EAAE,GAAG,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"getDeliveryCreditCardData.js","sourceRoot":"","sources":["../../../src/components/CreditCardForm/getDeliveryCreditCardData.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,uBAAuB,EAAE,MAAM,6BAA6B,CAAC;AAEtE,OAAO,EAAE,oBAAoB,EAAE,MAAM,yCAAyC,CAAC;AAC/E,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAElD,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,QAAuB,EAAE,EAAE;IACzD,MAAM,EAAE,YAAY,EAAE,YAAY,GAAG,EAAE,EAAE,YAAY,EAAE,GAAG,QAAQ,CAAC;IACnE,MAAM,iBAAiB,GAAG,oBAAoB,EAAE,CAAC;IACjD,wEAAwE;IACxE,MAAM,OAAO,GAAG,iBAAiB,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,sCAAsC,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,GAAG,EAAE,CAAC;IAEjG,MAAM,iBAAiB,GAAG,YAAY,KAAK,SAAS,CAAC;IACrD,MAAM,cAAc,GAAG,YAAY,CAAC,CAAC,CAAC,EAAE,cAAc,EAAE,EAAE,GAAG,EAAE,YAAY,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;IAErF,OAAO,iBAAiB;QACtB,CAAC,CAAC;YACE,kBAAkB,EAAE,iBAAiB;YACrC,YAAY,EAAE,SAAS,CAAC,YAAY,CAAC,QAAQ,EAAE,CAAC,OAAO,CAAC,gBAAgB,EAAE,UAAU,CAAC,CAAC;YACtF,4DAA4D;YAC5D,MAAM,EAAE,OAAO;YACf,GAAG,cAAc;SAClB;QACH,CAAC,CAAC,EAAE,CAAC;AACT,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,QAAuB,EAAE,EAAE;IACvD,MAAM,EAAE,aAAa,EAAE,YAAY,EAAE,GAAG,QAAQ,CAAC;IAEjD,MAAM,cAAc,GAAG,aAAa,EAAE,GAAG,IAAI,YAAY,KAAK,QAAQ,CAAC;IAEvE,OAAO,cAAc;QACnB,CAAC,CAAC;YACE,MAAM,EAAE,EAAE,EAAE,EAAE,aAAa,CAAC,GAAG,EAAE;SAClC;QACH,CAAC,CAAC,EAAE,CAAC;AACT,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,yBAAyB,GAAG,CAAC,QAAuB,EAAE,EAAE;IACnE,MAAM,EAAE,cAAc,EAAE,YAAY,EAAE,GAAG,QAAQ,CAAC;IAElD,MAAM,iBAAiB,GAAG,YAAY,KAAK,SAAS,CAAC;IAErD,OAAO,iBAAiB;QACtB,CAAC,CAAC;YACE,oBAAoB,EAAE,uBAAuB,CAAC,EAAE,cAAc,EAAE,CAAC;SAClE;QACH,CAAC,CAAC,EAAE,CAAC;AACT,CAAC,CAAC"}
|
|
@@ -20,7 +20,8 @@ export const useCreditCardFormAPI = ({ step, onNextStep, onFinish, }) => {
|
|
|
20
20
|
cardCategory: leadForm?.cardCategory?.text,
|
|
21
21
|
deliveryDate: leadForm?.deliveryDate,
|
|
22
22
|
};
|
|
23
|
-
|
|
23
|
+
const resetState = { ...initialState, methodObtain: undefined };
|
|
24
|
+
retailFormStore.leadForm = resetState;
|
|
24
25
|
}
|
|
25
26
|
}, [isFinalStep, initialState]);
|
|
26
27
|
const handleSubmit = useCallback(async (formData) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useCreditCardFormAPI.js","sourceRoot":"","sources":["../../../src/components/CreditCardForm/useCreditCardFormAPI.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAC;AACnE,OAAO,EAAE,OAAO,EAAE,MAAM,qCAAqC,CAAC;AAC9D,OAAO,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AACjE,OAAO,EAAE,kBAAkB,EAAE,MAAM,uCAAuC,CAAC;AAE3E,OAAO,EAAE,mBAAmB,EAAE,MAAM,wCAAwC,CAAC;AAC7E,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9C,OAAO,EAAE,yBAAyB,EAAE,MAAM,6BAA6B,CAAC;AAQxE,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAAC,EACnC,IAAI,EACJ,UAAU,EACV,QAAQ,GACW,EAA+D,EAAE;IACpF,MAAM,CAAC,SAAS,EAAE,EAAE,OAAO,EAAE,YAAY,EAAE,QAAQ,EAAE,UAAU,EAAE,CAAC,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC;IACpF,MAAM,WAAW,GAAG,IAAI,KAAK,CAAC,CAAC;IAE/B,MAAM,eAAe,GAAG,kBAAkB,EAAE,CAAC;IAE7C,MAAM,YAAY,GAAG,OAAO,CAC1B,GAAG,EAAE,CAAC,mBAAmB,CAAC,IAAI,EAAE,eAAe,CAAC,QAAQ,EAAE,YAAY,CAAC,EACvE,CAAC,IAAI,EAAE,eAAe,CAAC,QAAQ,CAAC,CACjC,CAAC;IACF,MAAM,SAAS,GAAG,WAAW,CAC3B,CAAC,QAAkB,EAAE,EAAE;QACrB,MAAM,EAAE,QAAQ,EAAE,GAAG,eAAe,CAAC;QACrC,IAAI,WAAW,IAAI,QAAQ,CAAC,EAAE,IAAI,QAAQ,EAAE;YAC1C,eAAe,CAAC,UAAU,GAAG;gBAC3B,YAAY,EAAE,QAAQ,EAAE,YAAY,EAAE,IAAI;gBAC1C,aAAa,EAAE,QAAQ,EAAE,aAAa,EAAE,IAAI;gBAC5C,eAAe,EAAE,QAAQ,EAAE,cAAc,EAAE,WAAW;gBACtD,YAAY,EAAE,QAAQ,EAAE,YAAY,EAAE,IAAI;gBAC1C,YAAY,EAAE,QAAQ,EAAE,YAAY;aACrC,CAAC;YACF,eAAe,CAAC,QAAQ,GAAG,
|
|
1
|
+
{"version":3,"file":"useCreditCardFormAPI.js","sourceRoot":"","sources":["../../../src/components/CreditCardForm/useCreditCardFormAPI.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAC;AACnE,OAAO,EAAE,OAAO,EAAE,MAAM,qCAAqC,CAAC;AAC9D,OAAO,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AACjE,OAAO,EAAE,kBAAkB,EAAE,MAAM,uCAAuC,CAAC;AAE3E,OAAO,EAAE,mBAAmB,EAAE,MAAM,wCAAwC,CAAC;AAC7E,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9C,OAAO,EAAE,yBAAyB,EAAE,MAAM,6BAA6B,CAAC;AAQxE,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAAC,EACnC,IAAI,EACJ,UAAU,EACV,QAAQ,GACW,EAA+D,EAAE;IACpF,MAAM,CAAC,SAAS,EAAE,EAAE,OAAO,EAAE,YAAY,EAAE,QAAQ,EAAE,UAAU,EAAE,CAAC,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC;IACpF,MAAM,WAAW,GAAG,IAAI,KAAK,CAAC,CAAC;IAE/B,MAAM,eAAe,GAAG,kBAAkB,EAAE,CAAC;IAE7C,MAAM,YAAY,GAAG,OAAO,CAC1B,GAAG,EAAE,CAAC,mBAAmB,CAAC,IAAI,EAAE,eAAe,CAAC,QAAQ,EAAE,YAAY,CAAC,EACvE,CAAC,IAAI,EAAE,eAAe,CAAC,QAAQ,CAAC,CACjC,CAAC;IACF,MAAM,SAAS,GAAG,WAAW,CAC3B,CAAC,QAAkB,EAAE,EAAE;QACrB,MAAM,EAAE,QAAQ,EAAE,GAAG,eAAe,CAAC;QACrC,IAAI,WAAW,IAAI,QAAQ,CAAC,EAAE,IAAI,QAAQ,EAAE;YAC1C,eAAe,CAAC,UAAU,GAAG;gBAC3B,YAAY,EAAE,QAAQ,EAAE,YAAY,EAAE,IAAI;gBAC1C,aAAa,EAAE,QAAQ,EAAE,aAAa,EAAE,IAAI;gBAC5C,eAAe,EAAE,QAAQ,EAAE,cAAc,EAAE,WAAW;gBACtD,YAAY,EAAE,QAAQ,EAAE,YAAY,EAAE,IAAI;gBAC1C,YAAY,EAAE,QAAQ,EAAE,YAAY;aACrC,CAAC;YACF,MAAM,UAAU,GAAG,EAAE,GAAG,YAAY,EAAE,YAAY,EAAE,SAAS,EAAE,CAAC;YAChE,eAAe,CAAC,QAAQ,GAAG,UAAU,CAAC;SACvC;IACH,CAAC,EACD,CAAC,WAAW,EAAE,YAAY,CAAC,CAC5B,CAAC;IAEF,MAAM,YAAY,GAAG,WAAW,CAC9B,KAAK,EAAE,QAAuB,EAAE,EAAE;QAChC,YAAY,EAAE,CAAC;QACf,eAAe,CAAC,QAAQ,GAAG,QAAQ,CAAC;QAEpC,IAAI;YACF,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,aAAa,EAAE,GAAG,eAAe,CAAC;YAC7D,IAAI,MAAM,EAAE;gBACV,MAAM,QAAQ,GAAG,MAAM,cAAc,CACnC,yBAAyB,CAAC;oBACxB,aAAa;oBACb,MAAM;oBACN,SAAS;oBACT,IAAI;oBACJ,QAAQ,EAAE,QAAe;iBAC1B,CAAC,CACH,CAAC;gBACF,SAAS,CAAC,QAAQ,CAAC,CAAC;aACrB;YAED,WAAW,CAAC,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,EAAE,CAAC;SAC3C;QAAC,OAAO,EAAE,EAAE;YACX,aAAa;SACd;gBAAS;YACR,UAAU,EAAE,CAAC;SACd;IACH,CAAC,EACD,CAAC,WAAW,EAAE,SAAS,CAAC,CACzB,CAAC;IAEF,OAAO,CAAC,YAAY,EAAE,YAAY,EAAE,SAAS,CAAC,CAAC;AACjD,CAAC,CAAC"}
|
|
@@ -16,5 +16,5 @@ export interface OfficesAtmsMapLayoutProps<T> extends ComponentType, TitleProps
|
|
|
16
16
|
initFilterState?: InitFilterState;
|
|
17
17
|
descriptionData?: AtmsDef;
|
|
18
18
|
}
|
|
19
|
-
export declare const OfficesAtmsMapLayout: import("@redneckz/uni-jsx").UNIComponent<OfficesAtmsMapLayoutProps<
|
|
19
|
+
export declare const OfficesAtmsMapLayout: import("@redneckz/uni-jsx").UNIComponent<OfficesAtmsMapLayoutProps<Branch | RemoteWorkplace | Atm>, any, any>;
|
|
20
20
|
export declare const getFiltersWithNonEmptyData: (data: (Branch | Atm | RemoteWorkplace)[]) => string[];
|
|
@@ -3,12 +3,8 @@ import { JSX } from '@redneckz/uni-jsx';
|
|
|
3
3
|
import { useMemo } from '@redneckz/uni-jsx/lib/hooks';
|
|
4
4
|
import { DatePickerControl } from '../../../ui-kit/DatePicker/DatePickerControl.js';
|
|
5
5
|
import { useLeadFormData } from '../../hooks/useLeadFormData.js';
|
|
6
|
-
import { useRetailFormStore } from '../../hooks/useRetailFormStore.js';
|
|
7
6
|
const MIN_DATE = new Date(Date.now() + 1 * 24 * 60 * 60 * 1000);
|
|
8
7
|
export const DeliveryDateField = JSX(({ field, input }) => {
|
|
9
|
-
const { productType } = useRetailFormStore();
|
|
10
|
-
const isDebit = productType === 'debitCard';
|
|
11
|
-
const minDate = isDebit ? MIN_DATE : new Date();
|
|
12
8
|
const { data } = useLeadFormData('DAYS_DELIVERY_SETTINGS');
|
|
13
9
|
const weekends = useMemo(() => {
|
|
14
10
|
const weekendItem = data?.find((item) => item.key === 'WEEKEND');
|
|
@@ -17,6 +13,6 @@ export const DeliveryDateField = JSX(({ field, input }) => {
|
|
|
17
13
|
}
|
|
18
14
|
return [];
|
|
19
15
|
}, [data]);
|
|
20
|
-
return (_jsx(DatePickerControl, { label: "\u0414\u0430\u0442\u0430 \u0434\u043E\u0441\u0442\u0430\u0432\u043A\u0438", ...field(input?.name ?? ''), ...input, minDate:
|
|
16
|
+
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 }));
|
|
21
17
|
});
|
|
22
18
|
//# sourceMappingURL=DeliveryDateField.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DeliveryDateField.js","sourceRoot":"","sources":["../../../../src/retail/components/Fields/DeliveryDateField.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AACxC,OAAO,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAC;AACtD,OAAO,EAAE,iBAAiB,EAAE,MAAM,8CAA8C,CAAC;AAEjF,OAAO,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;
|
|
1
|
+
{"version":3,"file":"DeliveryDateField.js","sourceRoot":"","sources":["../../../../src/retail/components/Fields/DeliveryDateField.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AACxC,OAAO,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAC;AACtD,OAAO,EAAE,iBAAiB,EAAE,MAAM,8CAA8C,CAAC;AAEjF,OAAO,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAE9D,MAAM,QAAQ,GAAG,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC;AAEhE,MAAM,CAAC,MAAM,iBAAiB,GAAG,GAAG,CAAmB,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,EAAE;IAC1E,MAAM,EAAE,IAAI,EAAE,GAAG,eAAe,CAAC,wBAAwB,CAAC,CAAC;IAE3D,MAAM,QAAQ,GAAa,OAAO,CAAC,GAAG,EAAE;QACtC,MAAM,WAAW,GAAG,IAAI,EAAE,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,KAAK,SAAS,CAAC,CAAC;QACjE,IAAI,WAAW,IAAI,WAAW,CAAC,KAAK,EAAE;YACpC,OAAO,WAAW,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;SACjD;QAED,OAAO,EAAE,CAAC;IACZ,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC;IAEX,OAAO,CACL,KAAC,iBAAiB,IAChB,KAAK,EAAC,2EAAe,KACjB,KAAK,CAAC,KAAK,EAAE,IAAI,IAAI,EAAE,CAAC,KACxB,KAAK,EACT,OAAO,EAAE,QAAQ,EACjB,QAAQ,EAAE,QAAQ,GAClB,CACH,CAAC;AACJ,CAAC,CAAC,CAAC"}
|
|
@@ -14,6 +14,7 @@ export const DeliveryTimeField = JSX(({ field, input }) => {
|
|
|
14
14
|
const allowedTimes = isDebit ? debitDeliveryTime : creditDeliveryTime;
|
|
15
15
|
return (data || [])
|
|
16
16
|
.filter((item) => item.key && allowedTimes.includes(item.key))
|
|
17
|
+
.sort((a, b) => (a.displayOrder || 0) - (b.displayOrder || 0))
|
|
17
18
|
.map((item) => ({
|
|
18
19
|
id: item.key,
|
|
19
20
|
text: item.value,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DeliveryTimeField.js","sourceRoot":"","sources":["../../../../src/retail/components/Fields/DeliveryTimeField.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AACxC,OAAO,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAC;AAGtD,OAAO,EAAE,uBAAuB,EAAE,MAAM,0DAA0D,CAAC;AACnG,OAAO,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAC9D,OAAO,EAAE,kBAAkB,EAAE,MAAM,gCAAgC,CAAC;AAEpE,MAAM,CAAC,MAAM,iBAAiB,GAAG,GAAG,CAAmB,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,EAAE;IAC1E,MAAM,EAAE,WAAW,EAAE,GAAG,kBAAkB,EAAE,CAAC;IAC7C,MAAM,OAAO,GAAG,WAAW,KAAK,WAAW,CAAC;IAC5C,MAAM,EAAE,IAAI,EAAE,GAAG,eAAe,CAAC,uBAAuB,CAAC,CAAC;IAC1D,MAAM,kBAAkB,GAAG,CAAC,QAAQ,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC;IAC1D,MAAM,iBAAiB,GAAG,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;IAE/C,MAAM,YAAY,GAAsB,OAAO,CAAC,GAAG,EAAE;QACnD,MAAM,YAAY,GAAG,OAAO,CAAC,CAAC,CAAC,iBAAiB,CAAC,CAAC,CAAC,kBAAkB,CAAC;QAEtE,OAAO,CAAC,IAAI,IAAI,EAAE,CAAC;aAChB,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,IAAI,YAAY,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;aAC7D,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;YACd,EAAE,EAAE,IAAI,CAAC,GAAa;YACtB,IAAI,EAAE,IAAI,CAAC,KAAK;SACjB,CAAC,CAAC,CAAC;IACR,CAAC,EAAE,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC;IAEpB,OAAO,CACL,KAAC,uBAAuB,IACtB,KAAK,EAAC,iFAAgB,EACtB,SAAS,EAAC,UAAU,EACpB,KAAK,EAAE,YAAY,KACf,KAAK,CAAC,KAAK,EAAE,IAAI,IAAI,EAAE,CAAC,GAC5B,CACH,CAAC;AACJ,CAAC,CAAC,CAAC"}
|
|
1
|
+
{"version":3,"file":"DeliveryTimeField.js","sourceRoot":"","sources":["../../../../src/retail/components/Fields/DeliveryTimeField.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AACxC,OAAO,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAC;AAGtD,OAAO,EAAE,uBAAuB,EAAE,MAAM,0DAA0D,CAAC;AACnG,OAAO,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAC9D,OAAO,EAAE,kBAAkB,EAAE,MAAM,gCAAgC,CAAC;AAEpE,MAAM,CAAC,MAAM,iBAAiB,GAAG,GAAG,CAAmB,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,EAAE;IAC1E,MAAM,EAAE,WAAW,EAAE,GAAG,kBAAkB,EAAE,CAAC;IAC7C,MAAM,OAAO,GAAG,WAAW,KAAK,WAAW,CAAC;IAC5C,MAAM,EAAE,IAAI,EAAE,GAAG,eAAe,CAAC,uBAAuB,CAAC,CAAC;IAC1D,MAAM,kBAAkB,GAAG,CAAC,QAAQ,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC;IAC1D,MAAM,iBAAiB,GAAG,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;IAE/C,MAAM,YAAY,GAAsB,OAAO,CAAC,GAAG,EAAE;QACnD,MAAM,YAAY,GAAG,OAAO,CAAC,CAAC,CAAC,iBAAiB,CAAC,CAAC,CAAC,kBAAkB,CAAC;QAEtE,OAAO,CAAC,IAAI,IAAI,EAAE,CAAC;aAChB,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,IAAI,YAAY,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;aAC7D,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,YAAY,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,YAAY,IAAI,CAAC,CAAC,CAAC;aAC7D,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;YACd,EAAE,EAAE,IAAI,CAAC,GAAa;YACtB,IAAI,EAAE,IAAI,CAAC,KAAK;SACjB,CAAC,CAAC,CAAC;IACR,CAAC,EAAE,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC;IAEpB,OAAO,CACL,KAAC,uBAAuB,IACtB,KAAK,EAAC,iFAAgB,EACtB,SAAS,EAAC,UAAU,EACpB,KAAK,EAAE,YAAY,KACf,KAAK,CAAC,KAAK,EAAE,IAAI,IAAI,EAAE,CAAC,GAC5B,CACH,CAAC;AACJ,CAAC,CAAC,CAAC"}
|
|
@@ -6251,9 +6251,6 @@
|
|
|
6251
6251
|
|
|
6252
6252
|
const MIN_DATE = new Date(Date.now() + 1 * 24 * 60 * 60 * 1000);
|
|
6253
6253
|
const DeliveryDateField = JSX(({ field, input }) => {
|
|
6254
|
-
const { productType } = useRetailFormStore();
|
|
6255
|
-
const isDebit = productType === 'debitCard';
|
|
6256
|
-
const minDate = isDebit ? MIN_DATE : new Date();
|
|
6257
6254
|
const { data } = useLeadFormData('DAYS_DELIVERY_SETTINGS');
|
|
6258
6255
|
const weekends = useMemo(() => {
|
|
6259
6256
|
const weekendItem = data?.find((item) => item.key === 'WEEKEND');
|
|
@@ -6262,7 +6259,7 @@
|
|
|
6262
6259
|
}
|
|
6263
6260
|
return [];
|
|
6264
6261
|
}, [data]);
|
|
6265
|
-
return (jsx(DatePickerControl, { label: "\u0414\u0430\u0442\u0430 \u0434\u043E\u0441\u0442\u0430\u0432\u043A\u0438", ...field(input?.name ?? ''), ...input, minDate:
|
|
6262
|
+
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 }));
|
|
6266
6263
|
});
|
|
6267
6264
|
|
|
6268
6265
|
const DeliveryTimeField = JSX(({ field, input }) => {
|
|
@@ -6275,6 +6272,7 @@
|
|
|
6275
6272
|
const allowedTimes = isDebit ? debitDeliveryTime : creditDeliveryTime;
|
|
6276
6273
|
return (data || [])
|
|
6277
6274
|
.filter((item) => item.key && allowedTimes.includes(item.key))
|
|
6275
|
+
.sort((a, b) => (a.displayOrder || 0) - (b.displayOrder || 0))
|
|
6278
6276
|
.map((item) => ({
|
|
6279
6277
|
id: item.key,
|
|
6280
6278
|
text: item.value,
|
|
@@ -10820,12 +10818,17 @@
|
|
|
10820
10818
|
|
|
10821
10819
|
const getDeliveryData$1 = (formData) => {
|
|
10822
10820
|
const { methodObtain, deliveryDate = '', deliveryTime } = formData;
|
|
10821
|
+
const isNewMicroservice = checkNewMicroservice();
|
|
10822
|
+
//TODO временный хардкод для тестирования, требуется чтобы отработал ЕФР
|
|
10823
|
+
const oficeId = isNewMicroservice ? { id: '92fc8b67-2648-43ad-a441-5ca827021186' } : { id: '3' };
|
|
10823
10824
|
const isCourierDelivery = methodObtain === 'courier';
|
|
10824
10825
|
const deliveryTimeCd = deliveryTime ? { deliveryTimeCd: { key: deliveryTime } } : {};
|
|
10825
10826
|
return isCourierDelivery
|
|
10826
10827
|
? {
|
|
10827
10828
|
courierDeliveryFlg: isCourierDelivery,
|
|
10828
10829
|
deliveryDate: dateToISO(deliveryDate.toString().replace(/(GMT)[+-]\d{4}/, 'GMT+0000')),
|
|
10830
|
+
//TODO временный хардкод для тестирования, не забыть удалить
|
|
10831
|
+
office: oficeId,
|
|
10829
10832
|
...deliveryTimeCd,
|
|
10830
10833
|
}
|
|
10831
10834
|
: {};
|
|
@@ -10921,7 +10924,8 @@
|
|
|
10921
10924
|
cardCategory: leadForm?.cardCategory?.text,
|
|
10922
10925
|
deliveryDate: leadForm?.deliveryDate,
|
|
10923
10926
|
};
|
|
10924
|
-
|
|
10927
|
+
const resetState = { ...initialState, methodObtain: undefined };
|
|
10928
|
+
retailFormStore.leadForm = resetState;
|
|
10925
10929
|
}
|
|
10926
10930
|
}, [isFinalStep, initialState]);
|
|
10927
10931
|
const handleSubmit = useCallback(async (formData) => {
|
|
@@ -14619,7 +14623,7 @@
|
|
|
14619
14623
|
slots: () => [HEADER_SLOT, FOOTER_SLOT, STICKY_FOOTER_SLOT],
|
|
14620
14624
|
});
|
|
14621
14625
|
|
|
14622
|
-
const packageVersion = "0.14.
|
|
14626
|
+
const packageVersion = "0.14.1065";
|
|
14623
14627
|
|
|
14624
14628
|
exports.Blocks = Blocks;
|
|
14625
14629
|
exports.ContentPage = ContentPage;
|