@pisell/private-materials 6.3.177 → 6.3.179

package/es/components/scanOrder/components/Check/index.js

@@ -9,9 +9,9 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import React, { useMemo, useState, useCallback, useEffect } from 'react';
-import { Input, message, Modal } from 'antd';
+import { Input, message } from 'antd';
 import { locales } from '@pisell/utils';
-import { Button, PisellLoading, PisellToast } from '@pisell/materials';
+import { PisellLoading, PisellToast } from '@pisell/materials';
 import Cart from "../Cart";
 import FulfillmentMode from "../FulfillmentMode";
 import ManualPickupRefModal from "../ManualPickupRefModal";
@@ -25,8 +25,7 @@ export default function Check() {
     refreshViewModel = _useScanOrderContext.refreshViewModel,
     tableName = _useScanOrderContext.tableName,
     entryMode = _useScanOrderContext.entryMode,
-    clearStepCache = _useScanOrderContext.clearStepCache,
-    entryContext = _useScanOrderContext.entryContext;
+    clearStepCache = _useScanOrderContext.clearStepCache;
   var isAdditionalOrder = entryMode === 'additional_order';
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
@@ -40,19 +39,15 @@ export default function Check() {
     _useState6 = _slicedToArray(_useState5, 2),
     pickupRefOpen = _useState6[0],
     setPickupRefOpen = _useState6[1];
-  var _useState7 = useState(false),
-    _useState8 = _slicedToArray(_useState7, 2),
-    addOnConfirmOpen = _useState8[0],
-    setAddOnConfirmOpen = _useState8[1];
   var utils = contextUtils();
-  var _useState9 = useState(null),
+  var _useState7 = useState(null),
+    _useState8 = _slicedToArray(_useState7, 2),
+    dineInConfig = _useState8[0],
+    setDineInConfig = _useState8[1];
+  var _useState9 = useState(''),
     _useState10 = _slicedToArray(_useState9, 2),
-    dineInConfig = _useState10[0],
-    setDineInConfig = _useState10[1];
-  var _useState11 = useState(''),
-    _useState12 = _slicedToArray(_useState11, 2),
-    channel = _useState12[0],
-    setChannel = _useState12[1];
+    channel = _useState10[0],
+    setChannel = _useState10[1];
   // 去读 pisellos 内的配置
   var getConfig = useCallback( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
     var _otherParams$dineInCo, _otherParams$channel;
@@ -94,18 +89,6 @@ export default function Check() {
   var productsTitle = useMemo(function () {
     return String(locales.getText('pisell2.scan.order.products.title') || 'Products');
   }, []);
-  var addOnConfirmTitle = useMemo(function () {
-    return String(locales.getText('pisell2.scan.order.add.on.confirm.title') || 'This table has already started ordering');
-  }, []);
-  var addOnConfirmDescription = useMemo(function () {
-    return String(locales.getText('pisell2.scan.order.add.on.confirm.description') || 'Someone at your table has placed the order. This will be submitted as an add-on order.');
-  }, []);
-  var addOnConfirmButtonText = useMemo(function () {
-    return String(locales.getText('pisell2.scan.order.add.on.confirm.button') || 'Confirm Add-on Order');
-  }, []);
-  var addOnReturnButtonText = useMemo(function () {
-    return String(locales.getText('pisell2.scan.order.add.on.return.button') || 'Return to Cart');
-  }, []);
   var showCheckStepEmptyCartTip = function showCheckStepEmptyCartTip() {
     message.error(locales.getText('pisell2.scan.order.check.cart.empty.tip') || 'Please go back to add products');
   };
@@ -115,31 +98,9 @@ export default function Check() {
       content: content
     });
   }, []);
-  var showInventoryInsufficientModal = useCallback(function (error) {
-    var _error$data;
-    setSubmitting(false);
-    var unavailableProducts = Array.isArray(error === null || error === void 0 || (_error$data = error.data) === null || _error$data === void 0 ? void 0 : _error$data.unavailable_products) ? error.data.unavailable_products : [];
-    var productNames = unavailableProducts.map(function (product) {
-      return String((product === null || product === void 0 ? void 0 : product.title) || (product === null || product === void 0 ? void 0 : product.product_id) || '').trim();
-    }).filter(Boolean);
-    var title = String(locales.getText('pisell2.scan.order.inventory.insufficient.title') || 'Insufficient inventory');
-    var description = String(locales.getText('pisell2.scan.order.inventory.insufficient.description') || 'The following items are out of stock or do not have enough inventory. Please adjust your cart and try again.');
-    var productsLabel = String(locales.getText('pisell2.scan.order.inventory.insufficient.products.label') || 'Unavailable products:');
-    var fallbackMessage = String((error === null || error === void 0 ? void 0 : error.message) || description);
-    Modal.info({
-      title: title,
-      content: /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("div", null, description), /*#__PURE__*/React.createElement("div", null, productsLabel), productNames.length > 0 ? /*#__PURE__*/React.createElement("ul", null, productNames.map(function (name, index) {
-        return /*#__PURE__*/React.createElement("li", {
-          key: "".concat(name, "-").concat(index)
-        }, name);
-      })) : /*#__PURE__*/React.createElement("div", null, fallbackMessage)),
-      okText: String(locales.getText('pisell2.event.confirm') || 'OK'),
-      maskClosable: false
-    });
-  }, []);
   var doSubmit = /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
-      var items, _res$data, res, orderId, shouldPayOnSubmit, channelMap, saleChannel, _res$data2, _viewModel$summary, _utils$history, _utils$history2, link, reservationResourceSelectType, allowAddItems, _res;
+      var items, _res$data, res, orderId, shouldPayOnSubmit, channelMap, saleChannel, _res$data2, _viewModel$summary, _utils$history, _utils$history2, link;
       return _regeneratorRuntime().wrap(function _callee3$(_context3) {
         while (1) switch (_context3.prev = _context3.next) {
           case 0:
@@ -163,39 +124,31 @@ export default function Check() {
             res = _context3.sent;
             console.log('submitScanOrder >>>>> ', res);
             if (!((res === null || res === void 0 ? void 0 : res.status) === false)) {
-              _context3.next = 20;
-              break;
-            }
-            if (!((res === null || res === void 0 ? void 0 : res.code) === 6008)) {
               _context3.next = 17;
               break;
             }
-            showInventoryInsufficientModal(res);
-            return _context3.abrupt("return");
-          case 17:
             setSubmitting(false);
             showSubmitFailedTip(res === null || res === void 0 ? void 0 : res.message);
             return _context3.abrupt("return");
-          case 20:
+          case 17:
             orderId = res === null || res === void 0 || (_res$data = res.data) === null || _res$data === void 0 ? void 0 : _res$data.order_id;
             shouldPayOnSubmit = (dineInConfig === null || dineInConfig === void 0 ? void 0 : dineInConfig['sale.require_payment_on_submit']) && !isAdditionalOrder;
             if (orderId) {
-              _context3.next = 25;
+              _context3.next = 22;
               break;
             }
             showSubmitFailedTip(res === null || res === void 0 ? void 0 : res.message);
             return _context3.abrupt("return");
-          case 25:
+          case 22:
             // 下单成功：清空步骤缓存（step / gate / entryContext），避免残留影响下次扫码
             clearStepCache();
             channelMap = {
               'scan_to_order': 'table-order',
-              'scan_to_order_2': 'mobile_order',
-              'scan_to_order_3': 'scantoorder3'
+              'scan_to_order_2': 'mobile_order'
             };
             saleChannel = channelMap[channel] || channel;
             if (!shouldPayOnSubmit) {
-              _context3.next = 33;
+              _context3.next = 30;
               break;
             }
             setSubmitting(false);
@@ -233,20 +186,20 @@ export default function Check() {
                 return callback;
               }()
             });
-            _context3.next = 51;
+            _context3.next = 48;
             break;
-          case 33:
-            _context3.prev = 33;
-            _context3.next = 36;
+          case 30:
+            _context3.prev = 30;
+            _context3.next = 33;
             return runModuleAction('restoreOrder');
-          case 36:
-            _context3.next = 41;
+          case 33:
+            _context3.next = 38;
             break;
-          case 38:
-            _context3.prev = 38;
-            _context3.t0 = _context3["catch"](33);
+          case 35:
+            _context3.prev = 35;
+            _context3.t0 = _context3["catch"](30);
             console.warn('[scanOrder] restoreOrder before redirect failed', _context3.t0);
-          case 41:
+          case 38:
             link = "/order/details?id=".concat(orderId);
             if (utils !== null && utils !== void 0 && (_utils$history = utils.history) !== null && _utils$history !== void 0 && _utils$history.replace) {
               utils.history.replace(link);
@@ -255,75 +208,35 @@ export default function Check() {
             } else {
               location.replace(link);
             }
-            _context3.prev = 43;
-            _context3.next = 46;
+            _context3.prev = 40;
+            _context3.next = 43;
             return runModuleAction('restoreOrder');
-          case 46:
-            _context3.next = 51;
+          case 43:
+            _context3.next = 48;
             break;
-          case 48:
-            _context3.prev = 48;
-            _context3.t1 = _context3["catch"](43);
+          case 45:
+            _context3.prev = 45;
+            _context3.t1 = _context3["catch"](40);
             console.warn('[scanOrder] restoreOrder after payment failed', _context3.t1);
-          case 51:
-            _context3.next = 53;
+          case 48:
+            _context3.next = 50;
             return refreshViewModel();
-          case 53:
-            _context3.next = 77;
+          case 50:
+            _context3.next = 56;
             break;
-          case 55:
-            _context3.prev = 55;
+          case 52:
+            _context3.prev = 52;
             _context3.t2 = _context3["catch"](5);
             console.error('[scanOrder] submitScanOrder failed', _context3.t2);
-            if (!((_context3.t2 === null || _context3.t2 === void 0 ? void 0 : _context3.t2.code) === 670005)) {
-              _context3.next = 63;
-              break;
-            }
-            setSubmitting(false);
-            showSubmitFailedTip(String(locales.getText('pisell2.scan.order.settled.cannot.add.tip') || ''));
-            _context3.next = 77;
-            break;
-          case 63:
-            if (!((_context3.t2 === null || _context3.t2 === void 0 ? void 0 : _context3.t2.code) === 670007 && entryContext !== null && entryContext !== void 0 && entryContext.resource_id)) {
-              _context3.next = 76;
-              break;
-            }
-            _context3.next = 66;
-            return runModuleAction('getReservationResourceSelectType');
-          case 66:
-            reservationResourceSelectType = _context3.sent;
-            _context3.next = 69;
-            return runModuleAction('checkAllowAddItems');
-          case 69:
-            allowAddItems = _context3.sent;
-            _context3.next = 72;
-            return runModuleAction('syncAdditionalOrderFromResource', entryContext === null || entryContext === void 0 ? void 0 : entryContext.resource_id);
-          case 72:
-            _res = _context3.sent;
-            if (reservationResourceSelectType.resourceSelectType === 'single' && allowAddItems !== null && allowAddItems !== void 0 && allowAddItems.enabled && _res !== null && _res !== void 0 && _res.matched) {
-              setSubmitting(false);
-              setAddOnConfirmOpen(true);
-            } else {
-              setSubmitting(false);
-              showSubmitFailedTip(_context3.t2 === null || _context3.t2 === void 0 ? void 0 : _context3.t2.message);
-            }
-            _context3.next = 77;
-            break;
-          case 76:
-            if ((_context3.t2 === null || _context3.t2 === void 0 ? void 0 : _context3.t2.code) === 6008) {
-              showInventoryInsufficientModal(_context3.t2);
-            } else {
-              setSubmitting(false);
-              showSubmitFailedTip(_context3.t2 === null || _context3.t2 === void 0 ? void 0 : _context3.t2.message);
-            }
-          case 77:
-            _context3.prev = 77;
-            return _context3.finish(77);
-          case 79:
+            showSubmitFailedTip(_context3.t2 === null || _context3.t2 === void 0 ? void 0 : _context3.t2.message);
+          case 56:
+            _context3.prev = 56;
+            return _context3.finish(56);
+          case 58:
           case "end":
             return _context3.stop();
         }
-      }, _callee3, null, [[5, 55, 77, 79], [33, 38], [43, 48]]);
+      }, _callee3, null, [[5, 52, 56, 58], [30, 35], [40, 45]]);
     }));
     return function doSubmit() {
       return _ref2.apply(this, arguments);
@@ -431,35 +344,6 @@ export default function Check() {
     if (submitting) return;
     setPickupRefOpen(false);
   };
-  var handleAddOnConfirm = /*#__PURE__*/function () {
-    var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6() {
-      return _regeneratorRuntime().wrap(function _callee6$(_context6) {
-        while (1) switch (_context6.prev = _context6.next) {
-          case 0:
-            if (!submitting) {
-              _context6.next = 2;
-              break;
-            }
-            return _context6.abrupt("return");
-          case 2:
-            setAddOnConfirmOpen(false);
-            // 再次提交时，OS 会自动代理到加餐模式。
-            _context6.next = 5;
-            return doSubmit();
-          case 5:
-          case "end":
-            return _context6.stop();
-        }
-      }, _callee6);
-    }));
-    return function handleAddOnConfirm() {
-      return _ref5.apply(this, arguments);
-    };
-  }();
-  var handleAddOnReturn = function handleAddOnReturn() {
-    if (submitting) return;
-    setAddOnConfirmOpen(false);
-  };
   var noteContent = /*#__PURE__*/React.createElement("div", {
     className: "pisell-scan-order-check-note"
   }, /*#__PURE__*/React.createElement("div", {
@@ -500,32 +384,7 @@ export default function Check() {
     confirmLoading: submitting,
     onCancel: handlePickupRefCancel,
     onConfirm: handlePickupRefConfirm
-  }), /*#__PURE__*/React.createElement(Modal, {
-    open: addOnConfirmOpen,
-    footer: null,
-    onCancel: handleAddOnReturn,
-    maskClosable: false,
-    destroyOnClose: true,
-    centered: true,
-    className: "pisell-scan-order-add-on-confirm-modal"
-  }, /*#__PURE__*/React.createElement("div", {
-    className: "pisell-scan-order-add-on-confirm-body"
-  }, /*#__PURE__*/React.createElement("div", {
-    className: "pisell-scan-order-add-on-confirm-title"
-  }, addOnConfirmTitle), /*#__PURE__*/React.createElement("div", {
-    className: "pisell-scan-order-add-on-confirm-desc"
-  }, addOnConfirmDescription), /*#__PURE__*/React.createElement(Button, {
-    type: "primary",
-    block: true,
-    size: "large",
-    loading: submitting,
-    onClick: handleAddOnConfirm
-  }, addOnConfirmButtonText), /*#__PURE__*/React.createElement(Button, {
-    block: true,
-    size: "large",
-    disabled: submitting,
-    onClick: handleAddOnReturn
-  }, addOnReturnButtonText))), submitting ? /*#__PURE__*/React.createElement("div", {
+  }), submitting ? /*#__PURE__*/React.createElement("div", {
     className: "pisell-scan-order-check-loading-mask"
   }, /*#__PURE__*/React.createElement("div", {
     className: "pisell-scan-order-check-loading-panel"

package/es/components/scanOrder/components/Check/index.less

@@ -80,42 +80,3 @@
   width: 64px;
   height: 64px;
 }
-
-.pisell-scan-order-add-on-confirm-modal {
-  .pisell-lowcode-modal-content {
-    border-radius: 28px;
-  }
-
-  .pisell-lowcode-modal-body {
-    padding: 42px 32px 32px;
-  }
-}
-
-.pisell-scan-order-add-on-confirm-body {
-  display: flex;
-  flex-direction: column;
-  gap: 16px;
-  text-align: center;
-
-  .pisell-lowcode-btn {
-    height: 56px;
-    border-radius: 18px;
-    font-size: 18px;
-    font-weight: 700;
-  }
-}
-
-.pisell-scan-order-add-on-confirm-title {
-  color: #1f2937;
-  font-size: 28px;
-  font-weight: 800;
-  line-height: 1.25;
-}
-
-.pisell-scan-order-add-on-confirm-desc {
-  margin-bottom: 18px;
-  color: #667085;
-  font-size: 20px;
-  font-weight: 400;
-  line-height: 1.35;
-}