@pisell/private-materials 6.4.49 → 6.4.50
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/meta.js +1 -1
- package/build/lowcode/preview.js +146 -146
- package/build/lowcode/render/default/view.css +1 -1
- package/build/lowcode/render/default/view.js +1 -1
- package/build/lowcode/view.css +1 -1
- package/build/lowcode/view.js +3 -3
- package/es/components/booking/components/TabProduct/index.d.ts +0 -1
- package/es/components/booking/components/TabProduct/selectProductItem/index.d.ts +0 -1
- package/es/components/booking/components/collapsibleList/utils.d.ts +0 -1
- package/es/components/booking/components/emptyBooking/index.d.ts +0 -1
- package/es/components/booking/components/footer/FooterMenus/index.d.ts +0 -1
- package/es/components/booking/components/footer/index.js +12 -4
- package/es/components/booking/components/formItemChildrenWrap/index.d.ts +0 -1
- package/es/components/booking/components/reloadResourceModal/index.d.ts +0 -1
- package/es/components/booking/deposit/index.d.ts +0 -1
- package/es/components/booking/forms/single/index.d.ts +0 -1
- package/es/components/booking/forms/table/index.d.ts +0 -1
- package/es/components/booking/info/addServiceVariant/index.d.ts +0 -1
- package/es/components/booking/info/clientVariant/hooks/useClientFn.d.ts +0 -1
- package/es/components/booking/info/clientVariant/hooks/useIsLowSpeedNetwork.d.ts +0 -1
- package/es/components/booking/info/date/index.d.ts +0 -1
- package/es/components/booking/info/header/index.d.ts +0 -1
- package/es/components/booking/info/hooks/useInfoHolder.d.ts +0 -1
- package/es/components/booking/info/index.d.ts +0 -1
- package/es/components/booking/info/service/actions/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/like/index.d.ts +0 -1
- package/es/components/booking/info/service/serviceList/index.d.ts +0 -1
- package/es/components/booking/info2/service/actions/index.d.ts +0 -1
- package/es/components/booking/info2/service/addService/index.d.ts +0 -1
- package/es/components/booking/info2/service/serviceList/index.d.ts +0 -1
- package/es/components/booking/materiels/contacts/index.d.ts +0 -1
- package/es/components/booking/materiels/duration/index.d.ts +0 -1
- package/es/components/booking/materiels/holder/index.d.ts +0 -1
- package/es/components/booking/materiels/startTime/index.d.ts +0 -1
- package/es/components/booking/notes/NoteBlock/NoteItem/index.d.ts +0 -1
- package/es/components/booking/utils.d.ts +2 -2
- package/es/components/checkout/PaymentModal.js +78 -42
- package/es/components/checkout/components/AmountSummary/index.js +39 -4
- package/es/components/checkout/components/PaymentDetailModal/index.js +72 -20
- package/es/components/checkout/components/PaymentDetailModal/index.less +23 -2
- package/es/components/checkout/hooks/useWalletPass.js +1 -0
- package/es/components/checkout/locales.d.ts +3 -0
- package/es/components/checkout/locales.js +3 -0
- package/es/components/eftpos/deviceList/index.d.ts +0 -1
- package/es/components/eftpos/form/index.d.ts +0 -1
- package/es/components/eftpos/group/index.d.ts +0 -1
- package/es/components/eftpos/hooks.d.ts +0 -1
- package/es/components/eftpos/icon/apiKey.d.ts +0 -1
- package/es/components/eftpos/icon/device.d.ts +0 -1
- package/es/components/eftpos/index.d.ts +0 -1
- package/es/components/eftpos/pos.d.ts +0 -1
- package/es/components/eftpos/receipt/index.d.ts +0 -1
- package/es/components/eftpos/surcharge/index.d.ts +0 -1
- package/es/components/eftposPay/component/alert/warn.d.ts +0 -1
- package/es/components/eftposPay/component/fail/network.d.ts +0 -1
- package/es/components/eftposPay/component/fail/unknow.d.ts +0 -1
- package/es/components/eftposPay/component/header/titlebar.d.ts +0 -1
- package/es/components/eftposPay/component/manual/index.d.ts +0 -1
- package/es/components/eftposPay/component/signature/index.d.ts +0 -1
- package/es/components/eftposPay/component/step/index.d.ts +0 -1
- package/es/components/eftposPay/component/step/step.d.ts +0 -1
- package/es/components/eftposPay/hooks.d.ts +1 -1
- package/es/components/eftposPay/payo/config.d.ts +0 -1
- package/es/components/eftposPay/store/index.d.ts +4 -4
- package/es/components/eftposPay/tip.d.ts +0 -1
- package/es/components/eftposPay/tyro/hooks.d.ts +0 -1
- package/es/components/eftposPay/windcave/receiptAction.d.ts +0 -1
- package/es/components/eftposPay/windcave/windcave.d.ts +0 -1
- package/es/components/eventBooking/components/bookingAvailabilityCalendar/components/CalendarDate/CalenDateStatus/index.d.ts +0 -1
- package/es/components/eventBooking/components/bookingAvailabilityCalendar/components/CalendarDate/Item/DayItem/index.d.ts +0 -1
- package/es/components/eventBooking/components/bookingAvailabilityCalendar/components/CalendarDate/Item/index.d.ts +0 -1
- package/es/components/eventBooking/components/bookingAvailabilityCalendar/components/CalendarDate/Status/index.d.ts +0 -1
- package/es/components/eventBooking/components/scheduleCalendar/ProductItem/index.d.ts +0 -1
- package/es/components/login/index.d.ts +0 -1
- package/es/components/pay/toB/components/Content/Header.d.ts +0 -1
- package/es/components/pay/toC/PaymentMethods/MWCreditCard/TDSPay/ThreedsLoading/index.d.ts +0 -1
- package/es/components/pay/toC/PaymentMethods/StripePay/Stripe/Finish/index.d.ts +0 -1
- package/es/components/pay/toC/PaymentMethods/StripePay/Stripe/StripeSDK/SDK.d.ts +0 -1
- package/es/components/pay/toC/PaymentMethods/StripePay/Stripe/StripeSDK/index.d.ts +0 -1
- package/es/components/pay/toC/PaymentMethods/StripePay/Stripe/components/PageLoading/index.d.ts +0 -1
- package/es/components/pay/toC/PaymentMethods/StripePay/Stripe/components/SetupForm/PaymentRequestForm.d.ts +0 -1
- package/es/components/pisellSelectCustomerModal/RightPanel/Add/BirthdayField/index.d.ts +0 -1
- package/es/components/pisellSelectCustomerModal/RightPanel/Add/GenderField/index.d.ts +0 -1
- package/es/components/productExtension/fields/Actor/index.d.ts +0 -1
- package/es/components/productExtension/fields/Forms/index.d.ts +0 -1
- package/es/components/productExtension/fields/SelectProducts/ProductItemPreview/index.d.ts +0 -1
- package/es/components/ruleSetting/ruleBorder/index.d.ts +0 -1
- package/es/components/schedules/calendar/calendarItem.d.ts +0 -1
- package/es/components/schedules/calendar/index.d.ts +0 -1
- package/es/components/schedules/components/CurrentDay/index.d.ts +0 -1
- package/es/components/schedules/components/ScheduleDetailList/index.d.ts +0 -1
- package/es/components/schedules/components/ScheduleList/RenderScheduleItem/index.d.ts +0 -1
- package/es/components/schedules/components/ScheduleList/index.d.ts +0 -1
- package/es/components/schedules/products/ProductDetailDrawer/ProductDetail/MaxParticipantsModule/index.d.ts +0 -1
- package/es/components/schedules/products/ProductDetailDrawer/ProductDetail/ResourcesModule/index.d.ts +0 -1
- package/es/components/schedules/products/ProductDetailDrawer/ProductDetail/SchedulesModule/AddSchedules/index.d.ts +0 -1
- package/es/components/schedules/products/ProductDetailDrawer/ProductDetail/SchedulesModule/index.d.ts +0 -1
- package/es/components/schedules/products/ProductDetailDrawer/ProductDetail/index.d.ts +0 -1
- package/es/components/schedules/products/ProductDetailDrawer/ProductDetailByDate/index.d.ts +0 -1
- package/es/components/schedules/products/ProductDetailDrawer/index.d.ts +0 -1
- package/es/components/schedules/products/index.d.ts +0 -1
- package/es/components/schedules/products/list/ProductItem/index.d.ts +0 -1
- package/es/components/schedules/products/list/index.d.ts +0 -1
- package/es/components/schedules/resources/index.d.ts +0 -1
- package/es/components/schedules/resources/list/index.d.ts +0 -1
- package/es/components/schedules/resources/relationProduct/index.d.ts +0 -1
- package/es/components/schedules/schedules/AllSchedules/index.d.ts +0 -1
- package/es/components/schedules/schedules/ScheduleDetailDrawer/index.d.ts +0 -1
- package/es/components/schedules/schedules/index.d.ts +0 -1
- package/es/components/taxSelect/index.d.ts +0 -1
- package/es/components/ticketBooking/components/addServiceVariant/index.d.ts +0 -1
- package/es/components/ticketBooking/utils/index.d.ts +1 -1
- package/es/hooks/usePaymentLogger.d.ts +0 -1
- package/es/plus/clientName/index.d.ts +0 -1
- package/es/plus/clinetSearch/Add/BirthdayField/index.d.ts +0 -1
- package/es/plus/clinetSearch/Add/GenderField/index.d.ts +0 -1
- package/es/plus/saasCreateOrganization/components/Header.d.ts +0 -1
- package/es/plus/saasCreateOrganization/index.d.ts +0 -1
- package/es/plus/saasRegister/components/EntryEmail.d.ts +0 -1
- package/es/plus/saasRegister/components/EntryInfo.d.ts +0 -1
- package/es/plus/saasRegister/components/GoLogin.d.ts +0 -1
- package/es/plus/saasRegister/components/Header.d.ts +0 -1
- package/es/plus/saasRegister/components/VerifyError.d.ts +0 -1
- package/es/plus/saasRegister/components/VerifyingLink.d.ts +0 -1
- package/lib/components/booking/components/TabProduct/index.d.ts +0 -1
- package/lib/components/booking/components/TabProduct/selectProductItem/index.d.ts +0 -1
- package/lib/components/booking/components/collapsibleList/utils.d.ts +0 -1
- package/lib/components/booking/components/emptyBooking/index.d.ts +0 -1
- package/lib/components/booking/components/footer/FooterMenus/index.d.ts +0 -1
- package/lib/components/booking/components/footer/index.js +6 -1
- package/lib/components/booking/components/formItemChildrenWrap/index.d.ts +0 -1
- package/lib/components/booking/components/reloadResourceModal/index.d.ts +0 -1
- package/lib/components/booking/deposit/index.d.ts +0 -1
- package/lib/components/booking/forms/single/index.d.ts +0 -1
- package/lib/components/booking/forms/table/index.d.ts +0 -1
- package/lib/components/booking/info/addServiceVariant/index.d.ts +0 -1
- package/lib/components/booking/info/clientVariant/hooks/useClientFn.d.ts +0 -1
- package/lib/components/booking/info/clientVariant/hooks/useIsLowSpeedNetwork.d.ts +0 -1
- package/lib/components/booking/info/date/index.d.ts +0 -1
- package/lib/components/booking/info/header/index.d.ts +0 -1
- package/lib/components/booking/info/hooks/useInfoHolder.d.ts +0 -1
- package/lib/components/booking/info/index.d.ts +0 -1
- package/lib/components/booking/info/service/actions/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/like/index.d.ts +0 -1
- package/lib/components/booking/info/service/serviceList/index.d.ts +0 -1
- package/lib/components/booking/info2/service/actions/index.d.ts +0 -1
- package/lib/components/booking/info2/service/addService/index.d.ts +0 -1
- package/lib/components/booking/info2/service/serviceList/index.d.ts +0 -1
- package/lib/components/booking/materiels/contacts/index.d.ts +0 -1
- package/lib/components/booking/materiels/duration/index.d.ts +0 -1
- package/lib/components/booking/materiels/holder/index.d.ts +0 -1
- package/lib/components/booking/materiels/startTime/index.d.ts +0 -1
- package/lib/components/booking/notes/NoteBlock/NoteItem/index.d.ts +0 -1
- package/lib/components/booking/utils.d.ts +2 -2
- package/lib/components/checkout/PaymentModal.js +36 -9
- package/lib/components/checkout/components/AmountSummary/index.js +31 -3
- package/lib/components/checkout/components/PaymentDetailModal/index.js +49 -11
- package/lib/components/checkout/components/PaymentDetailModal/index.less +23 -2
- package/lib/components/checkout/hooks/useWalletPass.js +1 -0
- package/lib/components/checkout/locales.d.ts +3 -0
- package/lib/components/checkout/locales.js +3 -0
- package/lib/components/eftpos/deviceList/index.d.ts +0 -1
- package/lib/components/eftpos/form/index.d.ts +0 -1
- package/lib/components/eftpos/group/index.d.ts +0 -1
- package/lib/components/eftpos/hooks.d.ts +0 -1
- package/lib/components/eftpos/icon/apiKey.d.ts +0 -1
- package/lib/components/eftpos/icon/device.d.ts +0 -1
- package/lib/components/eftpos/index.d.ts +0 -1
- package/lib/components/eftpos/pos.d.ts +0 -1
- package/lib/components/eftpos/receipt/index.d.ts +0 -1
- package/lib/components/eftpos/surcharge/index.d.ts +0 -1
- package/lib/components/eftposPay/component/alert/warn.d.ts +0 -1
- package/lib/components/eftposPay/component/fail/network.d.ts +0 -1
- package/lib/components/eftposPay/component/fail/unknow.d.ts +0 -1
- package/lib/components/eftposPay/component/header/titlebar.d.ts +0 -1
- package/lib/components/eftposPay/component/manual/index.d.ts +0 -1
- package/lib/components/eftposPay/component/signature/index.d.ts +0 -1
- package/lib/components/eftposPay/component/step/index.d.ts +0 -1
- package/lib/components/eftposPay/component/step/step.d.ts +0 -1
- package/lib/components/eftposPay/hooks.d.ts +1 -1
- package/lib/components/eftposPay/payo/config.d.ts +0 -1
- package/lib/components/eftposPay/store/index.d.ts +4 -4
- package/lib/components/eftposPay/tip.d.ts +0 -1
- package/lib/components/eftposPay/tyro/hooks.d.ts +0 -1
- package/lib/components/eftposPay/windcave/receiptAction.d.ts +0 -1
- package/lib/components/eftposPay/windcave/windcave.d.ts +0 -1
- package/lib/components/eventBooking/components/bookingAvailabilityCalendar/components/CalendarDate/CalenDateStatus/index.d.ts +0 -1
- package/lib/components/eventBooking/components/bookingAvailabilityCalendar/components/CalendarDate/Item/DayItem/index.d.ts +0 -1
- package/lib/components/eventBooking/components/bookingAvailabilityCalendar/components/CalendarDate/Item/index.d.ts +0 -1
- package/lib/components/eventBooking/components/bookingAvailabilityCalendar/components/CalendarDate/Status/index.d.ts +0 -1
- package/lib/components/eventBooking/components/scheduleCalendar/ProductItem/index.d.ts +0 -1
- package/lib/components/login/index.d.ts +0 -1
- package/lib/components/pay/toB/components/Content/Header.d.ts +0 -1
- package/lib/components/pay/toC/PaymentMethods/MWCreditCard/TDSPay/ThreedsLoading/index.d.ts +0 -1
- package/lib/components/pay/toC/PaymentMethods/StripePay/Stripe/Finish/index.d.ts +0 -1
- package/lib/components/pay/toC/PaymentMethods/StripePay/Stripe/StripeSDK/SDK.d.ts +0 -1
- package/lib/components/pay/toC/PaymentMethods/StripePay/Stripe/StripeSDK/index.d.ts +0 -1
- package/lib/components/pay/toC/PaymentMethods/StripePay/Stripe/components/PageLoading/index.d.ts +0 -1
- package/lib/components/pay/toC/PaymentMethods/StripePay/Stripe/components/SetupForm/PaymentRequestForm.d.ts +0 -1
- package/lib/components/pisellSelectCustomerModal/RightPanel/Add/BirthdayField/index.d.ts +0 -1
- package/lib/components/pisellSelectCustomerModal/RightPanel/Add/GenderField/index.d.ts +0 -1
- package/lib/components/productExtension/fields/Actor/index.d.ts +0 -1
- package/lib/components/productExtension/fields/Forms/index.d.ts +0 -1
- package/lib/components/productExtension/fields/SelectProducts/ProductItemPreview/index.d.ts +0 -1
- package/lib/components/ruleSetting/ruleBorder/index.d.ts +0 -1
- package/lib/components/schedules/calendar/calendarItem.d.ts +0 -1
- package/lib/components/schedules/calendar/index.d.ts +0 -1
- package/lib/components/schedules/components/CurrentDay/index.d.ts +0 -1
- package/lib/components/schedules/components/ScheduleDetailList/index.d.ts +0 -1
- package/lib/components/schedules/components/ScheduleList/RenderScheduleItem/index.d.ts +0 -1
- package/lib/components/schedules/components/ScheduleList/index.d.ts +0 -1
- package/lib/components/schedules/products/ProductDetailDrawer/ProductDetail/MaxParticipantsModule/index.d.ts +0 -1
- package/lib/components/schedules/products/ProductDetailDrawer/ProductDetail/ResourcesModule/index.d.ts +0 -1
- package/lib/components/schedules/products/ProductDetailDrawer/ProductDetail/SchedulesModule/AddSchedules/index.d.ts +0 -1
- package/lib/components/schedules/products/ProductDetailDrawer/ProductDetail/SchedulesModule/index.d.ts +0 -1
- package/lib/components/schedules/products/ProductDetailDrawer/ProductDetail/index.d.ts +0 -1
- package/lib/components/schedules/products/ProductDetailDrawer/ProductDetailByDate/index.d.ts +0 -1
- package/lib/components/schedules/products/ProductDetailDrawer/index.d.ts +0 -1
- package/lib/components/schedules/products/index.d.ts +0 -1
- package/lib/components/schedules/products/list/ProductItem/index.d.ts +0 -1
- package/lib/components/schedules/products/list/index.d.ts +0 -1
- package/lib/components/schedules/resources/index.d.ts +0 -1
- package/lib/components/schedules/resources/list/index.d.ts +0 -1
- package/lib/components/schedules/resources/relationProduct/index.d.ts +0 -1
- package/lib/components/schedules/schedules/AllSchedules/index.d.ts +0 -1
- package/lib/components/schedules/schedules/ScheduleDetailDrawer/index.d.ts +0 -1
- package/lib/components/schedules/schedules/index.d.ts +0 -1
- package/lib/components/taxSelect/index.d.ts +0 -1
- package/lib/components/ticketBooking/components/addServiceVariant/index.d.ts +0 -1
- package/lib/components/ticketBooking/utils/index.d.ts +1 -1
- package/lib/hooks/usePaymentLogger.d.ts +0 -1
- package/lib/plus/clientName/index.d.ts +0 -1
- package/lib/plus/clinetSearch/Add/BirthdayField/index.d.ts +0 -1
- package/lib/plus/clinetSearch/Add/GenderField/index.d.ts +0 -1
- package/lib/plus/saasCreateOrganization/components/Header.d.ts +0 -1
- package/lib/plus/saasCreateOrganization/index.d.ts +0 -1
- package/lib/plus/saasRegister/components/EntryEmail.d.ts +0 -1
- package/lib/plus/saasRegister/components/EntryInfo.d.ts +0 -1
- package/lib/plus/saasRegister/components/GoLogin.d.ts +0 -1
- package/lib/plus/saasRegister/components/Header.d.ts +0 -1
- package/lib/plus/saasRegister/components/VerifyError.d.ts +0 -1
- package/lib/plus/saasRegister/components/VerifyingLink.d.ts +0 -1
- package/package.json +2 -2
@@ -44,7 +44,7 @@ import dayjs from 'dayjs';
|
|
44
44
|
import useScanManager from "../../../ticketBooking/hooks/pisellos/useScanManager";
|
45
45
|
import { Iconfont } from '@pisell/materials';
|
46
46
|
import { useCustomer } from "../../../ticketBooking/hooks/pisellos/useCustomer";
|
47
|
-
import { useDebounceEffect, useMemoizedFn } from 'ahooks';
|
47
|
+
import { useDebounceEffect, useDebounceFn, useMemoizedFn } from 'ahooks';
|
48
48
|
import { cloneDeep } from 'lodash';
|
49
49
|
import { useShopDiscount } from "../../../appointmentBooking/hooks";
|
50
50
|
|
@@ -608,13 +608,13 @@ var Footer = function Footer(props) {
|
|
608
608
|
}, [JSON.stringify(total), JSON.stringify(orderTotalList), JSON.stringify(subTotalList), (_state$client2 = state.client) === null || _state$client2 === void 0 || (_state$client2 = _state$client2.value) === null || _state$client2 === void 0 ? void 0 : _state$client2.id]);
|
609
609
|
|
610
610
|
/**
|
611
|
-
* @title: 处理checkout
|
611
|
+
* @title: 处理checkout内部函数
|
612
612
|
* @description:
|
613
613
|
* @return {*}
|
614
614
|
* @Author: zhiwei.Wang
|
615
615
|
* @Date: 2024-01-30 16:53
|
616
616
|
*/
|
617
|
-
var
|
617
|
+
var handleCheckoutInternal = /*#__PURE__*/function () {
|
618
618
|
var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
|
619
619
|
var isNewOrder, isHasDayProducts, res, modalData, _res;
|
620
620
|
return _regeneratorRuntime().wrap(function _callee4$(_context4) {
|
@@ -720,11 +720,19 @@ var Footer = function Footer(props) {
|
|
720
720
|
}
|
721
721
|
}, _callee4);
|
722
722
|
}));
|
723
|
-
return function
|
723
|
+
return function handleCheckoutInternal() {
|
724
724
|
return _ref4.apply(this, arguments);
|
725
725
|
};
|
726
726
|
}();
|
727
727
|
|
728
|
+
// 使用防抖,500毫秒内不重复执行
|
729
|
+
var _useDebounceFn = useDebounceFn(handleCheckoutInternal, {
|
730
|
+
wait: 500,
|
731
|
+
leading: true,
|
732
|
+
trailing: false
|
733
|
+
}),
|
734
|
+
handleCheckout = _useDebounceFn.run;
|
735
|
+
|
728
736
|
/**
|
729
737
|
* @title: 保存额外商品
|
730
738
|
* @description:
|
@@ -165,10 +165,10 @@ export declare const getProductTotalPrice: (item: any) => number;
|
|
165
165
|
export declare const getDuration: (duration: number | {
|
166
166
|
type: string;
|
167
167
|
value: number;
|
168
|
-
}) => number | {
|
168
|
+
}) => number | "flexible" | {
|
169
169
|
type: string;
|
170
170
|
value: number;
|
171
|
-
}
|
171
|
+
};
|
172
172
|
export declare const isWalkIn: (customer_id?: number | string) => boolean;
|
173
173
|
export declare const getIsEdit: (state: any) => boolean;
|
174
174
|
export {};
|
@@ -560,7 +560,7 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
|
|
560
560
|
updateOrderInfo === null || updateOrderInfo === void 0 || updateOrderInfo(orderInfo);
|
561
561
|
balanceDueAmount = checkoutModule.getBalanceDueAmount();
|
562
562
|
if (!(Number(balanceDueAmount) > 0)) {
|
563
|
-
_context5.next =
|
563
|
+
_context5.next = 14;
|
564
564
|
break;
|
565
565
|
}
|
566
566
|
autoCloseConfig = calculateAutoCloseConfig('partially_paid', false); // 获取订单总金额
|
@@ -572,7 +572,7 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
|
|
572
572
|
if (_paymentItems.length > 0 && _paymentItems.filter(function (n) {
|
573
573
|
return n.isSynced;
|
574
574
|
}).some(function (item) {
|
575
|
-
return item.service_charge;
|
575
|
+
return item.service_charge || item.rounding_amount;
|
576
576
|
})) {
|
577
577
|
serviceChargeTotal = _paymentItems.reduce(function (acc, item) {
|
578
578
|
var _item$service_charge, _item$service_charge2;
|
@@ -580,13 +580,19 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
|
|
580
580
|
var chargePercentage = new Decimal(((_item$service_charge2 = item.service_charge) === null || _item$service_charge2 === void 0 ? void 0 : _item$service_charge2.percentage) || 0);
|
581
581
|
var itemAmount = new Decimal(item.amount || 0);
|
582
582
|
var itemServiceCharge = chargeAmount.add(chargePercentage.mul(itemAmount));
|
583
|
+
// 如果支付项的 rounding_amount 是正数,需要减掉rounding_amount
|
584
|
+
if (Number(item.rounding_amount) > 0) {
|
585
|
+
itemServiceCharge = itemServiceCharge.sub(new Decimal(item.rounding_amount));
|
586
|
+
}
|
587
|
+
console.log(itemServiceCharge);
|
583
588
|
return acc.add(itemServiceCharge);
|
584
589
|
}, new Decimal(0));
|
585
590
|
_totalAmount = _totalAmount.add(serviceChargeTotal);
|
586
591
|
}
|
592
|
+
console.log(_totalAmount, _paymentItems);
|
587
593
|
|
588
594
|
// 根据支付状态展示不同的 toast
|
589
|
-
_context5.next =
|
595
|
+
_context5.next = 14;
|
590
596
|
return displayPaymentResultToast({
|
591
597
|
paymentStatus: 'partially_paid',
|
592
598
|
orderTotalAmount: _totalAmount.toNumber(),
|
@@ -604,7 +610,7 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
|
|
604
610
|
// 不自动关闭Modal,让两个弹窗独立管理
|
605
611
|
}
|
606
612
|
}));
|
607
|
-
case
|
613
|
+
case 14:
|
608
614
|
// 判断是否为现金支付
|
609
615
|
paymentMethodName = data.paymentMethodName || data.name || '';
|
610
616
|
isCashPayment = data.paymentMethodCode === 'CASHMANUAL' || /现金|現金/i.test(paymentMethodName) || /cash/i.test(paymentMethodName);
|
@@ -623,7 +629,7 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
|
|
623
629
|
}
|
624
630
|
});
|
625
631
|
}
|
626
|
-
case
|
632
|
+
case 17:
|
627
633
|
case "end":
|
628
634
|
return _context5.stop();
|
629
635
|
}
|
@@ -754,19 +760,23 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
|
|
754
760
|
return showSuccessToast === null || showSuccessToast === void 0 ? void 0 : showSuccessToast(result);
|
755
761
|
case 12:
|
756
762
|
if (!result.success) {
|
757
|
-
_context8.next =
|
763
|
+
_context8.next = 23;
|
758
764
|
break;
|
759
765
|
}
|
766
|
+
// 触发 voucher 的更新
|
767
|
+
checkoutModule.core.effects.emit('checkout:onPaymentStarted', {
|
768
|
+
paymentMethodCode: ''
|
769
|
+
});
|
760
770
|
// 检查订单此时是不是定金支付订单
|
761
771
|
_orderInfo = checkoutModule.getCurrentOrderInfo();
|
762
772
|
setCurrentEditOrderId === null || setCurrentEditOrderId === void 0 || setCurrentEditOrderId(result.orderId);
|
763
|
-
if (!(result.is_deposit && Number(_orderInfo.depositAmount < _orderInfo.totalAmount))) {
|
764
|
-
_context8.next =
|
773
|
+
if (!(result.is_deposit && Number(_orderInfo.depositAmount) < Number(_orderInfo.totalAmount))) {
|
774
|
+
_context8.next = 19;
|
765
775
|
break;
|
766
776
|
}
|
767
777
|
updateOrderInfo === null || updateOrderInfo === void 0 || updateOrderInfo(_orderInfo);
|
768
778
|
return _context8.abrupt("return");
|
769
|
-
case
|
779
|
+
case 19:
|
770
780
|
responseData = (_result$response = result.response) === null || _result$response === void 0 ? void 0 : _result$response.data; // 打印订单完整信息
|
771
781
|
console.log('print_order_onOrderSynced>>>>', result);
|
772
782
|
try {
|
@@ -788,7 +798,7 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
|
|
788
798
|
}
|
789
799
|
// 支付成功时关闭 PaymentModal
|
790
800
|
onPaymentCancel(true);
|
791
|
-
case
|
801
|
+
case 23:
|
792
802
|
case "end":
|
793
803
|
return _context8.stop();
|
794
804
|
}
|
@@ -1360,7 +1370,8 @@ var PaymentModal = function PaymentModal(_ref18) {
|
|
1360
1370
|
var _ref19 = (context === null || context === void 0 || (_context$appHelper = context.appHelper) === null || _context$appHelper === void 0 ? void 0 : _context$appHelper.utils) || {},
|
1361
1371
|
pisellos = _ref19.pisellos,
|
1362
1372
|
getData = _ref19.getData,
|
1363
|
-
interaction = _ref19.interaction
|
1373
|
+
interaction = _ref19.interaction,
|
1374
|
+
isWebPos = _ref19.isWebPos;
|
1364
1375
|
var _useState23 = useState(null),
|
1365
1376
|
_useState24 = _slicedToArray(_useState23, 2),
|
1366
1377
|
orderInfo = _useState24[0],
|
@@ -1989,7 +2000,7 @@ var PaymentModal = function PaymentModal(_ref18) {
|
|
1989
2000
|
// 获取 checkout 模块并处理订单数据
|
1990
2001
|
checkout = pisellos === null || pisellos === void 0 ? void 0 : pisellos.getModule('checkout');
|
1991
2002
|
if (!(checkout && data && !isLocalOrderCreated.current)) {
|
1992
|
-
_context23.next =
|
2003
|
+
_context23.next = 25;
|
1993
2004
|
break;
|
1994
2005
|
}
|
1995
2006
|
isLocalOrderCreated.current = true;
|
@@ -2024,17 +2035,24 @@ var PaymentModal = function PaymentModal(_ref18) {
|
|
2024
2035
|
totalInfo: newData.subtotal_info
|
2025
2036
|
});
|
2026
2037
|
case 12:
|
2027
|
-
_context23.next =
|
2038
|
+
_context23.next = 17;
|
2028
2039
|
break;
|
2029
2040
|
case 14:
|
2030
|
-
|
2041
|
+
logger === null || logger === void 0 || logger.addLog({
|
2042
|
+
type: 'info',
|
2043
|
+
title: '正常创建 createLocalOrderAsync',
|
2044
|
+
metadata: {
|
2045
|
+
data: data
|
2046
|
+
}
|
2047
|
+
});
|
2048
|
+
_context23.next = 17;
|
2031
2049
|
return checkout.createLocalOrderAsync({
|
2032
2050
|
orderData: newData.order_info,
|
2033
2051
|
cartSummary: (_newData$subtotal_inf2 = newData.subtotal_info) === null || _newData$subtotal_inf2 === void 0 ? void 0 : _newData$subtotal_inf2.subTotalList,
|
2034
2052
|
autoPayment: true,
|
2035
2053
|
totalInfo: newData.subtotal_info
|
2036
2054
|
});
|
2037
|
-
case
|
2055
|
+
case 17:
|
2038
2056
|
// 获取订单总金额
|
2039
2057
|
_orderInfo2 = checkout.getCurrentOrderInfo();
|
2040
2058
|
console.log(_orderInfo2);
|
@@ -2055,7 +2073,7 @@ var PaymentModal = function PaymentModal(_ref18) {
|
|
2055
2073
|
unsubscribeRef.current = checkout.core.effects.on('checkout:onOrderSynced', /*#__PURE__*/function () {
|
2056
2074
|
var _ref29 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee22(data) {
|
2057
2075
|
var _data$response, _responseData$payment2;
|
2058
|
-
var currentOrderId, responseData, paymentStatus, orderTotalAmount, gapAmount, currentChangeGivenAmount, failureReason,
|
2076
|
+
var currentOrderId, responseData, paymentStatus, orderTotalAmount, gapAmount, currentChangeGivenAmount, failureReason, _responseData$payment3, params, statusClassName, autoCloseConfig, enabledAutoPrint, _interaction$utils6, _interaction$utils6$a, _orderInfo3, paymentResult;
|
2059
2077
|
return _regeneratorRuntime().wrap(function _callee22$(_context22) {
|
2060
2078
|
while (1) switch (_context22.prev = _context22.next) {
|
2061
2079
|
case 0:
|
@@ -2086,7 +2104,7 @@ var PaymentModal = function PaymentModal(_ref18) {
|
|
2086
2104
|
// 获取失败原因
|
2087
2105
|
failureReason = responseData === null || responseData === void 0 ? void 0 : responseData.failure_reason; // 根据支付状态弹出对应的支付结果toast
|
2088
2106
|
if (!paymentStatus) {
|
2089
|
-
_context22.next =
|
2107
|
+
_context22.next = 35;
|
2090
2108
|
break;
|
2091
2109
|
}
|
2092
2110
|
// 打印订单完整信息
|
@@ -2140,15 +2158,26 @@ var PaymentModal = function PaymentModal(_ref18) {
|
|
2140
2158
|
// 确定支付状态
|
2141
2159
|
statusClassName = calculateStatusClassName(paymentStatus);
|
2142
2160
|
autoCloseConfig = calculateAutoCloseConfig(paymentStatus, !!currentChangeGivenAmount);
|
2143
|
-
|
2161
|
+
enabledAutoPrint = false;
|
2162
|
+
if (!isWebPos) {
|
2163
|
+
_context22.next = 24;
|
2164
|
+
break;
|
2165
|
+
}
|
2166
|
+
// web pos 没有自动打印配置
|
2167
|
+
enabledAutoPrint = false;
|
2168
|
+
_context22.next = 27;
|
2169
|
+
break;
|
2170
|
+
case 24:
|
2171
|
+
_context22.next = 26;
|
2144
2172
|
return interaction === null || interaction === void 0 || (_interaction$utils6 = interaction.utils) === null || _interaction$utils6 === void 0 || (_interaction$utils6$a = _interaction$utils6.asyncDataManager) === null || _interaction$utils6$a === void 0 ? void 0 : _interaction$utils6$a.call(_interaction$utils6, {
|
2145
2173
|
module: 'get',
|
2146
2174
|
key: 'auto_print_receipt'
|
2147
2175
|
});
|
2148
|
-
case
|
2176
|
+
case 26:
|
2149
2177
|
enabledAutoPrint = _context22.sent;
|
2178
|
+
case 27:
|
2150
2179
|
_orderInfo3 = checkout.getCurrentOrderInfo(); // 根据支付状态展示不同的 toast
|
2151
|
-
_context22.next =
|
2180
|
+
_context22.next = 30;
|
2152
2181
|
return displayPaymentResultToast({
|
2153
2182
|
paymentStatus: paymentStatus,
|
2154
2183
|
orderTotalAmount: _orderInfo3.isDeposit ? _orderInfo3.depositAmount : orderTotalAmount,
|
@@ -2157,7 +2186,7 @@ var PaymentModal = function PaymentModal(_ref18) {
|
|
2157
2186
|
autoCloseConfig: autoCloseConfig,
|
2158
2187
|
actionButtons: generateActionButtons(paymentStatus, enabledAutoPrint)
|
2159
2188
|
}, paymentResultToastConfig);
|
2160
|
-
case
|
2189
|
+
case 30:
|
2161
2190
|
// 当支付状态为 paid 时,关闭 paymentModal
|
2162
2191
|
if (paymentStatus === 'paid') {
|
2163
2192
|
handleModalClose();
|
@@ -2173,11 +2202,11 @@ var PaymentModal = function PaymentModal(_ref18) {
|
|
2173
2202
|
}
|
2174
2203
|
});
|
2175
2204
|
handlePaymentComplete(paymentResult);
|
2176
|
-
_context22.next =
|
2205
|
+
_context22.next = 36;
|
2177
2206
|
break;
|
2178
|
-
case
|
2207
|
+
case 35:
|
2179
2208
|
handlePaymentComplete(data);
|
2180
|
-
case
|
2209
|
+
case 36:
|
2181
2210
|
case "end":
|
2182
2211
|
return _context22.stop();
|
2183
2212
|
}
|
@@ -2187,24 +2216,24 @@ var PaymentModal = function PaymentModal(_ref18) {
|
|
2187
2216
|
return _ref29.apply(this, arguments);
|
2188
2217
|
};
|
2189
2218
|
}());
|
2190
|
-
_context23.next =
|
2219
|
+
_context23.next = 42;
|
2191
2220
|
break;
|
2192
|
-
case
|
2221
|
+
case 25:
|
2193
2222
|
if (!isLocalOrderCreated.current) {
|
2194
|
-
_context23.next =
|
2223
|
+
_context23.next = 42;
|
2195
2224
|
break;
|
2196
2225
|
}
|
2197
2226
|
// // 如果本地订单已创建,这时候还更新了 data,则需要销毁当前的订单数据,然后更新新的订单数据了
|
2198
2227
|
console.log('🔄 PaymentModal: data changed, updating checkout data...');
|
2199
2228
|
isLocalOrderCreated.current = false;
|
2200
|
-
_context23.next =
|
2229
|
+
_context23.next = 30;
|
2201
2230
|
return checkout.cancelCurrentOrderAsync();
|
2202
|
-
case
|
2231
|
+
case 30:
|
2203
2232
|
if (!(editOrderId || currentEditOrderId)) {
|
2204
|
-
_context23.next =
|
2233
|
+
_context23.next = 35;
|
2205
2234
|
break;
|
2206
2235
|
}
|
2207
|
-
_context23.next =
|
2236
|
+
_context23.next = 33;
|
2208
2237
|
return checkout.updateLocalOrderAsync({
|
2209
2238
|
orderId: editOrderId || currentEditOrderId,
|
2210
2239
|
orderData: data === null || data === void 0 ? void 0 : data.order_info,
|
@@ -2212,18 +2241,25 @@ var PaymentModal = function PaymentModal(_ref18) {
|
|
2212
2241
|
autoPayment: true,
|
2213
2242
|
totalInfo: data === null || data === void 0 ? void 0 : data.subtotal_info
|
2214
2243
|
});
|
2215
|
-
case
|
2216
|
-
_context23.next =
|
2244
|
+
case 33:
|
2245
|
+
_context23.next = 38;
|
2217
2246
|
break;
|
2218
|
-
case
|
2219
|
-
|
2247
|
+
case 35:
|
2248
|
+
logger === null || logger === void 0 || logger.addLog({
|
2249
|
+
type: 'info',
|
2250
|
+
title: '含有 localOrderCreate, 调用 createLocalOrderAsync',
|
2251
|
+
metadata: {
|
2252
|
+
data: data
|
2253
|
+
}
|
2254
|
+
});
|
2255
|
+
_context23.next = 38;
|
2220
2256
|
return checkout.createLocalOrderAsync({
|
2221
2257
|
orderData: data === null || data === void 0 ? void 0 : data.order_info,
|
2222
2258
|
cartSummary: data === null || data === void 0 || (_data$subtotal_info2 = data.subtotal_info) === null || _data$subtotal_info2 === void 0 ? void 0 : _data$subtotal_info2.subTotalList,
|
2223
2259
|
autoPayment: true,
|
2224
2260
|
totalInfo: data === null || data === void 0 ? void 0 : data.subtotal_info
|
2225
2261
|
});
|
2226
|
-
case
|
2262
|
+
case 38:
|
2227
2263
|
// 获取订单总金额
|
2228
2264
|
_orderInfo4 = checkout.getCurrentOrderInfo();
|
2229
2265
|
if (_orderInfo4 && _orderInfo4.totalAmount) {
|
@@ -2231,11 +2267,11 @@ var PaymentModal = function PaymentModal(_ref18) {
|
|
2231
2267
|
}
|
2232
2268
|
setOrderInfo(_orderInfo4);
|
2233
2269
|
isLocalOrderCreated.current = true;
|
2234
|
-
case 40:
|
2235
|
-
_context23.next = 46;
|
2236
|
-
break;
|
2237
2270
|
case 42:
|
2238
|
-
_context23.
|
2271
|
+
_context23.next = 48;
|
2272
|
+
break;
|
2273
|
+
case 44:
|
2274
|
+
_context23.prev = 44;
|
2239
2275
|
_context23.t0 = _context23["catch"](0);
|
2240
2276
|
console.error('Failed to initialize checkout data:', _context23.t0);
|
2241
2277
|
logger === null || logger === void 0 || logger.addLog({
|
@@ -2245,11 +2281,11 @@ var PaymentModal = function PaymentModal(_ref18) {
|
|
2245
2281
|
error: _context23.t0
|
2246
2282
|
}
|
2247
2283
|
});
|
2248
|
-
case
|
2284
|
+
case 48:
|
2249
2285
|
case "end":
|
2250
2286
|
return _context23.stop();
|
2251
2287
|
}
|
2252
|
-
}, _callee23, null, [[0,
|
2288
|
+
}, _callee23, null, [[0, 44]]);
|
2253
2289
|
}));
|
2254
2290
|
return function initCheckoutData() {
|
2255
2291
|
return _ref28.apply(this, arguments);
|
@@ -201,7 +201,7 @@ function AmountSummary(_ref2) {
|
|
201
201
|
// 获取部分付款信息
|
202
202
|
// 计算非 walletpass 的支付项金额
|
203
203
|
var nonWalletPassAmount = (paymentItems === null || paymentItems === void 0 || (_paymentItems$reduce = paymentItems.reduce(function (acc, item) {
|
204
|
-
if (!item.voucher_id) {
|
204
|
+
if (!item.voucher_id || item.voucher_id && item.isSynced) {
|
205
205
|
var itemAmount = new Decimal(item.amount || '0');
|
206
206
|
|
207
207
|
// 如果有 rounding_amount 且为负数,将其作为已付的一部分加入计算
|
@@ -499,7 +499,16 @@ function AmountSummary(_ref2) {
|
|
499
499
|
// 使用 Decimal.js 进行精确计算
|
500
500
|
var balanceDecimal = new Decimal(balanceAmountValue);
|
501
501
|
|
502
|
-
//
|
502
|
+
// 需要减去已经同步给后端过的 voucher
|
503
|
+
var syncedVoucherAmount = paymentItems === null || paymentItems === void 0 ? void 0 : paymentItems.reduce(function (acc, item) {
|
504
|
+
// 如果当前是普通支付,则减去order_payment_type不为 deposit的支付项
|
505
|
+
// 如果当前是定金支付,则减去order_payment_type为 deposit的支付项
|
506
|
+
if (item.voucher_id && item.isSynced && (paymentType === 'regular' && item.order_payment_type !== 'deposit' || paymentType === 'deposit' && item.order_payment_type === 'deposit')) {
|
507
|
+
return acc.plus(item.amount).plus(item.rounding_amount);
|
508
|
+
}
|
509
|
+
return acc;
|
510
|
+
}, new Decimal(0)).toNumber();
|
511
|
+
balanceDecimal = balanceDecimal.minus(syncedVoucherAmount);
|
503
512
|
// if (walletPassData?.selectedDiscountList && walletPassData.selectedDiscountList.length > 0) {
|
504
513
|
// walletPassData?.availableDiscountList?.forEach((discountItem: any) => {
|
505
514
|
// discountItem.appliedProductDetails?.forEach((productDetail: any) => {
|
@@ -627,12 +636,20 @@ function AmountSummary(_ref2) {
|
|
627
636
|
}, [paymentItems, paymentType, totalAmount]);
|
628
637
|
var showCancelSplitPayment = useMemo(function () {
|
629
638
|
// 如果 balanceDueAmount 和 balanceDueAmount 不一样,则展示取消拆分支付按钮
|
630
|
-
return balanceDueAmount !== customAmount;
|
639
|
+
return balanceDueAmount !== customAmount && Number(balanceDueAmount) > 0 && Number(customAmount) > 0;
|
631
640
|
}, [customAmount, balanceDueAmount]);
|
632
641
|
var handleChangeDepositAmount = function handleChangeDepositAmount(value) {
|
633
642
|
console.log('handleChangeDepositAmount', value);
|
634
643
|
checkoutModule === null || checkoutModule === void 0 || checkoutModule.setDepositAmountAsync(value);
|
635
644
|
};
|
645
|
+
var hasDepositPayment = useMemo(function () {
|
646
|
+
return paymentItems === null || paymentItems === void 0 ? void 0 : paymentItems.some(function (item) {
|
647
|
+
return item.order_payment_type === 'deposit' && item.status !== 'voided';
|
648
|
+
});
|
649
|
+
}, [paymentItems]);
|
650
|
+
var showCanNotChangeDepositAmount = function showCanNotChangeDepositAmount() {
|
651
|
+
Toast === null || Toast === void 0 || Toast.fail(locales.getText('pisell2.checkout.can-not-change-deposit-amount'));
|
652
|
+
};
|
636
653
|
return /*#__PURE__*/React.createElement("div", {
|
637
654
|
className: classNames('amount-summary-module', 'amount-summary-container')
|
638
655
|
}, /*#__PURE__*/React.createElement("div", {
|
@@ -682,7 +699,25 @@ function AmountSummary(_ref2) {
|
|
682
699
|
// 如果应该显示确认模式,直接返回确认界面
|
683
700
|
shouldShowConfirmMode() ? renderConfirmMode() : /*#__PURE__*/React.createElement("div", {
|
684
701
|
className: classNames('balance-due-info')
|
685
|
-
}, paymentType === 'deposit' ? /*#__PURE__*/React.createElement(
|
702
|
+
}, paymentType === 'deposit' ? hasDepositPayment ? /*#__PURE__*/React.createElement("div", {
|
703
|
+
onClick: function onClick() {
|
704
|
+
return showCanNotChangeDepositAmount();
|
705
|
+
}
|
706
|
+
}, /*#__PURE__*/React.createElement("div", {
|
707
|
+
className: classNames('balance-due-label')
|
708
|
+
}, getText('deposit.due') || 'Deposit Due'), /*#__PURE__*/React.createElement("div", {
|
709
|
+
className: classNames('balance-due-amount')
|
710
|
+
}, formatAmountWithOptions(balanceDueAmount, amountSymbol, {
|
711
|
+
precision: 2,
|
712
|
+
hideDecimalForWholeNumbers: false,
|
713
|
+
useThousandsSeparator: true,
|
714
|
+
showCurrencySymbol: true
|
715
|
+
}), /*#__PURE__*/React.createElement(Edit05, {
|
716
|
+
className: classNames('edit-icon'),
|
717
|
+
style: {
|
718
|
+
color: '#7F56DA'
|
719
|
+
}
|
720
|
+
}))) : /*#__PURE__*/React.createElement(PisellPriceKeyboardPopover, {
|
686
721
|
value: balanceDueAmount || '0'
|
687
722
|
// onChange={handleKeyboardChange}
|
688
723
|
,
|