@pisell/private-materials 6.3.65 → 6.3.67
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 +145 -145
- package/build/lowcode/render/default/view.css +1 -1
- package/build/lowcode/render/default/view.js +9 -9
- package/build/lowcode/view.css +1 -1
- package/build/lowcode/view.js +10 -10
- package/es/components/appointmentBooking/components/Cart/Item/Total.d.ts +0 -1
- package/es/components/appointmentBooking/components/Cart/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/deposit/components/PolicyModal/index.d.ts +0 -1
- package/es/components/booking/components/TabProduct/index.d.ts +0 -1
- package/es/components/booking/components/TabProduct/productItem/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/utils.d.ts +1 -0
- package/es/components/booking/components/footer/utils.js +42 -23
- package/es/components/booking/components/reloadResourceModal/index.d.ts +0 -1
- package/es/components/booking/components/voucher/index.js +7 -8
- 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/forms/single/index.d.ts +0 -1
- package/es/components/booking/forms/table/index.d.ts +0 -1
- package/es/components/booking/hooks/useClearCart.d.ts +0 -1
- package/es/components/booking/info/clientVariant/hooks/useClientFn.d.ts +0 -1
- package/es/components/booking/info/date/index.d.ts +0 -1
- package/es/components/booking/info/dateRange/index.d.ts +0 -1
- package/es/components/booking/info/notes/index.d.ts +0 -1
- package/es/components/booking/info/service/actions/index.d.ts +0 -1
- package/es/components/booking/info2/service/actions/index.d.ts +0 -1
- package/es/components/booking/info2/service/contactInfoMode/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/notes/NoteBlock/index.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/eftposPay/amount.d.ts +0 -1
- package/es/components/eftposPay/component/fail/failCustom.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/manual/index.d.ts +0 -1
- package/es/components/eftposPay/component/signature/index.d.ts +0 -1
- package/es/components/eftposPay/pay.d.ts +0 -1
- package/es/components/eftposPay/payo/config.d.ts +0 -1
- package/es/components/eftposPay/tip.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/Provider/Cart/Deposit/index.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/Content/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/Header/index.d.ts +0 -1
- package/es/components/eventBooking/components/Provider/Information/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/Provider/SelectHolderModal.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/Status/index.d.ts +0 -1
- package/es/components/eventBooking/components/bookingDetailModal/components/BookingOptions.d.ts +0 -1
- package/es/components/eventBooking/components/bookingDetailModal/components/Resource.d.ts +0 -1
- package/es/components/eventBooking/components/bookingDetailModal/components/Schedule.d.ts +0 -1
- package/es/components/eventBooking/components/scheduleCalendar/ProductItem/index.d.ts +0 -1
- package/es/components/eventBooking/components/scheduleCalendar/components/ScheduleTimeItem/index.d.ts +0 -1
- package/es/components/login/index.d.ts +0 -1
- package/es/components/pay/toC/PaymentList/index.d.ts +1 -1
- package/es/components/pay/toC/PaymentList/index.js +54 -5
- package/es/components/pay/toC/PaymentList/index.less +58 -1
- package/es/components/pay/toC/PaymentList/payment/credit_card.png +0 -0
- package/es/components/pay/toC/PaymentList/payment/visa.png +0 -0
- package/es/components/pay/toC/PaymentList/serve.d.ts +1 -1
- package/es/components/pay/toC/PaymentList/serve.js +7 -0
- package/es/components/pay/toC/PaymentList/utils.d.ts +21 -0
- package/es/components/pay/toC/PaymentList/utils.js +165 -5
- package/es/components/pay/toC/PaymentMethods/StripePay/Stripe/index.d.ts +0 -1
- package/es/components/pay/toC/WalletPassBlock/components/WalletUseList/index.d.ts +0 -1
- package/es/components/pay/toC/index.js +2 -1
- package/es/components/pay/toC/locales.d.ts +6 -0
- package/es/components/pay/toC/locales.js +9 -3
- 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/pisellSelectCustomerModal/RightPanel/Add/index.d.ts +0 -1
- package/es/components/pisellSelectCustomerModal/RightPanel/List/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/ProductItem/index.d.ts +0 -1
- package/es/components/productExtension/fields/SelectProducts/ProductItemPreview/index.d.ts +0 -1
- package/es/components/productExtension/fields/SelectProducts/index.d.ts +0 -1
- package/es/components/productExtension/fields/SelectResourcesTable/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/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/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/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/shoppingCart/components/Empty/index.d.ts +0 -1
- package/es/components/shoppingCart/components/Render/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/shoppingCart/index.d.ts +0 -1
- package/es/components/systemSettings/registry/components/SectionList.js +5 -1
- package/es/hooks/usePaymentLogger.d.ts +0 -1
- package/es/index.d.ts +1 -0
- package/es/index.js +1 -0
- package/es/plus/productSelect/index.js +5 -1
- package/es/plus/saasCreateOrganization/components/Header.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/es/plus/saasRegister/components/VertifyEmail.d.ts +0 -1
- package/es/plus/walletEditor/components/relationProduct/index.d.ts +0 -1
- package/es/plus/walletPassGallery/components/passList/index.d.ts +0 -1
- package/es/plus/walletPassGallery/components/timelineSection/index.d.ts +0 -1
- package/es/pro/Login2.0/components/LoginCodeInput.js +36 -3
- package/es/pro/Login2.0/steps/CodeInput.js +37 -7
- package/lib/components/appointmentBooking/components/Cart/Item/Total.d.ts +0 -1
- package/lib/components/appointmentBooking/components/Cart/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/deposit/components/PolicyModal/index.d.ts +0 -1
- package/lib/components/booking/components/TabProduct/index.d.ts +0 -1
- package/lib/components/booking/components/TabProduct/productItem/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/utils.d.ts +1 -0
- package/lib/components/booking/components/footer/utils.js +20 -3
- package/lib/components/booking/components/reloadResourceModal/index.d.ts +0 -1
- package/lib/components/booking/components/voucher/index.js +1 -0
- 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/forms/single/index.d.ts +0 -1
- package/lib/components/booking/forms/table/index.d.ts +0 -1
- package/lib/components/booking/hooks/useClearCart.d.ts +0 -1
- package/lib/components/booking/info/clientVariant/hooks/useClientFn.d.ts +0 -1
- package/lib/components/booking/info/date/index.d.ts +0 -1
- package/lib/components/booking/info/dateRange/index.d.ts +0 -1
- package/lib/components/booking/info/notes/index.d.ts +0 -1
- package/lib/components/booking/info/service/actions/index.d.ts +0 -1
- package/lib/components/booking/info2/service/actions/index.d.ts +0 -1
- package/lib/components/booking/info2/service/contactInfoMode/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/notes/NoteBlock/index.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/eftposPay/amount.d.ts +0 -1
- package/lib/components/eftposPay/component/fail/failCustom.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/manual/index.d.ts +0 -1
- package/lib/components/eftposPay/component/signature/index.d.ts +0 -1
- package/lib/components/eftposPay/pay.d.ts +0 -1
- package/lib/components/eftposPay/payo/config.d.ts +0 -1
- package/lib/components/eftposPay/tip.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/Provider/Cart/Deposit/index.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/Content/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/Header/index.d.ts +0 -1
- package/lib/components/eventBooking/components/Provider/Information/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/Provider/SelectHolderModal.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/Status/index.d.ts +0 -1
- package/lib/components/eventBooking/components/bookingDetailModal/components/BookingOptions.d.ts +0 -1
- package/lib/components/eventBooking/components/bookingDetailModal/components/Resource.d.ts +0 -1
- package/lib/components/eventBooking/components/bookingDetailModal/components/Schedule.d.ts +0 -1
- package/lib/components/eventBooking/components/scheduleCalendar/ProductItem/index.d.ts +0 -1
- package/lib/components/eventBooking/components/scheduleCalendar/components/ScheduleTimeItem/index.d.ts +0 -1
- package/lib/components/login/index.d.ts +0 -1
- package/lib/components/pay/toC/PaymentList/index.d.ts +1 -1
- package/lib/components/pay/toC/PaymentList/index.js +36 -5
- package/lib/components/pay/toC/PaymentList/index.less +58 -1
- package/lib/components/pay/toC/PaymentList/payment/credit_card.png +0 -0
- package/lib/components/pay/toC/PaymentList/payment/visa.png +0 -0
- package/lib/components/pay/toC/PaymentList/serve.d.ts +1 -1
- package/lib/components/pay/toC/PaymentList/serve.js +5 -1
- package/lib/components/pay/toC/PaymentList/utils.d.ts +21 -0
- package/lib/components/pay/toC/PaymentList/utils.js +134 -6
- package/lib/components/pay/toC/PaymentMethods/StripePay/Stripe/index.d.ts +0 -1
- package/lib/components/pay/toC/WalletPassBlock/components/WalletUseList/index.d.ts +0 -1
- package/lib/components/pay/toC/index.js +2 -1
- package/lib/components/pay/toC/locales.d.ts +6 -0
- package/lib/components/pay/toC/locales.js +9 -3
- 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/pisellSelectCustomerModal/RightPanel/Add/index.d.ts +0 -1
- package/lib/components/pisellSelectCustomerModal/RightPanel/List/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/ProductItem/index.d.ts +0 -1
- package/lib/components/productExtension/fields/SelectProducts/ProductItemPreview/index.d.ts +0 -1
- package/lib/components/productExtension/fields/SelectProducts/index.d.ts +0 -1
- package/lib/components/productExtension/fields/SelectResourcesTable/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/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/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/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/shoppingCart/components/Empty/index.d.ts +0 -1
- package/lib/components/shoppingCart/components/Render/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/shoppingCart/index.d.ts +0 -1
- package/lib/components/systemSettings/registry/components/SectionList.js +4 -1
- package/lib/hooks/usePaymentLogger.d.ts +0 -1
- package/lib/index.d.ts +1 -0
- package/lib/index.js +3 -0
- package/lib/plus/productSelect/index.js +4 -1
- package/lib/plus/saasCreateOrganization/components/Header.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/lib/plus/saasRegister/components/VertifyEmail.d.ts +0 -1
- package/lib/plus/walletEditor/components/relationProduct/index.d.ts +0 -1
- package/lib/plus/walletPassGallery/components/passList/index.d.ts +0 -1
- package/lib/plus/walletPassGallery/components/timelineSection/index.d.ts +0 -1
- package/lib/pro/Login2.0/components/LoginCodeInput.js +26 -4
- package/lib/pro/Login2.0/steps/CodeInput.js +27 -5
- package/package.json +2 -2
|
@@ -42,5 +42,6 @@ export declare const checkResourcesFormat: (resources: any[], service: any, isCh
|
|
|
42
42
|
* @Date: 2024-12-23 12:05
|
|
43
43
|
*/
|
|
44
44
|
export declare const formatProductPrice: (item: any) => number;
|
|
45
|
+
export declare const getMainProductSellingPrice: (item: any) => number | undefined;
|
|
45
46
|
export declare const formatValues: (state: any) => any;
|
|
46
47
|
export declare const checkHolderIsError: (state: any) => any;
|
|
@@ -17,8 +17,8 @@ import { getSumCapacity } from "../../info2/utilsByBooking";
|
|
|
17
17
|
import { getDays } from "../../utils";
|
|
18
18
|
import { appointmentTypes } from "../../info/service2/status";
|
|
19
19
|
import { isDaysBooking, formatDayTime, isEventBooking, isNormalProductByDurationSchedule } from "../../info/service2/utils";
|
|
20
|
-
import { isArr, locales, sendWarningLog } from '@pisell/utils';
|
|
21
|
-
import { PisellToast } from
|
|
20
|
+
import { isArr, locales, sendWarningLog, isNumber } from '@pisell/utils';
|
|
21
|
+
import { PisellToast } from '@pisell/materials';
|
|
22
22
|
import Decimal from 'decimal.js';
|
|
23
23
|
var formatNote = function formatNote(data) {
|
|
24
24
|
var _data$notes;
|
|
@@ -344,6 +344,25 @@ var getSourceProductPrice = function getSourceProductPrice(item) {
|
|
|
344
344
|
return price;
|
|
345
345
|
};
|
|
346
346
|
|
|
347
|
+
// 获取主商品价格 要增加option
|
|
348
|
+
export var getMainProductSellingPrice = function getMainProductSellingPrice(item) {
|
|
349
|
+
var _item$_extend17, _item$_extend$other, _item$_extend$other2, _item$_extend18;
|
|
350
|
+
if (!isNumber((_item$_extend17 = item._extend) === null || _item$_extend17 === void 0 ? void 0 : _item$_extend17.main_product_selling_price)) {
|
|
351
|
+
return undefined;
|
|
352
|
+
}
|
|
353
|
+
var optionPrice = new Decimal(0);
|
|
354
|
+
// 单规格
|
|
355
|
+
if ((_item$_extend$other = item._extend.other) !== null && _item$_extend$other !== void 0 && _item$_extend$other.option && Array.isArray((_item$_extend$other2 = item._extend.other) === null || _item$_extend$other2 === void 0 ? void 0 : _item$_extend$other2.option)) {
|
|
356
|
+
var _item$_extend$other3;
|
|
357
|
+
optionPrice = (_item$_extend$other3 = item._extend.other) === null || _item$_extend$other3 === void 0 ? void 0 : _item$_extend$other3.option.reduce(function (accumulator, currentValue) {
|
|
358
|
+
var currentPrice = new Decimal(currentValue.price || 0);
|
|
359
|
+
var currentNum = new Decimal(currentValue.num || 0);
|
|
360
|
+
return accumulator.add(currentPrice.mul(currentNum));
|
|
361
|
+
}, optionPrice);
|
|
362
|
+
}
|
|
363
|
+
return new Decimal((_item$_extend18 = item._extend) === null || _item$_extend18 === void 0 ? void 0 : _item$_extend18.main_product_selling_price).add(optionPrice).toNumber();
|
|
364
|
+
};
|
|
365
|
+
|
|
347
366
|
/**
|
|
348
367
|
* @title: 格式化商品数据
|
|
349
368
|
* @description:
|
|
@@ -353,11 +372,11 @@ var getSourceProductPrice = function getSourceProductPrice(item) {
|
|
|
353
372
|
* @Date: 2024-12-07 14:21
|
|
354
373
|
*/
|
|
355
374
|
var formatProducts = function formatProducts(item, quantity) {
|
|
356
|
-
var _item$
|
|
375
|
+
var _item$_extend19, _getMainProductSellin, _item$_extend20, _item$_extend21, _item$_extend22;
|
|
357
376
|
var total = Number(item._extend.total);
|
|
358
377
|
var origin_total = Number(item._extend.origin_total);
|
|
359
378
|
var discount_amount = origin_total - total;
|
|
360
|
-
var bundleDiscountList = getBundleDiscountList(((_item$
|
|
379
|
+
var bundleDiscountList = getBundleDiscountList(((_item$_extend19 = item._extend) === null || _item$_extend19 === void 0 || (_item$_extend19 = _item$_extend19.other) === null || _item$_extend19 === void 0 ? void 0 : _item$_extend19.bundle) || []);
|
|
361
380
|
var discount_list = _toConsumableArray((item === null || item === void 0 ? void 0 : item.discount_list) || []);
|
|
362
381
|
discount_list.push.apply(discount_list, _toConsumableArray(bundleDiscountList));
|
|
363
382
|
|
|
@@ -371,7 +390,7 @@ var formatProducts = function formatProducts(item, quantity) {
|
|
|
371
390
|
return {
|
|
372
391
|
"num": quantity || item._extend.quantity,
|
|
373
392
|
"price": formatProductPrice(item),
|
|
374
|
-
"main_product_selling_price": (
|
|
393
|
+
"main_product_selling_price": (_getMainProductSellin = getMainProductSellingPrice(item)) !== null && _getMainProductSellin !== void 0 ? _getMainProductSellin : formatProductPrice(item),
|
|
375
394
|
"source_product_price": getSourceProductPrice(item),
|
|
376
395
|
"product_id": (item === null || item === void 0 ? void 0 : item.product_id) || item.id,
|
|
377
396
|
"discount_amount": notManualDiscount.length > 0 ? 0 : discount_amount,
|
|
@@ -382,10 +401,10 @@ var formatProducts = function formatProducts(item, quantity) {
|
|
|
382
401
|
"discount_per": item._extend.discount_per,
|
|
383
402
|
"discount_type": item._extend.discount_type || discount_type,
|
|
384
403
|
"order_detail_id": item._extend.order_detail_id || 0,
|
|
385
|
-
"product_bundle": formatProductBundle((_item$
|
|
404
|
+
"product_bundle": formatProductBundle((_item$_extend20 = item._extend) === null || _item$_extend20 === void 0 || (_item$_extend20 = _item$_extend20.other) === null || _item$_extend20 === void 0 ? void 0 : _item$_extend20.bundle),
|
|
386
405
|
"bundle_edit": item._extend.bundle_edit || bundleDiscountList.length ? 1 : 0,
|
|
387
|
-
"product_option_item": formatProductOption((_item$
|
|
388
|
-
"product_variant_id": ((_item$
|
|
406
|
+
"product_option_item": formatProductOption((_item$_extend21 = item._extend) === null || _item$_extend21 === void 0 || (_item$_extend21 = _item$_extend21.other) === null || _item$_extend21 === void 0 ? void 0 : _item$_extend21.option),
|
|
407
|
+
"product_variant_id": ((_item$_extend22 = item._extend) === null || _item$_extend22 === void 0 || (_item$_extend22 = _item$_extend22.other) === null || _item$_extend22 === void 0 ? void 0 : _item$_extend22.product_variant_id) || 0,
|
|
389
408
|
"discount_list": notManualDiscount,
|
|
390
409
|
metadata: formatMetaData(item, false)
|
|
391
410
|
};
|
|
@@ -405,8 +424,8 @@ var formatDayRelationProducts = function formatDayRelationProducts(data, booking
|
|
|
405
424
|
|
|
406
425
|
// 过滤出卡片中的普通商品
|
|
407
426
|
var relation_products = list === null || list === void 0 ? void 0 : list.filter(function (item) {
|
|
408
|
-
var _item$
|
|
409
|
-
var holderId = (_item$
|
|
427
|
+
var _item$_extend23;
|
|
428
|
+
var holderId = (_item$_extend23 = item._extend) === null || _item$_extend23 === void 0 ? void 0 : _item$_extend23.holder_id;
|
|
410
429
|
var bookingHolderId = booking_item._extend.holder_id;
|
|
411
430
|
var isDayBookingProduct = appointmentTypes.includes(item.extension_type);
|
|
412
431
|
return holderId && holderId === bookingHolderId && !isDayBookingProduct;
|
|
@@ -432,15 +451,15 @@ var formatAppointmentProductLists = function formatAppointmentProductLists(data)
|
|
|
432
451
|
|
|
433
452
|
// 找出预约商品
|
|
434
453
|
list = list.filter(function (item) {
|
|
435
|
-
var _item$
|
|
436
|
-
return ((_item$
|
|
454
|
+
var _item$_extend24;
|
|
455
|
+
return ((_item$_extend24 = item._extend) === null || _item$_extend24 === void 0 ? void 0 : _item$_extend24.holder_id) && !isNormalProductByDurationSchedule(item);
|
|
437
456
|
});
|
|
438
457
|
|
|
439
458
|
// 对预约商品列表根据holder_id进行分组
|
|
440
459
|
var groupMap = new Map();
|
|
441
460
|
list.forEach(function (item) {
|
|
442
|
-
var _item$
|
|
443
|
-
var key = (_item$
|
|
461
|
+
var _item$_extend25;
|
|
462
|
+
var key = (_item$_extend25 = item._extend) === null || _item$_extend25 === void 0 ? void 0 : _item$_extend25.holder_id; // 分组键
|
|
444
463
|
if (!groupMap.has(key)) {
|
|
445
464
|
groupMap.set(key, []);
|
|
446
465
|
}
|
|
@@ -501,7 +520,7 @@ var formatBookings = function formatBookings(data, values) {
|
|
|
501
520
|
var bookings = [];
|
|
502
521
|
var obj = {};
|
|
503
522
|
list.forEach(function (item) {
|
|
504
|
-
var _item$
|
|
523
|
+
var _item$_extend30;
|
|
505
524
|
var start_date = item._extend.startDate.format('YYYY-MM-DD');
|
|
506
525
|
var end_date = item._extend.endDate.format('YYYY-MM-DD');
|
|
507
526
|
var end_time = item._extend.endDate.format('HH:mm');
|
|
@@ -515,9 +534,9 @@ var formatBookings = function formatBookings(data, values) {
|
|
|
515
534
|
|
|
516
535
|
// 跨日预约下的普通商品
|
|
517
536
|
if (isDay) {
|
|
518
|
-
var _item$
|
|
519
|
-
var startDate = ((_item$
|
|
520
|
-
var endDate = ((_item$
|
|
537
|
+
var _item$_extend26, _item$_extend27, _item$_extend28, _item$_extend29;
|
|
538
|
+
var startDate = ((_item$_extend26 = item._extend) === null || _item$_extend26 === void 0 ? void 0 : _item$_extend26.startDate) || ((_item$_extend27 = item._extend) === null || _item$_extend27 === void 0 ? void 0 : _item$_extend27.start_date);
|
|
539
|
+
var endDate = ((_item$_extend28 = item._extend) === null || _item$_extend28 === void 0 ? void 0 : _item$_extend28.endDate) || ((_item$_extend29 = item._extend) === null || _item$_extend29 === void 0 ? void 0 : _item$_extend29.end_date);
|
|
521
540
|
var _formatDayTime = formatDayTime({
|
|
522
541
|
startDate: startDate,
|
|
523
542
|
endDate: endDate
|
|
@@ -543,7 +562,7 @@ var formatBookings = function formatBookings(data, values) {
|
|
|
543
562
|
// 跨日预约处理: 跨日预约所有数据都在list中, 每一组预约通过groupId进行分组
|
|
544
563
|
// 通过obj 记录下每个GroupId第一次出现的时机, 第一次出现需要设置 metadata.multiDayPrices
|
|
545
564
|
// 后续出现不需要设置 metadata.multiDayPrices. 节省体积
|
|
546
|
-
var isSetGroupId = obj[item === null || item === void 0 || (_item$
|
|
565
|
+
var isSetGroupId = obj[item === null || item === void 0 || (_item$_extend30 = item._extend) === null || _item$_extend30 === void 0 ? void 0 : _item$_extend30.groupId];
|
|
547
566
|
var booking = _objectSpread(_objectSpread({
|
|
548
567
|
"product": formatProducts(item),
|
|
549
568
|
"relation_products": formatRelationDetails(item._extend.relation_details),
|
|
@@ -602,10 +621,10 @@ var formatRelationProducts = function formatRelationProducts(data, type) {
|
|
|
602
621
|
var list = ((_data$service = data.service) === null || _data$service === void 0 ? void 0 : _data$service.value) || [];
|
|
603
622
|
// open items 下的商品
|
|
604
623
|
list = list.filter(function (item) {
|
|
605
|
-
var _item$
|
|
624
|
+
var _item$_extend31;
|
|
606
625
|
return (
|
|
607
626
|
// 跨日预约把普通商品加在relationProducts 活动预约按之前逻辑
|
|
608
|
-
type === 'day' ? isNormalProductByDurationSchedule(item) : ((_item$
|
|
627
|
+
type === 'day' ? isNormalProductByDurationSchedule(item) : ((_item$_extend31 = item._extend) === null || _item$_extend31 === void 0 ? void 0 : _item$_extend31.holder_id) && appointmentTypes.includes(item.extension_type)
|
|
609
628
|
);
|
|
610
629
|
});
|
|
611
630
|
var relationProducts = [];
|
|
@@ -739,7 +758,7 @@ export var formatValues = function formatValues(state) {
|
|
|
739
758
|
export var checkHolderIsError = function checkHolderIsError(state) {
|
|
740
759
|
var _state$client;
|
|
741
760
|
var holderError = state.service.value.some(function (item) {
|
|
742
|
-
var _item$
|
|
761
|
+
var _item$_extend32;
|
|
743
762
|
// 普通商品不需要检测holder
|
|
744
763
|
if (isNormalProductByDurationSchedule(item)) {
|
|
745
764
|
return false;
|
|
@@ -747,7 +766,7 @@ export var checkHolderIsError = function checkHolderIsError(state) {
|
|
|
747
766
|
if (item._extend.quantity === 1 && !item._extend.holder_id) {
|
|
748
767
|
return true;
|
|
749
768
|
}
|
|
750
|
-
if (item._extend.quantity > 1 && ((_item$
|
|
769
|
+
if (item._extend.quantity > 1 && ((_item$_extend32 = item._extend) === null || _item$_extend32 === void 0 || (_item$_extend32 = _item$_extend32.holder_id) === null || _item$_extend32 === void 0 ? void 0 : _item$_extend32.length) !== item._extend.quantity) {
|
|
751
770
|
return true;
|
|
752
771
|
}
|
|
753
772
|
return false;
|
|
@@ -85,7 +85,7 @@ var VoucherCard = function VoucherCard(props) {
|
|
|
85
85
|
var _ref;
|
|
86
86
|
var val = (_ref = state.service.value || []) === null || _ref === void 0 ? void 0 : _ref.map(function (value) {
|
|
87
87
|
var _value$_extend, _value$_extend2, _value$_extend3;
|
|
88
|
-
return {
|
|
88
|
+
return _defineProperty(_defineProperty({
|
|
89
89
|
booking_id: value.booking_id,
|
|
90
90
|
id: value.id,
|
|
91
91
|
price: value.price,
|
|
@@ -93,9 +93,8 @@ var VoucherCard = function VoucherCard(props) {
|
|
|
93
93
|
discount_list: value.discount_list,
|
|
94
94
|
origin_total: value === null || value === void 0 || (_value$_extend2 = value._extend) === null || _value$_extend2 === void 0 ? void 0 : _value$_extend2.origin_total,
|
|
95
95
|
quantity: value._extend.quantity,
|
|
96
|
-
startDate: value._extend.startDate
|
|
97
|
-
|
|
98
|
-
};
|
|
96
|
+
startDate: value._extend.startDate
|
|
97
|
+
}, "quantity", value._extend.quantity), "holder_id", value === null || value === void 0 || (_value$_extend3 = value._extend) === null || _value$_extend3 === void 0 ? void 0 : _value$_extend3.holder_id);
|
|
99
98
|
});
|
|
100
99
|
return val;
|
|
101
100
|
}, [state.service.value]);
|
|
@@ -105,8 +104,8 @@ var VoucherCard = function VoucherCard(props) {
|
|
|
105
104
|
}, 0);
|
|
106
105
|
}, [serviceMemo]);
|
|
107
106
|
var addonsMemo = useMemo(function () {
|
|
108
|
-
var
|
|
109
|
-
var val = (
|
|
107
|
+
var _ref3;
|
|
108
|
+
var val = (_ref3 = state.addons.value || []) === null || _ref3 === void 0 ? void 0 : _ref3.map(function (value) {
|
|
110
109
|
var _value$_extend4, _value$_extend5;
|
|
111
110
|
return {
|
|
112
111
|
booking_id: value.booking_id,
|
|
@@ -245,7 +244,7 @@ var VoucherCard = function VoucherCard(props) {
|
|
|
245
244
|
|
|
246
245
|
// apply code
|
|
247
246
|
var onScanCode = /*#__PURE__*/function () {
|
|
248
|
-
var
|
|
247
|
+
var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
|
|
249
248
|
var _state$client$value2;
|
|
250
249
|
var customerId, val;
|
|
251
250
|
return _regeneratorRuntime().wrap(function _callee$(_context) {
|
|
@@ -273,7 +272,7 @@ var VoucherCard = function VoucherCard(props) {
|
|
|
273
272
|
}, _callee);
|
|
274
273
|
}));
|
|
275
274
|
return function onScanCode() {
|
|
276
|
-
return
|
|
275
|
+
return _ref4.apply(this, arguments);
|
|
277
276
|
};
|
|
278
277
|
}();
|
|
279
278
|
var availableData = useMemo(function () {
|