@pisell/private-materials 3.3.94 → 3.3.95
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/build/lowcode/assets-daily.json +11 -11
- package/build/lowcode/assets-dev.json +2 -2
- package/build/lowcode/assets-prod.json +11 -11
- package/build/lowcode/index.js +1 -1
- package/build/lowcode/meta.js +1 -1
- package/build/lowcode/preview.js +8 -8
- package/build/lowcode/render/default/view.css +1 -1
- package/build/lowcode/render/default/view.js +11 -11
- package/build/lowcode/view.css +1 -1
- package/build/lowcode/view.js +11 -11
- package/es/components/Sales/Cart/index.js +1 -5
- package/es/components/Sales/Cart/utils.d.ts +0 -40
- package/es/components/Sales/Cart/utils.js +0 -167
- package/es/components/Sales/Checkout/index.d.ts +0 -4
- package/es/components/Sales/Checkout/index.js +8 -52
- package/es/components/Sales/Checkout/serve.d.ts +0 -13
- package/es/components/Sales/Checkout/serve.js +2 -16
- package/es/components/Sales/Checkout/utils.js +1 -7
- package/es/components/Sales/Summary/index.d.ts +0 -10
- package/es/components/Sales/Summary/index.js +2 -17
- package/es/components/Sales/Summary/serve.d.ts +0 -1
- package/es/components/Sales/Summary/serve.js +0 -6
- package/es/components/Sales/Summary/utils.d.ts +0 -15
- package/es/components/Sales/Summary/utils.js +1 -43
- package/es/components/appointmentBooking/components/Cart/Item/index.less +3 -3
- package/es/components/appointmentBooking/components/Content/index.js +1 -15
- package/es/components/appointmentBooking/components/Content/index.less +1 -1
- package/es/components/appointmentBooking/components/Deposit/index.d.ts +0 -6
- package/es/components/appointmentBooking/components/Deposit/index.js +7 -27
- package/es/components/appointmentBooking/components/Services/index.js +27 -23
- package/es/components/appointmentBooking/deposit/components/PolicyModal/index.js +20 -25
- package/es/components/appointmentBooking/deposit/index.js +2 -4
- package/es/components/appointmentBooking/index.js +0 -14
- package/es/components/appointmentBooking/index.less +1 -1
- package/es/components/booking/components/voucher/index.js +2 -2
- package/es/components/eftposPay/component/step/index.d.ts +0 -1
- package/es/components/eftposPay/const.d.ts +1 -4
- package/es/components/eftposPay/const.js +1 -3
- package/es/components/eftposPay/hooks.d.ts +1 -1
- package/es/components/eftposPay/hooks.js +1 -3
- package/es/components/eftposPay/index.js +1 -1
- package/es/components/eftposPay/manufacturer.d.ts +0 -1
- package/es/components/eftposPay/manufacturer.js +0 -4
- package/es/components/eftposPay/pay.d.ts +1 -1
- package/es/components/eftposPay/pay.js +2 -6
- package/es/components/eftposPay/store/index.d.ts +1 -1
- package/es/components/eventBooking/components/Provider/Cart/ContinueButton/index.js +17 -29
- package/es/components/eventBooking/components/Provider/Cart/Item/Total.js +6 -10
- package/es/components/eventBooking/components/Provider/Cart/Item/index.js +2 -4
- package/es/components/eventBooking/components/bookingDetailModal/index.js +1 -3
- package/es/components/eventBooking/locales.d.ts +0 -24
- package/es/components/eventBooking/locales.js +3 -27
- package/es/components/index.d.ts +2 -2
- package/es/components/index.js +2 -2
- package/es/components/pay/toC/PaymentMethods/index.js +4 -5
- package/es/components/ticketBooking/components/addServiceVariant/addService.js +1 -1
- package/es/components/ticketBooking/components/ticketBooking/index.js +1 -120
- package/es/components/ticketBooking/locales.d.ts +146 -164
- package/es/components/ticketBooking/locales.js +147 -195
- package/es/index.d.ts +1 -1
- package/es/index.js +2 -2
- package/lib/components/Sales/Cart/index.js +0 -1
- package/lib/components/Sales/Cart/utils.d.ts +0 -40
- package/lib/components/Sales/Cart/utils.js +0 -117
- package/lib/components/Sales/Checkout/index.d.ts +0 -4
- package/lib/components/Sales/Checkout/index.js +7 -39
- package/lib/components/Sales/Checkout/serve.d.ts +0 -13
- package/lib/components/Sales/Checkout/serve.js +2 -7
- package/lib/components/Sales/Checkout/utils.js +0 -2
- package/lib/components/Sales/Summary/index.d.ts +0 -10
- package/lib/components/Sales/Summary/index.js +1 -7
- package/lib/components/Sales/Summary/serve.d.ts +0 -1
- package/lib/components/Sales/Summary/serve.js +0 -32
- package/lib/components/Sales/Summary/utils.d.ts +0 -15
- package/lib/components/Sales/Summary/utils.js +1 -30
- package/lib/components/appointmentBooking/components/Cart/Item/index.less +3 -3
- package/lib/components/appointmentBooking/components/Content/index.js +1 -6
- package/lib/components/appointmentBooking/components/Content/index.less +1 -1
- package/lib/components/appointmentBooking/components/Deposit/index.d.ts +0 -6
- package/lib/components/appointmentBooking/components/Deposit/index.js +4 -36
- package/lib/components/appointmentBooking/components/Services/index.js +11 -6
- package/lib/components/appointmentBooking/deposit/components/PolicyModal/index.js +4 -8
- package/lib/components/appointmentBooking/deposit/index.js +2 -4
- package/lib/components/appointmentBooking/index.js +0 -11
- package/lib/components/appointmentBooking/index.less +1 -1
- package/lib/components/booking/components/voucher/index.js +2 -2
- package/lib/components/eftposPay/component/step/index.d.ts +0 -1
- package/lib/components/eftposPay/const.d.ts +1 -4
- package/lib/components/eftposPay/const.js +0 -2
- package/lib/components/eftposPay/hooks.d.ts +1 -1
- package/lib/components/eftposPay/hooks.js +4 -11
- package/lib/components/eftposPay/index.js +1 -1
- package/lib/components/eftposPay/manufacturer.d.ts +0 -1
- package/lib/components/eftposPay/manufacturer.js +0 -6
- package/lib/components/eftposPay/pay.d.ts +1 -1
- package/lib/components/eftposPay/pay.js +2 -13
- package/lib/components/eftposPay/store/index.d.ts +1 -1
- package/lib/components/eventBooking/components/Provider/Cart/ContinueButton/index.js +3 -16
- package/lib/components/eventBooking/components/Provider/Cart/Item/Total.js +5 -8
- package/lib/components/eventBooking/components/Provider/Cart/Item/index.js +2 -4
- package/lib/components/eventBooking/components/bookingDetailModal/index.js +1 -1
- package/lib/components/eventBooking/locales.d.ts +0 -24
- package/lib/components/eventBooking/locales.js +3 -27
- package/lib/components/index.d.ts +2 -2
- package/lib/components/index.js +1 -1
- package/lib/components/pay/toC/PaymentMethods/index.js +9 -10
- package/lib/components/ticketBooking/components/addServiceVariant/addService.js +1 -1
- package/lib/components/ticketBooking/components/ticketBooking/index.js +1 -120
- package/lib/components/ticketBooking/locales.d.ts +146 -164
- package/lib/components/ticketBooking/locales.js +4 -22
- package/lib/index.d.ts +1 -1
- package/lib/index.js +1 -1
- package/package.json +4 -4
- package/es/components/eftposPay/linkly/const.d.ts +0 -23
- package/es/components/eftposPay/linkly/const.js +0 -82
- package/es/components/eftposPay/linkly/hooks/index.d.ts +0 -2
- package/es/components/eftposPay/linkly/hooks/index.js +0 -2
- package/es/components/eftposPay/linkly/hooks/normal.d.ts +0 -30
- package/es/components/eftposPay/linkly/hooks/normal.js +0 -321
- package/es/components/eftposPay/linkly/hooks/useTimeQuery.d.ts +0 -4
- package/es/components/eftposPay/linkly/hooks/useTimeQuery.js +0 -273
- package/es/components/eftposPay/linkly/index.d.ts +0 -2
- package/es/components/eftposPay/linkly/index.js +0 -197
- package/es/components/eftposPay/linkly/service.d.ts +0 -32
- package/es/components/eftposPay/linkly/service.js +0 -81
- package/es/components/eventBooking/components/Provider/Cart/Deposit/index.d.ts +0 -2
- package/es/components/eventBooking/components/Provider/Cart/Deposit/index.js +0 -17
- package/es/components/ticketBooking/utils/formatProductMessage.d.ts +0 -2
- package/es/components/ticketBooking/utils/formatProductMessage.js +0 -62
- package/es/components/ticketBooking/utils/formatTime.d.ts +0 -31
- package/es/components/ticketBooking/utils/formatTime.js +0 -144
- package/lib/components/eftposPay/linkly/const.d.ts +0 -23
- package/lib/components/eftposPay/linkly/const.js +0 -102
- package/lib/components/eftposPay/linkly/hooks/index.d.ts +0 -2
- package/lib/components/eftposPay/linkly/hooks/index.js +0 -25
- package/lib/components/eftposPay/linkly/hooks/normal.d.ts +0 -30
- package/lib/components/eftposPay/linkly/hooks/normal.js +0 -242
- package/lib/components/eftposPay/linkly/hooks/useTimeQuery.d.ts +0 -4
- package/lib/components/eftposPay/linkly/hooks/useTimeQuery.js +0 -222
- package/lib/components/eftposPay/linkly/index.d.ts +0 -2
- package/lib/components/eftposPay/linkly/index.js +0 -208
- package/lib/components/eftposPay/linkly/service.d.ts +0 -32
- package/lib/components/eftposPay/linkly/service.js +0 -55
- package/lib/components/eventBooking/components/Provider/Cart/Deposit/index.d.ts +0 -2
- package/lib/components/eventBooking/components/Provider/Cart/Deposit/index.js +0 -55
- package/lib/components/ticketBooking/utils/formatProductMessage.d.ts +0 -2
- package/lib/components/ticketBooking/utils/formatProductMessage.js +0 -84
- package/lib/components/ticketBooking/utils/formatTime.d.ts +0 -31
- package/lib/components/ticketBooking/utils/formatTime.js +0 -139
|
@@ -41,7 +41,6 @@ var import_useEngineContext = __toESM(require("../../../hooks/useEngineContext")
|
|
|
41
41
|
var import_ahooks = require("ahooks");
|
|
42
42
|
var import_serve = require("./serve");
|
|
43
43
|
var import_Cart = require("../Cart");
|
|
44
|
-
var import_utils = require("../../appointmentBooking/utils");
|
|
45
44
|
var defaultState = {};
|
|
46
45
|
var CheckoutContext = (0, import_react.createContext)(
|
|
47
46
|
void 0
|
|
@@ -55,7 +54,6 @@ var CheckoutProvider = ({
|
|
|
55
54
|
const { updateDisabledCartItem } = (0, import_Cart.useCart)();
|
|
56
55
|
const checkoutCallback = (0, import_react.useRef)(null);
|
|
57
56
|
const checkRef = (0, import_react.useRef)(null);
|
|
58
|
-
const payRef = (0, import_react.useRef)(null);
|
|
59
57
|
const checkBeforeBooking = (0, import_ahooks.useRequest)(import_serve.checkBeforeBookingApi, {
|
|
60
58
|
manual: true,
|
|
61
59
|
onSuccess: (res) => {
|
|
@@ -78,17 +76,6 @@ var CheckoutProvider = ({
|
|
|
78
76
|
checkoutCallback.current({ success: false, err });
|
|
79
77
|
}
|
|
80
78
|
});
|
|
81
|
-
const freePay = (0, import_ahooks.useRequest)(import_serve.freePayApi, {
|
|
82
|
-
manual: true,
|
|
83
|
-
onSuccess: (res) => {
|
|
84
|
-
var _a, _b;
|
|
85
|
-
if (res == null ? void 0 : res.status) {
|
|
86
|
-
goPaymentFinish((_a = payRef.current) == null ? void 0 : _a.order_id, (_b = payRef.current) == null ? void 0 : _b.total_amount);
|
|
87
|
-
} else {
|
|
88
|
-
(0, import_utils.Toast)(res == null ? void 0 : res.message);
|
|
89
|
-
}
|
|
90
|
-
}
|
|
91
|
-
});
|
|
92
79
|
const onCheckBeforeBooking = (data2) => {
|
|
93
80
|
return new Promise((resolve) => {
|
|
94
81
|
checkRef.current = (res) => {
|
|
@@ -107,40 +94,21 @@ var CheckoutProvider = ({
|
|
|
107
94
|
createBooking.runAsync(data2);
|
|
108
95
|
});
|
|
109
96
|
};
|
|
110
|
-
const goPaymentFinish = (order_id, amount) => {
|
|
111
|
-
var _a;
|
|
112
|
-
const url = `/payment-finish/success?order_id=${order_id}&amount=${Number(
|
|
113
|
-
amount
|
|
114
|
-
)}`;
|
|
115
|
-
(_a = utils == null ? void 0 : utils.history) == null ? void 0 : _a.replace(url);
|
|
116
|
-
};
|
|
117
97
|
const onPay = (payProps) => {
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
type: "pisell1.payment",
|
|
124
|
-
data: { ...payProps, total_amount: _total },
|
|
125
|
-
callback: (e) => {
|
|
126
|
-
checkoutCallback.current && checkoutCallback.current(e);
|
|
127
|
-
}
|
|
128
|
-
});
|
|
129
|
-
} else {
|
|
130
|
-
if (is_deposit) {
|
|
131
|
-
goPaymentFinish(payProps.order_id, _total);
|
|
132
|
-
return;
|
|
98
|
+
utils.action({
|
|
99
|
+
type: "pisell1.payment",
|
|
100
|
+
data: payProps,
|
|
101
|
+
callback: (e) => {
|
|
102
|
+
checkoutCallback.current && checkoutCallback.current(e);
|
|
133
103
|
}
|
|
134
|
-
|
|
135
|
-
}
|
|
104
|
+
});
|
|
136
105
|
};
|
|
137
106
|
const contextValue = {
|
|
138
107
|
onCheckBeforeBooking,
|
|
139
108
|
onCheckout,
|
|
140
109
|
onPay,
|
|
141
110
|
createBooking,
|
|
142
|
-
checkBeforeBooking
|
|
143
|
-
freePay
|
|
111
|
+
checkBeforeBooking
|
|
144
112
|
};
|
|
145
113
|
return /* @__PURE__ */ import_react.default.createElement(CheckoutContext.Provider, { value: contextValue }, children);
|
|
146
114
|
};
|
|
@@ -1,15 +1,2 @@
|
|
|
1
|
-
/**
|
|
2
|
-
* @title: 下单前置校验接口
|
|
3
|
-
* @param {any} data
|
|
4
|
-
*/
|
|
5
1
|
export declare const checkBeforeBookingApi: (data: any) => Promise<any>;
|
|
6
|
-
/**
|
|
7
|
-
* @title: 创建订单
|
|
8
|
-
* @param {any} data
|
|
9
|
-
*/
|
|
10
2
|
export declare const createBookingApi: (data: any) => Promise<any>;
|
|
11
|
-
/**
|
|
12
|
-
* @title: 免费支付
|
|
13
|
-
* @param {string} orderId
|
|
14
|
-
*/
|
|
15
|
-
export declare const freePayApi: (orderId: string) => Promise<any>;
|
|
@@ -20,8 +20,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
|
|
|
20
20
|
var serve_exports = {};
|
|
21
21
|
__export(serve_exports, {
|
|
22
22
|
checkBeforeBookingApi: () => checkBeforeBookingApi,
|
|
23
|
-
createBookingApi: () => createBookingApi
|
|
24
|
-
freePayApi: () => freePayApi
|
|
23
|
+
createBookingApi: () => createBookingApi
|
|
25
24
|
});
|
|
26
25
|
module.exports = __toCommonJS(serve_exports);
|
|
27
26
|
var import_utils = require("../../../utils");
|
|
@@ -31,12 +30,8 @@ var checkBeforeBookingApi = (data) => {
|
|
|
31
30
|
var createBookingApi = (data) => {
|
|
32
31
|
return import_utils.request.getRequest().post("/h5/eventbookingv2/order", data);
|
|
33
32
|
};
|
|
34
|
-
var freePayApi = (orderId) => {
|
|
35
|
-
return import_utils.request.getRequest().post(`/h5/pay/order/free-pay/${orderId}`, {});
|
|
36
|
-
};
|
|
37
33
|
// Annotate the CommonJS export names for ESM import in node:
|
|
38
34
|
0 && (module.exports = {
|
|
39
35
|
checkBeforeBookingApi,
|
|
40
|
-
createBookingApi
|
|
41
|
-
freePayApi
|
|
36
|
+
createBookingApi
|
|
42
37
|
});
|
|
@@ -79,8 +79,6 @@ var formatValues = (state, excludeDisabled, otherValue) => {
|
|
|
79
79
|
} else {
|
|
80
80
|
data = state.cartData.cartItems;
|
|
81
81
|
}
|
|
82
|
-
const is_deposit = data.find((v) => v.deposit) ? 1 : 0;
|
|
83
|
-
values.is_deposit = is_deposit;
|
|
84
82
|
values.bookings = formatBookings(data);
|
|
85
83
|
return values;
|
|
86
84
|
};
|
|
@@ -7,16 +7,6 @@ interface SummaryContextType {
|
|
|
7
7
|
taxTitle?: string;
|
|
8
8
|
totalTaxFee?: string;
|
|
9
9
|
isPriceIncludeTax?: 0 | 1;
|
|
10
|
-
deposit?: {
|
|
11
|
-
total: string;
|
|
12
|
-
protocols: any[];
|
|
13
|
-
hasDeposit: boolean;
|
|
14
|
-
};
|
|
15
|
-
isAgreeDepositPolicy: boolean;
|
|
16
|
-
setIsAgreeDepositPolicy: (value: boolean) => void;
|
|
17
|
-
getDepositProtocol: (params: {
|
|
18
|
-
id: string;
|
|
19
|
-
}) => Promise<any>;
|
|
20
10
|
}
|
|
21
11
|
interface SummaryProviderProps {
|
|
22
12
|
children: React.ReactNode;
|
|
@@ -39,7 +39,6 @@ var import_react = __toESM(require("react"));
|
|
|
39
39
|
var import_Cart = require("../Cart");
|
|
40
40
|
var import_utils = require("./utils");
|
|
41
41
|
var import_Init = require("../Init");
|
|
42
|
-
var import_serve = require("./serve");
|
|
43
42
|
var defaultState = {};
|
|
44
43
|
var SummaryContext = (0, import_react.createContext)(
|
|
45
44
|
void 0
|
|
@@ -49,7 +48,6 @@ var SummaryProvider = ({
|
|
|
49
48
|
}) => {
|
|
50
49
|
const { cartData } = (0, import_Cart.useCart)();
|
|
51
50
|
const { initData } = (0, import_Init.useInit)();
|
|
52
|
-
const [isAgreeDepositPolicy, setIsAgreeDepositPolicy] = (0, import_react.useState)(false);
|
|
53
51
|
const summaryData = (0, import_react.useMemo)(() => {
|
|
54
52
|
return (0, import_utils.calculatePriceDetails)(
|
|
55
53
|
(initData == null ? void 0 : initData.shop) || {},
|
|
@@ -63,11 +61,7 @@ var SummaryProvider = ({
|
|
|
63
61
|
total: summaryData.total,
|
|
64
62
|
taxTitle: summaryData.taxTitle,
|
|
65
63
|
totalTaxFee: summaryData.totalTaxFee,
|
|
66
|
-
isPriceIncludeTax: summaryData.isPriceIncludeTax
|
|
67
|
-
deposit: summaryData.deposit,
|
|
68
|
-
isAgreeDepositPolicy,
|
|
69
|
-
setIsAgreeDepositPolicy,
|
|
70
|
-
getDepositProtocol: import_serve.getDepositProtocolApi
|
|
64
|
+
isPriceIncludeTax: summaryData.isPriceIncludeTax
|
|
71
65
|
};
|
|
72
66
|
return /* @__PURE__ */ import_react.default.createElement(SummaryContext.Provider, { value: contextValue }, children);
|
|
73
67
|
};
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
export declare const getDepositProtocolApi: (id: string) => Promise<any>;
|
|
@@ -1,32 +0,0 @@
|
|
|
1
|
-
var __defProp = Object.defineProperty;
|
|
2
|
-
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
|
3
|
-
var __getOwnPropNames = Object.getOwnPropertyNames;
|
|
4
|
-
var __hasOwnProp = Object.prototype.hasOwnProperty;
|
|
5
|
-
var __export = (target, all) => {
|
|
6
|
-
for (var name in all)
|
|
7
|
-
__defProp(target, name, { get: all[name], enumerable: true });
|
|
8
|
-
};
|
|
9
|
-
var __copyProps = (to, from, except, desc) => {
|
|
10
|
-
if (from && typeof from === "object" || typeof from === "function") {
|
|
11
|
-
for (let key of __getOwnPropNames(from))
|
|
12
|
-
if (!__hasOwnProp.call(to, key) && key !== except)
|
|
13
|
-
__defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
|
|
14
|
-
}
|
|
15
|
-
return to;
|
|
16
|
-
};
|
|
17
|
-
var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
|
|
18
|
-
|
|
19
|
-
// src/components/Sales/Summary/serve.ts
|
|
20
|
-
var serve_exports = {};
|
|
21
|
-
__export(serve_exports, {
|
|
22
|
-
getDepositProtocolApi: () => getDepositProtocolApi
|
|
23
|
-
});
|
|
24
|
-
module.exports = __toCommonJS(serve_exports);
|
|
25
|
-
var import_utils = require("../../../utils");
|
|
26
|
-
var getDepositProtocolApi = (id) => {
|
|
27
|
-
return import_utils.request.getRequest().get(`/h5/shop-policy/${id}`, {});
|
|
28
|
-
};
|
|
29
|
-
// Annotate the CommonJS export names for ESM import in node:
|
|
30
|
-
0 && (module.exports = {
|
|
31
|
-
getDepositProtocolApi
|
|
32
|
-
});
|
|
@@ -10,11 +10,6 @@ interface PriceDetail {
|
|
|
10
10
|
taxTitle?: string;
|
|
11
11
|
totalTaxFee?: string;
|
|
12
12
|
isPriceIncludeTax?: 0 | 1;
|
|
13
|
-
deposit?: {
|
|
14
|
-
total: string;
|
|
15
|
-
protocols: any[];
|
|
16
|
-
hasDeposit: boolean;
|
|
17
|
-
};
|
|
18
13
|
}
|
|
19
14
|
/**
|
|
20
15
|
* 计算商品小计(不含其他费用)
|
|
@@ -38,14 +33,4 @@ export declare const calculateTaxFee: (shopInfo: any, items: CartItem[]) => "0.0
|
|
|
38
33
|
* @returns 价格明细对象
|
|
39
34
|
*/
|
|
40
35
|
export declare const calculatePriceDetails: (shopInfo: any, items: CartItem[]) => PriceDetail;
|
|
41
|
-
/**
|
|
42
|
-
* @title: 计算定金
|
|
43
|
-
* @param items - 购物车商品数组
|
|
44
|
-
* @returns 定金字符串,保留2位小数
|
|
45
|
-
*/
|
|
46
|
-
export declare const calculateDeposit: (items: CartItem[]) => {
|
|
47
|
-
total: string;
|
|
48
|
-
protocols: any[];
|
|
49
|
-
hasDeposit: never;
|
|
50
|
-
} | undefined;
|
|
51
36
|
export {};
|
|
@@ -29,7 +29,6 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
|
|
|
29
29
|
// src/components/Sales/Summary/utils.ts
|
|
30
30
|
var utils_exports = {};
|
|
31
31
|
__export(utils_exports, {
|
|
32
|
-
calculateDeposit: () => calculateDeposit,
|
|
33
32
|
calculatePriceDetails: () => calculatePriceDetails,
|
|
34
33
|
calculateSubtotal: () => calculateSubtotal,
|
|
35
34
|
calculateTaxFee: () => calculateTaxFee
|
|
@@ -66,44 +65,16 @@ var calculatePriceDetails = (shopInfo, items) => {
|
|
|
66
65
|
const totalTaxFee = new import_decimal.default(calculateTaxFee(shopInfo, items));
|
|
67
66
|
console.log("totalTaxFee", totalTaxFee.toFixed(2));
|
|
68
67
|
const total = (shopInfo == null ? void 0 : shopInfo.is_price_include_tax) ? subtotal : subtotal.plus(totalTaxFee);
|
|
69
|
-
const deposit = calculateDeposit(items);
|
|
70
68
|
return {
|
|
71
69
|
subtotal: subtotal.toFixed(2),
|
|
72
70
|
total: total.toFixed(2),
|
|
73
71
|
taxTitle: shopInfo == null ? void 0 : shopInfo.tax_title,
|
|
74
72
|
totalTaxFee: totalTaxFee.toFixed(2),
|
|
75
|
-
isPriceIncludeTax: shopInfo == null ? void 0 : shopInfo.is_price_include_tax
|
|
76
|
-
deposit
|
|
73
|
+
isPriceIncludeTax: shopInfo == null ? void 0 : shopInfo.is_price_include_tax
|
|
77
74
|
};
|
|
78
75
|
};
|
|
79
|
-
var calculateDeposit = (items) => {
|
|
80
|
-
if (!(items == null ? void 0 : items.length)) {
|
|
81
|
-
return void 0;
|
|
82
|
-
}
|
|
83
|
-
const protocols = [];
|
|
84
|
-
let hasDeposit = false;
|
|
85
|
-
const total = items.reduce((sum, item) => {
|
|
86
|
-
var _a, _b, _c;
|
|
87
|
-
if (item == null ? void 0 : item.deposit) {
|
|
88
|
-
hasDeposit = true;
|
|
89
|
-
const cartItemTotalPrice = new import_decimal.default(((_a = item == null ? void 0 : item.deposit) == null ? void 0 : _a.total) || 0);
|
|
90
|
-
(_c = (_b = item == null ? void 0 : item.deposit) == null ? void 0 : _b.protocols) == null ? void 0 : _c.forEach((protocol) => {
|
|
91
|
-
if (protocols.findIndex((p) => p.id === protocol.id) === -1) {
|
|
92
|
-
protocols.push(protocol);
|
|
93
|
-
}
|
|
94
|
-
});
|
|
95
|
-
return sum.plus(cartItemTotalPrice);
|
|
96
|
-
}
|
|
97
|
-
return sum;
|
|
98
|
-
}, new import_decimal.default(0));
|
|
99
|
-
if (hasDeposit) {
|
|
100
|
-
return { total: total.toFixed(2), protocols, hasDeposit };
|
|
101
|
-
}
|
|
102
|
-
return void 0;
|
|
103
|
-
};
|
|
104
76
|
// Annotate the CommonJS export names for ESM import in node:
|
|
105
77
|
0 && (module.exports = {
|
|
106
|
-
calculateDeposit,
|
|
107
78
|
calculatePriceDetails,
|
|
108
79
|
calculateSubtotal,
|
|
109
80
|
calculateTaxFee
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
.appointment-cart-item-wrap {
|
|
2
|
-
height: calc(
|
|
2
|
+
height: calc(100vh - 100px);
|
|
3
3
|
display: flex;
|
|
4
4
|
flex-direction: column;
|
|
5
5
|
|
|
@@ -39,7 +39,7 @@
|
|
|
39
39
|
flex-direction: column;
|
|
40
40
|
align-items: start;
|
|
41
41
|
|
|
42
|
-
>
|
|
42
|
+
>div {
|
|
43
43
|
display: flex;
|
|
44
44
|
align-items: center;
|
|
45
45
|
justify-content: space-between;
|
|
@@ -105,4 +105,4 @@
|
|
|
105
105
|
flex: none;
|
|
106
106
|
z-index: 10;
|
|
107
107
|
}
|
|
108
|
-
}
|
|
108
|
+
}
|
|
@@ -190,10 +190,6 @@ var Layout = () => {
|
|
|
190
190
|
if (isDateSelectedFirst && key === "select-date") return false;
|
|
191
191
|
return key !== "confirm-information";
|
|
192
192
|
}, [isDateSelectedFirst, (_e = currentStep == null ? void 0 : currentStep.step) == null ? void 0 : _e.key]);
|
|
193
|
-
const depositProtocolRequest = (id) => {
|
|
194
|
-
var _a2;
|
|
195
|
-
return (_a2 = appointmentBooking == null ? void 0 : appointmentBooking.getProtocol) == null ? void 0 : _a2.call(appointmentBooking, id);
|
|
196
|
-
};
|
|
197
193
|
return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, !isRetailTemplate ? /* @__PURE__ */ import_react.default.createElement(import_Header.default, null) : null, /* @__PURE__ */ import_react.default.createElement(
|
|
198
194
|
"div",
|
|
199
195
|
{
|
|
@@ -218,8 +214,7 @@ var Layout = () => {
|
|
|
218
214
|
onConfirm: () => closePolicy(true),
|
|
219
215
|
item: policyParams == null ? void 0 : policyParams.content,
|
|
220
216
|
onChange: () => setLoading(false),
|
|
221
|
-
isHideCheckout: false
|
|
222
|
-
depositProtocolRequest
|
|
217
|
+
isHideCheckout: false
|
|
223
218
|
}
|
|
224
219
|
) : null);
|
|
225
220
|
};
|
|
@@ -1,9 +1,3 @@
|
|
|
1
1
|
import './index.less';
|
|
2
|
-
export declare const DepositContent: (props: {
|
|
3
|
-
isAgreeDepositPolicy: boolean;
|
|
4
|
-
setIsAgreeDepositPolicy: (value: boolean) => void;
|
|
5
|
-
deposit: any;
|
|
6
|
-
depositProtocolRequest?: any;
|
|
7
|
-
}) => JSX.Element;
|
|
8
2
|
declare const Deposit: () => JSX.Element;
|
|
9
3
|
export default Deposit;
|
|
@@ -29,7 +29,6 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
|
|
|
29
29
|
// src/components/appointmentBooking/components/Deposit/index.tsx
|
|
30
30
|
var Deposit_exports = {};
|
|
31
31
|
__export(Deposit_exports, {
|
|
32
|
-
DepositContent: () => DepositContent,
|
|
33
32
|
default: () => Deposit_default
|
|
34
33
|
});
|
|
35
34
|
module.exports = __toCommonJS(Deposit_exports);
|
|
@@ -39,13 +38,9 @@ var import_deposit = __toESM(require("../../deposit"));
|
|
|
39
38
|
var import_context = require("../../context");
|
|
40
39
|
var import_utils = require("@pisell/utils");
|
|
41
40
|
var import_index = require("./index.less");
|
|
42
|
-
var
|
|
43
|
-
const {
|
|
44
|
-
|
|
45
|
-
setIsAgreeDepositPolicy,
|
|
46
|
-
deposit,
|
|
47
|
-
depositProtocolRequest
|
|
48
|
-
} = props;
|
|
41
|
+
var Deposit = () => {
|
|
42
|
+
const { setIsAgreeDepositPolicy, isAgreeDepositPolicy, summary } = (0, import_context.useAppointmentBookingContext)();
|
|
43
|
+
const { deposit } = summary;
|
|
49
44
|
return /* @__PURE__ */ import_react.default.createElement("div", { className: "appointment-deposit-wrap" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "appointment-deposit-top" }, /* @__PURE__ */ import_react.default.createElement("span", null, import_utils.locales.getText("pisell2.appointment.deposit")), /* @__PURE__ */ import_react.default.createElement(
|
|
50
45
|
import_materials.PisellText.Amount,
|
|
51
46
|
{
|
|
@@ -59,35 +54,8 @@ var DepositContent = (props) => {
|
|
|
59
54
|
total: deposit == null ? void 0 : deposit.total,
|
|
60
55
|
protocols: deposit == null ? void 0 : deposit.protocols,
|
|
61
56
|
isAgreePolicy: isAgreeDepositPolicy,
|
|
62
|
-
onChange: (value) => setIsAgreeDepositPolicy(value)
|
|
63
|
-
depositProtocolRequest
|
|
57
|
+
onChange: (value) => setIsAgreeDepositPolicy(value)
|
|
64
58
|
}
|
|
65
59
|
));
|
|
66
60
|
};
|
|
67
|
-
var Deposit = () => {
|
|
68
|
-
const {
|
|
69
|
-
setIsAgreeDepositPolicy,
|
|
70
|
-
isAgreeDepositPolicy,
|
|
71
|
-
summary,
|
|
72
|
-
appointmentBooking
|
|
73
|
-
} = (0, import_context.useAppointmentBookingContext)();
|
|
74
|
-
const { deposit } = summary;
|
|
75
|
-
const depositProtocolRequest = (id) => {
|
|
76
|
-
var _a;
|
|
77
|
-
return (_a = appointmentBooking == null ? void 0 : appointmentBooking.getProtocol) == null ? void 0 : _a.call(appointmentBooking, id);
|
|
78
|
-
};
|
|
79
|
-
return /* @__PURE__ */ import_react.default.createElement(
|
|
80
|
-
DepositContent,
|
|
81
|
-
{
|
|
82
|
-
isAgreeDepositPolicy: !!isAgreeDepositPolicy,
|
|
83
|
-
setIsAgreeDepositPolicy,
|
|
84
|
-
deposit,
|
|
85
|
-
depositProtocolRequest
|
|
86
|
-
}
|
|
87
|
-
);
|
|
88
|
-
};
|
|
89
61
|
var Deposit_default = Deposit;
|
|
90
|
-
// Annotate the CommonJS export names for ESM import in node:
|
|
91
|
-
0 && (module.exports = {
|
|
92
|
-
DepositContent
|
|
93
|
-
});
|
|
@@ -74,7 +74,9 @@ var Services = (0, import_react.forwardRef)((props, ref) => {
|
|
|
74
74
|
let type = "";
|
|
75
75
|
if (!isRetailTemplate) {
|
|
76
76
|
type = await checkProductType(item == null ? void 0 : item.id);
|
|
77
|
-
|
|
77
|
+
if (type === "session") {
|
|
78
|
+
appointmentBooking.openProductDetail(item.id);
|
|
79
|
+
}
|
|
78
80
|
}
|
|
79
81
|
utils == null ? void 0 : utils.action({
|
|
80
82
|
type: "pisell1.productDetail",
|
|
@@ -84,10 +86,6 @@ var Services = (0, import_react.forwardRef)((props, ref) => {
|
|
|
84
86
|
},
|
|
85
87
|
callback: async (data) => {
|
|
86
88
|
var _a, _b;
|
|
87
|
-
if (data.isCancel) {
|
|
88
|
-
appointmentBooking.closeProductDetail();
|
|
89
|
-
return;
|
|
90
|
-
}
|
|
91
89
|
const product = {
|
|
92
90
|
...data,
|
|
93
91
|
options: (data == null ? void 0 : data.option) || []
|
|
@@ -98,6 +96,13 @@ var Services = (0, import_react.forwardRef)((props, ref) => {
|
|
|
98
96
|
appointmentBooking.storeProduct(product);
|
|
99
97
|
return;
|
|
100
98
|
}
|
|
99
|
+
if (data == null ? void 0 : data.isCancel) {
|
|
100
|
+
if (type === "session") {
|
|
101
|
+
appointmentBooking.closeProductDetail();
|
|
102
|
+
appointmentBooking.getAvailableDate();
|
|
103
|
+
}
|
|
104
|
+
return;
|
|
105
|
+
}
|
|
101
106
|
const session = data == null ? void 0 : data.session;
|
|
102
107
|
if (session) {
|
|
103
108
|
const startDate = (0, import_dayjs.default)(session == null ? void 0 : session.start_at).format("YYYY-MM-DD");
|
|
@@ -109,6 +114,7 @@ var Services = (0, import_react.forwardRef)((props, ref) => {
|
|
|
109
114
|
endTime: `${endDate} ${session == null ? void 0 : session.end_time}`
|
|
110
115
|
}
|
|
111
116
|
});
|
|
117
|
+
appointmentBooking.closeProductDetail();
|
|
112
118
|
await appointmentBooking.getAvailableDate({
|
|
113
119
|
startDate,
|
|
114
120
|
endDate
|
|
@@ -126,7 +132,6 @@ var Services = (0, import_react.forwardRef)((props, ref) => {
|
|
|
126
132
|
await appointmentBooking.getAvailableDate();
|
|
127
133
|
}
|
|
128
134
|
}
|
|
129
|
-
appointmentBooking.closeProductDetail();
|
|
130
135
|
if (isDateSelectedFirst) {
|
|
131
136
|
const index = (currentStep == null ? void 0 : currentStep.index) + 2;
|
|
132
137
|
if (type === "duration" || appointmentBooking.isCartHasDurationProduct()) {
|
|
@@ -36,6 +36,7 @@ var import_react = __toESM(require("react"));
|
|
|
36
36
|
var import_antd = require("antd");
|
|
37
37
|
var import_materials = require("@pisell/materials");
|
|
38
38
|
var import_utils = require("@pisell/utils");
|
|
39
|
+
var import_context = require("../../../context");
|
|
39
40
|
var import_index = require("./index.less");
|
|
40
41
|
var DepositModal = (props) => {
|
|
41
42
|
const {
|
|
@@ -44,10 +45,9 @@ var DepositModal = (props) => {
|
|
|
44
45
|
item,
|
|
45
46
|
onChange,
|
|
46
47
|
onConfirm,
|
|
47
|
-
isHideCheckout = true
|
|
48
|
-
depositProtocolRequest
|
|
49
|
-
// 定金协议请求
|
|
48
|
+
isHideCheckout = true
|
|
50
49
|
} = props;
|
|
50
|
+
const { appointmentBooking } = (0, import_context.useAppointmentBookingContext)();
|
|
51
51
|
const [policy, setPolicy] = (0, import_react.useState)(null);
|
|
52
52
|
const [loading, setLoading] = (0, import_react.useState)(false);
|
|
53
53
|
const [disabled, setDisabled] = (0, import_react.useState)(false);
|
|
@@ -55,13 +55,9 @@ var DepositModal = (props) => {
|
|
|
55
55
|
setDisabled(!isHideCheckout);
|
|
56
56
|
}, [isHideCheckout]);
|
|
57
57
|
const getPolicy = async (id) => {
|
|
58
|
-
if (!depositProtocolRequest) {
|
|
59
|
-
console.error("depositProtocolRequest is not defined");
|
|
60
|
-
return;
|
|
61
|
-
}
|
|
62
58
|
setLoading(true);
|
|
63
59
|
try {
|
|
64
|
-
const { data } = await (
|
|
60
|
+
const { data } = await appointmentBooking.getProtocol(id);
|
|
65
61
|
setPolicy(data);
|
|
66
62
|
onChange && onChange(data);
|
|
67
63
|
} catch (error) {
|
|
@@ -48,8 +48,7 @@ var Deposit = (props) => {
|
|
|
48
48
|
title,
|
|
49
49
|
isAgreePolicy = true,
|
|
50
50
|
isShowTitle = true,
|
|
51
|
-
onChange
|
|
52
|
-
depositProtocolRequest
|
|
51
|
+
onChange
|
|
53
52
|
} = props;
|
|
54
53
|
const context = (0, import_useEngineContext.default)();
|
|
55
54
|
const [visible, setVisible] = (0, import_react.useState)(false);
|
|
@@ -103,8 +102,7 @@ var Deposit = (props) => {
|
|
|
103
102
|
{
|
|
104
103
|
open: visible,
|
|
105
104
|
onCancel: () => setVisible(false),
|
|
106
|
-
item: policyItem
|
|
107
|
-
depositProtocolRequest
|
|
105
|
+
item: policyItem
|
|
108
106
|
}
|
|
109
107
|
));
|
|
110
108
|
};
|
|
@@ -58,17 +58,6 @@ var AppointmentBooking = () => {
|
|
|
58
58
|
}
|
|
59
59
|
});
|
|
60
60
|
}, []);
|
|
61
|
-
(0, import_react.useEffect)(() => {
|
|
62
|
-
const setRealVH = () => {
|
|
63
|
-
const vh = window.innerHeight * 0.01;
|
|
64
|
-
document.documentElement.style.setProperty("--vh", `${vh}px`);
|
|
65
|
-
};
|
|
66
|
-
setRealVH();
|
|
67
|
-
window.addEventListener("resize", setRealVH);
|
|
68
|
-
return () => {
|
|
69
|
-
window.removeEventListener("resize", setRealVH);
|
|
70
|
-
};
|
|
71
|
-
}, []);
|
|
72
61
|
return /* @__PURE__ */ import_react.default.createElement(
|
|
73
62
|
"div",
|
|
74
63
|
{
|
|
@@ -41,8 +41,8 @@ var import_useEngineContext = __toESM(require("../../../../hooks/useEngineContex
|
|
|
41
41
|
var import_materials = require("@pisell/materials");
|
|
42
42
|
var import_useIsBooking4Shop = require("../../hooks/useIsBooking4Shop");
|
|
43
43
|
var import_index = require("./index.less");
|
|
44
|
-
var import_ahooks = require("ahooks");
|
|
45
44
|
var import_utils2 = require("./utils");
|
|
45
|
+
var import_ahooks = require("ahooks");
|
|
46
46
|
var ShopDiscountHooks = {
|
|
47
47
|
onInited: "shopDiscount:onInited",
|
|
48
48
|
onDestroy: "shopDiscount:onDestroy",
|
|
@@ -274,8 +274,8 @@ var VoucherCard = (props) => {
|
|
|
274
274
|
import_materials.PisellGoodPassCard,
|
|
275
275
|
{
|
|
276
276
|
style: { width: "100%" },
|
|
277
|
-
dataSource: ((_d = (_c = state.service) == null ? void 0 : _c.value) == null ? void 0 : _d.length) ? availableData : [],
|
|
278
277
|
mixedSort,
|
|
278
|
+
dataSource: ((_d = (_c = state.service) == null ? void 0 : _c.value) == null ? void 0 : _d.length) ? availableData : [],
|
|
279
279
|
onChange: (val) => {
|
|
280
280
|
const shopDiscount2 = pisellos.getModule("shopDiscount");
|
|
281
281
|
const detail = shopDiscount2.setDiscountSelected({
|
|
@@ -5,8 +5,7 @@ export declare enum EftposEnum {
|
|
|
5
5
|
Tyro = "tyro",
|
|
6
6
|
/** 后端支付 - 支付 + 退款 */
|
|
7
7
|
Windcave = "windcave",
|
|
8
|
-
Stripe = "stripe"
|
|
9
|
-
Linkly = "linkly"
|
|
8
|
+
Stripe = "stripe"
|
|
10
9
|
}
|
|
11
10
|
export declare enum StatusEnum {
|
|
12
11
|
Loading = "loading",
|
|
@@ -148,8 +147,6 @@ export declare enum PayStatus {
|
|
|
148
147
|
'Success' = "200",
|
|
149
148
|
/** 未生成交易记录 */
|
|
150
149
|
'NoPay' = "4004",
|
|
151
|
-
/** 配对失效 */
|
|
152
|
-
'PairingFailure' = "606020",
|
|
153
150
|
/** 支付失败 */
|
|
154
151
|
'Unknown' = "701000",
|
|
155
152
|
/** 交易请求超时 */
|
|
@@ -35,7 +35,6 @@ var EftposEnum = /* @__PURE__ */ ((EftposEnum2) => {
|
|
|
35
35
|
EftposEnum2["Tyro"] = "tyro";
|
|
36
36
|
EftposEnum2["Windcave"] = "windcave";
|
|
37
37
|
EftposEnum2["Stripe"] = "stripe";
|
|
38
|
-
EftposEnum2["Linkly"] = "linkly";
|
|
39
38
|
return EftposEnum2;
|
|
40
39
|
})(EftposEnum || {});
|
|
41
40
|
var StatusEnum = /* @__PURE__ */ ((StatusEnum2) => {
|
|
@@ -89,7 +88,6 @@ var PayRouteEnum = /* @__PURE__ */ ((PayRouteEnum2) => {
|
|
|
89
88
|
var PayStatus = /* @__PURE__ */ ((PayStatus2) => {
|
|
90
89
|
PayStatus2["Success"] = "200";
|
|
91
90
|
PayStatus2["NoPay"] = "4004";
|
|
92
|
-
PayStatus2["PairingFailure"] = "606020";
|
|
93
91
|
PayStatus2["Unknown"] = "701000";
|
|
94
92
|
PayStatus2["Timeout"] = "701001";
|
|
95
93
|
PayStatus2["PayOtherEftposFailed"] = "701003";
|
|
@@ -19,7 +19,7 @@ export declare const useStoreRef: <T extends {
|
|
|
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<"tyro" | "windcave" | "stripe" | "payo"
|
|
22
|
+
readonly eftposRef: React.MutableRefObject<"tyro" | "windcave" | "stripe" | "payo">;
|
|
23
23
|
readonly clientRef: React.MutableRefObject<ClientEnum>;
|
|
24
24
|
readonly dataRef: React.MutableRefObject<import("./store").State>;
|
|
25
25
|
};
|