@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
@@ -41,7 +41,7 @@ declare type ScanData = {
|
|
41
41
|
};
|
42
42
|
};
|
43
43
|
export declare const formatScanCustomer: (data: ScanData) => {
|
44
|
-
searchType: "
|
44
|
+
searchType: "customer" | "product" | "wallet" | "walletPass" | "local_product";
|
45
45
|
data: any;
|
46
46
|
scanCode: string;
|
47
47
|
} | null;
|
@@ -463,7 +463,7 @@ var Footer = (props) => {
|
|
463
463
|
JSON.stringify(subTotalList),
|
464
464
|
(_l = (_k = state.client) == null ? void 0 : _k.value) == null ? void 0 : _l.id
|
465
465
|
]);
|
466
|
-
const
|
466
|
+
const handleCheckoutInternal = async () => {
|
467
467
|
(0, import_PaymentResultToast.closeAllPaymentResultToasts)();
|
468
468
|
const isNewOrder = !state.bookingId;
|
469
469
|
if (isEdit) {
|
@@ -524,6 +524,11 @@ var Footer = (props) => {
|
|
524
524
|
}
|
525
525
|
return goCheckout(state.bookingId, isNewOrder);
|
526
526
|
};
|
527
|
+
const { run: handleCheckout } = (0, import_ahooks.useDebounceFn)(handleCheckoutInternal, {
|
528
|
+
wait: 500,
|
529
|
+
leading: true,
|
530
|
+
trailing: false
|
531
|
+
});
|
527
532
|
const handleSaveAddons = async () => {
|
528
533
|
try {
|
529
534
|
let _list = [...state.addons.value];
|
@@ -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 {};
|
@@ -451,17 +451,22 @@ var PaymentContent = (0, import_react.forwardRef)(
|
|
451
451
|
);
|
452
452
|
const paymentItems2 = await checkoutModule.getCurrentOrderPaymentItemsAsync();
|
453
453
|
let totalAmount2 = new import_decimal.default(orderInfo2.isDeposit ? orderInfo2.depositAmount : orderInfo2.totalAmount);
|
454
|
-
if (paymentItems2.length > 0 && paymentItems2.filter((n) => n.isSynced).some((item) => item.service_charge)) {
|
454
|
+
if (paymentItems2.length > 0 && paymentItems2.filter((n) => n.isSynced).some((item) => item.service_charge || item.rounding_amount)) {
|
455
455
|
const serviceChargeTotal = paymentItems2.reduce((acc, item) => {
|
456
456
|
var _a3, _b3;
|
457
457
|
const chargeAmount = new import_decimal.default(((_a3 = item.service_charge) == null ? void 0 : _a3.amount) || 0);
|
458
458
|
const chargePercentage = new import_decimal.default(((_b3 = item.service_charge) == null ? void 0 : _b3.percentage) || 0);
|
459
459
|
const itemAmount = new import_decimal.default(item.amount || 0);
|
460
|
-
|
460
|
+
let itemServiceCharge = chargeAmount.add(chargePercentage.mul(itemAmount));
|
461
|
+
if (Number(item.rounding_amount) > 0) {
|
462
|
+
itemServiceCharge = itemServiceCharge.sub(new import_decimal.default(item.rounding_amount));
|
463
|
+
}
|
464
|
+
console.log(itemServiceCharge);
|
461
465
|
return acc.add(itemServiceCharge);
|
462
466
|
}, new import_decimal.default(0));
|
463
467
|
totalAmount2 = totalAmount2.add(serviceChargeTotal);
|
464
468
|
}
|
469
|
+
console.log(totalAmount2, paymentItems2);
|
465
470
|
await (0, import_PaymentResultToastUtils.displayPaymentResultToast)(
|
466
471
|
{
|
467
472
|
paymentStatus: "partially_paid",
|
@@ -563,9 +568,12 @@ var PaymentContent = (0, import_react.forwardRef)(
|
|
563
568
|
const result = await checkoutModule.manualSyncOrderAsync();
|
564
569
|
await (showSuccessToast == null ? void 0 : showSuccessToast(result));
|
565
570
|
if (result.success) {
|
571
|
+
checkoutModule.core.effects.emit("checkout:onPaymentStarted", {
|
572
|
+
paymentMethodCode: ""
|
573
|
+
});
|
566
574
|
const orderInfo2 = checkoutModule.getCurrentOrderInfo();
|
567
575
|
setCurrentEditOrderId == null ? void 0 : setCurrentEditOrderId(result.orderId);
|
568
|
-
if (result.is_deposit && Number(orderInfo2.depositAmount < orderInfo2.totalAmount)) {
|
576
|
+
if (result.is_deposit && Number(orderInfo2.depositAmount) < Number(orderInfo2.totalAmount)) {
|
569
577
|
updateOrderInfo == null ? void 0 : updateOrderInfo(orderInfo2);
|
570
578
|
return;
|
571
579
|
}
|
@@ -1044,7 +1052,7 @@ var PaymentModal = ({
|
|
1044
1052
|
import_locales2.default,
|
1045
1053
|
((_e = (_d = (_c = (_b = (_a = context.appHelper.utils) == null ? void 0 : _a.getApp) == null ? void 0 : _b.call(_a)) == null ? void 0 : _c.locales) == null ? void 0 : _d.getLocale) == null ? void 0 : _e.call(_d)) || ((_g = (_f = context.appHelper.utils) == null ? void 0 : _f.storage) == null ? void 0 : _g.get("umi_locale")) || "en"
|
1046
1054
|
);
|
1047
|
-
const { pisellos, getData, interaction } = ((_h = context == null ? void 0 : context.appHelper) == null ? void 0 : _h.utils) || {};
|
1055
|
+
const { pisellos, getData, interaction, isWebPos } = ((_h = context == null ? void 0 : context.appHelper) == null ? void 0 : _h.utils) || {};
|
1048
1056
|
const [orderInfo, setOrderInfo] = (0, import_react.useState)(null);
|
1049
1057
|
const [totalAmount, setTotalAmount] = (0, import_react.useState)(0);
|
1050
1058
|
const [actualShowCashPayment, setActualShowCashPayment] = (0, import_react.useState)(true);
|
@@ -1422,6 +1430,13 @@ var PaymentModal = ({
|
|
1422
1430
|
totalInfo: newData.subtotal_info
|
1423
1431
|
});
|
1424
1432
|
} else {
|
1433
|
+
logger == null ? void 0 : logger.addLog({
|
1434
|
+
type: "info",
|
1435
|
+
title: "正常创建 createLocalOrderAsync",
|
1436
|
+
metadata: {
|
1437
|
+
data
|
1438
|
+
}
|
1439
|
+
});
|
1425
1440
|
await checkout.createLocalOrderAsync({
|
1426
1441
|
orderData: newData.order_info,
|
1427
1442
|
cartSummary: (_b2 = newData.subtotal_info) == null ? void 0 : _b2.subTotalList,
|
@@ -1515,10 +1530,15 @@ var PaymentModal = ({
|
|
1515
1530
|
paymentStatus,
|
1516
1531
|
!!currentChangeGivenAmount
|
1517
1532
|
);
|
1518
|
-
|
1519
|
-
|
1520
|
-
|
1521
|
-
}
|
1533
|
+
let enabledAutoPrint = false;
|
1534
|
+
if (isWebPos) {
|
1535
|
+
enabledAutoPrint = false;
|
1536
|
+
} else {
|
1537
|
+
enabledAutoPrint = await ((_e2 = (_d3 = interaction == null ? void 0 : interaction.utils) == null ? void 0 : _d3.asyncDataManager) == null ? void 0 : _e2.call(_d3, {
|
1538
|
+
module: "get",
|
1539
|
+
key: "auto_print_receipt"
|
1540
|
+
}));
|
1541
|
+
}
|
1522
1542
|
const orderInfo3 = checkout.getCurrentOrderInfo();
|
1523
1543
|
await (0, import_PaymentResultToastUtils.displayPaymentResultToast)(
|
1524
1544
|
{
|
@@ -1564,6 +1584,13 @@ var PaymentModal = ({
|
|
1564
1584
|
totalInfo: data == null ? void 0 : data.subtotal_info
|
1565
1585
|
});
|
1566
1586
|
} else {
|
1587
|
+
logger == null ? void 0 : logger.addLog({
|
1588
|
+
type: "info",
|
1589
|
+
title: "含有 localOrderCreate, 调用 createLocalOrderAsync",
|
1590
|
+
metadata: {
|
1591
|
+
data
|
1592
|
+
}
|
1593
|
+
});
|
1567
1594
|
await checkout.createLocalOrderAsync({
|
1568
1595
|
orderData: data == null ? void 0 : data.order_info,
|
1569
1596
|
cartSummary: (_d2 = data == null ? void 0 : data.subtotal_info) == null ? void 0 : _d2.subTotalList,
|
@@ -1618,7 +1645,7 @@ var PaymentModal = ({
|
|
1618
1645
|
setTimeout(() => {
|
1619
1646
|
(0, import_PaymentResultToast.closePaymentResultToast)();
|
1620
1647
|
}, 0);
|
1621
|
-
const { isTerminal, isWebPos } = (_a2 = context.appHelper) == null ? void 0 : _a2.utils;
|
1648
|
+
const { isTerminal, isWebPos: isWebPos2 } = (_a2 = context.appHelper) == null ? void 0 : _a2.utils;
|
1622
1649
|
if (isTerminal == null ? void 0 : isTerminal()) {
|
1623
1650
|
const checkout = pisellos.getModule("checkout");
|
1624
1651
|
const orderId = await checkout.getCurrentOrderId();
|
@@ -173,7 +173,7 @@ function AmountSummary({
|
|
173
173
|
(0, import_react.useEffect)(() => {
|
174
174
|
var _a2;
|
175
175
|
const nonWalletPassAmount = ((_a2 = paymentItems == null ? void 0 : paymentItems.reduce((acc, item) => {
|
176
|
-
if (!item.voucher_id) {
|
176
|
+
if (!item.voucher_id || item.voucher_id && item.isSynced) {
|
177
177
|
let itemAmount = new import_decimal.default(item.amount || "0");
|
178
178
|
if (item.rounding_amount) {
|
179
179
|
const roundingAmount = new import_decimal.default(item.rounding_amount);
|
@@ -364,6 +364,13 @@ function AmountSummary({
|
|
364
364
|
const renderConfirmMode = () => {
|
365
365
|
let balanceAmountValue = parseFormattedAmount(getBalanceDueAmount());
|
366
366
|
let balanceDecimal = new import_decimal.default(balanceAmountValue);
|
367
|
+
const syncedVoucherAmount = paymentItems == null ? void 0 : paymentItems.reduce((acc, item) => {
|
368
|
+
if (item.voucher_id && item.isSynced && (paymentType === "regular" && item.order_payment_type !== "deposit" || paymentType === "deposit" && item.order_payment_type === "deposit")) {
|
369
|
+
return acc.plus(item.amount).plus(item.rounding_amount);
|
370
|
+
}
|
371
|
+
return acc;
|
372
|
+
}, new import_decimal.default(0)).toNumber();
|
373
|
+
balanceDecimal = balanceDecimal.minus(syncedVoucherAmount);
|
367
374
|
const finalBalanceAmount = (0, import_utils.formatAmountWithOptions)(
|
368
375
|
balanceDecimal.toNumber(),
|
369
376
|
amountSymbol,
|
@@ -457,12 +464,22 @@ function AmountSummary({
|
|
457
464
|
}
|
458
465
|
}, [paymentItems, paymentType, totalAmount]);
|
459
466
|
const showCancelSplitPayment = (0, import_react.useMemo)(() => {
|
460
|
-
return balanceDueAmount !== customAmount;
|
467
|
+
return balanceDueAmount !== customAmount && Number(balanceDueAmount) > 0 && Number(customAmount) > 0;
|
461
468
|
}, [customAmount, balanceDueAmount]);
|
462
469
|
const handleChangeDepositAmount = (value) => {
|
463
470
|
console.log("handleChangeDepositAmount", value);
|
464
471
|
checkoutModule == null ? void 0 : checkoutModule.setDepositAmountAsync(value);
|
465
472
|
};
|
473
|
+
const hasDepositPayment = (0, import_react.useMemo)(() => {
|
474
|
+
return paymentItems == null ? void 0 : paymentItems.some((item) => item.order_payment_type === "deposit" && item.status !== "voided");
|
475
|
+
}, [paymentItems]);
|
476
|
+
const showCanNotChangeDepositAmount = () => {
|
477
|
+
Toast == null ? void 0 : Toast.fail(
|
478
|
+
import_utils.locales.getText(
|
479
|
+
"pisell2.checkout.can-not-change-deposit-amount"
|
480
|
+
)
|
481
|
+
);
|
482
|
+
};
|
466
483
|
return /* @__PURE__ */ import_react2.default.createElement(
|
467
484
|
"div",
|
468
485
|
{
|
@@ -504,7 +521,18 @@ function AmountSummary({
|
|
504
521
|
})
|
505
522
|
},
|
506
523
|
// 如果应该显示确认模式,直接返回确认界面
|
507
|
-
shouldShowConfirmMode() ? renderConfirmMode() : /* @__PURE__ */ import_react2.default.createElement("div", { className: (0, import_classnames.default)("balance-due-info") }, paymentType === "deposit" ? /* @__PURE__ */ import_react2.default.createElement(
|
524
|
+
shouldShowConfirmMode() ? renderConfirmMode() : /* @__PURE__ */ import_react2.default.createElement("div", { className: (0, import_classnames.default)("balance-due-info") }, paymentType === "deposit" ? hasDepositPayment ? /* @__PURE__ */ import_react2.default.createElement("div", { onClick: () => showCanNotChangeDepositAmount() }, /* @__PURE__ */ import_react2.default.createElement("div", { className: (0, import_classnames.default)("balance-due-label") }, getText("deposit.due") || "Deposit Due"), /* @__PURE__ */ import_react2.default.createElement("div", { className: (0, import_classnames.default)("balance-due-amount") }, (0, import_utils.formatAmountWithOptions)(balanceDueAmount, amountSymbol, {
|
525
|
+
precision: 2,
|
526
|
+
hideDecimalForWholeNumbers: false,
|
527
|
+
useThousandsSeparator: true,
|
528
|
+
showCurrencySymbol: true
|
529
|
+
}), /* @__PURE__ */ import_react2.default.createElement(
|
530
|
+
import_icon.Edit05,
|
531
|
+
{
|
532
|
+
className: (0, import_classnames.default)("edit-icon"),
|
533
|
+
style: { color: "#7F56DA" }
|
534
|
+
}
|
535
|
+
))) : /* @__PURE__ */ import_react2.default.createElement(
|
508
536
|
import_pisellSimplePriceKeyboardPopover.default,
|
509
537
|
{
|
510
538
|
value: balanceDueAmount || "0",
|