@pisell/private-materials 6.5.15 → 6.5.17
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/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 +1 -1
- package/es/components/appointmentBooking/components/Guest/components/InformationOptionsModal/index.d.ts +1 -0
- package/es/components/appointmentBooking/components/Header/index.d.ts +0 -1
- package/es/components/appointmentBooking/deposit/components/PolicyModal/index.d.ts +1 -0
- package/es/components/appointmentBooking/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/deposit/index.d.ts +0 -1
- package/es/components/booking/forms/single/index.d.ts +0 -1
- package/es/components/booking/hooks/useClearCart.d.ts +1 -0
- package/es/components/booking/info/addServiceVariant/index.d.ts +0 -1
- package/es/components/booking/info/dateRange/index.d.ts +1 -0
- 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/notes/index.d.ts +0 -1
- package/es/components/booking/info/service/editService/BookingList/index.d.ts +1 -0
- package/es/components/booking/info/service/serviceItem/index.d.ts +1 -0
- package/es/components/booking/info2/service/addService/index.d.ts +0 -1
- package/es/components/booking/info2/service/serviceItem/index.d.ts +1 -0
- package/es/components/booking/materiels/contacts/index.d.ts +0 -1
- package/es/components/booking/notes/NoteBlock/index.d.ts +0 -1
- package/es/components/booking/notes/addNote/index.d.ts +0 -1
- package/es/components/booking/utils.d.ts +2 -2
- package/es/components/checkout/PaymentPlugin.d.ts +0 -1
- package/es/components/checkout/components/WalletPassModule/components/ConflictModal/index.d.ts +1 -0
- package/es/components/eftpos/form/index.d.ts +0 -1
- package/es/components/eftpos/hooks.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/surcharge/index.d.ts +0 -1
- package/es/components/eftposPay/amount.d.ts +0 -1
- package/es/components/eftposPay/app.d.ts +0 -1
- package/es/components/eftposPay/component/fail/failCustom.d.ts +0 -1
- package/es/components/eftposPay/component/fail/index.d.ts +0 -1
- package/es/components/eftposPay/component/fail/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/hooks.d.ts +2 -2
- package/es/components/eftposPay/index.d.ts +0 -1
- package/es/components/eftposPay/pay.d.ts +0 -1
- package/es/components/eftposPay/store/index.d.ts +4 -4
- package/es/components/eventBooking/components/ErrorTip/index.d.ts +1 -0
- package/es/components/eventBooking/components/Provider/EmptyHolderModal/index.d.ts +1 -0
- package/es/components/eventBooking/components/Provider/InformationOptionsModal/index.d.ts +1 -0
- package/es/components/eventBooking/components/Provider/OrderProductModal/index.d.ts +1 -0
- package/es/components/eventBooking/components/Provider/RemoveOptionConfirmModal.d.ts +1 -0
- package/es/components/eventBooking/components/bookingAvailabilityCalendar/components/CalendarDate/CalenDateWeek/CallToBook/index.d.ts +1 -0
- package/es/components/eventBooking/components/bookingAvailabilityCalendar/components/CalendarDate/CalenDateWeek/WeekItem/index.d.ts +1 -0
- package/es/components/eventBooking/components/bookingAvailabilityCalendar/components/CalendarDate/CalenDateWeek/index.d.ts +1 -0
- package/es/components/eventBooking/components/scheduleCalendar/ProductItem/index.d.ts +0 -1
- package/es/components/eventBooking/components/scheduleCalendar/components/ScheduleTimeItem/index.d.ts +1 -0
- package/es/components/pay/toB/components/Card/index.d.ts +1 -0
- package/es/components/pay/toB/components/Content/Footer.d.ts +1 -0
- 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/SetupForm/index.d.ts +1 -0
- package/es/components/pay/toC/WalletPassBlock/components/WalletUseList/index.d.ts +1 -0
- package/es/components/pisellSelectCustomerModal/RightPanel/List/index.d.ts +1 -0
- 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/SelectResourcesTable/index.d.ts +1 -0
- 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/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/index.d.ts +0 -1
- package/es/components/schedules/products/index.d.ts +0 -1
- package/es/components/schedules/resources/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/shoppingCart/components/Empty/index.d.ts +1 -0
- package/es/components/shoppingCart/hooks/useAddService.d.ts +1 -0
- package/es/components/shoppingCart/hooks/useClearCart.d.ts +1 -0
- package/es/components/taxSelect/index.d.ts +0 -1
- package/es/components/ticketBooking/components/ProductDisplayAdapter/index.less +12 -0
- package/es/components/ticketBooking/components/addServiceVariant/addService.js +14 -3
- package/es/components/ticketBooking/components/menuBar/index.js +5 -4
- package/es/components/ticketBooking/components/menuBar/index.less +5 -0
- package/es/components/ticketBooking/components/ticketBooking/index.js +1 -0
- package/es/components/ticketBooking/hooks/pisellos/useProducts.d.ts +1 -1
- package/es/components/ticketBooking/hooks/pisellos/useProducts.js +36 -12
- package/es/components/ticketBooking/utils/index.d.ts +1 -1
- package/es/components/workSpaceList/components/Modal/index.d.ts +1 -0
- package/es/hooks/useEngineContext.d.ts +1 -0
- package/es/hooks/useEngineContext.js +7 -0
- package/es/plus/productSelect/ProductCard/SkuCard/SkuCardA1/index.d.ts +0 -1
- package/es/plus/productSelect/ProductCard/SkuCard/SkuCardA2/index.d.ts +0 -1
- package/es/plus/productSelect/ProductCard/SkuCard/SkuCardA5/index.d.ts +0 -1
- package/es/plus/productSelect/ProductCard/SkuCard/SkuCardA9/index.d.ts +0 -1
- package/es/plus/productSelect/ProductCard/SkuCard/SkuCardCustom/index.d.ts +0 -1
- package/es/plus/productSelect/ProductCard/SkuCard/components/CardCom/index.d.ts +0 -1
- package/es/plus/productSelect/ProductCard/SkuCard/components/Cover/index.d.ts +0 -1
- package/es/plus/productSelect/ProductCard/SkuCard/components/Price/index.d.ts +0 -1
- package/es/plus/productSelect/ProductCard/SkuCard/components/SubTitle/index.d.ts +0 -1
- package/es/plus/productSelect/ProductCard/SkuCard/components/Title/index.d.ts +0 -1
- package/es/plus/productSelect/ProductCard/SkuCard/components/TooltipTags/index.d.ts +0 -1
- package/es/plus/productSelect/ProductCard/SkuCard/components/WarningLists/index.d.ts +0 -1
- package/es/plus/productSelect/ProductCard/SkuCard/index.d.ts +0 -1
- package/es/plus/saasCreateOrganization/index.d.ts +0 -1
- package/es/plus/saasRegister/components/VertifyEmail.d.ts +1 -0
- package/es/pro/pisellPhoneKeyboard/index.d.ts +1 -0
- package/es/pro/priceKeyboard/components/cashKeyboard/CashKeyboardIntact.d.ts +1 -0
- package/es/pro/priceKeyboard/components/cashKeyboard/index.d.ts +0 -1
- package/es/pro/priceKeyboard/hooks/rightItems.d.ts +1 -0
- package/lib/components/appointmentBooking/components/Guest/components/InformationOptionsModal/index.d.ts +1 -0
- package/lib/components/appointmentBooking/components/Header/index.d.ts +0 -1
- package/lib/components/appointmentBooking/deposit/components/PolicyModal/index.d.ts +1 -0
- package/lib/components/appointmentBooking/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/deposit/index.d.ts +0 -1
- package/lib/components/booking/forms/single/index.d.ts +0 -1
- package/lib/components/booking/hooks/useClearCart.d.ts +1 -0
- package/lib/components/booking/info/addServiceVariant/index.d.ts +0 -1
- package/lib/components/booking/info/dateRange/index.d.ts +1 -0
- 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/notes/index.d.ts +0 -1
- package/lib/components/booking/info/service/editService/BookingList/index.d.ts +1 -0
- package/lib/components/booking/info/service/serviceItem/index.d.ts +1 -0
- package/lib/components/booking/info2/service/addService/index.d.ts +0 -1
- package/lib/components/booking/info2/service/serviceItem/index.d.ts +1 -0
- package/lib/components/booking/materiels/contacts/index.d.ts +0 -1
- package/lib/components/booking/notes/NoteBlock/index.d.ts +0 -1
- package/lib/components/booking/notes/addNote/index.d.ts +0 -1
- package/lib/components/booking/utils.d.ts +2 -2
- package/lib/components/checkout/PaymentPlugin.d.ts +0 -1
- package/lib/components/checkout/components/WalletPassModule/components/ConflictModal/index.d.ts +1 -0
- package/lib/components/eftpos/form/index.d.ts +0 -1
- package/lib/components/eftpos/hooks.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/surcharge/index.d.ts +0 -1
- package/lib/components/eftposPay/amount.d.ts +0 -1
- package/lib/components/eftposPay/app.d.ts +0 -1
- package/lib/components/eftposPay/component/fail/failCustom.d.ts +0 -1
- package/lib/components/eftposPay/component/fail/index.d.ts +0 -1
- package/lib/components/eftposPay/component/fail/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/hooks.d.ts +2 -2
- package/lib/components/eftposPay/index.d.ts +0 -1
- package/lib/components/eftposPay/pay.d.ts +0 -1
- package/lib/components/eftposPay/store/index.d.ts +4 -4
- package/lib/components/eventBooking/components/ErrorTip/index.d.ts +1 -0
- package/lib/components/eventBooking/components/Provider/EmptyHolderModal/index.d.ts +1 -0
- package/lib/components/eventBooking/components/Provider/InformationOptionsModal/index.d.ts +1 -0
- package/lib/components/eventBooking/components/Provider/OrderProductModal/index.d.ts +1 -0
- package/lib/components/eventBooking/components/Provider/RemoveOptionConfirmModal.d.ts +1 -0
- package/lib/components/eventBooking/components/bookingAvailabilityCalendar/components/CalendarDate/CalenDateWeek/CallToBook/index.d.ts +1 -0
- package/lib/components/eventBooking/components/bookingAvailabilityCalendar/components/CalendarDate/CalenDateWeek/WeekItem/index.d.ts +1 -0
- package/lib/components/eventBooking/components/bookingAvailabilityCalendar/components/CalendarDate/CalenDateWeek/index.d.ts +1 -0
- package/lib/components/eventBooking/components/scheduleCalendar/ProductItem/index.d.ts +0 -1
- package/lib/components/eventBooking/components/scheduleCalendar/components/ScheduleTimeItem/index.d.ts +1 -0
- package/lib/components/pay/toB/components/Card/index.d.ts +1 -0
- package/lib/components/pay/toB/components/Content/Footer.d.ts +1 -0
- 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/SetupForm/index.d.ts +1 -0
- package/lib/components/pay/toC/WalletPassBlock/components/WalletUseList/index.d.ts +1 -0
- package/lib/components/pisellSelectCustomerModal/RightPanel/List/index.d.ts +1 -0
- 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/SelectResourcesTable/index.d.ts +1 -0
- 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/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/index.d.ts +0 -1
- package/lib/components/schedules/products/index.d.ts +0 -1
- package/lib/components/schedules/resources/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/shoppingCart/components/Empty/index.d.ts +1 -0
- package/lib/components/shoppingCart/hooks/useAddService.d.ts +1 -0
- package/lib/components/shoppingCart/hooks/useClearCart.d.ts +1 -0
- package/lib/components/taxSelect/index.d.ts +0 -1
- package/lib/components/ticketBooking/components/ProductDisplayAdapter/index.less +12 -0
- package/lib/components/ticketBooking/components/addServiceVariant/addService.js +13 -2
- package/lib/components/ticketBooking/components/menuBar/index.js +5 -4
- package/lib/components/ticketBooking/components/menuBar/index.less +5 -0
- package/lib/components/ticketBooking/components/ticketBooking/index.js +1 -0
- package/lib/components/ticketBooking/hooks/pisellos/useProducts.d.ts +1 -1
- package/lib/components/ticketBooking/hooks/pisellos/useProducts.js +23 -5
- package/lib/components/ticketBooking/utils/index.d.ts +1 -1
- package/lib/components/workSpaceList/components/Modal/index.d.ts +1 -0
- package/lib/hooks/useEngineContext.d.ts +1 -0
- package/lib/hooks/useEngineContext.js +10 -2
- package/lib/plus/productSelect/ProductCard/SkuCard/SkuCardA1/index.d.ts +0 -1
- package/lib/plus/productSelect/ProductCard/SkuCard/SkuCardA2/index.d.ts +0 -1
- package/lib/plus/productSelect/ProductCard/SkuCard/SkuCardA5/index.d.ts +0 -1
- package/lib/plus/productSelect/ProductCard/SkuCard/SkuCardA9/index.d.ts +0 -1
- package/lib/plus/productSelect/ProductCard/SkuCard/SkuCardCustom/index.d.ts +0 -1
- package/lib/plus/productSelect/ProductCard/SkuCard/components/CardCom/index.d.ts +0 -1
- package/lib/plus/productSelect/ProductCard/SkuCard/components/Cover/index.d.ts +0 -1
- package/lib/plus/productSelect/ProductCard/SkuCard/components/Price/index.d.ts +0 -1
- package/lib/plus/productSelect/ProductCard/SkuCard/components/SubTitle/index.d.ts +0 -1
- package/lib/plus/productSelect/ProductCard/SkuCard/components/Title/index.d.ts +0 -1
- package/lib/plus/productSelect/ProductCard/SkuCard/components/TooltipTags/index.d.ts +0 -1
- package/lib/plus/productSelect/ProductCard/SkuCard/components/WarningLists/index.d.ts +0 -1
- package/lib/plus/productSelect/ProductCard/SkuCard/index.d.ts +0 -1
- package/lib/plus/saasCreateOrganization/index.d.ts +0 -1
- package/lib/plus/saasRegister/components/VertifyEmail.d.ts +1 -0
- package/lib/pro/pisellPhoneKeyboard/index.d.ts +1 -0
- package/lib/pro/priceKeyboard/components/cashKeyboard/CashKeyboardIntact.d.ts +1 -0
- package/lib/pro/priceKeyboard/components/cashKeyboard/index.d.ts +0 -1
- package/lib/pro/priceKeyboard/hooks/rightItems.d.ts +1 -0
- package/package.json +1 -1
|
@@ -20,7 +20,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
|
|
|
20
20
|
import { getUniqueId, locales, sendWarningLog } from '@pisell/utils';
|
|
21
21
|
import React, { useEffect, useMemo, useRef, useState } from 'react';
|
|
22
22
|
import { useMemoizedFn } from 'ahooks';
|
|
23
|
-
import useEngineContext from "../../../../hooks/useEngineContext";
|
|
23
|
+
import useEngineContext, { usePlatform } from "../../../../hooks/useEngineContext";
|
|
24
24
|
import { isSessionProduct, request, getProductTotalPrice, getIsEject, getIsOnlySession } from "../../../booking/utils";
|
|
25
25
|
import { getProductExtend } from "../../../booking/info2/service/addService/utils";
|
|
26
26
|
import { holderId, isDaysBooking, isNormalProductByDurationSchedule } from "../../../booking/info/service2/utils";
|
|
@@ -58,6 +58,7 @@ var AddSerivce = function AddSerivce(props) {
|
|
|
58
58
|
onGetProductsReady = props.onGetProductsReady,
|
|
59
59
|
productDisplayConfig = props.productDisplayConfig;
|
|
60
60
|
var context = useEngineContext();
|
|
61
|
+
var platform = usePlatform();
|
|
61
62
|
var notAvailableRef = useRef(null);
|
|
62
63
|
var isLoadedServiceRef = useRef(false);
|
|
63
64
|
request.setRequest(context.appHelper.utils.request);
|
|
@@ -107,7 +108,7 @@ var AddSerivce = function AddSerivce(props) {
|
|
|
107
108
|
// }
|
|
108
109
|
// }, [state?.service?.value]);
|
|
109
110
|
|
|
110
|
-
var _useProducts = useProducts(),
|
|
111
|
+
var _useProducts = useProducts(notAvailableRef),
|
|
111
112
|
getProducts = _useProducts.getProducts,
|
|
112
113
|
products = _useProducts.products,
|
|
113
114
|
loading = _useProducts.loading,
|
|
@@ -996,7 +997,7 @@ var AddSerivce = function AddSerivce(props) {
|
|
|
996
997
|
return state.date.value.format('YYYY-MM-DD HH:mm:ss');
|
|
997
998
|
}, [state.date.value]);
|
|
998
999
|
useEffect(function () {
|
|
999
|
-
if (renderMode === 'current' && state.bookingConfig) {
|
|
1000
|
+
if (renderMode === 'current' && state.bookingConfig && platform !== 'shop') {
|
|
1000
1001
|
getProducts({
|
|
1001
1002
|
schedule_date: currentDate,
|
|
1002
1003
|
customer_id: customerId,
|
|
@@ -1008,6 +1009,16 @@ var AddSerivce = function AddSerivce(props) {
|
|
|
1008
1009
|
});
|
|
1009
1010
|
}
|
|
1010
1011
|
}, [renderMode, customerId, menuList]);
|
|
1012
|
+
useEffect(function () {
|
|
1013
|
+
if (renderMode === 'current' && state.bookingConfig && platform === 'shop') {
|
|
1014
|
+
getProducts({
|
|
1015
|
+
schedule_date: currentDate,
|
|
1016
|
+
customer_id: customerId,
|
|
1017
|
+
menu_list_ids: menuList,
|
|
1018
|
+
schedule_datetime: currentDatetime
|
|
1019
|
+
});
|
|
1020
|
+
}
|
|
1021
|
+
}, [renderMode, currentDate, customerId, menuList, currentDatetime]);
|
|
1011
1022
|
|
|
1012
1023
|
// 产品展示配置,支持字符串预设或完整配置对象
|
|
1013
1024
|
var finalDisplayConfig = useMemo(function () {
|
|
@@ -2,7 +2,7 @@ import React from 'react';
|
|
|
2
2
|
import { useNetworkStatus, NetworkStatus, NetworkStatusColor } from "../../hooks/useNetworkStatus";
|
|
3
3
|
import "./index.less";
|
|
4
4
|
import { Menu } from 'antd';
|
|
5
|
-
import { SettingOutlined } from '@ant-design/icons';
|
|
5
|
+
import { ReloadOutlined, SettingOutlined } from '@ant-design/icons';
|
|
6
6
|
import { locales } from '@pisell/utils';
|
|
7
7
|
import { ConfigProvider, Iconfont } from '@pisell/materials';
|
|
8
8
|
var index = function index(props) {
|
|
@@ -32,12 +32,13 @@ var index = function index(props) {
|
|
|
32
32
|
})
|
|
33
33
|
}];
|
|
34
34
|
var items = [{
|
|
35
|
+
key: 'reload',
|
|
36
|
+
label: locales.getText('pisell2.ticket-booking.reload'),
|
|
37
|
+
icon: /*#__PURE__*/React.createElement(ReloadOutlined, null)
|
|
38
|
+
}, {
|
|
35
39
|
key: '1',
|
|
36
40
|
icon: /*#__PURE__*/React.createElement(SettingOutlined, null),
|
|
37
41
|
children: [{
|
|
38
|
-
key: 'reload',
|
|
39
|
-
label: locales.getText('pisell2.ticket-booking.reload')
|
|
40
|
-
}, {
|
|
41
42
|
key: 'version',
|
|
42
43
|
label: '6.4.38'
|
|
43
44
|
}
|
|
@@ -1343,6 +1343,7 @@ var TicketBooking = function TicketBooking(props) {
|
|
|
1343
1343
|
}), isShowFloatButtons && /*#__PURE__*/React.createElement(FloatButtons, {
|
|
1344
1344
|
items: floatButtons
|
|
1345
1345
|
})), isShowTimeBar && /*#__PURE__*/React.createElement(TimeBar, {
|
|
1346
|
+
setNowTime: _getProducts,
|
|
1346
1347
|
onCreateClick: handleCreateClick,
|
|
1347
1348
|
setGlobalState: setState,
|
|
1348
1349
|
globalState: state,
|
|
@@ -7,7 +7,7 @@ interface IGetProductsParams {
|
|
|
7
7
|
interface IGetScheduleTimePointsParams {
|
|
8
8
|
menu_list_ids?: number[];
|
|
9
9
|
}
|
|
10
|
-
export declare const useProducts: () => {
|
|
10
|
+
export declare const useProducts: (notAvailableRef: any) => {
|
|
11
11
|
getScheduleTimePoints: (params?: IGetScheduleTimePointsParams) => Promise<void>;
|
|
12
12
|
getProducts: (params?: IGetProductsParams) => Promise<void>;
|
|
13
13
|
products: any[];
|
|
@@ -16,11 +16,12 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
|
|
|
16
16
|
import { useMemoizedFn } from 'ahooks';
|
|
17
17
|
import { useBookingTicket } from "./bookingTicket";
|
|
18
18
|
import { useState, useEffect, useRef } from 'react';
|
|
19
|
-
import useEngineContext from "../../../../hooks/useEngineContext";
|
|
19
|
+
import useEngineContext, { usePlatform } from "../../../../hooks/useEngineContext";
|
|
20
20
|
import dayjs from 'dayjs';
|
|
21
|
-
export var useProducts = function useProducts() {
|
|
21
|
+
export var useProducts = function useProducts(notAvailableRef) {
|
|
22
22
|
var bookingTicket = useBookingTicket();
|
|
23
23
|
var context = useEngineContext();
|
|
24
|
+
var platform = usePlatform();
|
|
24
25
|
var _useState = useState([]),
|
|
25
26
|
_useState2 = _slicedToArray(_useState, 2),
|
|
26
27
|
products = _useState2[0],
|
|
@@ -29,6 +30,7 @@ export var useProducts = function useProducts() {
|
|
|
29
30
|
_useState4 = _slicedToArray(_useState3, 2),
|
|
30
31
|
loading = _useState4[0],
|
|
31
32
|
setLoading = _useState4[1];
|
|
33
|
+
var isFirstLoadRef = useRef(true);
|
|
32
34
|
|
|
33
35
|
// 日程时间段列表 HH:mm格式
|
|
34
36
|
var _useState5 = useState([]),
|
|
@@ -39,23 +41,36 @@ export var useProducts = function useProducts() {
|
|
|
39
41
|
var paramsRef = useRef(undefined);
|
|
40
42
|
var getProducts = useMemoizedFn( /*#__PURE__*/function () {
|
|
41
43
|
var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(params) {
|
|
42
|
-
var
|
|
44
|
+
var _products, _notAvailableRef$curr;
|
|
43
45
|
return _regeneratorRuntime().wrap(function _callee$(_context) {
|
|
44
46
|
while (1) switch (_context.prev = _context.next) {
|
|
45
47
|
case 0:
|
|
46
48
|
setLoading(true);
|
|
49
|
+
_context.prev = 1;
|
|
47
50
|
paramsRef.current = params;
|
|
48
|
-
_context.next =
|
|
51
|
+
_context.next = 5;
|
|
49
52
|
return bookingTicket.loadProducts(params);
|
|
50
|
-
case
|
|
51
|
-
|
|
52
|
-
setProducts(
|
|
53
|
+
case 5:
|
|
54
|
+
_products = _context.sent;
|
|
55
|
+
setProducts(_products);
|
|
56
|
+
setLoading(false);
|
|
57
|
+
isFirstLoadRef.current = false;
|
|
58
|
+
_context.next = 16;
|
|
59
|
+
break;
|
|
60
|
+
case 11:
|
|
61
|
+
_context.prev = 11;
|
|
62
|
+
_context.t0 = _context["catch"](1);
|
|
63
|
+
// 只有在第一次加载或之前有数据时才显示 notAvailable
|
|
64
|
+
if ((_context.t0 === null || _context.t0 === void 0 ? void 0 : _context.t0.code) === 607100 && (isFirstLoadRef.current || products.length > 0)) {
|
|
65
|
+
(_notAvailableRef$curr = notAvailableRef.current) === null || _notAvailableRef$curr === void 0 || _notAvailableRef$curr.open();
|
|
66
|
+
}
|
|
53
67
|
setLoading(false);
|
|
54
|
-
|
|
68
|
+
isFirstLoadRef.current = false;
|
|
69
|
+
case 16:
|
|
55
70
|
case "end":
|
|
56
71
|
return _context.stop();
|
|
57
72
|
}
|
|
58
|
-
}, _callee);
|
|
73
|
+
}, _callee, null, [[1, 11]]);
|
|
59
74
|
}));
|
|
60
75
|
return function (_x) {
|
|
61
76
|
return _ref.apply(this, arguments);
|
|
@@ -64,6 +79,9 @@ export var useProducts = function useProducts() {
|
|
|
64
79
|
|
|
65
80
|
// 注册任务函数并在 scheduleTimePoints 改变时添加定时任务
|
|
66
81
|
useEffect(function () {
|
|
82
|
+
if (platform === 'shop') {
|
|
83
|
+
return;
|
|
84
|
+
}
|
|
67
85
|
try {
|
|
68
86
|
var _context$appHelper, _context$appHelper$ge;
|
|
69
87
|
var app = context === null || context === void 0 || (_context$appHelper = context.appHelper) === null || _context$appHelper === void 0 || (_context$appHelper = _context$appHelper.utils) === null || _context$appHelper === void 0 || (_context$appHelper$ge = _context$appHelper.getApp) === null || _context$appHelper$ge === void 0 ? void 0 : _context$appHelper$ge.call(_context$appHelper);
|
|
@@ -165,12 +183,18 @@ export var useProducts = function useProducts() {
|
|
|
165
183
|
return _regeneratorRuntime().wrap(function _callee3$(_context3) {
|
|
166
184
|
while (1) switch (_context3.prev = _context3.next) {
|
|
167
185
|
case 0:
|
|
168
|
-
|
|
169
|
-
|
|
186
|
+
if (!(platform === 'shop')) {
|
|
187
|
+
_context3.next = 2;
|
|
188
|
+
break;
|
|
189
|
+
}
|
|
190
|
+
return _context3.abrupt("return");
|
|
170
191
|
case 2:
|
|
192
|
+
_context3.next = 4;
|
|
193
|
+
return bookingTicket.getScheduleTimePoints(params);
|
|
194
|
+
case 4:
|
|
171
195
|
scheduleTimePoints = _context3.sent;
|
|
172
196
|
setScheduleTimePoints(scheduleTimePoints);
|
|
173
|
-
case
|
|
197
|
+
case 6:
|
|
174
198
|
case "end":
|
|
175
199
|
return _context3.stop();
|
|
176
200
|
}
|
|
@@ -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;
|
|
@@ -14,4 +14,11 @@ export var usePisellOS = function usePisellOS() {
|
|
|
14
14
|
pisellos = _ref.pisellos;
|
|
15
15
|
return pisellos;
|
|
16
16
|
};
|
|
17
|
+
export var usePlatform = function usePlatform() {
|
|
18
|
+
var _context$appHelper2;
|
|
19
|
+
var context = useEngineContext();
|
|
20
|
+
var _ref2 = (context === null || context === void 0 || (_context$appHelper2 = context.appHelper) === null || _context$appHelper2 === void 0 ? void 0 : _context$appHelper2.constants) || {},
|
|
21
|
+
platform = _ref2.platform;
|
|
22
|
+
return platform;
|
|
23
|
+
};
|
|
17
24
|
export default useEngineContext;
|
|
@@ -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 {};
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
/// <reference types="react" />
|
|
2
1
|
import { PosProps, RouteType } from './const';
|
|
3
2
|
declare const App: ({ action, api, device_number, terminal, tyroUrl, tyroVersion, onChangeParams, isMobile, channel, formatAmount, ...props }: Omit<PosProps, "type" | "mode" | "getApi"> & {
|
|
4
3
|
action: RouteType;
|
|
@@ -15,11 +15,11 @@ export declare const useStoreRef: <T extends {
|
|
|
15
15
|
readonly numRef: React.MutableRefObject<string | number | undefined>;
|
|
16
16
|
readonly orderIdRef: React.MutableRefObject<string | number>;
|
|
17
17
|
readonly modeRef: React.MutableRefObject<ModeEnum>;
|
|
18
|
-
readonly statusRef: React.MutableRefObject<"loading" | "
|
|
18
|
+
readonly statusRef: React.MutableRefObject<"loading" | "success" | "warn" | "fail" | "pedding" | "resove" | "reject" | "question">;
|
|
19
19
|
readonly netRef: React.MutableRefObject<boolean | undefined>;
|
|
20
20
|
readonly symbolRef: React.MutableRefObject<string>;
|
|
21
21
|
readonly amountRef: React.MutableRefObject<string | number>;
|
|
22
|
-
readonly eftposRef: React.MutableRefObject<"stripe" | "
|
|
22
|
+
readonly eftposRef: React.MutableRefObject<"stripe" | "tyro" | "windcave" | "payo" | "linkly">;
|
|
23
23
|
readonly clientRef: React.MutableRefObject<ClientEnum>;
|
|
24
24
|
readonly dataRef: React.MutableRefObject<import("./store").State>;
|
|
25
25
|
};
|