@pisell/private-materials 3.4.72 → 3.4.73
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/Sales/Cart/index.d.ts +1 -1
- package/es/components/Sales/Cart/index.js +18 -3
- package/es/components/Sales/Checkout/utils.js +57 -1
- package/es/components/Sales/Summary/index.d.ts +2 -0
- package/es/components/Sales/Summary/index.js +7 -2
- package/es/components/Sales/Summary/utils.d.ts +10 -3
- package/es/components/Sales/Summary/utils.js +57 -10
- package/es/components/appointmentBooking/components/Cart/Item/Total.d.ts +0 -1
- package/es/components/appointmentBooking/components/Cart/Item/index.js +62 -4
- package/es/components/appointmentBooking/components/Cart/index.d.ts +0 -1
- package/es/components/appointmentBooking/components/Deposit/index.d.ts +5 -2
- package/es/components/appointmentBooking/components/Deposit/index.js +9 -4
- package/es/components/appointmentBooking/components/Footer/index.d.ts +0 -1
- package/es/components/appointmentBooking/components/Guest/components/InformationOptionsModal/index.d.ts +0 -1
- 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/hooks/useClearCart.d.ts +0 -1
- package/es/components/booking/info/dateRange/index.d.ts +0 -1
- package/es/components/eftposPay/app.d.ts +1 -1
- package/es/components/eftposPay/windcave/windcave.d.ts +1 -0
- package/es/components/eventBooking/components/ErrorTip/index.d.ts +0 -1
- package/es/components/eventBooking/components/Provider/Cart/Deposit/index.d.ts +4 -2
- package/es/components/eventBooking/components/Provider/Cart/Deposit/index.js +4 -1
- package/es/components/eventBooking/components/Provider/Cart/Item/index.d.ts +0 -1
- package/es/components/eventBooking/components/Provider/Cart/Item/index.js +79 -6
- package/es/components/eventBooking/components/Provider/Cart/Item/index.less +7 -6
- package/es/components/eventBooking/components/Provider/Cart/index.d.ts +0 -1
- package/es/components/eventBooking/components/Provider/Cart/index.js +2 -7
- package/es/components/eventBooking/components/Provider/Content/index.less +1 -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/Information/index.d.ts +0 -1
- package/es/components/eventBooking/components/Provider/InformationOptionsModal/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/Voucher/index.js +1 -1
- package/es/components/eventBooking/components/bookingAvailabilityCalendar/components/CalendarDate/CalenDateWeek/WeekItem/index.d.ts +0 -1
- package/es/components/eventBooking/components/bookingAvailabilityCalendar/components/CalendarDate/CalenDateWeek/index.d.ts +0 -1
- package/es/components/eventBooking/components/bookingDetailModal/components/BookingOptions.d.ts +0 -1
- package/es/components/eventBooking/components/scheduleCalendar/components/ScheduleTimeItem/index.d.ts +0 -1
- package/es/components/index.d.ts +1 -2
- package/es/components/index.js +1 -2
- package/es/components/pay/toC/PaymentMethods/StripePay/Stripe/components/SetupForm/index.d.ts +0 -1
- package/es/components/pay/toC/WalletPassBlock/components/WalletUseList/index.d.ts +0 -1
- package/es/components/pisellSelectCustomerModal/RightPanel/List/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/subTotal/index.d.ts +2 -0
- package/es/components/subTotal/index.js +42 -20
- package/es/components/workSpaceList/components/Modal/index.d.ts +0 -1
- package/es/plus/orderList/components/HandleActions.d.ts +0 -1
- package/es/plus/orderList/components/QuickFilter.d.ts +0 -1
- package/es/plus/orderList/components/Reset.d.ts +0 -1
- package/es/plus/orderList/components/Toolbar.d.ts +0 -1
- package/es/plus/saasRegister/components/VertifyEmail.d.ts +0 -1
- package/es/plus/selectHolder/components/ErrorTip/index.d.ts +0 -1
- package/es/plus/skuOptionsSelection/components/OptionsCard/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/lib/components/Sales/Cart/index.d.ts +1 -1
- package/lib/components/Sales/Cart/index.js +20 -7
- package/lib/components/Sales/Checkout/utils.js +64 -1
- package/lib/components/Sales/Summary/index.d.ts +2 -0
- package/lib/components/Sales/Summary/index.js +8 -2
- package/lib/components/Sales/Summary/utils.d.ts +10 -3
- package/lib/components/Sales/Summary/utils.js +38 -13
- package/lib/components/appointmentBooking/components/Cart/Item/Total.d.ts +0 -1
- package/lib/components/appointmentBooking/components/Cart/Item/index.js +52 -4
- package/lib/components/appointmentBooking/components/Cart/index.d.ts +0 -1
- package/lib/components/appointmentBooking/components/Deposit/index.d.ts +5 -2
- package/lib/components/appointmentBooking/components/Deposit/index.js +7 -4
- package/lib/components/appointmentBooking/components/Footer/index.d.ts +0 -1
- package/lib/components/appointmentBooking/components/Guest/components/InformationOptionsModal/index.d.ts +0 -1
- 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/hooks/useClearCart.d.ts +0 -1
- package/lib/components/booking/info/dateRange/index.d.ts +0 -1
- package/lib/components/eftposPay/app.d.ts +1 -1
- package/lib/components/eftposPay/windcave/windcave.d.ts +1 -0
- package/lib/components/eventBooking/components/ErrorTip/index.d.ts +0 -1
- package/lib/components/eventBooking/components/Provider/Cart/Deposit/index.d.ts +4 -2
- package/lib/components/eventBooking/components/Provider/Cart/Deposit/index.js +3 -1
- package/lib/components/eventBooking/components/Provider/Cart/Item/index.d.ts +0 -1
- package/lib/components/eventBooking/components/Provider/Cart/Item/index.js +77 -5
- package/lib/components/eventBooking/components/Provider/Cart/Item/index.less +7 -6
- package/lib/components/eventBooking/components/Provider/Cart/index.d.ts +0 -1
- package/lib/components/eventBooking/components/Provider/Cart/index.js +2 -2
- package/lib/components/eventBooking/components/Provider/Content/index.less +1 -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/Information/index.d.ts +0 -1
- package/lib/components/eventBooking/components/Provider/InformationOptionsModal/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/Voucher/index.js +1 -1
- package/lib/components/eventBooking/components/bookingAvailabilityCalendar/components/CalendarDate/CalenDateWeek/WeekItem/index.d.ts +0 -1
- package/lib/components/eventBooking/components/bookingAvailabilityCalendar/components/CalendarDate/CalenDateWeek/index.d.ts +0 -1
- package/lib/components/eventBooking/components/bookingDetailModal/components/BookingOptions.d.ts +0 -1
- package/lib/components/eventBooking/components/scheduleCalendar/components/ScheduleTimeItem/index.d.ts +0 -1
- package/lib/components/index.d.ts +1 -2
- package/lib/components/index.js +0 -3
- package/lib/components/pay/toC/PaymentMethods/StripePay/Stripe/components/SetupForm/index.d.ts +0 -1
- package/lib/components/pay/toC/WalletPassBlock/components/WalletUseList/index.d.ts +0 -1
- package/lib/components/pisellSelectCustomerModal/RightPanel/List/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/subTotal/index.d.ts +2 -0
- package/lib/components/subTotal/index.js +34 -20
- package/lib/components/workSpaceList/components/Modal/index.d.ts +0 -1
- package/lib/plus/orderList/components/HandleActions.d.ts +0 -1
- package/lib/plus/orderList/components/QuickFilter.d.ts +0 -1
- package/lib/plus/orderList/components/Reset.d.ts +0 -1
- package/lib/plus/orderList/components/Toolbar.d.ts +0 -1
- package/lib/plus/saasRegister/components/VertifyEmail.d.ts +0 -1
- package/lib/plus/selectHolder/components/ErrorTip/index.d.ts +0 -1
- package/lib/plus/skuOptionsSelection/components/OptionsCard/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/package.json +2 -2
|
@@ -1,15 +1,22 @@
|
|
|
1
|
-
|
|
1
|
+
function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
|
|
2
|
+
function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
|
|
3
|
+
function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
|
|
4
|
+
function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
|
|
5
|
+
function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
|
|
6
|
+
function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
|
|
7
|
+
import React, { useMemo } from 'react';
|
|
2
8
|
import { isMobile, locales } from '@pisell/utils';
|
|
3
9
|
import ShoppingCart from "../../../../../shoppingCart";
|
|
4
10
|
import { useCart, useHolder, useSummary, useStep } from "../../../../../Sales";
|
|
5
11
|
import SelectHolderModal from "../../SelectHolderModal";
|
|
6
12
|
import ContinueButton from "../ContinueButton";
|
|
7
|
-
import
|
|
13
|
+
import { SubTotal } from "../../../../../index";
|
|
14
|
+
import useEngineContext from "../../../../../../hooks/useEngineContext";
|
|
8
15
|
import Deposit from "../Deposit";
|
|
9
16
|
import Voucher from "../../../Voucher";
|
|
10
17
|
import "./index.less";
|
|
11
18
|
var CartItem = function CartItem() {
|
|
12
|
-
var _cartData$
|
|
19
|
+
var _context$appHelper, _cartData$cartItems2;
|
|
13
20
|
var _useHolder = useHolder(),
|
|
14
21
|
open = _useHolder.open,
|
|
15
22
|
holderData = _useHolder.holderData,
|
|
@@ -20,14 +27,24 @@ var CartItem = function CartItem() {
|
|
|
20
27
|
cartData = _useCart.cartData,
|
|
21
28
|
addNoteToCartItem = _useCart.addNoteToCartItem;
|
|
22
29
|
var _useSummary = useSummary(),
|
|
23
|
-
|
|
30
|
+
taxTitle = _useSummary.taxTitle,
|
|
31
|
+
taxRate = _useSummary.taxRate,
|
|
32
|
+
totalTaxFee = _useSummary.totalTaxFee,
|
|
33
|
+
isPriceIncludeTax = _useSummary.isPriceIncludeTax,
|
|
34
|
+
total = _useSummary.total,
|
|
35
|
+
deposit = _useSummary.deposit,
|
|
36
|
+
subtotal = _useSummary.subtotal,
|
|
37
|
+
surcharge = _useSummary.surcharge;
|
|
24
38
|
var _useStep = useStep(),
|
|
25
39
|
isLastStep = _useStep.isLastStep;
|
|
40
|
+
var context = useEngineContext();
|
|
41
|
+
var _ref = (context === null || context === void 0 || (_context$appHelper = context.appHelper) === null || _context$appHelper === void 0 ? void 0 : _context$appHelper.utils) || {},
|
|
42
|
+
translation = _ref.translation;
|
|
26
43
|
var handleClickCard = function handleClickCard(e, type, key) {
|
|
27
44
|
if (type === 'note') {
|
|
28
45
|
return addNoteToCartItem(e);
|
|
29
46
|
}
|
|
30
|
-
|
|
47
|
+
|
|
31
48
|
// 删除
|
|
32
49
|
if (type === 'delete') {
|
|
33
50
|
return deleteCartItem(e);
|
|
@@ -36,6 +53,54 @@ var CartItem = function CartItem() {
|
|
|
36
53
|
return deleteCartItemByHolder(key);
|
|
37
54
|
}
|
|
38
55
|
};
|
|
56
|
+
|
|
57
|
+
/**
|
|
58
|
+
* @description: 是否显示定金
|
|
59
|
+
* @param {*} useMemo
|
|
60
|
+
* @return {*}
|
|
61
|
+
*/
|
|
62
|
+
var showDeposit = useMemo(function () {
|
|
63
|
+
var _cartData$cartItems;
|
|
64
|
+
return (cartData === null || cartData === void 0 || (_cartData$cartItems = cartData.cartItems) === null || _cartData$cartItems === void 0 ? void 0 : _cartData$cartItems.length) > 0 && (deposit === null || deposit === void 0 ? void 0 : deposit.hasDeposit);
|
|
65
|
+
}, [cartData === null || cartData === void 0 || (_cartData$cartItems2 = cartData.cartItems) === null || _cartData$cartItems2 === void 0 ? void 0 : _cartData$cartItems2.length, deposit === null || deposit === void 0 ? void 0 : deposit.hasDeposit]);
|
|
66
|
+
|
|
67
|
+
/**
|
|
68
|
+
* @description: 结算列表数据
|
|
69
|
+
* @param {*} useMemo
|
|
70
|
+
* @return {*}
|
|
71
|
+
*/
|
|
72
|
+
var subTotalList = useMemo(function () {
|
|
73
|
+
var surchargeList = ((surcharge === null || surcharge === void 0 ? void 0 : surcharge.surchargeList) || []).map(function (d, index) {
|
|
74
|
+
return {
|
|
75
|
+
key: "custom_surcharge_".concat(index),
|
|
76
|
+
label: translation(d === null || d === void 0 ? void 0 : d.name),
|
|
77
|
+
value: d.amount
|
|
78
|
+
};
|
|
79
|
+
});
|
|
80
|
+
return [{
|
|
81
|
+
key: 'deposit',
|
|
82
|
+
value: deposit === null || deposit === void 0 ? void 0 : deposit.total,
|
|
83
|
+
label: locales.getText('pisell2.appointment.deposit'),
|
|
84
|
+
hidden: !showDeposit
|
|
85
|
+
}, {
|
|
86
|
+
key: 'sub_total',
|
|
87
|
+
value: subtotal
|
|
88
|
+
}].concat(_toConsumableArray(surchargeList), [{
|
|
89
|
+
key: 'tax',
|
|
90
|
+
value: totalTaxFee,
|
|
91
|
+
hidden: Number(totalTaxFee) <= 0,
|
|
92
|
+
tax: {
|
|
93
|
+
rate: taxRate,
|
|
94
|
+
is_price_include_tax: isPriceIncludeTax,
|
|
95
|
+
title: taxTitle
|
|
96
|
+
}
|
|
97
|
+
}, {
|
|
98
|
+
key: 'custom_total',
|
|
99
|
+
value: total,
|
|
100
|
+
label: locales.getText('pisell2.event.total'),
|
|
101
|
+
bold: !showDeposit
|
|
102
|
+
}]);
|
|
103
|
+
}, [total, subtotal, surcharge === null || surcharge === void 0 ? void 0 : surcharge.surchargeList, deposit === null || deposit === void 0 ? void 0 : deposit.total, taxRate, isPriceIncludeTax, totalTaxFee, taxTitle, showDeposit]);
|
|
39
104
|
return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
|
|
40
105
|
className: "cart-item-wrap ".concat(isMobile() ? 'cart-mobile-item-wrap' : '')
|
|
41
106
|
}, /*#__PURE__*/React.createElement("div", {
|
|
@@ -59,7 +124,15 @@ var CartItem = function CartItem() {
|
|
|
59
124
|
}
|
|
60
125
|
})), /*#__PURE__*/React.createElement("div", {
|
|
61
126
|
className: "event-footer"
|
|
62
|
-
}, /*#__PURE__*/React.createElement(Voucher, null), /*#__PURE__*/React.createElement(
|
|
127
|
+
}, /*#__PURE__*/React.createElement(Voucher, null), /*#__PURE__*/React.createElement(SubTotal, {
|
|
128
|
+
list: subTotalList,
|
|
129
|
+
style: {
|
|
130
|
+
padding: 0
|
|
131
|
+
},
|
|
132
|
+
children: showDeposit ? /*#__PURE__*/React.createElement(Deposit, {
|
|
133
|
+
showTitle: false
|
|
134
|
+
}) : null
|
|
135
|
+
}), /*#__PURE__*/React.createElement(ContinueButton, null))), /*#__PURE__*/React.createElement(SelectHolderModal, {
|
|
63
136
|
open: open
|
|
64
137
|
}));
|
|
65
138
|
};
|
|
@@ -1,8 +1,12 @@
|
|
|
1
1
|
.cart-item-wrap {
|
|
2
2
|
height: 100%;
|
|
3
|
+
display: flex;
|
|
4
|
+
flex-direction: column;
|
|
3
5
|
.content {
|
|
4
6
|
background: #fff;
|
|
5
7
|
padding: 20px;
|
|
8
|
+
height: auto;
|
|
9
|
+
overflow: auto;
|
|
6
10
|
.pisell-lowcode__shopping-cart-content {
|
|
7
11
|
.ant-card-body {
|
|
8
12
|
padding: 0;
|
|
@@ -71,15 +75,12 @@
|
|
|
71
75
|
|
|
72
76
|
.content {
|
|
73
77
|
flex: 1;
|
|
74
|
-
|
|
75
|
-
|
|
78
|
+
padding: 20px 20px 4px;
|
|
79
|
+
max-height: 100%;
|
|
76
80
|
}
|
|
77
81
|
.event-footer {
|
|
78
82
|
z-index: 10;
|
|
79
|
-
|
|
80
|
-
bottom: 0;
|
|
81
|
-
left: 0;
|
|
82
|
-
right: 0;
|
|
83
|
+
flex: none;
|
|
83
84
|
border-top: 1px solid #eaecf0;
|
|
84
85
|
padding: 14px 24px 24px;
|
|
85
86
|
margin-top: 0;
|
|
@@ -15,16 +15,11 @@ var Cart = function Cart(_ref) {
|
|
|
15
15
|
return _onCancel();
|
|
16
16
|
},
|
|
17
17
|
bodyStyle: {
|
|
18
|
-
padding:
|
|
18
|
+
padding: 0
|
|
19
19
|
},
|
|
20
20
|
destroyOnClose: true,
|
|
21
21
|
className: "event-cart-modal",
|
|
22
22
|
footer: null
|
|
23
|
-
}, /*#__PURE__*/React.createElement(
|
|
24
|
-
style: {
|
|
25
|
-
flex: 1,
|
|
26
|
-
overflowY: 'auto'
|
|
27
|
-
}
|
|
28
|
-
}, /*#__PURE__*/React.createElement(CartItem, null)));
|
|
23
|
+
}, /*#__PURE__*/React.createElement(CartItem, null));
|
|
29
24
|
};
|
|
30
25
|
export default Cart;
|
|
@@ -102,7 +102,7 @@ var VoucherCard = function VoucherCard() {
|
|
|
102
102
|
var batchUpdateCart = function batchUpdateCart(productList) {
|
|
103
103
|
if (!(productList !== null && productList !== void 0 && productList.length)) return;
|
|
104
104
|
productList.forEach(function (product) {
|
|
105
|
-
updateCartItem(product);
|
|
105
|
+
updateCartItem(product, 'deposit');
|
|
106
106
|
});
|
|
107
107
|
};
|
|
108
108
|
|
package/es/components/index.d.ts
CHANGED
|
@@ -10,7 +10,6 @@ import RuleSetting from './ruleSetting';
|
|
|
10
10
|
import TaxSelect from './taxSelect';
|
|
11
11
|
import ToCPay from './pay/toC';
|
|
12
12
|
import WalletList from './walletList';
|
|
13
|
-
import Wallet from './wallet';
|
|
14
13
|
import WorkspaceListDetail from './workSpaceListDetail/';
|
|
15
14
|
import WorkspaceList from './workSpaceList';
|
|
16
15
|
import PisellSelectCustomerModal from './pisellSelectCustomerModal';
|
|
@@ -21,4 +20,4 @@ import PinModal from './pinModal';
|
|
|
21
20
|
import PinVerifyModal from './pinVerifyModal';
|
|
22
21
|
import { OAuthConfig, SaaSAdminAuth, OrgAdminAuth, CustomerAuth, CustomerOAuthConfig, DeviceAuth, POSOperatorAuth, OnlineShopAuth, SaaSManagermentAuth } from './authentication/admin';
|
|
23
22
|
import Registry from './systemSettings/registry';
|
|
24
|
-
export { Login, BookingInfo, Booking, BookingNotes, BookingAddons, BookingForms, Schedules, ProductExtension, RuleSetting, TaxSelect, ToCPay, PisellSelectCustomerModal,
|
|
23
|
+
export { Login, BookingInfo, Booking, BookingNotes, BookingAddons, BookingForms, Schedules, ProductExtension, RuleSetting, TaxSelect, ToCPay, PisellSelectCustomerModal, WalletList, WorkspaceList, WorkspaceListDetail, SubTotal, EditBookingModal, StepController, PinModal, PinVerifyModal, OAuthConfig, SaaSAdminAuth, OrgAdminAuth, CustomerAuth, CustomerOAuthConfig, DeviceAuth, POSOperatorAuth, OnlineShopAuth, SaaSManagermentAuth, Registry, };
|
package/es/components/index.js
CHANGED
|
@@ -10,7 +10,6 @@ import RuleSetting from "./ruleSetting";
|
|
|
10
10
|
import TaxSelect from "./taxSelect";
|
|
11
11
|
import ToCPay from "./pay/toC";
|
|
12
12
|
import WalletList from "./walletList";
|
|
13
|
-
import Wallet from "./wallet";
|
|
14
13
|
import WorkspaceListDetail from "./workSpaceListDetail/";
|
|
15
14
|
import WorkspaceList from "./workSpaceList";
|
|
16
15
|
import PisellSelectCustomerModal from "./pisellSelectCustomerModal";
|
|
@@ -21,4 +20,4 @@ import PinModal from "./pinModal";
|
|
|
21
20
|
import PinVerifyModal from "./pinVerifyModal";
|
|
22
21
|
import { OAuthConfig, SaaSAdminAuth, OrgAdminAuth, CustomerAuth, CustomerOAuthConfig, DeviceAuth, POSOperatorAuth, OnlineShopAuth, SaaSManagermentAuth } from "./authentication/admin";
|
|
23
22
|
import Registry from "./systemSettings/registry";
|
|
24
|
-
export { Login, BookingInfo, Booking, BookingNotes, BookingAddons, BookingForms, Schedules, ProductExtension, RuleSetting, TaxSelect, ToCPay, PisellSelectCustomerModal,
|
|
23
|
+
export { Login, BookingInfo, Booking, BookingNotes, BookingAddons, BookingForms, Schedules, ProductExtension, RuleSetting, TaxSelect, ToCPay, PisellSelectCustomerModal, WalletList, WorkspaceList, WorkspaceListDetail, SubTotal, EditBookingModal, StepController, PinModal, PinVerifyModal, OAuthConfig, SaaSAdminAuth, OrgAdminAuth, CustomerAuth, CustomerOAuthConfig, DeviceAuth, POSOperatorAuth, OnlineShopAuth, SaaSManagermentAuth, Registry };
|
|
@@ -12,11 +12,13 @@ export interface SubTotalItem extends React.HTMLAttributes<HTMLDivElement> {
|
|
|
12
12
|
is_price_include_tax?: boolean;
|
|
13
13
|
title?: string;
|
|
14
14
|
};
|
|
15
|
+
bold?: boolean;
|
|
15
16
|
}
|
|
16
17
|
interface SubTotalProps extends React.HTMLAttributes<HTMLDivElement> {
|
|
17
18
|
list: SubTotalItem[];
|
|
18
19
|
mode?: 'column1' | 'column2';
|
|
19
20
|
describe?: string;
|
|
21
|
+
children?: React.ReactNode;
|
|
20
22
|
}
|
|
21
23
|
declare const SubTotal: (props: SubTotalProps) => JSX.Element;
|
|
22
24
|
export default SubTotal;
|
|
@@ -1,29 +1,33 @@
|
|
|
1
1
|
var _excluded = ["label", "key", "count", "value", "tax", "hidden"],
|
|
2
|
-
_excluded2 = ["list", "mode", "describe"];
|
|
2
|
+
_excluded2 = ["list", "mode", "describe", "children"];
|
|
3
3
|
function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
|
|
4
4
|
function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
|
|
5
5
|
function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
|
|
6
6
|
import React, { useEffect, useMemo } from 'react';
|
|
7
7
|
import { Divider } from 'antd';
|
|
8
8
|
import "./index.less";
|
|
9
|
-
import { getLocale } from "../../utils/locales";
|
|
10
9
|
import localeTexts from "./locales";
|
|
11
10
|
import classNames from 'classnames';
|
|
12
11
|
import { PisellText, Iconfont, Tooltip } from '@pisell/materials';
|
|
13
12
|
import { locales } from '@pisell/utils';
|
|
13
|
+
import useEngineContext from "../../hooks/useEngineContext";
|
|
14
14
|
|
|
15
15
|
// 先定义一个内置key的类型
|
|
16
16
|
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
17
|
+
/**
|
|
18
|
+
* 获取标签映射
|
|
19
|
+
*/
|
|
20
|
+
var getLabelMaps = function getLabelMaps() {
|
|
21
|
+
return {
|
|
22
|
+
deposit: locales.getText('pisell2.subtotal.deposit'),
|
|
23
|
+
total: locales.getText('pisell2.subtotal.total'),
|
|
24
|
+
sub_total: locales.getText('pisell2.subtotal.subtotal'),
|
|
25
|
+
tax: locales.getText('pisell2.subtotal.tax'),
|
|
26
|
+
delivery_fee: locales.getText('pisell2.subtotal.delivery-fee'),
|
|
27
|
+
discount: locales.getText('pisell2.subtotal.discount'),
|
|
28
|
+
point_deduction: locales.getText('pisell2.subtotal.point-deduction'),
|
|
29
|
+
member_deduction: locales.getText('pisell2.subtotal.member-deduction')
|
|
30
|
+
};
|
|
27
31
|
};
|
|
28
32
|
var groupByMod = function groupByMod(arr, groupCount) {
|
|
29
33
|
// 参数验证
|
|
@@ -48,7 +52,8 @@ var groupByMod = function groupByMod(arr, groupCount) {
|
|
|
48
52
|
};
|
|
49
53
|
var Item = function Item(props) {
|
|
50
54
|
var item = props.item,
|
|
51
|
-
bold = props.bold
|
|
55
|
+
bold = props.bold,
|
|
56
|
+
labelMaps = props.labelMaps;
|
|
52
57
|
var label = item.label,
|
|
53
58
|
key = item.key,
|
|
54
59
|
count = item.count,
|
|
@@ -97,11 +102,11 @@ var Item = function Item(props) {
|
|
|
97
102
|
})));
|
|
98
103
|
}
|
|
99
104
|
return labelMaps[key];
|
|
100
|
-
}, [label, key, count, taxText]);
|
|
105
|
+
}, [label, key, count, taxText, labelMaps]);
|
|
101
106
|
if (hidden) return null;
|
|
102
107
|
return /*#__PURE__*/React.createElement("div", _extends({
|
|
103
108
|
className: classNames('pisell-lowcode__subtotal-item', {
|
|
104
|
-
'pisell-lowcode__subtotal-item-bold': bold
|
|
109
|
+
'pisell-lowcode__subtotal-item-bold': bold || (item === null || item === void 0 ? void 0 : item.bold)
|
|
105
110
|
})
|
|
106
111
|
}, rest), /*#__PURE__*/React.createElement("div", {
|
|
107
112
|
className: "pisell-lowcode__subtotal-item-label"
|
|
@@ -147,16 +152,28 @@ var defaultList = [{
|
|
|
147
152
|
value: 0
|
|
148
153
|
}];
|
|
149
154
|
var SubTotal = function SubTotal(props) {
|
|
155
|
+
var _context$engine;
|
|
150
156
|
var _props$list = props.list,
|
|
151
157
|
list = _props$list === void 0 ? [] : _props$list,
|
|
152
158
|
_props$mode = props.mode,
|
|
153
159
|
mode = _props$mode === void 0 ? 'column1' : _props$mode,
|
|
154
160
|
_props$describe = props.describe,
|
|
155
161
|
describe = _props$describe === void 0 ? '' : _props$describe,
|
|
162
|
+
children = props.children,
|
|
156
163
|
rest = _objectWithoutProperties(props, _excluded2);
|
|
164
|
+
|
|
165
|
+
// 在组件内部调用 Hook
|
|
166
|
+
var context = useEngineContext();
|
|
167
|
+
|
|
168
|
+
// 获取当前 locale
|
|
169
|
+
var locale = (context === null || context === void 0 || (_context$engine = context.engine) === null || _context$engine === void 0 || (_context$engine = _context$engine.props) === null || _context$engine === void 0 ? void 0 : _context$engine.locale) || 'en';
|
|
170
|
+
locales.init(localeTexts, locale);
|
|
171
|
+
var labelMaps = useMemo(function () {
|
|
172
|
+
return getLabelMaps();
|
|
173
|
+
}, [locale]);
|
|
157
174
|
var depositItem = useMemo(function () {
|
|
158
175
|
return list.find(function (item) {
|
|
159
|
-
return item.key === 'deposit';
|
|
176
|
+
return item.key === 'deposit' && !(item !== null && item !== void 0 && item.hidden);
|
|
160
177
|
});
|
|
161
178
|
}, [list]);
|
|
162
179
|
var totalItem = useMemo(function () {
|
|
@@ -201,12 +218,14 @@ var SubTotal = function SubTotal(props) {
|
|
|
201
218
|
}, rest), headerItem && /*#__PURE__*/React.createElement(Item, {
|
|
202
219
|
key: headerItem.key,
|
|
203
220
|
item: headerItem,
|
|
204
|
-
bold: true
|
|
221
|
+
bold: true,
|
|
222
|
+
labelMaps: labelMaps
|
|
205
223
|
}), depositItem ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Divider, {
|
|
206
224
|
className: "pisell-lowcode__subtotal-divider"
|
|
207
225
|
}), totalItem ? /*#__PURE__*/React.createElement(Item, {
|
|
208
226
|
key: totalItem.key,
|
|
209
|
-
item: totalItem
|
|
227
|
+
item: totalItem,
|
|
228
|
+
labelMaps: labelMaps
|
|
210
229
|
}) : null) : null, /*#__PURE__*/React.createElement("div", {
|
|
211
230
|
className: "pisell-lowcode__subtotal-list"
|
|
212
231
|
}, mapData.map(function (items, index) {
|
|
@@ -219,7 +238,8 @@ var SubTotal = function SubTotal(props) {
|
|
|
219
238
|
}, items.map(function (d) {
|
|
220
239
|
return /*#__PURE__*/React.createElement(Item, {
|
|
221
240
|
key: d.key,
|
|
222
|
-
item: d
|
|
241
|
+
item: d,
|
|
242
|
+
labelMaps: labelMaps
|
|
223
243
|
});
|
|
224
244
|
}))), mode === 'column2' && !isLast ? /*#__PURE__*/React.createElement(Divider, {
|
|
225
245
|
type: "vertical",
|
|
@@ -229,6 +249,8 @@ var SubTotal = function SubTotal(props) {
|
|
|
229
249
|
}) : null);
|
|
230
250
|
})), describe ? /*#__PURE__*/React.createElement(Describe, {
|
|
231
251
|
describe: describe
|
|
232
|
-
}) : null
|
|
252
|
+
}) : null, children ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Divider, {
|
|
253
|
+
className: "pisell-lowcode__subtotal-divider"
|
|
254
|
+
}), children) : null);
|
|
233
255
|
};
|
|
234
256
|
export default SubTotal;
|
|
@@ -13,7 +13,7 @@ interface CartContextType {
|
|
|
13
13
|
createCartItemFromEvent: (eventItem: any) => CartItem;
|
|
14
14
|
createCartItemFromHolder: (holderItem: any) => CartItem;
|
|
15
15
|
addToCart: () => void;
|
|
16
|
-
updateCartItem: (cartItem: CartItem) => CartItem;
|
|
16
|
+
updateCartItem: (cartItem: CartItem, updateType?: 'deposit') => CartItem;
|
|
17
17
|
deleteCartItem: (cartItem: CartItem) => void;
|
|
18
18
|
clickCartItem: (cartItem: CartItem) => void;
|
|
19
19
|
updateCurrentCartItem: (cartItem: Partial<CartItem>) => void;
|
|
@@ -241,10 +241,7 @@ var CartProvider = ({ children }) => {
|
|
|
241
241
|
const endDateInfo = (_g = (_f = eventItem == null ? void 0 : eventItem.eventDetail) == null ? void 0 : _f.selectDate) == null ? void 0 : _g.endDateInfo;
|
|
242
242
|
const endTime = (_j = (_i = (_h = endDateInfo == null ? void 0 : endDateInfo.times) == null ? void 0 : _h.slice(-1)) == null ? void 0 : _i[0]) == null ? void 0 : _j.end_at;
|
|
243
243
|
const num = 1;
|
|
244
|
-
const { price, totalPrice, originTotal, is_charge_tax } = (0, import_utils3.handleProductInfo)(
|
|
245
|
-
eventDetail,
|
|
246
|
-
num
|
|
247
|
-
);
|
|
244
|
+
const { price, totalPrice, originTotal, is_charge_tax } = (0, import_utils3.handleProductInfo)(eventDetail, num);
|
|
248
245
|
const transformProduct = (_temp) => {
|
|
249
246
|
var _a2;
|
|
250
247
|
if (!((_a2 = _temp == null ? void 0 : _temp.variant) == null ? void 0 : _a2.length)) {
|
|
@@ -305,6 +302,7 @@ var CartProvider = ({ children }) => {
|
|
|
305
302
|
event_unique_identifier: _id
|
|
306
303
|
// 传递给接口用于商品可用性检测的比对
|
|
307
304
|
},
|
|
305
|
+
_eventDetail: eventDetail,
|
|
308
306
|
_productDetail: eventDetail.productDetail,
|
|
309
307
|
_productOrigin: transformProduct(
|
|
310
308
|
((_p = eventDetail == null ? void 0 : eventDetail.productDetail) == null ? void 0 : _p.origin) || bookingOptionData
|
|
@@ -337,9 +335,24 @@ var CartProvider = ({ children }) => {
|
|
|
337
335
|
});
|
|
338
336
|
}
|
|
339
337
|
};
|
|
340
|
-
const updateCartItem = (cartItem) => {
|
|
341
|
-
|
|
342
|
-
|
|
338
|
+
const updateCartItem = (cartItem, updateType) => {
|
|
339
|
+
var _a, _b, _c;
|
|
340
|
+
let newCartItems = (_c = (_b = (_a = getCurrentData()) == null ? void 0 : _a.cartData) == null ? void 0 : _b.cartItems) == null ? void 0 : _c.map(
|
|
341
|
+
(item) => {
|
|
342
|
+
if (item._id === cartItem._id) {
|
|
343
|
+
const _tempCartItem = { ...cartItem || {} };
|
|
344
|
+
if (updateType === "deposit") {
|
|
345
|
+
const eventDetail = _tempCartItem == null ? void 0 : _tempCartItem._eventDetail;
|
|
346
|
+
if (eventDetail) {
|
|
347
|
+
const num = (_tempCartItem == null ? void 0 : _tempCartItem.num) || 1;
|
|
348
|
+
const deposit = (0, import_utils3.handleProductDeposit)(_tempCartItem, eventDetail, num);
|
|
349
|
+
_tempCartItem.deposit = deposit;
|
|
350
|
+
}
|
|
351
|
+
}
|
|
352
|
+
return _tempCartItem;
|
|
353
|
+
}
|
|
354
|
+
return item;
|
|
355
|
+
}
|
|
343
356
|
);
|
|
344
357
|
setCartData({
|
|
345
358
|
cartItems: newCartItems
|