@pisell/private-materials 6.3.55 → 6.3.57

package/es/components/appointmentBooking/components/Services/index.js

@@ -112,17 +112,20 @@ var Services = /*#__PURE__*/forwardRef(function (props, ref) {
               },
               callback: function () {
                 var _callback = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(data) {
-                  var product, res, session, startDate, endDate, _res, _data$origin, resources, activeStatus, _res2, index, stepList, hasResourceStep, description;
+                  var _appointmentBooking$o, product, res, session, startDate, endDate, _res, _data$origin, resources, activeStatus, _res2, index, stepList, hasResourceStep, description;
                   return _regeneratorRuntime().wrap(function _callee$(_context) {
                     while (1) switch (_context.prev = _context.next) {
                       case 0:
+                        if (data !== null && data !== void 0 && data.origin) {
+                          data.origin.isFormSubject = (appointmentBooking === null || appointmentBooking === void 0 || (_appointmentBooking$o = appointmentBooking.otherParams) === null || _appointmentBooking$o === void 0 || (_appointmentBooking$o = _appointmentBooking$o.bookingSetting) === null || _appointmentBooking$o === void 0 || (_appointmentBooking$o = _appointmentBooking$o.bookingSubject) === null || _appointmentBooking$o === void 0 ? void 0 : _appointmentBooking$o.type) === 'form';
+                        }
                         if (!data.isCancel) {
-                          _context.next = 3;
+                          _context.next = 4;
                           break;
                         }
                         appointmentBooking.closeProductDetail();
                         return _context.abrupt("return");
-                      case 3:
+                      case 4:
                         product = _objectSpread(_objectSpread({}, data), {}, {
                           options: (data === null || data === void 0 ? void 0 : data.option) || []
                         });
@@ -130,27 +133,27 @@ var Services = /*#__PURE__*/forwardRef(function (props, ref) {
 
                         // 零售模版，直接加入购物车
                         if (!isRetailTemplate) {
-                          _context.next = 12;
+                          _context.next = 13;
                           break;
                         }
                         if (!(data !== null && data !== void 0 && data.isCancel)) {
-                          _context.next = 8;
+                          _context.next = 9;
                           break;
                         }
                         return _context.abrupt("return");
-                      case 8:
+                      case 9:
                         res = appointmentBooking.storeProduct(product);
                         if (!(!res.success && res.errorCode === 'not_enough_stock')) {
-                          _context.next = 11;
+                          _context.next = 12;
                           break;
                         }
                         return _context.abrupt("return", Toast(locales.getText('pisell2.appointment.unuse.stock')));
-                      case 11:
-                        return _context.abrupt("return");
                       case 12:
+                        return _context.abrupt("return");
+                      case 13:
                         session = data === null || data === void 0 ? void 0 : data.session;
                         if (!session) {
-                          _context.next = 24;
+                          _context.next = 25;
                           break;
                         }
                         startDate = dayjs(session === null || session === void 0 ? void 0 : session.start_at).format('YYYY-MM-DD');
@@ -163,45 +166,45 @@ var Services = /*#__PURE__*/forwardRef(function (props, ref) {
                           }
                         });
                         if (!(!_res.success && _res.errorCode === 'not_enough_stock')) {
-                          _context.next = 19;
+                          _context.next = 20;
                           break;
                         }
                         return _context.abrupt("return", Toast(locales.getText('pisell2.appointment.unuse.stock')));
-                      case 19:
+                      case 20:
                         appointmentBooking.closeProductDetail();
-                        _context.next = 22;
+                        _context.next = 23;
                         return appointmentBooking.getAvailableDate({
                           startDate: startDate,
                           endDate: endDate
                         });
-                      case 22:
-                        _context.next = 34;
+                      case 23:
+                        _context.next = 35;
                         break;
-                      case 24:
+                      case 25:
                         resources = (data === null || data === void 0 || (_data$origin = data.origin) === null || _data$origin === void 0 || (_data$origin = _data$origin.product_resource) === null || _data$origin === void 0 ? void 0 : _data$origin.resources) || [];
                         activeStatus = resources.find(function (item) {
                           return item.status === 1;
                         });
                         if (!(!activeStatus && !appointmentBooking.isTargetNormalProduct(data === null || data === void 0 ? void 0 : data.origin))) {
-                          _context.next = 28;
+                          _context.next = 29;
                           break;
                         }
                         return _context.abrupt("return", Toast(locales.getText('pisell2.appointment.no.available.service')));
-                      case 28:
+                      case 29:
                         _res2 = appointmentBooking.storeProduct(product);
                         if (!(!_res2.success && _res2.errorCode === 'not_enough_stock')) {
-                          _context.next = 31;
+                          _context.next = 32;
                           break;
                         }
                         return _context.abrupt("return", Toast(locales.getText('pisell2.appointment.unuse.stock')));
-                      case 31:
+                      case 32:
                         if (!(type === 'duration')) {
-                          _context.next = 34;
+                          _context.next = 35;
                           break;
                         }
-                        _context.next = 34;
+                        _context.next = 35;
                         return appointmentBooking.getAvailableDate();
-                      case 34:
+                      case 35:
                         appointmentBooking.closeProductDetail();
 
                         // 先选择日期流程
@@ -230,7 +233,7 @@ var Services = /*#__PURE__*/forwardRef(function (props, ref) {
                             removeStep('select-time');
                           }
                         }
-                      case 36:
+                      case 37:
                       case "end":
                         return _context.stop();
                     }

package/es/components/appointmentBooking/components/Voucher/index.js

@@ -115,6 +115,20 @@ var VoucherCard = function VoucherCard(props) {
     var val = shopDiscount.calcDiscount(products);
     batchUpdateCart(val.productList);
   };
+  var stringifiedHolders = useMemo(function () {
+    var _ret;
+    try {
+      _ret = JSON.stringify(products.map(function (item) {
+        return (item === null || item === void 0 ? void 0 : item.holder_id) || '';
+      }));
+    } catch (error) {
+      _ret = '';
+    }
+    return _ret;
+  }, [products]);
+  useEffect(function () {
+    onCartChange();
+  }, [stringifiedHolders]);
 
   // // 监听customer变化
   useEffect(function () {

package/es/components/booking/components/TabProduct/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import "./index.less";
 interface TabProductProps {
     list: any[];

package/es/components/booking/components/voucher/index.js

@@ -40,7 +40,7 @@ var ShopDiscountHooks = {
 };
 var services = {};
 var VoucherCard = function VoucherCard(props) {
-  var _context$appHelper, _state$client$value, _state$service2;
+  var _context$appHelper, _state$client$value, _state$pet2, _state$service2;
   var context = useEngineContext();
   var state = props.state,
     dispatch = props.dispatch,
@@ -63,6 +63,7 @@ var VoucherCard = function VoucherCard(props) {
   var addonsValueRef = useRef(state.addons.value);
   var isBooking4Shop = useIsBooking4Shop(state);
   var shopDiscount = pisellos.getModule('shopDiscount');
+  var holderChangedRef = useRef(false);
   services = state.service;
 
   // 设置client
@@ -83,7 +84,7 @@ var VoucherCard = function VoucherCard(props) {
   var serviceMemo = useMemo(function () {
     var _ref;
     var val = (_ref = state.service.value || []) === null || _ref === void 0 ? void 0 : _ref.map(function (value) {
-      var _value$_extend, _value$_extend2;
+      var _value$_extend, _value$_extend2, _value$_extend3;
       return {
         booking_id: value.booking_id,
         id: value.id,
@@ -92,7 +93,8 @@ var VoucherCard = function VoucherCard(props) {
         discount_list: value.discount_list,
         origin_total: value === null || value === void 0 || (_value$_extend2 = value._extend) === null || _value$_extend2 === void 0 ? void 0 : _value$_extend2.origin_total,
         quantity: value._extend.quantity,
-        startDate: value._extend.startDate
+        startDate: value._extend.startDate,
+        holder_id: value === null || value === void 0 || (_value$_extend3 = value._extend) === null || _value$_extend3 === void 0 ? void 0 : _value$_extend3.holder_id
       };
     });
     return val;
@@ -105,20 +107,37 @@ var VoucherCard = function VoucherCard(props) {
   var addonsMemo = useMemo(function () {
     var _ref2;
     var val = (_ref2 = state.addons.value || []) === null || _ref2 === void 0 ? void 0 : _ref2.map(function (value) {
-      var _value$_extend3, _value$_extend4;
+      var _value$_extend4, _value$_extend5;
       return {
         booking_id: value.booking_id,
         id: value.id,
         _id: value._id,
         price: value.price,
-        total: value === null || value === void 0 || (_value$_extend3 = value._extend) === null || _value$_extend3 === void 0 ? void 0 : _value$_extend3.total,
+        total: value === null || value === void 0 || (_value$_extend4 = value._extend) === null || _value$_extend4 === void 0 ? void 0 : _value$_extend4.total,
         discount_list: value.discount_list,
         _key: value._key,
-        num: value === null || value === void 0 || (_value$_extend4 = value._extend) === null || _value$_extend4 === void 0 ? void 0 : _value$_extend4.quantity
+        num: value === null || value === void 0 || (_value$_extend5 = value._extend) === null || _value$_extend5 === void 0 ? void 0 : _value$_extend5.quantity
       };
     });
     return val;
   }, [state.addons.value]);
+  var holdersMemo = useMemo(function () {
+    if (isBooking4Shop) {
+      var _state$pet;
+      var list = [];
+      if ((_state$pet = state.pet) !== null && _state$pet !== void 0 && _state$pet.value) {
+        var entries = Object.entries(state.pet.value);
+        // 多余 1 个表单类型时，无法计算
+        // 同一表单多个 holder 时，os内只取第一个
+        if (entries.length === 1) {
+          list = entries[0][1];
+        }
+      }
+      shopDiscount.setHolders(list);
+      holderChangedRef.current = true;
+      return list || [];
+    }
+  }, [(_state$pet2 = state.pet) === null || _state$pet2 === void 0 ? void 0 : _state$pet2.value, isBooking4Shop]);
   var disabled = useMemo(function () {
     var _state$bookingDetail;
     if (['paid', 'partially_paid'].includes((_state$bookingDetail = state.bookingDetail) === null || _state$bookingDetail === void 0 ? void 0 : _state$bookingDetail.payment_status) && [].concat(_toConsumableArray(addonsMemo), _toConsumableArray(serviceMemo)).every(function (item) {
@@ -130,8 +149,7 @@ var VoucherCard = function VoucherCard(props) {
   }, [state, addonsMemo, serviceMemo]);
   var _useDebounceFn = useDebounceFn(function () {
       var _state$service;
-      // console.log('state.service.value1', state.service.value);
-      if (serviceValueRef.current === state.service.value && addonsValueRef.current === state.addons.value || !((_state$service = state.service) !== null && _state$service !== void 0 && (_state$service = _state$service.value) !== null && _state$service !== void 0 && _state$service.length)) {
+      if (serviceValueRef.current === state.service.value && addonsValueRef.current === state.addons.value && !holderChangedRef.current || !((_state$service = state.service) !== null && _state$service !== void 0 && (_state$service = _state$service.value) !== null && _state$service !== void 0 && _state$service.length)) {
         return;
       }
       if (isBooking4Shop) {
@@ -139,6 +157,8 @@ var VoucherCard = function VoucherCard(props) {
         console.log('input: ', state.service.value);
         console.log('output: ', val);
         productListToValue(val.productList);
+        // 重置 holder 变化标识，防止重复计算
+        holderChangedRef.current = false;
       }
     }, {
       wait: 500
@@ -148,7 +168,7 @@ var VoucherCard = function VoucherCard(props) {
   // 更新productList
   useEffect(function () {
     run();
-  }, [JSON.stringify(serviceMemo), JSON.stringify(addonsMemo), isBooking4Shop]);
+  }, [JSON.stringify(serviceMemo), JSON.stringify(addonsMemo), JSON.stringify(holdersMemo), isBooking4Shop]);
   var fn = useMemoizedFn(function (result) {
     var _result$productList;
     if (!(result !== null && result !== void 0 && result.productList) || result !== null && result !== void 0 && (_result$productList = result.productList) !== null && _result$productList !== void 0 && _result$productList.some(function (item) {

package/es/components/eftpos/form/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 /**
  * @title: 递归循环表单数据
  * @Author: hongbing.wang

package/es/components/eftpos/hooks.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { Eftpos } from './const';
 /**
  * @title: tyro 设备连接

package/es/components/eftposPay/component/step/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { StatusType } from '../../const';
 declare const _default: (props: {
     status: StatusType;

package/es/components/eftposPay/hooks.d.ts

@@ -19,7 +19,7 @@ export declare const useStoreRef: <T extends {
     readonly netRef: React.MutableRefObject<boolean | undefined>;
     readonly symbolRef: React.MutableRefObject<string>;
     readonly amountRef: React.MutableRefObject<string | number>;
-    readonly eftposRef: React.MutableRefObject<"stripe" | "payo" | "tyro" | "windcave" | "linkly">;
+    readonly eftposRef: React.MutableRefObject<"stripe" | "tyro" | "windcave" | "payo" | "linkly">;
     readonly clientRef: React.MutableRefObject<ClientEnum>;
     readonly dataRef: React.MutableRefObject<import("./store").State>;
 };

package/es/components/eftposPay/store/index.d.ts

@@ -297,7 +297,7 @@ export declare const backUpFree: (payload: Partial<State>) => {
         amount?: string | number | undefined;
         mode?: "refund" | "pay" | "fullPay" | "query" | undefined;
         order_id?: string | number | undefined;
-        eftpos?: "stripe" | "payo" | "tyro" | "windcave" | "linkly" | undefined;
+        eftpos?: "stripe" | "tyro" | "windcave" | "payo" | "linkly" | undefined;
         action?: "amount" | "pay" | "deviceList" | undefined;
         key?: number | undefined;
         step?: number | undefined;

package/es/components/eventBooking/components/Provider/Cart/Deposit/index.d.ts

@@ -1,3 +1,2 @@
-/// <reference types="react" />
 declare const Deposit: () => JSX.Element;
 export default Deposit;

package/es/components/pay/toC/PaymentMethods/StripePay/Stripe/StripeSDK/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 declare const StripeSDK: ({ public_key, client_secret, children, lang, }: {
     public_key: string;
     client_secret?: string | undefined;

package/es/components/pay/toC/PaymentMethods/StripePay/Stripe/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.module.less';
 declare const StripePayment: () => JSX.Element;
 export default StripePayment;

package/es/components/pay/toC/PaymentMethods/WalletPass/index.d.ts

@@ -15,11 +15,16 @@ export interface WalletPassProps {
     walletPass: {
         cards: WalletPassDataType[];
         amount: number;
+        recommended?: WalletPassDataType[];
+        transformList?: WalletPassDataType[];
+        noApplicableVoucher?: WalletPassDataType[];
     };
     walletSetting: {
         name: string;
         popup_status: 0 | 1;
     };
+    orderDetail: any;
+    total_amount: number;
 }
 declare const _default: React.MemoExoticComponent<React.ForwardRefExoticComponent<WalletPassProps & React.RefAttributes<WalletPassRef>>>;
 export default _default;