@pisell/private-materials 6.6.84 → 6.6.85

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

@@ -653,7 +653,7 @@ var Footer = function Footer(props) {
     };
     return {
       wait: function wait(orderId) {
-        var timeout = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 2000;
+        var timeout = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 3000;
         return new Promise(function (resolve) {
           targetOrderId = String(orderId !== null && orderId !== void 0 ? orderId : '');
           if (!targetOrderId || syncedOrderIds.has(targetOrderId)) {
@@ -686,7 +686,7 @@ var Footer = function Footer(props) {
   var handleCheckoutInternal = /*#__PURE__*/function () {
     var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
       var _state$bookingConfig5;
-      var isToastMode, isNewOrder, isHasDayProducts, res, modalData, orderSyncWaiter, _res;
+      var isToastMode, isNewOrder, isHasDayProducts, res, modalData, _window7, orderSyncWaiter, _res;
       return _regeneratorRuntime().wrap(function _callee4$(_context4) {
         while (1) switch (_context4.prev = _context4.next) {
           case 0:
@@ -697,7 +697,7 @@ var Footer = function Footer(props) {
             }
             isNewOrder = !state.bookingId; // 如果有编辑内容, 则先保存
             if (!isEdit) {
-              _context4.next = 33;
+              _context4.next = 34;
               break;
             }
             if (!isDayBooking(state)) {
@@ -770,10 +770,10 @@ var Footer = function Footer(props) {
                 }
               };
             });
-            _context4.next = 32;
+            _context4.next = 33;
             break;
           case 21:
-            orderSyncWaiter = isWebPos && isNewOrder ? createOrderSyncWaiter() : null;
+            orderSyncWaiter = (_window7 = window) !== null && _window7 !== void 0 && _window7.isWebPos && isNewOrder ? createOrderSyncWaiter() : null;
             _context4.next = 24;
             return handleSave({
               type: 'checkout',
@@ -781,24 +781,25 @@ var Footer = function Footer(props) {
             });
           case 24:
             _res = _context4.sent;
-            if (_res) {
+            if (!(!_res && orderSyncWaiter)) {
               _context4.next = 28;
               break;
             }
             orderSyncWaiter === null || orderSyncWaiter === void 0 || orderSyncWaiter.dispose();
             return _context4.abrupt("return");
           case 28:
-            _context4.next = 30;
+            console.log(orderSyncWaiter, isTerminal === null || isTerminal === void 0 ? void 0 : isTerminal(), 'orderSyncWaiter');
+            _context4.next = 31;
             return orderSyncWaiter === null || orderSyncWaiter === void 0 ? void 0 : orderSyncWaiter.wait(_res === null || _res === void 0 ? void 0 : _res.order_id);
-          case 30:
+          case 31:
             // goCheckout2(res);
             console.log(_res);
             goCheckout((_res === null || _res === void 0 ? void 0 : _res.order_id) || state.bookingId, isNewOrder);
-          case 32:
-            return _context4.abrupt("return");
           case 33:
-            return _context4.abrupt("return", goCheckout(state.bookingId, isNewOrder));
+            return _context4.abrupt("return");
           case 34:
+            return _context4.abrupt("return", goCheckout(state.bookingId, isNewOrder));
+          case 35:
           case "end":
             return _context4.stop();
         }
@@ -930,7 +931,7 @@ var Footer = function Footer(props) {
   var handleSave = /*#__PURE__*/function () {
     var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(_ref6) {
       var _submitState, _submitState$service, _submitState$client;
-      var type, _ref6$messageShow, messageShow, _ref6$noSubmit, noSubmit, submitState, isToastMode, isHasDayProducts, hasUnspecifiedHolderProduct, shouldContinue, _setLoading, loadingTimer, _getApis, createBooking, editBooking, editApi, createApi, saveOtherValue, _submitState2, _submitState2$onSave, _store$getState, _window7, _submitState4, callbackData, values, checkout, subtotal_info, res, _submitState3, isNeedDeposit, api;
+      var type, _ref6$messageShow, messageShow, _ref6$noSubmit, noSubmit, submitState, isToastMode, isHasDayProducts, hasUnspecifiedHolderProduct, shouldContinue, _setLoading, loadingTimer, _getApis, createBooking, editBooking, editApi, createApi, saveOtherValue, _submitState2, _submitState2$onSave, _store$getState, _window8, _submitState4, callbackData, values, checkout, subtotal_info, res, _submitState3, isNeedDeposit, api;
       return _regeneratorRuntime().wrap(function _callee6$(_context6) {
         while (1) switch (_context6.prev = _context6.next) {
           case 0:
@@ -1072,7 +1073,7 @@ var Footer = function Footer(props) {
                 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((_window7 = window) === null || _window7 === void 0 ? void 0 : _window7.shopApi, function (key, value) {
+                value: JSON.stringify((_window8 = window) === null || _window8 === void 0 ? void 0 : _window8.shopApi, function (key, value) {
                   if (typeof value === 'function') {
                     return 'function';
                   }

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

@@ -508,7 +508,7 @@ var Footer = (props) => {
       (_b3 = (_a3 = pisellos == null ? void 0 : pisellos.effects) == null ? void 0 : _a3.off) == null ? void 0 : _b3.call(_a3, "order:onOrdersChanged", handleOrdersChanged);
     };
     return {
-      wait: (orderId, timeout = 2e3) => new Promise((resolve) => {
+      wait: (orderId, timeout = 3e3) => new Promise((resolve) => {
         targetOrderId = String(orderId ?? "");
         if (!targetOrderId || syncedOrderIds.has(targetOrderId)) {
           dispose();
@@ -582,15 +582,16 @@ var Footer = (props) => {
           }
         });
       } else {
-        const orderSyncWaiter = isWebPos && isNewOrder ? createOrderSyncWaiter() : null;
+        const orderSyncWaiter = (window == null ? void 0 : window.isWebPos) && isNewOrder ? createOrderSyncWaiter() : null;
         const res = await handleSave({
           type: "checkout",
           messageShow: !(isTerminal == null ? void 0 : isTerminal())
         });
-        if (!res) {
+        if (!res && orderSyncWaiter) {
           orderSyncWaiter == null ? void 0 : orderSyncWaiter.dispose();
           return;
         }
+        console.log(orderSyncWaiter, isTerminal == null ? void 0 : isTerminal(), "orderSyncWaiter");
         await (orderSyncWaiter == null ? void 0 : orderSyncWaiter.wait(res == null ? void 0 : res.order_id));
         console.log(res);
         goCheckout((res == null ? void 0 : res.order_id) || state.bookingId, isNewOrder);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/private-materials",
-  "version": "6.6.84",
+  "version": "6.6.85",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -63,9 +63,9 @@
     "styled-components": "^6.0.0-rc.3",
     "@react-spring/web": "^9.6.1",
     "@use-gesture/react": "^10.3.1",
+    "@pisell/utils": "3.0.2",
     "@pisell/materials": "6.6.20",
     "@pisell/icon": "0.0.11",
-    "@pisell/utils": "3.0.2",
     "@pisell/date-picker": "3.0.7"
   },
   "peerDependencies": {