@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;
|
|
@@ -36,7 +36,8 @@ import { checkHolderIsError, formatValues } from "./utils";
|
|
|
36
36
|
import VoucherCard from "../voucher";
|
|
37
37
|
import { SubTotal } from "../../../../index";
|
|
38
38
|
import { useIsBooking4Shop } from "../../hooks/useIsBooking4Shop";
|
|
39
|
-
|
|
39
|
+
import { sendWarningLog } from '@pisell/utils';
|
|
40
|
+
import dayjs from 'dayjs';
|
|
40
41
|
/**
|
|
41
42
|
* @title: 底部
|
|
42
43
|
* @description:
|
|
@@ -324,7 +325,8 @@ var Footer = function Footer(props) {
|
|
|
324
325
|
case 5:
|
|
325
326
|
_context2.next = 7;
|
|
326
327
|
return handleSave({
|
|
327
|
-
type: 'checkout'
|
|
328
|
+
type: 'checkout',
|
|
329
|
+
messageShow: !(isTerminal !== null && isTerminal !== void 0 && isTerminal())
|
|
328
330
|
});
|
|
329
331
|
case 7:
|
|
330
332
|
res = _context2.sent;
|
|
@@ -469,7 +471,19 @@ var Footer = function Footer(props) {
|
|
|
469
471
|
_context4.prev = 20;
|
|
470
472
|
callbackData = null; // 格式化提交的参数
|
|
471
473
|
values = formatValues(_objectSpread(_objectSpread({}, state), saveOtherValue)); // 区分是新增还是编辑
|
|
472
|
-
api = state.bookingId ? editApi : createApi; //
|
|
474
|
+
api = state.bookingId ? editApi : createApi; // 增加日志记录
|
|
475
|
+
sendWarningLog({
|
|
476
|
+
title: 'saveBooking',
|
|
477
|
+
content: [{
|
|
478
|
+
key: '下单前数据',
|
|
479
|
+
value: JSON.stringify(values)
|
|
480
|
+
}, {
|
|
481
|
+
key: '日期',
|
|
482
|
+
value: dayjs().format('YYYY-MM-DD HH:mm')
|
|
483
|
+
}]
|
|
484
|
+
});
|
|
485
|
+
|
|
486
|
+
// 活动预约新建时校验重复 -- 暂不处理
|
|
473
487
|
// if (!state.bookingId && state.renderType === 'eventBooking') {
|
|
474
488
|
// const { data } = await eventBookingCheck(values);
|
|
475
489
|
// if (data.list.length) {
|
|
@@ -496,45 +510,46 @@ var Footer = function Footer(props) {
|
|
|
496
510
|
// }
|
|
497
511
|
// }
|
|
498
512
|
// }
|
|
513
|
+
|
|
499
514
|
// 如果有addons改动, 则先保存
|
|
500
515
|
if (!addonsEdit) {
|
|
501
|
-
_context4.next =
|
|
516
|
+
_context4.next = 28;
|
|
502
517
|
break;
|
|
503
518
|
}
|
|
504
|
-
_context4.next =
|
|
519
|
+
_context4.next = 28;
|
|
505
520
|
return handleSaveAddons();
|
|
506
|
-
case
|
|
521
|
+
case 28:
|
|
507
522
|
if (!infoEdit) {
|
|
508
|
-
_context4.next =
|
|
523
|
+
_context4.next = 33;
|
|
509
524
|
break;
|
|
510
525
|
}
|
|
511
|
-
_context4.next =
|
|
526
|
+
_context4.next = 31;
|
|
512
527
|
return api(values, state.bookingId);
|
|
513
|
-
case
|
|
528
|
+
case 31:
|
|
514
529
|
callbackData = _context4.sent;
|
|
515
530
|
if (messageShow) {
|
|
516
531
|
message.success(locales.getText(state.bookingId ? 'pisell2.text.appointment-updated' : 'pisell2.text.created-successfully'));
|
|
517
532
|
}
|
|
518
|
-
case
|
|
533
|
+
case 33:
|
|
519
534
|
// 回调关闭弹窗
|
|
520
|
-
state === null || state === void 0 || state.callback(callbackData);
|
|
535
|
+
state === null || state === void 0 || state.callback(callbackData, type);
|
|
521
536
|
_setLoading(false);
|
|
522
537
|
|
|
523
538
|
// return数据 checkout时需要
|
|
524
539
|
return _context4.abrupt("return", callbackData || values);
|
|
525
|
-
case
|
|
526
|
-
_context4.prev =
|
|
540
|
+
case 38:
|
|
541
|
+
_context4.prev = 38;
|
|
527
542
|
_context4.t1 = _context4["catch"](20);
|
|
528
543
|
console.log(_context4.t1);
|
|
529
544
|
if ((_context4.t1 === null || _context4.t1 === void 0 ? void 0 : _context4.t1.code) === 70101) {
|
|
530
545
|
message.error(_context4.t1 === null || _context4.t1 === void 0 ? void 0 : _context4.t1.message);
|
|
531
546
|
}
|
|
532
547
|
_setLoading(false);
|
|
533
|
-
case
|
|
548
|
+
case 43:
|
|
534
549
|
case "end":
|
|
535
550
|
return _context4.stop();
|
|
536
551
|
}
|
|
537
|
-
}, _callee4, null, [[20,
|
|
552
|
+
}, _callee4, null, [[20, 38]]);
|
|
538
553
|
}));
|
|
539
554
|
return function handleSave(_x2) {
|
|
540
555
|
return _ref5.apply(this, arguments);
|
|
@@ -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>;
|
|
@@ -208,7 +208,7 @@ var Info = function Info(_, ref) {
|
|
|
208
208
|
* @Date: 2024-01-09 14:04
|
|
209
209
|
*/
|
|
210
210
|
var onFinish = function onFinish(values) {
|
|
211
|
-
var _resourcesRef$current;
|
|
211
|
+
var _resourcesRef$current, _item$_extend;
|
|
212
212
|
var isSuccess = (_resourcesRef$current = resourcesRef.current) === null || _resourcesRef$current === void 0 ? void 0 : _resourcesRef$current.check();
|
|
213
213
|
if (isShowTimeAndResource && !isSuccess) {
|
|
214
214
|
return;
|
|
@@ -227,7 +227,11 @@ var Info = function Info(_, ref) {
|
|
|
227
227
|
var _item = _objectSpread(_objectSpread({}, state.service.cacheItem), {}, {
|
|
228
228
|
autoClose: false
|
|
229
229
|
});
|
|
230
|
-
var _extend = _objectSpread(_objectSpread({}, _item._extend),
|
|
230
|
+
var _extend = _objectSpread(_objectSpread({}, _item._extend), {}, {
|
|
231
|
+
other: _objectSpread(_objectSpread({}, ((_item$_extend = _item._extend) === null || _item$_extend === void 0 ? void 0 : _item$_extend.other) || {}), {}, {
|
|
232
|
+
quantity: values.quantity
|
|
233
|
+
})
|
|
234
|
+
}, values);
|
|
231
235
|
var _getServiceTimes = getServiceTimes({
|
|
232
236
|
_extend: _extend
|
|
233
237
|
}),
|
|
@@ -405,11 +409,11 @@ var Info = function Info(_, ref) {
|
|
|
405
409
|
var isSession = isSessionProduct(item);
|
|
406
410
|
var sessionValue = {};
|
|
407
411
|
if (isSession) {
|
|
408
|
-
var _item$
|
|
412
|
+
var _item$_extend2, _item$_extend3, _item$_extend4;
|
|
409
413
|
sessionValue.startEndTime = {
|
|
410
|
-
startDate: item === null || item === void 0 || (_item$
|
|
411
|
-
endDate: item === null || item === void 0 || (_item$
|
|
412
|
-
duration: item === null || item === void 0 || (_item$
|
|
414
|
+
startDate: item === null || item === void 0 || (_item$_extend2 = item._extend) === null || _item$_extend2 === void 0 ? void 0 : _item$_extend2.start_date,
|
|
415
|
+
endDate: item === null || item === void 0 || (_item$_extend3 = item._extend) === null || _item$_extend3 === void 0 ? void 0 : _item$_extend3.end_date,
|
|
416
|
+
duration: item === null || item === void 0 || (_item$_extend4 = item._extend) === null || _item$_extend4 === void 0 ? void 0 : _item$_extend4.duration
|
|
413
417
|
};
|
|
414
418
|
}
|
|
415
419
|
|
|
@@ -428,9 +432,9 @@ var Info = function Info(_, ref) {
|
|
|
428
432
|
},
|
|
429
433
|
isOS: isSession,
|
|
430
434
|
customer_id: (_state$client = state.client) === null || _state$client === void 0 || (_state$client = _state$client.value) === null || _state$client === void 0 ? void 0 : _state$client.id,
|
|
431
|
-
value: _objectSpread(_objectSpread({
|
|
432
|
-
quantity: item._extend.quantity
|
|
433
|
-
}
|
|
435
|
+
value: _objectSpread(_objectSpread(_objectSpread({}, item._extend.other), sessionValue), {}, {
|
|
436
|
+
quantity: values.quantity || item._extend.quantity
|
|
437
|
+
})
|
|
434
438
|
},
|
|
435
439
|
callback: function callback(e, extension_type, detail) {
|
|
436
440
|
var _cacheItem$_extend;
|
|
@@ -81,12 +81,13 @@ export var getResourceTimeIsUsable = function getResourceTimeIsUsable(item, cach
|
|
|
81
81
|
*/
|
|
82
82
|
if (isFlexible) {
|
|
83
83
|
// 如果有event, 那么灵活时长时间只能在 最后一个event的结束时间 ~ time的结束时间内
|
|
84
|
-
if (eventList.length) {
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
}
|
|
84
|
+
// if (eventList.length) {
|
|
85
|
+
// timeStartDate = (eventList).reduce((max: any, event: any) => {
|
|
86
|
+
// const endAt = dayjs(event.end_at);
|
|
87
|
+
// return endAt.isAfter(max) ? endAt : max;
|
|
88
|
+
// }, dayjs(eventList[0].end_at));
|
|
89
|
+
// }
|
|
90
|
+
|
|
90
91
|
isDateRange = startDate.isAfter(timeStartDate) && startDate.isBefore(timeEndDate);
|
|
91
92
|
|
|
92
93
|
// 如果灵活时长不在范围内, 则认为是已约满
|
|
@@ -317,11 +318,17 @@ export var getServiceStartTimeAndEndTime = function getServiceStartTimeAndEndTim
|
|
|
317
318
|
if (lastServer) {
|
|
318
319
|
var lastServerStartDate = lastServer._extend.startDate;
|
|
319
320
|
var lastServerEndDate = lastServer._extend.endDate;
|
|
320
|
-
|
|
321
|
-
|
|
322
|
-
|
|
321
|
+
|
|
322
|
+
// 同时预约模式
|
|
323
|
+
if (appointmentTimingPreference === 'parallel') {
|
|
324
|
+
_extend.start_time = lastServerStartDate.format('HH:mm');
|
|
323
325
|
} else {
|
|
324
|
-
|
|
326
|
+
// 如果上个服务商品的结束时间跨天, 那么设置为最后一个时间段, 不跨天则取上一个的结束时间
|
|
327
|
+
if (dayjs(lastServerEndDate).isAfter(lastServerStartDate, "day")) {
|
|
328
|
+
_extend.start_time = timeObj.timeSlices[timeObj.timeSlices.length - 1].value;
|
|
329
|
+
} else {
|
|
330
|
+
_extend.start_time = lastServerEndDate.format("HH:mm");
|
|
331
|
+
}
|
|
325
332
|
}
|
|
326
333
|
} else {
|
|
327
334
|
// 没有上一个商品 资源为 0
|
|
@@ -683,11 +683,17 @@ export var getServerItemExtend = function getServerItemExtend(state, cacheItem,
|
|
|
683
683
|
_extend.resource = lastServer._extend.resource;
|
|
684
684
|
var lastServerStartDate = lastServer._extend.startDate;
|
|
685
685
|
var lastServerEndDate = lastServer._extend.endDate;
|
|
686
|
-
|
|
687
|
-
|
|
688
|
-
|
|
686
|
+
|
|
687
|
+
// 同时预约模式
|
|
688
|
+
if (appointmentTimingPreference === 'parallel') {
|
|
689
|
+
_extend.start_time = lastServerStartDate.format('HH:mm');
|
|
689
690
|
} else {
|
|
690
|
-
|
|
691
|
+
// 如果上个服务商品的结束时间跨天, 那么设置为最后一个时间段, 不跨天则取上一个的结束时间
|
|
692
|
+
if (dayjs(lastServerEndDate).isAfter(lastServerStartDate, 'day')) {
|
|
693
|
+
_extend.start_time = timeObj.timeSlices[timeObj.timeSlices.length - 1].value;
|
|
694
|
+
} else {
|
|
695
|
+
_extend.start_time = lastServerEndDate.format("HH:mm");
|
|
696
|
+
}
|
|
691
697
|
}
|
|
692
698
|
} else {
|
|
693
699
|
// 没有上一个商品 资源为 0
|
|
@@ -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
|
/** 用于重置当前步骤 */
|