@pisell/private-materials 6.2.48 → 6.2.50

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

@@ -7,7 +7,7 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
 function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return e; }; var t, e = {}, r = Object.prototype, n = r.hasOwnProperty, o = Object.defineProperty || function (t, e, r) { t[e] = r.value; }, i = "function" == typeof Symbol ? Symbol : {}, a = i.iterator || "@@iterator", c = i.asyncIterator || "@@asyncIterator", u = i.toStringTag || "@@toStringTag"; function define(t, e, r) { return Object.defineProperty(t, e, { value: r, enumerable: !0, configurable: !0, writable: !0 }), t[e]; } try { define({}, ""); } catch (t) { define = function define(t, e, r) { return t[e] = r; }; } function wrap(t, e, r, n) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype), c = new Context(n || []); return o(a, "_invoke", { value: makeInvokeMethod(t, r, c) }), a; } function tryCatch(t, e, r) { try { return { type: "normal", arg: t.call(e, r) }; } catch (t) { return { type: "throw", arg: t }; } } e.wrap = wrap; var h = "suspendedStart", l = "suspendedYield", f = "executing", s = "completed", y = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var p = {}; define(p, a, function () { return this; }); var d = Object.getPrototypeOf, v = d && d(d(values([]))); v && v !== r && n.call(v, a) && (p = v); var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); function defineIteratorMethods(t) { ["next", "throw", "return"].forEach(function (e) { define(t, e, function (t) { return this._invoke(e, t); }); }); } function AsyncIterator(t, e) { function invoke(r, o, i, a) { var c = tryCatch(t[r], t, o); if ("throw" !== c.type) { var u = c.arg, h = u.value; return h && "object" == _typeof(h) && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) { invoke("next", t, i, a); }, function (t) { invoke("throw", t, i, a); }) : e.resolve(h).then(function (t) { u.value = t, i(u); }, function (t) { return invoke("throw", t, i, a); }); } a(c.arg); } var r; o(this, "_invoke", { value: function value(t, n) { function callInvokeWithMethodAndArg() { return new e(function (e, r) { invoke(t, n, e, r); }); } return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(e, r, n) { var o = h; return function (i, a) { if (o === f) throw new Error("Generator is already running"); if (o === s) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var c = n.delegate; if (c) { var u = maybeInvokeDelegate(c, n); if (u) { if (u === y) continue; return u; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (o === h) throw o = s, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = f; var p = tryCatch(e, r, n); if ("normal" === p.type) { if (o = n.done ? s : l, p.arg === y) continue; return { value: p.arg, done: n.done }; } "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg); } }; } function maybeInvokeDelegate(e, r) { var n = r.method, o = e.iterator[n]; if (o === t) return r.delegate = null, "throw" === n && e.iterator.return && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y; var i = tryCatch(o, e.iterator, r.arg); if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y; var a = i.arg; return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y); } function pushTryEntry(t) { var e = { tryLoc: t[0] }; 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); } function resetTryEntry(t) { var e = t.completion || {}; e.type = "normal", delete e.arg, t.completion = e; } function Context(t) { this.tryEntries = [{ tryLoc: "root" }], t.forEach(pushTryEntry, this), this.reset(!0); } function values(e) { if (e || "" === e) { var r = e[a]; if (r) return r.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) { var o = -1, i = function next() { for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; return next.value = t, next.done = !0, next; }; return i.next = i; } } throw new TypeError(_typeof(e) + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), o(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) { var e = "function" == typeof t && t.constructor; return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name)); }, e.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t; }, e.awrap = function (t) { return { __await: t }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { return this; }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(wrap(t, r, n, o), i); return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () { return this; }), define(g, "toString", function () { return "[object Generator]"; }), e.keys = function (t) { var e = Object(t), r = []; for (var n in e) r.push(n); return r.reverse(), function next() { for (; r.length;) { var t = r.pop(); if (t in e) return next.value = t, next.done = !1, next; } return next.done = !0, next; }; }, e.values = values, Context.prototype = { constructor: Context, reset: function reset(e) { if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0].completion; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(e) { if (this.done) throw e; var r = this; function handle(n, o) { return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o; } for (var o = this.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i.completion; if ("root" === i.tryLoc) return handle("end"); if (i.tryLoc <= this.prev) { var c = n.call(i, "catchLoc"), u = n.call(i, "finallyLoc"); if (c && u) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } else if (c) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); } else { if (!u) throw new Error("try statement without catch or finally"); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } } } }, abrupt: function abrupt(t, e) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var o = this.tryEntries[r]; if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) { var i = o; break; } } i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); var a = i ? i.completion : {}; return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a); }, complete: function complete(t, e) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y; }, finish: function finish(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; } }, catch: function _catch(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.tryLoc === t) { var n = r.completion; if ("throw" === n.type) { var o = n.arg; resetTryEntry(r); } return o; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(e, r, n) { return this.delegate = { iterator: values(e), resultName: r, nextLoc: n }, "next" === this.method && (this.arg = t), y; } }, e; }
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
-import React, { forwardRef, useImperativeHandle, useEffect } from 'react';
+import React, { forwardRef, useImperativeHandle, useEffect, useRef } from 'react';
 import { locales, isMobile } from '@pisell/utils';
 import useEngineContext from "../../../../hooks/useEngineContext";
 import { useAppointmentBookingContext } from "../../context";
@@ -18,9 +18,12 @@ import { getFormParams } from "./utils";
 import "./index.less";
 var ConfirmInformation = /*#__PURE__*/forwardRef(function (props, ref) {
   var _context$appHelper;
+  // 用于跟踪是否已经订阅了事件，避免重复订阅
+  var hasSubscribedRef = useRef(false);
   var context = useEngineContext();
   var config = (context === null || context === void 0 || (_context$appHelper = context.appHelper) === null || _context$appHelper === void 0 || (_context$appHelper = _context$appHelper.constants) === null || _context$appHelper === void 0 ? void 0 : _context$appHelper.config) || {};
   var utils = contextUtils();
+  var pubsub = context.appHelper.utils.pubsub;
   var _ref = useAppointmentBookingContext(),
     appointmentBooking = _ref.appointmentBooking,
     summary = _ref.summary,
@@ -252,15 +255,36 @@ var ConfirmInformation = /*#__PURE__*/forwardRef(function (props, ref) {
       return _ref4.apply(this, arguments);
     };
   }();
+  var handleSubmit = function handleSubmit() {
+    var _utils$businessUtils, _utils$businessUtils$;
+    // 如果用户是guest用户，下单时则拉起注册弹窗
+    if (utils !== null && utils !== void 0 && (_utils$businessUtils = utils.businessUtils) !== null && _utils$businessUtils !== void 0 && (_utils$businessUtils$ = _utils$businessUtils.isGuestUser) !== null && _utils$businessUtils$ !== void 0 && _utils$businessUtils$.call(_utils$businessUtils)) {
+      var _utils$businessUtils2, _utils$businessUtils3;
+      // 避免重复订阅
+      if (!hasSubscribedRef.current) {
+        pubsub.subscribe('bind.guest.user', handleNext);
+        hasSubscribedRef.current = true;
+      }
+      utils === null || utils === void 0 || (_utils$businessUtils2 = utils.businessUtils) === null || _utils$businessUtils2 === void 0 || (_utils$businessUtils3 = _utils$businessUtils2.openRegisterModal) === null || _utils$businessUtils3 === void 0 || _utils$businessUtils3.call(_utils$businessUtils2, true);
+      return;
+    }
+    handleNext();
+  };
+  useEffect(function () {
+    return function () {
+      pubsub.unsubscribe('bind.guest.user', handleNext);
+      hasSubscribedRef.current = false;
+    };
+  }, []);
   useImperativeHandle(ref, function () {
     return {
-      next: handleNext
+      next: handleSubmit
     };
   });
   return /*#__PURE__*/React.createElement("div", {
     className: "appointment-confirm-information-wrap"
   }, isMobile() ? /*#__PURE__*/React.createElement(CartItem, {
-    onNext: handleNext
+    onNext: handleSubmit
   }) : /*#__PURE__*/React.createElement("div", {
     className: "appointment-confirm-information-content"
   }, /*#__PURE__*/React.createElement("div", {

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

@@ -87,7 +87,7 @@ var Layout = function Layout() {
   var pubsub = context.appHelper.utils.pubsub;
   useEffect(function () {
     var handleLoginSuccess = /*#__PURE__*/function () {
-      var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+      var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(res) {
         var _utils$storage, user, currentUser, accountLists, meAccount;
         return _regeneratorRuntime().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
@@ -118,13 +118,13 @@ var Layout = function Layout() {
           }
         }, _callee);
       }));
-      return function handleLoginSuccess() {
+      return function handleLoginSuccess(_x) {
         return _ref2.apply(this, arguments);
       };
     }();
     pubsub.subscribe('pisell1.login.success', handleLoginSuccess);
     return function () {
-      pubsub.unsubscribe('pisell1.login.success');
+      pubsub.unsubscribe('pisell1.login.success', handleLoginSuccess);
     };
   }, []);
   useEffect(function () {

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

@@ -99,7 +99,7 @@ var Services = /*#__PURE__*/forwardRef(function (props, ref) {
               },
               callback: function () {
                 var _callback = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(data) {
-                  var product, session, startDate, endDate, _data$origin, resources, activeStatus, index, stepList, hasResourceStep, description;
+                  var 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:
@@ -117,7 +117,7 @@ var Services = /*#__PURE__*/forwardRef(function (props, ref) {
 
                         // 零售模版，直接加入购物车
                         if (!isRetailTemplate) {
-                          _context.next = 10;
+                          _context.next = 12;
                           break;
                         }
                         if (!(data !== null && data !== void 0 && data.isCancel)) {
@@ -126,51 +126,69 @@ var Services = /*#__PURE__*/forwardRef(function (props, ref) {
                         }
                         return _context.abrupt("return");
                       case 8:
-                        appointmentBooking.storeProduct(product);
+                        res = appointmentBooking.storeProduct(product);
+                        if (!(!res.success && res.errorCode === 'not_enough_stock')) {
+                          _context.next = 11;
+                          break;
+                        }
+                        return _context.abrupt("return", Toast(locales.getText('pisell2.appointment.unuse.stock')));
+                      case 11:
                         return _context.abrupt("return");
-                      case 10:
+                      case 12:
                         session = data === null || data === void 0 ? void 0 : data.session;
                         if (!session) {
-                          _context.next = 19;
+                          _context.next = 24;
                           break;
                         }
                         startDate = dayjs(session === null || session === void 0 ? void 0 : session.start_at).format('YYYY-MM-DD');
                         endDate = dayjs(session === null || session === void 0 ? void 0 : session.end_at).format('YYYY-MM-DD');
-                        appointmentBooking.addProductToCart({
+                        _res = appointmentBooking.addProductToCart({
                           product: _objectSpread({}, product),
                           date: {
                             startTime: "".concat(startDate, " ").concat(session === null || session === void 0 ? void 0 : session.start_time),
                             endTime: "".concat(endDate, " ").concat(session === null || session === void 0 ? void 0 : session.end_time)
                           }
                         });
-                        _context.next = 17;
+                        if (!(!_res.success && _res.errorCode === 'not_enough_stock')) {
+                          _context.next = 19;
+                          break;
+                        }
+                        return _context.abrupt("return", Toast(locales.getText('pisell2.appointment.unuse.stock')));
+                      case 19:
+                        appointmentBooking.closeProductDetail();
+                        _context.next = 22;
                         return appointmentBooking.getAvailableDate({
                           startDate: startDate,
                           endDate: endDate
                         });
-                      case 17:
-                        _context.next = 27;
+                      case 22:
+                        _context.next = 34;
                         break;
-                      case 19:
+                      case 24:
                         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 = 23;
+                          _context.next = 28;
                           break;
                         }
                         return _context.abrupt("return", Toast(locales.getText('pisell2.appointment.no.available.service')));
-                      case 23:
-                        appointmentBooking.storeProduct(product);
-                        // duration 类型的商品，要获取一下资源，在先选日期的 duration 步骤里目前只能通过这个动作拉取
+                      case 28:
+                        _res2 = appointmentBooking.storeProduct(product);
+                        if (!(!_res2.success && _res2.errorCode === 'not_enough_stock')) {
+                          _context.next = 31;
+                          break;
+                        }
+                        return _context.abrupt("return", Toast(locales.getText('pisell2.appointment.unuse.stock')));
+                      case 31:
                         if (!(type === 'duration')) {
-                          _context.next = 27;
+                          _context.next = 34;
                           break;
                         }
-                        _context.next = 27;
+                        _context.next = 34;
                         return appointmentBooking.getAvailableDate();
-                      case 27:
+                      case 34:
                         appointmentBooking.closeProductDetail();
 
                         // 先选择日期流程
@@ -199,7 +217,7 @@ var Services = /*#__PURE__*/forwardRef(function (props, ref) {
                             removeStep('select-time');
                           }
                         }
-                      case 29:
+                      case 36:
                       case "end":
                         return _context.stop();
                     }

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

@@ -136,13 +136,14 @@ var VoucherCard = function VoucherCard(props) {
   // // apply code
   var onScanCode = /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-      var val;
+      var customerId, val;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
-            _context.next = 2;
-            return shopDiscount.scanCode(code);
-          case 2:
+            customerId = currentUser.id;
+            _context.next = 3;
+            return shopDiscount.scanCode(code, customerId);
+          case 3:
             val = _context.sent;
             if (val !== null && val !== void 0 && val.isAvailable) {
               batchUpdateCart(val.productList);
@@ -152,7 +153,7 @@ var VoucherCard = function VoucherCard(props) {
                 content: val.type === 'server' ? locales.getText('pisell2.text.goodpass.code-invalid') : locales.getText('pisell2.text.goodpass.code-invalid-cart')
               });
             }
-          case 4:
+          case 5:
           case "end":
             return _context.stop();
         }

package/es/components/appointmentBooking/hooks.js

@@ -206,6 +206,12 @@ export var useAppointmentBookingStep = function useAppointmentBookingStep() {
       if (!result) {
         return Toast(locales.getText('pisell2.appointment.unuse.date'));
       }
+      var capacityResult = appointmentBooking.checkMaxDurationCapacity();
+      if (!capacityResult.success) {
+        var getMessage = locales.getText('pisell2.appointment.unuse.capacity');
+        var message = typeof getMessage === 'function' ? getMessage(capacityResult.minAvailableCount) : getMessage;
+        return Toast(message);
+      }
     }
     if (!isRetailTemplate && currentKey !== null && currentKey !== void 0 && currentKey.startsWith('select-resource')) {
       var _currentSelectedResou;
@@ -357,8 +363,10 @@ export var useAppointmentBookingStep = function useAppointmentBookingStep() {
                 }
                 // const accountLists = await appointmentBooking.getAccounts()
                 pubsub = utils.pubsub;
-                pubsub.once('pisell1.login.success', function () {
-                  checkHolder();
+                pubsub.once('pisell1.login.success', function (res) {
+                  if (res === 'success') {
+                    checkHolder();
+                  }
                 });
                 return _context3.abrupt("return", openLoginModal({
                   callback: function callback(status) {

package/es/components/appointmentBooking/index.js

@@ -24,6 +24,16 @@ var AppointmentBooking = function AppointmentBooking() {
       if (!data.length) {
         var currentUser = formatCurrentUser(utils);
         appointmentBooking.addAccounts([currentUser]);
+      } else if (data.length >= 1) {
+        var meAccount = data === null || data === void 0 ? void 0 : data.find(function (d) {
+          return !(d !== null && d !== void 0 && d.isGuest);
+        });
+        // 如果 length >= 1 找到非 guest 账号，检测这个账号是否跟 localStorage 里已登录的账号 id 一致
+        // 如果不一致的话，则setLoginAccount ls 里的账号
+        var _currentUser = formatCurrentUser(utils);
+        if (_currentUser && meAccount.id !== _currentUser.id) {
+          appointmentBooking.setLoginAccount(meAccount.id, _currentUser);
+        }
       }
     });
   }, []);

package/es/components/booking/addons/model.d.ts

@@ -1,10 +1 @@
-/// <reference types="react" />
-import { FormState } from "../model";
-export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
-    state: FormState;
-} & {
-    dispatch: (params: {
-        type: string;
-        payload: any;
-    }) => void;
-}>;
+export declare const Provider: any, Context: any;

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

@@ -435,7 +435,7 @@ var Footer = function Footer(props) {
    */
   var handleSave = /*#__PURE__*/function () {
     var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(_ref4) {
-      var type, _ref4$messageShow, messageShow, isHasDayProducts, _setLoading, _getApis, createBooking, editBooking, editApi, createApi, saveOtherValue, _state$onSave, callbackData, values, api;
+      var type, _ref4$messageShow, messageShow, isHasDayProducts, _setLoading, _getApis, createBooking, editBooking, editApi, createApi, saveOtherValue, _state$onSave, _store$getState, _window, callbackData, values, api;
       return _regeneratorRuntime().wrap(function _callee4$(_context4) {
         while (1) switch (_context4.prev = _context4.next) {
           case 0:
@@ -492,6 +492,17 @@ var Footer = function Footer(props) {
               }, {
                 key: '日期',
                 value: dayjs().format('YYYY-MM-DD HH:mm')
+              }, {
+                key: '店铺id',
+                value: store === null || store === void 0 || (_store$getState = store.getState) === null || _store$getState === void 0 || (_store$getState = _store$getState.call(store)) === null || _store$getState === void 0 || (_store$getState = _store$getState.global) === null || _store$getState === void 0 || (_store$getState = _store$getState.globalConfig) === null || _store$getState === void 0 ? void 0 : _store$getState.id
+              }, {
+                key: 'shopApi',
+                value: JSON.stringify((_window = window) === null || _window === void 0 ? void 0 : _window.shopApi, function (key, value) {
+                  if (typeof value === 'function') {
+                    return 'function';
+                  }
+                  return value;
+                })
               }]
             });
 

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

@@ -71,7 +71,7 @@ var EditBookingModal = function EditBookingModal(props, ref) {
   var getInitData = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(params) {
       var _data$fromResource, _data$toResource;
-      var mockProps, _data, _initResourceVal, fromResourceFormId, toResourceFormId, _form_id, _data$toResource2, _formatResources, list, maps, currentForm, relation_id, _currentForm$renderLi, _currentForm$renderLi2, _currentForm$renderLi3, _currentForm$renderLi4, _targetResource, _cloned, _idx, _sameResource;
+      var mockProps, _data, _initResourceVal, fromResourceFormId, toResourceFormId, _form_id, _data$toResource2, _formatResources, list, maps, currentForm, relation_id, _currentForm$renderLi, _currentForm$renderLi2, _currentForm$renderLi3, _currentForm$renderLi4, _targetResource, _cloned, _idx, _sameResource, _targetIdx;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
@@ -129,7 +129,13 @@ var EditBookingModal = function EditBookingModal(props, ref) {
                       _cloned[_idx] = _targetResource; // 替换现有对象
                     }
                   } else {
-                    _cloned.push(_targetResource); // 添加新对象
+                    // 未发现原资源位置（短时间内通过其它渠道修改过资源）
+                    _targetIdx = _cloned.findIndex(function (rs) {
+                      return rs.relation_id == (_targetResource === null || _targetResource === void 0 ? void 0 : _targetResource.relation_id);
+                    }); // 判断是否已经包含了目标资源，不包含则加入进来
+                    if (_targetIdx === -1) {
+                      _cloned.push(_targetResource); // 添加新对象
+                    }
                   }
                   _initResourceVal = _objectSpread(_objectSpread({}, _initResourceVal), {}, _defineProperty({}, _form_id, _cloned));
                 } else {

package/es/components/booking/forms/model.d.ts

@@ -1,10 +1 @@
-/// <reference types="react" />
-import { FormState } from "../model";
-export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
-    state: FormState;
-} & {
-    dispatch: (params: {
-        type: string;
-        payload: any;
-    }) => void;
-}>;
+export declare const Provider: any, Context: any;

package/es/components/booking/info/model.d.ts

@@ -1,14 +1,5 @@
-/// <reference types="react" />
-import { FormState } from '../model';
 export declare const walkInData: {
     id: number;
     nickname: string;
 };
-export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
-    state: FormState;
-} & {
-    dispatch: (params: {
-        type: string;
-        payload: any;
-    }) => void;
-}>;
+export declare const Provider: any, Context: any;

package/es/components/booking/info/service/addService/utils.d.ts

@@ -6,7 +6,7 @@ export declare const getDurationProps: ({ cacheItem, useStartTime, currentResour
         type: string;
         value: number;
     };
-    locale: any;
+    locale: string;
     slice: any;
     selectProps: {
         size: string;

package/es/components/booking/info2/service/addService/utils.d.ts

@@ -7,7 +7,7 @@ export declare const getDurationProps: ({ cacheItem, useStartTime, currentResour
         type: string;
         value: number;
     };
-    locale: any;
+    locale: string;
     slice: any;
     selectProps: {
         size: string;

package/es/components/booking/locales.d.ts

@@ -156,6 +156,8 @@ declare const _default: {
         'pisell2.text.deposit-delete-message': string;
         'pisell2.text.deposit-paid': string;
         "pisell2.text.stock": string;
+        'pisell2.appointment.unuse.stock': string;
+        'pisell2.appointment.unuse.capacity': (count: number) => string;
         'pisell2.text.payment-link': string;
         'pisell2.text.send-mail': string;
         'pisell2.text.copy-to-clipboard': string;
@@ -458,6 +460,8 @@ declare const _default: {
         'pisell2.text.deposit-delete-message': string;
         'pisell2.text.deposit-paid': string;
         "pisell2.text.stock": string;
+        'pisell2.appointment.unuse.stock': string;
+        'pisell2.appointment.unuse.capacity': (count: number) => string;
         'pisell2.text.payment-link': string;
         'pisell2.text.send-mail': string;
         'pisell2.text.copy-to-clipboard': string;
@@ -760,6 +764,8 @@ declare const _default: {
         'pisell2.text.deposit-delete-message': string;
         'pisell2.text.deposit-paid': string;
         "pisell2.text.stock": string;
+        'pisell2.appointment.unuse.stock': string;
+        'pisell2.appointment.unuse.capacity': (count: number) => string;
         'pisell2.text.payment-link': string;
         'pisell2.text.send-mail': string;
         'pisell2.text.copy-to-clipboard': string;

package/es/components/booking/locales.js

@@ -102,7 +102,7 @@ export default {
       var obj = {
         shop: 'Paid from Merchant Portal',
         'mini-program': 'Paid from WeChat Mini-program',
-        pos: 'Paid from Pisell Terminal',
+        pos: 'Paid from Terminal',
         PC: 'Paid from Website',
         app: 'Paid from APP'
       };
@@ -145,7 +145,7 @@ export default {
     'pisell2.text.edit-profile': 'Edit profile',
     'pisell2.text.remove-contact': 'Remove contact',
     'pisell2.text.order.sales.channel.online': "Online store",
-    'pisell2.text.order.sales.channel.pos-terminal': "Pisell terminal",
+    'pisell2.text.order.sales.channel.pos-terminal': "Terminal",
     'pisell2.text.order.sales.channel.boxcocal': "Boxlocal",
     'pisell2.text.order.sales.channel.tableorder': "Table order",
     'pisell2.text.order.sales.channel.reserve': "Google reservation",
@@ -174,6 +174,10 @@ export default {
     'pisell2.text.deposit-delete-message': "It cannot be restored after deletion. Please confirm the operation.",
     'pisell2.text.deposit-paid': "Deposit paid",
     "pisell2.text.stock": "Stock",
+    'pisell2.appointment.unuse.stock': "Not enough stock",
+    'pisell2.appointment.unuse.capacity': function pisell2AppointmentUnuseCapacity(count) {
+      return "Only ".concat(count, " spots available. Please reduce quantity.");
+    },
     'pisell2.text.payment-link': "Payment link",
     'pisell2.text.send-mail': "Send email",
     'pisell2.text.copy-to-clipboard': "Copy to clipboard",
@@ -187,7 +191,7 @@ export default {
     'page.booking.text.available': 'Available',
     'page.booking.text.fully-booked': 'Fully booked',
     'page.booking.text.unlimited': 'Unlimited',
-    'pisell2.text.terminal-edit-message': "This operation cannot be performed. To proceed, please use the Pisell Terminal.",
+    'pisell2.text.terminal-edit-message': "This operation cannot be performed. To proceed, please use the Terminal.",
     "pisell2.text.actions": "Actions",
     "pisell2.text.add-client": "Add customer",
     // 日称tab
@@ -464,7 +468,7 @@ export default {
       var obj = {
         shop: '在 管理后台 支付',
         'mini-program': '在 微信小程序 支付',
-        pos: '在 Pisell 终端 支付',
+        pos: '在 终端 支付',
         PC: '在 网站 支付',
         app: '在 手机应用程序 支付'
       };
@@ -502,7 +506,7 @@ export default {
     'pisell2.text.edit-profile': '编辑个人资料',
     'pisell2.text.remove-contact': '删除联系人',
     'pisell2.text.order.sales.channel.online': "在线店铺",
-    'pisell2.text.order.sales.channel.pos-terminal': "Pisell终端",
+    'pisell2.text.order.sales.channel.pos-terminal': "终端",
     'pisell2.text.order.sales.channel.boxcocal': "Boxlocal",
     'pisell2.text.order.sales.channel.tableorder': "扫码点餐",
     'pisell2.text.order.sales.channel.reserve': "谷歌预约",
@@ -531,11 +535,15 @@ export default {
     'pisell2.text.deposit-delete-message': "删除后不可恢复，请确认操作",
     'pisell2.text.deposit-paid': "已付定金",
     "pisell2.text.stock": "库存",
+    'pisell2.appointment.unuse.stock': "库存不足",
+    'pisell2.appointment.unuse.capacity': function pisell2AppointmentUnuseCapacity(count) {
+      return "\u4EC5\u53EF\u9884\u7EA6 ".concat(count, " \u4E2A\uFF0C\u8BF7\u51CF\u5C11\u6570\u91CF");
+    },
     'pisell2.text.payment-link': "付款链接",
     'pisell2.text.send-mail': "发送邮件",
     'pisell2.text.copy-to-clipboard': "复制到剪切板",
     'pisell2.text.ok': "好的",
-    'pisell2.text.terminal-edit-message': "此操作不可使用，如需使用请至Pisell 终端设备操作。",
+    'pisell2.text.terminal-edit-message': "此操作不可使用，如需使用请至终端设备操作。",
     'page.booking.text.add-time': '加时',
     'page.booking.text.quantity': '数量',
     'page.booking.text.sales': '销售',
@@ -821,7 +829,7 @@ export default {
       var obj = {
         shop: '在 管理後臺 支付',
         'mini-program': '在 微信小程序 支付',
-        pos: '在 Pisell 終端 支付',
+        pos: '在 終端 支付',
         PC: '在 網站 支付',
         app: '在 手機應用程序 支付'
       };
@@ -859,7 +867,7 @@ export default {
     'pisell2.text.edit-profile': '編輯個人資料',
     'pisell2.text.remove-contact': '删除聯系人',
     'pisell2.text.order.sales.channel.online': "在線店鋪",
-    'pisell2.text.order.sales.channel.pos-terminal': "Pisell终端",
+    'pisell2.text.order.sales.channel.pos-terminal': "终端",
     'pisell2.text.order.sales.channel.boxcocal': "Boxlocal",
     'pisell2.text.order.sales.channel.tableorder': "掃碼點餐",
     'pisell2.text.order.sales.channel.reserve': "谷歌預約",
@@ -888,11 +896,15 @@ export default {
     'pisell2.text.deposit-delete-message': "刪除後不可恢復，請確認操作",
     'pisell2.text.deposit-paid': "已付定金",
     "pisell2.text.stock": "庫存",
+    'pisell2.appointment.unuse.stock': "庫存不足",
+    'pisell2.appointment.unuse.capacity': function pisell2AppointmentUnuseCapacity(count) {
+      return "\u50C5\u53EF\u9810\u7D04 ".concat(count, " \u500B\uFF0C\u8ACB\u6E1B\u5C11\u6578\u91CF");
+    },
     'pisell2.text.payment-link': "付款鏈接",
     'pisell2.text.send-mail': "發送郵件",
     'pisell2.text.copy-to-clipboard': "複製到剪切板",
     'pisell2.text.ok': "好的",
-    'pisell2.text.terminal-edit-message': "此操作不可使用，如需使用請至Pisell 終端設備操作。",
+    'pisell2.text.terminal-edit-message': "此操作不可使用，如需使用請至終端設備操作。",
     'page.booking.text.add-time': '加時',
     'page.booking.text.quantity': '數量',
     'page.booking.text.sales': '銷售',

package/es/components/booking/model.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 export interface FormState {
     amountSymbol: string;
     apis: {
@@ -106,11 +105,4 @@ export declare const walkInData: {
     id: number;
     nickname: string;
 };
-export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
-    state: FormState;
-} & {
-    dispatch: (params: {
-        type: string;
-        payload: any;
-    }) => void;
-}>;
+export declare const Provider: any, Context: any;

package/es/components/booking/notes/model.d.ts

@@ -1,10 +1 @@
-/// <reference types="react" />
-import { FormState } from "../model";
-export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
-    state: FormState;
-} & {
-    dispatch: (params: {
-        type: string;
-        payload: any;
-    }) => void;
-}>;
+export declare const Provider: any, Context: any;

package/es/components/booking/payments/model.d.ts

@@ -1,10 +1 @@
-/// <reference types="react" />
-import { FormState } from "../model";
-export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
-    state: FormState;
-} & {
-    dispatch: (params: {
-        type: string;
-        payload: any;
-    }) => void;
-}>;
+export declare const Provider: any, Context: any;

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<"payo" | "tyro" | "windcave" | "stripe" | "linkly">;
     readonly clientRef: React.MutableRefObject<ClientEnum>;
     readonly dataRef: React.MutableRefObject<import("./store").State>;
 };

package/es/components/eftposPay/linkly/hooks/normal.js

@@ -74,7 +74,7 @@ export var useLinklyPayOrRefund = function useLinklyPayOrRefund(handleCheck) {
     var status = res === null || res === void 0 || (_res$data = res.data) === null || _res$data === void 0 ? void 0 : _res$data.status;
 
     // 继续查询交易状态
-    if (status === 0) {
+    if (status == 0) {
       var _res$data2;
       // 交易流水号
       numRef.current = res === null || res === void 0 || (_res$data2 = res.data) === null || _res$data2 === void 0 ? void 0 : _res$data2.session_id;
@@ -89,7 +89,7 @@ export var useLinklyPayOrRefund = function useLinklyPayOrRefund(handleCheck) {
       setTimeout(function () {
         var _resultQueryRef$curre;
         (_resultQueryRef$curre = resultQueryRef.current) === null || _resultQueryRef$curre === void 0 || _resultQueryRef$curre.call(resultQueryRef);
-      });
+      }, 300);
       return;
     }
 
@@ -99,7 +99,7 @@ export var useLinklyPayOrRefund = function useLinklyPayOrRefund(handleCheck) {
     }));
 
     // 交易成功
-    if (status === 1) {
+    if (status == 1) {
       var _handleLinklySuccessR;
       (_handleLinklySuccessR = handleLinklySuccessRef.current) === null || _handleLinklySuccessR === void 0 || _handleLinklySuccessR.call(handleLinklySuccessRef, res);
       return;