@pisell/private-materials 3.3.65 → 3.3.66
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/build/lowcode/assets-daily.json +11 -11
- package/build/lowcode/assets-dev.json +2 -2
- package/build/lowcode/assets-prod.json +11 -11
- package/build/lowcode/index.js +1 -1
- package/build/lowcode/meta.js +1 -1
- package/build/lowcode/preview.js +8 -8
- package/build/lowcode/render/default/view.css +1 -1
- package/build/lowcode/render/default/view.js +7 -7
- package/build/lowcode/view.css +1 -1
- package/build/lowcode/view.js +6 -6
- package/es/components/appointmentBooking/components/Cart/Item/Total.d.ts +0 -1
- package/es/components/appointmentBooking/components/Cart/Item/index.d.ts +0 -1
- package/es/components/appointmentBooking/components/Cart/index.d.ts +0 -1
- package/es/components/appointmentBooking/components/Content/index.d.ts +0 -1
- package/es/components/appointmentBooking/components/Deposit/index.d.ts +0 -1
- package/es/components/appointmentBooking/components/Footer/index.d.ts +0 -1
- package/es/components/appointmentBooking/components/Guest/components/InformationOptionsModal/index.d.ts +0 -1
- package/es/components/appointmentBooking/components/Voucher/index.d.ts +0 -1
- package/es/components/appointmentBooking/components/Voucher/index.less +0 -2
- package/es/components/appointmentBooking/deposit/components/PolicyModal/index.d.ts +0 -1
- package/es/components/appointmentBooking/deposit/index.d.ts +0 -1
- package/es/components/appointmentBooking/index.d.ts +0 -1
- package/es/components/booking/components/TabProduct/selectProductItem/index.d.ts +0 -1
- package/es/components/booking/components/footer/index.js +30 -15
- package/es/components/booking/components/voucher/index.d.ts +0 -1
- package/es/components/booking/components/voucher/index.less +0 -1
- package/es/components/booking/forms/footer.d.ts +0 -1
- package/es/components/booking/forms/sendModal/useSendModal.d.ts +0 -1
- package/es/components/booking/hooks/useClearCart.d.ts +0 -1
- package/es/components/booking/info/dateRange/index.d.ts +0 -1
- package/es/components/booking/info/service/addService/index.d.ts +0 -1
- package/es/components/booking/info/service/addTimeModal/index.d.ts +0 -1
- package/es/components/booking/info/service/editService/BookingList/index.d.ts +0 -1
- package/es/components/booking/info/service/serviceItem/index.d.ts +0 -1
- package/es/components/booking/info/service2/utils.d.ts +1 -1
- package/es/components/booking/info2/service/editService/index.js +13 -9
- package/es/components/booking/info2/service/serviceItem/index.d.ts +0 -1
- package/es/components/booking/info2/utilsByBooking.js +17 -10
- package/es/components/booking/utils.js +10 -4
- package/es/components/eftposPay/amount.d.ts +1 -1
- package/es/components/eftposPay/component/fail/failCustom.d.ts +0 -1
- package/es/components/eftposPay/component/fail/index.d.ts +0 -1
- package/es/components/eftposPay/component/fail/unknow.d.ts +0 -1
- package/es/components/eftposPay/device.d.ts +1 -1
- package/es/components/eftposPay/hooks.d.ts +1 -1
- package/es/components/eftposPay/index.d.ts +0 -1
- package/es/components/eftposPay/pay.d.ts +0 -1
- package/es/components/eftposPay/store/index.d.ts +3 -3
- package/es/components/eftposPay/windcave/windcave.d.ts +0 -1
- package/es/components/eventBooking/components/ErrorTip/index.d.ts +0 -1
- package/es/components/eventBooking/components/Provider/Cart/ContinueButton/index.d.ts +0 -1
- package/es/components/eventBooking/components/Provider/Cart/Item/Total.d.ts +0 -1
- package/es/components/eventBooking/components/Provider/Cart/Item/index.d.ts +0 -1
- package/es/components/eventBooking/components/Provider/Cart/index.d.ts +0 -1
- package/es/components/eventBooking/components/Provider/EmptyHolderModal/index.d.ts +0 -1
- package/es/components/eventBooking/components/Provider/Event/index.d.ts +0 -1
- package/es/components/eventBooking/components/Provider/Footer/index.d.ts +0 -1
- package/es/components/eventBooking/components/Provider/Information/index.d.ts +0 -1
- package/es/components/eventBooking/components/Provider/InformationOptionsModal/index.d.ts +0 -1
- package/es/components/eventBooking/components/Provider/OrderProductModal/index.d.ts +0 -1
- package/es/components/eventBooking/components/Provider/RemoveOptionConfirmModal.d.ts +0 -1
- package/es/components/eventBooking/components/Provider/Resource/index.d.ts +0 -1
- package/es/components/eventBooking/components/bookingAvailabilityCalendar/components/CalendarDate/CalenDateWeek/CallToBook/index.d.ts +0 -1
- package/es/components/eventBooking/components/bookingAvailabilityCalendar/components/CalendarDate/CalenDateWeek/CallToBook/index.less +0 -1
- package/es/components/eventBooking/components/bookingAvailabilityCalendar/components/CalendarDate/CalenDateWeek/WeekItem/index.d.ts +0 -1
- package/es/components/eventBooking/components/bookingAvailabilityCalendar/components/CalendarDate/CalenDateWeek/index.d.ts +0 -1
- package/es/components/eventBooking/components/bookingAvailabilityCalendar/components/CalendarDate/Item/index.less +0 -1
- package/es/components/eventBooking/components/bookingDetailModal/components/BookingOptions.d.ts +0 -1
- package/es/components/eventBooking/components/scheduleCalendar/calendarItem.d.ts +0 -1
- package/es/components/eventBooking/components/scheduleCalendar/components/ScheduleTimeItem/index.d.ts +0 -1
- package/es/components/eventBooking/components/timeResourceSelector/index.less +0 -1
- package/es/components/pay/toC/PaymentMethods/StripePay/Stripe/components/SetupForm/index.d.ts +0 -1
- package/es/components/pay/toC/PaymentMethods/index.js +5 -4
- package/es/components/pay/toC/WalletPassBlock/components/WalletUseList/index.d.ts +0 -1
- package/es/components/pisellSelectCustomerModal/RightPanel/List/index.d.ts +0 -1
- package/es/components/pisellSelectCustomerModal/index.d.ts +0 -1
- package/es/components/productSelect/components/TabProduct/index.d.ts +0 -1
- package/es/components/productSelect/components/productGroup/index.d.ts +0 -1
- package/es/components/ruleSetting/index.d.ts +0 -1
- package/es/components/schedules/calendar/index.less +158 -152
- package/es/components/shoppingCart/components/Cart/Product.d.ts +0 -1
- package/es/components/shoppingCart/components/Cart/index.d.ts +0 -1
- package/es/components/shoppingCart/hooks/useAddService.d.ts +0 -1
- package/es/components/shoppingCart/hooks/useClearCart.d.ts +0 -1
- package/es/components/ticketBooking/components/addServiceVariant/addService.js +12 -10
- package/es/components/ticketBooking/components/ticketBooking/index.js +135 -9
- package/es/components/ticketBooking/components/timeBar/index.d.ts +0 -1
- package/es/components/ticketBooking/locales.d.ts +164 -146
- package/es/components/ticketBooking/locales.js +195 -147
- package/es/components/ticketBooking/serve.d.ts +5 -0
- package/es/components/ticketBooking/serve.js +27 -0
- package/es/components/ticketBooking/utils/formatProductMessage.d.ts +2 -0
- package/es/components/ticketBooking/utils/formatProductMessage.js +53 -0
- package/es/components/ticketBooking/utils/formatTime.d.ts +31 -0
- package/es/components/ticketBooking/utils/formatTime.js +144 -0
- package/es/components/wallet/DiscountCard/index.less +0 -1
- package/es/components/wallet/PointCard/index.less +0 -1
- package/es/components/wallet/RechargeableCard/index.less +5 -9
- package/es/components/wallet/Voucher/index.less +0 -1
- package/es/components/wallet/index.less +0 -4
- package/es/components/walletList/index.js +55 -7
- package/es/components/walletList/index.less +17 -15
- package/es/components/walletList/locales.d.ts +18 -0
- package/es/components/walletList/locales.js +17 -0
- package/es/components/walletList/serve.d.ts +8 -0
- package/es/components/walletList/serve.js +38 -0
- package/es/components/walletList/status.d.ts +38 -0
- package/es/components/walletList/status.js +47 -0
- package/es/components/workSpaceList/components/Modal/index.d.ts +0 -1
- package/es/components/workSpaceList/components/SearchWorkspaceAndBase/index.d.ts +0 -1
- package/lib/components/appointmentBooking/components/Cart/Item/Total.d.ts +0 -1
- package/lib/components/appointmentBooking/components/Cart/Item/index.d.ts +0 -1
- package/lib/components/appointmentBooking/components/Cart/index.d.ts +0 -1
- package/lib/components/appointmentBooking/components/Content/index.d.ts +0 -1
- package/lib/components/appointmentBooking/components/Deposit/index.d.ts +0 -1
- package/lib/components/appointmentBooking/components/Footer/index.d.ts +0 -1
- package/lib/components/appointmentBooking/components/Guest/components/InformationOptionsModal/index.d.ts +0 -1
- package/lib/components/appointmentBooking/components/Voucher/index.d.ts +0 -1
- package/lib/components/appointmentBooking/components/Voucher/index.less +0 -2
- package/lib/components/appointmentBooking/deposit/components/PolicyModal/index.d.ts +0 -1
- package/lib/components/appointmentBooking/deposit/index.d.ts +0 -1
- package/lib/components/appointmentBooking/index.d.ts +0 -1
- package/lib/components/booking/components/TabProduct/selectProductItem/index.d.ts +0 -1
- package/lib/components/booking/components/footer/index.js +14 -2
- package/lib/components/booking/components/voucher/index.d.ts +0 -1
- package/lib/components/booking/components/voucher/index.less +0 -1
- package/lib/components/booking/forms/footer.d.ts +0 -1
- package/lib/components/booking/forms/sendModal/useSendModal.d.ts +0 -1
- package/lib/components/booking/hooks/useClearCart.d.ts +0 -1
- package/lib/components/booking/info/dateRange/index.d.ts +0 -1
- package/lib/components/booking/info/service/addService/index.d.ts +0 -1
- package/lib/components/booking/info/service/addTimeModal/index.d.ts +0 -1
- package/lib/components/booking/info/service/editService/BookingList/index.d.ts +0 -1
- package/lib/components/booking/info/service/serviceItem/index.d.ts +0 -1
- package/lib/components/booking/info/service2/utils.d.ts +1 -1
- package/lib/components/booking/info2/service/editService/index.js +7 -3
- package/lib/components/booking/info2/service/serviceItem/index.d.ts +0 -1
- package/lib/components/booking/info2/utilsByBooking.js +7 -9
- package/lib/components/booking/utils.js +7 -3
- package/lib/components/eftposPay/amount.d.ts +1 -1
- package/lib/components/eftposPay/component/fail/failCustom.d.ts +0 -1
- package/lib/components/eftposPay/component/fail/index.d.ts +0 -1
- package/lib/components/eftposPay/component/fail/unknow.d.ts +0 -1
- package/lib/components/eftposPay/device.d.ts +1 -1
- package/lib/components/eftposPay/hooks.d.ts +1 -1
- package/lib/components/eftposPay/index.d.ts +0 -1
- package/lib/components/eftposPay/pay.d.ts +0 -1
- package/lib/components/eftposPay/store/index.d.ts +3 -3
- package/lib/components/eftposPay/windcave/windcave.d.ts +0 -1
- package/lib/components/eventBooking/components/ErrorTip/index.d.ts +0 -1
- package/lib/components/eventBooking/components/Provider/Cart/ContinueButton/index.d.ts +0 -1
- package/lib/components/eventBooking/components/Provider/Cart/Item/Total.d.ts +0 -1
- package/lib/components/eventBooking/components/Provider/Cart/Item/index.d.ts +0 -1
- package/lib/components/eventBooking/components/Provider/Cart/index.d.ts +0 -1
- package/lib/components/eventBooking/components/Provider/EmptyHolderModal/index.d.ts +0 -1
- package/lib/components/eventBooking/components/Provider/Event/index.d.ts +0 -1
- package/lib/components/eventBooking/components/Provider/Footer/index.d.ts +0 -1
- package/lib/components/eventBooking/components/Provider/Information/index.d.ts +0 -1
- package/lib/components/eventBooking/components/Provider/InformationOptionsModal/index.d.ts +0 -1
- package/lib/components/eventBooking/components/Provider/OrderProductModal/index.d.ts +0 -1
- package/lib/components/eventBooking/components/Provider/RemoveOptionConfirmModal.d.ts +0 -1
- package/lib/components/eventBooking/components/Provider/Resource/index.d.ts +0 -1
- package/lib/components/eventBooking/components/bookingAvailabilityCalendar/components/CalendarDate/CalenDateWeek/CallToBook/index.d.ts +0 -1
- package/lib/components/eventBooking/components/bookingAvailabilityCalendar/components/CalendarDate/CalenDateWeek/CallToBook/index.less +0 -1
- package/lib/components/eventBooking/components/bookingAvailabilityCalendar/components/CalendarDate/CalenDateWeek/WeekItem/index.d.ts +0 -1
- package/lib/components/eventBooking/components/bookingAvailabilityCalendar/components/CalendarDate/CalenDateWeek/index.d.ts +0 -1
- package/lib/components/eventBooking/components/bookingAvailabilityCalendar/components/CalendarDate/Item/index.less +0 -1
- package/lib/components/eventBooking/components/bookingDetailModal/components/BookingOptions.d.ts +0 -1
- package/lib/components/eventBooking/components/scheduleCalendar/calendarItem.d.ts +0 -1
- package/lib/components/eventBooking/components/scheduleCalendar/components/ScheduleTimeItem/index.d.ts +0 -1
- package/lib/components/eventBooking/components/timeResourceSelector/index.less +0 -1
- package/lib/components/pay/toC/PaymentMethods/StripePay/Stripe/components/SetupForm/index.d.ts +0 -1
- package/lib/components/pay/toC/PaymentMethods/index.js +10 -9
- package/lib/components/pay/toC/WalletPassBlock/components/WalletUseList/index.d.ts +0 -1
- package/lib/components/pisellSelectCustomerModal/RightPanel/List/index.d.ts +0 -1
- package/lib/components/pisellSelectCustomerModal/index.d.ts +0 -1
- package/lib/components/productSelect/components/TabProduct/index.d.ts +0 -1
- package/lib/components/productSelect/components/productGroup/index.d.ts +0 -1
- package/lib/components/ruleSetting/index.d.ts +0 -1
- package/lib/components/schedules/calendar/index.less +158 -152
- package/lib/components/shoppingCart/components/Cart/Product.d.ts +0 -1
- package/lib/components/shoppingCart/components/Cart/index.d.ts +0 -1
- package/lib/components/shoppingCart/hooks/useAddService.d.ts +0 -1
- package/lib/components/shoppingCart/hooks/useClearCart.d.ts +0 -1
- package/lib/components/ticketBooking/components/addServiceVariant/addService.js +5 -3
- package/lib/components/ticketBooking/components/ticketBooking/index.js +134 -8
- package/lib/components/ticketBooking/components/timeBar/index.d.ts +0 -1
- package/lib/components/ticketBooking/locales.d.ts +164 -146
- package/lib/components/ticketBooking/locales.js +22 -4
- package/lib/components/ticketBooking/serve.d.ts +5 -0
- package/lib/components/ticketBooking/serve.js +8 -2
- package/lib/components/ticketBooking/utils/formatProductMessage.d.ts +2 -0
- package/lib/components/ticketBooking/utils/formatProductMessage.js +76 -0
- package/lib/components/ticketBooking/utils/formatTime.d.ts +31 -0
- package/lib/components/ticketBooking/utils/formatTime.js +139 -0
- package/lib/components/wallet/DiscountCard/index.less +0 -1
- package/lib/components/wallet/PointCard/index.less +0 -1
- package/lib/components/wallet/RechargeableCard/index.less +5 -9
- package/lib/components/wallet/Voucher/index.less +0 -1
- package/lib/components/wallet/index.less +0 -4
- package/lib/components/walletList/index.js +42 -14
- package/lib/components/walletList/index.less +17 -15
- package/lib/components/walletList/locales.d.ts +18 -0
- package/lib/components/walletList/locales.js +41 -0
- package/lib/components/walletList/serve.d.ts +8 -0
- package/lib/components/walletList/serve.js +15 -2
- package/lib/components/walletList/status.d.ts +38 -0
- package/lib/components/walletList/status.js +66 -0
- package/lib/components/workSpaceList/components/Modal/index.d.ts +0 -1
- package/lib/components/workSpaceList/components/SearchWorkspaceAndBase/index.d.ts +0 -1
- package/package.json +3 -3
|
@@ -9,7 +9,6 @@
|
|
|
9
9
|
align-items: center;
|
|
10
10
|
gap: 10px;
|
|
11
11
|
color: var(--Gray-500, #667085);
|
|
12
|
-
font-family: Inter;
|
|
13
12
|
font-size: 14px;
|
|
14
13
|
font-style: normal;
|
|
15
14
|
font-weight: 600;
|
|
@@ -103,7 +102,6 @@
|
|
|
103
102
|
> div {
|
|
104
103
|
color: var(--Gray-500, #667085);
|
|
105
104
|
text-align: center;
|
|
106
|
-
font-family: Inter;
|
|
107
105
|
font-size: 16px;
|
|
108
106
|
font-style: normal;
|
|
109
107
|
font-weight: 600;
|
|
@@ -51,6 +51,8 @@ var import_utils3 = require("./utils");
|
|
|
51
51
|
var import_voucher = __toESM(require("../voucher"));
|
|
52
52
|
var import__ = require("../../../../index");
|
|
53
53
|
var import_useIsBooking4Shop = require("../../hooks/useIsBooking4Shop");
|
|
54
|
+
var import_utils4 = require("@pisell/utils");
|
|
55
|
+
var import_dayjs = __toESM(require("dayjs"));
|
|
54
56
|
var Footer = (props) => {
|
|
55
57
|
var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k;
|
|
56
58
|
const { state, buttons, dispatch, source } = props;
|
|
@@ -222,7 +224,10 @@ var Footer = (props) => {
|
|
|
222
224
|
const isHasDayProducts = handleDaySubmit();
|
|
223
225
|
if (isHasDayProducts) return;
|
|
224
226
|
}
|
|
225
|
-
const res = await handleSave({
|
|
227
|
+
const res = await handleSave({
|
|
228
|
+
type: "checkout",
|
|
229
|
+
messageShow: !(isTerminal == null ? void 0 : isTerminal())
|
|
230
|
+
});
|
|
226
231
|
goCheckout((res == null ? void 0 : res.order_id) || state.bookingId);
|
|
227
232
|
return;
|
|
228
233
|
}
|
|
@@ -288,6 +293,13 @@ var Footer = (props) => {
|
|
|
288
293
|
let callbackData = null;
|
|
289
294
|
let values = (0, import_utils3.formatValues)({ ...state, ...saveOtherValue });
|
|
290
295
|
const api = state.bookingId ? editApi : createApi;
|
|
296
|
+
(0, import_utils4.sendWarningLog)({
|
|
297
|
+
title: "saveBooking",
|
|
298
|
+
content: [
|
|
299
|
+
{ key: "下单前数据", value: JSON.stringify(values) },
|
|
300
|
+
{ key: "日期", value: (0, import_dayjs.default)().format("YYYY-MM-DD HH:mm") }
|
|
301
|
+
]
|
|
302
|
+
});
|
|
291
303
|
if (addonsEdit) {
|
|
292
304
|
await handleSaveAddons();
|
|
293
305
|
}
|
|
@@ -301,7 +313,7 @@ var Footer = (props) => {
|
|
|
301
313
|
);
|
|
302
314
|
}
|
|
303
315
|
}
|
|
304
|
-
state == null ? void 0 : state.callback(callbackData);
|
|
316
|
+
state == null ? void 0 : state.callback(callbackData, type);
|
|
305
317
|
_setLoading(false);
|
|
306
318
|
return callbackData || values;
|
|
307
319
|
} catch (err) {
|
|
@@ -244,4 +244,4 @@ export declare const updateAppointmentServicePrice: (state: any, { start_date, e
|
|
|
244
244
|
* @Author: WangHan
|
|
245
245
|
* @Date: 2024-12-24 11:32
|
|
246
246
|
*/
|
|
247
|
-
export declare const updateServicePrice: (state: any) => Promise<any
|
|
247
|
+
export declare const updateServicePrice: (state: any) => never[] | Promise<any>;
|
|
@@ -158,7 +158,7 @@ var Info = (_, ref) => {
|
|
|
158
158
|
form.setFieldsValue({ discount });
|
|
159
159
|
};
|
|
160
160
|
const onFinish = (values) => {
|
|
161
|
-
var _a2;
|
|
161
|
+
var _a2, _b2;
|
|
162
162
|
let isSuccess = (_a2 = resourcesRef.current) == null ? void 0 : _a2.check();
|
|
163
163
|
if (isShowTimeAndResource && !isSuccess) {
|
|
164
164
|
return;
|
|
@@ -177,6 +177,10 @@ var Info = (_, ref) => {
|
|
|
177
177
|
};
|
|
178
178
|
let _extend = {
|
|
179
179
|
..._item._extend,
|
|
180
|
+
other: {
|
|
181
|
+
...((_b2 = _item._extend) == null ? void 0 : _b2.other) || {},
|
|
182
|
+
quantity: values.quantity
|
|
183
|
+
},
|
|
180
184
|
...values
|
|
181
185
|
};
|
|
182
186
|
const { startDate, endDate } = (0, import_utils3.getServiceTimes)({ _extend });
|
|
@@ -333,9 +337,9 @@ var Info = (_, ref) => {
|
|
|
333
337
|
isOS: isSession,
|
|
334
338
|
customer_id: (_e2 = (_d2 = state.client) == null ? void 0 : _d2.value) == null ? void 0 : _e2.id,
|
|
335
339
|
value: {
|
|
336
|
-
quantity: item._extend.quantity,
|
|
337
340
|
...item._extend.other,
|
|
338
|
-
...sessionValue
|
|
341
|
+
...sessionValue,
|
|
342
|
+
quantity: values.quantity || item._extend.quantity
|
|
339
343
|
}
|
|
340
344
|
},
|
|
341
345
|
callback: (e2, extension_type, detail) => {
|
|
@@ -73,12 +73,6 @@ var getResourceTimeIsUsable = (item, cacheItem, resourceItem) => {
|
|
|
73
73
|
let endDate = null;
|
|
74
74
|
let isCalcCount = true;
|
|
75
75
|
if (isFlexible) {
|
|
76
|
-
if (eventList.length) {
|
|
77
|
-
timeStartDate = eventList.reduce((max, event) => {
|
|
78
|
-
const endAt = (0, import_dayjs.default)(event.end_at);
|
|
79
|
-
return endAt.isAfter(max) ? endAt : max;
|
|
80
|
-
}, (0, import_dayjs.default)(eventList[0].end_at));
|
|
81
|
-
}
|
|
82
76
|
isDateRange = startDate.isAfter(timeStartDate) && startDate.isBefore(timeEndDate);
|
|
83
77
|
if (!isDateRange && eventList.length) {
|
|
84
78
|
isCalcCount = false;
|
|
@@ -218,10 +212,14 @@ var getServiceStartTimeAndEndTime = (state, cacheItem, timeObj) => {
|
|
|
218
212
|
if (lastServer) {
|
|
219
213
|
let lastServerStartDate = lastServer._extend.startDate;
|
|
220
214
|
let lastServerEndDate = lastServer._extend.endDate;
|
|
221
|
-
if (
|
|
222
|
-
_extend.start_time =
|
|
215
|
+
if (appointmentTimingPreference === "parallel") {
|
|
216
|
+
_extend.start_time = lastServerStartDate.format("HH:mm");
|
|
223
217
|
} else {
|
|
224
|
-
|
|
218
|
+
if ((0, import_dayjs.default)(lastServerEndDate).isAfter(lastServerStartDate, "day")) {
|
|
219
|
+
_extend.start_time = timeObj.timeSlices[timeObj.timeSlices.length - 1].value;
|
|
220
|
+
} else {
|
|
221
|
+
_extend.start_time = lastServerEndDate.format("HH:mm");
|
|
222
|
+
}
|
|
225
223
|
}
|
|
226
224
|
} else {
|
|
227
225
|
let findNextSliceProps = {
|
|
@@ -557,10 +557,14 @@ var getServerItemExtend = (state, cacheItem, timeObj) => {
|
|
|
557
557
|
_extend.resource = lastServer._extend.resource;
|
|
558
558
|
let lastServerStartDate = lastServer._extend.startDate;
|
|
559
559
|
let lastServerEndDate = lastServer._extend.endDate;
|
|
560
|
-
if (
|
|
561
|
-
_extend.start_time =
|
|
560
|
+
if (appointmentTimingPreference === "parallel") {
|
|
561
|
+
_extend.start_time = lastServerStartDate.format("HH:mm");
|
|
562
562
|
} else {
|
|
563
|
-
|
|
563
|
+
if ((0, import_dayjs.default)(lastServerEndDate).isAfter(lastServerStartDate, "day")) {
|
|
564
|
+
_extend.start_time = timeObj.timeSlices[timeObj.timeSlices.length - 1].value;
|
|
565
|
+
} else {
|
|
566
|
+
_extend.start_time = lastServerEndDate.format("HH:mm");
|
|
567
|
+
}
|
|
564
568
|
}
|
|
565
569
|
} else {
|
|
566
570
|
let findNextSliceProps = {
|
|
@@ -9,7 +9,7 @@ import { PosProps } from './const';
|
|
|
9
9
|
*/
|
|
10
10
|
declare const _default: ({ className, onChange, onClose, formatAmount, isMobile, net, client }: {
|
|
11
11
|
className?: string | undefined;
|
|
12
|
-
onChange?: ((status: "
|
|
12
|
+
onChange?: ((status: "page" | "success" | "fail" | "print" | "mark_tx_processed", params?: string | {
|
|
13
13
|
[keys: string]: unknown;
|
|
14
14
|
} | undefined, other?: any) => void) | undefined;
|
|
15
15
|
onClose: () => void;
|
|
@@ -11,7 +11,7 @@ import './device.less';
|
|
|
11
11
|
declare const _default: ({ api, onChange, onClose, className, device_number, isMobile, net, client, formatAmount, }: {
|
|
12
12
|
api: PayProps['api'];
|
|
13
13
|
className?: string | undefined;
|
|
14
|
-
onChange?: ((status: "
|
|
14
|
+
onChange?: ((status: "page" | "success" | "fail" | "print" | "mark_tx_processed", params?: string | {
|
|
15
15
|
[keys: string]: unknown;
|
|
16
16
|
} | undefined, other?: any) => void) | undefined;
|
|
17
17
|
onClose: () => void;
|
|
@@ -15,7 +15,7 @@ export declare const useStoreRef: <T extends {
|
|
|
15
15
|
readonly numRef: React.MutableRefObject<string | number | undefined>;
|
|
16
16
|
readonly orderIdRef: React.MutableRefObject<string | number>;
|
|
17
17
|
readonly modeRef: React.MutableRefObject<ModeEnum>;
|
|
18
|
-
readonly statusRef: React.MutableRefObject<"
|
|
18
|
+
readonly statusRef: React.MutableRefObject<"loading" | "success" | "warn" | "fail" | "pedding" | "resove" | "reject" | "question">;
|
|
19
19
|
readonly netRef: React.MutableRefObject<boolean | undefined>;
|
|
20
20
|
readonly symbolRef: React.MutableRefObject<string>;
|
|
21
21
|
readonly amountRef: React.MutableRefObject<string | number>;
|
|
@@ -174,7 +174,7 @@ export declare const updateCustom: (payload: {
|
|
|
174
174
|
export declare const updateStatus: (status: 'loading' | 'warn' | 'fail' | 'success' | 'question') => {
|
|
175
175
|
type: EActionTypes;
|
|
176
176
|
payload: {
|
|
177
|
-
status: "
|
|
177
|
+
status: "loading" | "success" | "warn" | "fail" | "question";
|
|
178
178
|
};
|
|
179
179
|
};
|
|
180
180
|
/**
|
|
@@ -295,7 +295,7 @@ export declare const backUpFree: (payload: Partial<State>) => {
|
|
|
295
295
|
name?: string | undefined;
|
|
296
296
|
symbol?: string | undefined;
|
|
297
297
|
amount?: string | number | undefined;
|
|
298
|
-
mode?: "
|
|
298
|
+
mode?: "refund" | "pay" | "fullPay" | "query" | undefined;
|
|
299
299
|
order_id?: string | number | undefined;
|
|
300
300
|
eftpos?: "payo" | "tyro" | "windcave" | "stripe" | undefined;
|
|
301
301
|
action?: "amount" | "deviceList" | "pay" | undefined;
|
|
@@ -308,7 +308,7 @@ export declare const backUpFree: (payload: Partial<State>) => {
|
|
|
308
308
|
net?: boolean | undefined;
|
|
309
309
|
component?: string | undefined;
|
|
310
310
|
form?: string | undefined;
|
|
311
|
-
status?: "
|
|
311
|
+
status?: "loading" | "success" | "warn" | "fail" | "pedding" | "resove" | "reject" | "question" | undefined;
|
|
312
312
|
warn?: string | undefined;
|
|
313
313
|
steps?: {
|
|
314
314
|
/** 用于重置当前步骤 */
|
|
@@ -65,7 +65,7 @@ var isOfflinePayment = (type) => {
|
|
|
65
65
|
].includes(type);
|
|
66
66
|
};
|
|
67
67
|
var PaymentMethods = (props, ref) => {
|
|
68
|
-
var _a;
|
|
68
|
+
var _a, _b, _c;
|
|
69
69
|
const MWCreditCardRef2 = (0, import_react.useRef)(null);
|
|
70
70
|
const SuperPayAliPayH5Ref2 = (0, import_react.useRef)(null);
|
|
71
71
|
const StripePayRef2 = (0, import_react.useRef)(null);
|
|
@@ -83,9 +83,9 @@ var PaymentMethods = (props, ref) => {
|
|
|
83
83
|
const context = (0, import_useEngineContext.default)();
|
|
84
84
|
const { interaction } = (_a = context.appHelper) == null ? void 0 : _a.utils;
|
|
85
85
|
const init = async ({ type, payGroup }) => {
|
|
86
|
-
var _a2,
|
|
86
|
+
var _a2, _b2;
|
|
87
87
|
const waitAmount = (payGroup == null ? void 0 : payGroup.wait_amount) || 0;
|
|
88
|
-
const cards = (
|
|
88
|
+
const cards = (_b2 = (_a2 = payGroup == null ? void 0 : payGroup.walletPass) == null ? void 0 : _a2.cards) == null ? void 0 : _b2.length;
|
|
89
89
|
if (cards && (waitAmount <= 0 || isOfflinePayment(type))) {
|
|
90
90
|
try {
|
|
91
91
|
await (0, import_serve.walletPassPay)((0, import_utils.formatWalletPassParams)(payGroup));
|
|
@@ -115,10 +115,11 @@ var PaymentMethods = (props, ref) => {
|
|
|
115
115
|
}
|
|
116
116
|
await onPayByType({ type, payGroup });
|
|
117
117
|
};
|
|
118
|
+
console.log("paymentResult isAppEnv", (_c = (_b = interaction == null ? void 0 : interaction.utils) == null ? void 0 : _b.isAppEnv) == null ? void 0 : _c.call(_b), interaction, context);
|
|
118
119
|
(0, import_react.useEffect)(() => {
|
|
119
|
-
var _a2,
|
|
120
|
-
console.log("paymentResult isAppEnv", (
|
|
121
|
-
if ((_d = (
|
|
120
|
+
var _a2, _b2, _c2, _d;
|
|
121
|
+
console.log("paymentResult isAppEnv", (_b2 = (_a2 = interaction == null ? void 0 : interaction.utils) == null ? void 0 : _a2.isAppEnv) == null ? void 0 : _b2.call(_a2));
|
|
122
|
+
if ((_d = (_c2 = interaction == null ? void 0 : interaction.utils) == null ? void 0 : _c2.isAppEnv) == null ? void 0 : _d.call(_c2)) {
|
|
122
123
|
interaction.utils.mountFunction("global", "paymentResult", (strResult) => {
|
|
123
124
|
console.log("paymentResult", strResult);
|
|
124
125
|
if (!(0, import_utils2.isJson)(strResult)) return;
|
|
@@ -134,18 +135,18 @@ var PaymentMethods = (props, ref) => {
|
|
|
134
135
|
}
|
|
135
136
|
}, []);
|
|
136
137
|
const onPayByType = async ({ type, payGroup }) => {
|
|
137
|
-
var _a2,
|
|
138
|
+
var _a2, _b2, _c2, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n;
|
|
138
139
|
console.log(type, payGroup);
|
|
139
140
|
if (type === "mw.apple") {
|
|
140
141
|
await ((_a2 = ApplePayRef2.current) == null ? void 0 : _a2.init({ payGroup }));
|
|
141
142
|
return;
|
|
142
143
|
}
|
|
143
144
|
if (type === "mw.google") {
|
|
144
|
-
await ((
|
|
145
|
+
await ((_b2 = GooglePayRef2.current) == null ? void 0 : _b2.init({ payGroup }));
|
|
145
146
|
return;
|
|
146
147
|
}
|
|
147
148
|
if (type === "mw.credit_card") {
|
|
148
|
-
(
|
|
149
|
+
(_c2 = MWCreditCardRef2.current) == null ? void 0 : _c2.init({ payGroup });
|
|
149
150
|
return;
|
|
150
151
|
}
|
|
151
152
|
if (type === "superpay.alipay.h5") {
|