@pisell/private-materials 6.3.137 → 6.3.139

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

@@ -11,7 +11,10 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import React, { useMemo, useState } from 'react';
 import { Input, message } from 'antd';
 import { locales } from '@pisell/utils';
+import { PisellToast } from '@pisell/materials';
 import Cart from "../Cart";
+import FulfillmentMode from "../FulfillmentMode";
+import ManualPickupRefModal from "../ManualPickupRefModal";
 import { useScanOrderContext } from "../../context";
 import { contextUtils } from "../../hooks";
 import "./index.less";
@@ -19,7 +22,11 @@ export default function Check() {
   var _useScanOrderContext = useScanOrderContext(),
     viewModel = _useScanOrderContext.viewModel,
     runModuleAction = _useScanOrderContext.runModuleAction,
-    refreshViewModel = _useScanOrderContext.refreshViewModel;
+    refreshViewModel = _useScanOrderContext.refreshViewModel,
+    tableName = _useScanOrderContext.tableName,
+    entryMode = _useScanOrderContext.entryMode,
+    clearStepCache = _useScanOrderContext.clearStepCache;
+  var isAdditionalOrder = entryMode === 'additional_order';
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
     submitting = _useState2[0],
@@ -28,11 +35,15 @@ export default function Check() {
     _useState4 = _slicedToArray(_useState3, 2),
     note = _useState4[0],
     setNote = _useState4[1];
-  var utils = contextUtils();
-  var _useState5 = useState(null),
+  var _useState5 = useState(false),
     _useState6 = _slicedToArray(_useState5, 2),
-    dineInConfig = _useState6[0],
-    setDineInConfig = _useState6[1];
+    pickupRefOpen = _useState6[0],
+    setPickupRefOpen = _useState6[1];
+  var utils = contextUtils();
+  var _useState7 = useState(null),
+    _useState8 = _slicedToArray(_useState7, 2),
+    dineInConfig = _useState8[0],
+    setDineInConfig = _useState8[1];
   // 去读 pisellos 内的配置
   var getConfig = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
@@ -70,67 +81,224 @@ export default function Check() {
   var notePlaceholder = useMemo(function () {
     return String(locales.getText('pisell2.text.add-order-notes') || locales.getText('pisell2.scan.order.note.placeholder') || '请输入备注');
   }, []);
-  var handleSubmit = /*#__PURE__*/function () {
-    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
-      var res, _res$data, _viewModel$summary, _res$data2, _res$data3, link;
-      return _regeneratorRuntime().wrap(function _callee2$(_context2) {
-        while (1) switch (_context2.prev = _context2.next) {
+  var currentTableText = useMemo(function () {
+    return String(locales.getText('pisell2.scan.order.current.table') || 'Current table');
+  }, []);
+  var productsTitle = useMemo(function () {
+    return String(locales.getText('pisell2.scan.order.products.title') || 'Products');
+  }, []);
+  var doSubmit = /*#__PURE__*/function () {
+    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
+      var res, _res$data, _viewModel$summary, _res$data2, _res$data3, _utils$getApp, _app$history, _app$history2, link, app;
+      return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+        while (1) switch (_context3.prev = _context3.next) {
           case 0:
-            if (!submitting) {
-              _context2.next = 2;
-              break;
-            }
-            return _context2.abrupt("return");
-          case 2:
-            _context2.prev = 2;
+            _context3.prev = 0;
             setSubmitting(true);
-            _context2.next = 6;
+            _context3.next = 4;
             return runModuleAction('updateTempOrderNote', note);
-          case 6:
-            _context2.next = 8;
+          case 4:
+            _context3.next = 6;
             return runModuleAction('submitScanOrder');
-          case 8:
-            res = _context2.sent;
+          case 6:
+            res = _context3.sent;
             console.log('submitScanOrder >>>>> ', res);
-            if (dineInConfig !== null && dineInConfig !== void 0 && dineInConfig['workflow.require_payment_on_submit']) {
-              utils.action({
-                type: 'pisell1.payment',
-                data: {
-                  order_id: res === null || res === void 0 || (_res$data = res.data) === null || _res$data === void 0 ? void 0 : _res$data.order_id,
-                  total_amount: viewModel === null || viewModel === void 0 || (_viewModel$summary = viewModel.summary) === null || _viewModel$summary === void 0 ? void 0 : _viewModel$summary.total_amount
-                },
-                callback: function callback(e) {}
-              });
+            // 下单成功：清空步骤缓存（step / gate / entryContext），避免残留影响下次扫码
+            clearStepCache();
+            if (!(dineInConfig !== null && dineInConfig !== void 0 && dineInConfig['workflow.require_payment_on_submit'])) {
+              _context3.next = 13;
+              break;
+            }
+            utils.action({
+              type: 'pisell1.payment',
+              data: {
+                order_id: res === null || res === void 0 || (_res$data = res.data) === null || _res$data === void 0 ? void 0 : _res$data.order_id,
+                total_amount: viewModel === null || viewModel === void 0 || (_viewModel$summary = viewModel.summary) === null || _viewModel$summary === void 0 ? void 0 : _viewModel$summary.total_amount
+              },
+              callback: function () {
+                var _callback = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(_e) {
+                  return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+                    while (1) switch (_context2.prev = _context2.next) {
+                      case 0:
+                        _context2.prev = 0;
+                        _context2.next = 3;
+                        return runModuleAction('restoreOrder');
+                      case 3:
+                        _context2.next = 8;
+                        break;
+                      case 5:
+                        _context2.prev = 5;
+                        _context2.t0 = _context2["catch"](0);
+                        console.warn('[scanOrder] restoreOrder after payment failed', _context2.t0);
+                      case 8:
+                      case "end":
+                        return _context2.stop();
+                    }
+                  }, _callee2, null, [[0, 5]]);
+                }));
+                function callback(_x) {
+                  return _callback.apply(this, arguments);
+                }
+                return callback;
+              }()
+            });
+            _context3.next = 25;
+            break;
+          case 13:
+            if (!(res !== null && res !== void 0 && (_res$data2 = res.data) !== null && _res$data2 !== void 0 && _res$data2.order_id)) {
+              _context3.next = 25;
+              break;
+            }
+            _context3.prev = 14;
+            _context3.next = 17;
+            return runModuleAction('restoreOrder');
+          case 17:
+            _context3.next = 22;
+            break;
+          case 19:
+            _context3.prev = 19;
+            _context3.t0 = _context3["catch"](14);
+            console.warn('[scanOrder] restoreOrder before redirect failed', _context3.t0);
+          case 22:
+            link = "/order/details?id=".concat(res === null || res === void 0 || (_res$data3 = res.data) === null || _res$data3 === void 0 ? void 0 : _res$data3.order_id);
+            app = utils === null || utils === void 0 || (_utils$getApp = utils.getApp) === null || _utils$getApp === void 0 ? void 0 : _utils$getApp.call(utils);
+            if (app !== null && app !== void 0 && (_app$history = app.history) !== null && _app$history !== void 0 && _app$history.replace) {
+              app.history.replace(link);
+            } else if (app !== null && app !== void 0 && (_app$history2 = app.history) !== null && _app$history2 !== void 0 && _app$history2.push) {
+              app.history.push(link);
             } else {
-              if (res !== null && res !== void 0 && (_res$data2 = res.data) !== null && _res$data2 !== void 0 && _res$data2.order_id) {
-                link = "/order/details?id=".concat(res === null || res === void 0 || (_res$data3 = res.data) === null || _res$data3 === void 0 ? void 0 : _res$data3.order_id);
-                location.replace(link);
-              }
+              location.replace(link);
             }
-            _context2.next = 13;
+          case 25:
+            _context3.next = 27;
             return refreshViewModel();
-          case 13:
-            _context2.next = 19;
+          case 27:
+            _context3.next = 33;
             break;
-          case 15:
-            _context2.prev = 15;
-            _context2.t0 = _context2["catch"](2);
-            console.error('[scanOrder] submitScanOrder failed', _context2.t0);
-            message.error((_context2.t0 === null || _context2.t0 === void 0 ? void 0 : _context2.t0.message) || 'Submit order failed');
+          case 29:
+            _context3.prev = 29;
+            _context3.t1 = _context3["catch"](0);
+            console.error('[scanOrder] submitScanOrder failed', _context3.t1);
+            message.error((_context3.t1 === null || _context3.t1 === void 0 ? void 0 : _context3.t1.message) || 'Submit order failed');
+          case 33:
+            _context3.prev = 33;
+            setSubmitting(false);
+            return _context3.finish(33);
+          case 36:
+          case "end":
+            return _context3.stop();
+        }
+      }, _callee3, null, [[0, 29, 33, 36], [14, 19]]);
+    }));
+    return function doSubmit() {
+      return _ref2.apply(this, arguments);
+    };
+  }();
+  var handleSubmit = /*#__PURE__*/function () {
+    var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
+      var cartItems, manualPickup;
+      return _regeneratorRuntime().wrap(function _callee4$(_context4) {
+        while (1) switch (_context4.prev = _context4.next) {
+          case 0:
+            if (!submitting) {
+              _context4.next = 2;
+              break;
+            }
+            return _context4.abrupt("return");
+          case 2:
+            cartItems = (viewModel === null || viewModel === void 0 ? void 0 : viewModel.cartItems) || [];
+            if (!(cartItems.length === 0)) {
+              _context4.next = 6;
+              break;
+            }
+            PisellToast({
+              content: String(locales.getText('pisell2.scan.order.products.empty.tip') || 'Please select products'),
+              duration: 2
+            });
+            return _context4.abrupt("return");
+          case 6:
+            if (!isAdditionalOrder) {
+              _context4.next = 10;
+              break;
+            }
+            _context4.next = 9;
+            return doSubmit();
+          case 9:
+            return _context4.abrupt("return");
+          case 10:
+            _context4.prev = 10;
+            setSubmitting(true);
+            _context4.next = 14;
+            return runModuleAction('checkManualPickupRef');
+          case 14:
+            manualPickup = _context4.sent;
+            if (!(manualPickup !== null && manualPickup !== void 0 && manualPickup.enabled)) {
+              _context4.next = 19;
+              break;
+            }
+            setPickupRefOpen(true);
+            setSubmitting(false);
+            return _context4.abrupt("return");
           case 19:
-            _context2.prev = 19;
+            _context4.next = 27;
+            break;
+          case 21:
+            _context4.prev = 21;
+            _context4.t0 = _context4["catch"](10);
+            console.error('[scanOrder] checkManualPickupRef failed', _context4.t0);
+            message.error((_context4.t0 === null || _context4.t0 === void 0 ? void 0 : _context4.t0.message) || 'Submit order failed');
             setSubmitting(false);
-            return _context2.finish(19);
-          case 22:
+            return _context4.abrupt("return");
+          case 27:
+            _context4.next = 29;
+            return doSubmit();
+          case 29:
           case "end":
-            return _context2.stop();
+            return _context4.stop();
         }
-      }, _callee2, null, [[2, 15, 19, 22]]);
+      }, _callee4, null, [[10, 21]]);
     }));
     return function handleSubmit() {
-      return _ref2.apply(this, arguments);
+      return _ref3.apply(this, arguments);
+    };
+  }();
+  var handlePickupRefConfirm = /*#__PURE__*/function () {
+    var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(value) {
+      return _regeneratorRuntime().wrap(function _callee5$(_context5) {
+        while (1) switch (_context5.prev = _context5.next) {
+          case 0:
+            _context5.prev = 0;
+            setSubmitting(true);
+            _context5.next = 4;
+            return runModuleAction('setPickupRef', value);
+          case 4:
+            _context5.next = 12;
+            break;
+          case 6:
+            _context5.prev = 6;
+            _context5.t0 = _context5["catch"](0);
+            console.error('[scanOrder] setPickupRef failed', _context5.t0);
+            message.error((_context5.t0 === null || _context5.t0 === void 0 ? void 0 : _context5.t0.message) || 'Submit order failed');
+            setSubmitting(false);
+            return _context5.abrupt("return");
+          case 12:
+            setPickupRefOpen(false);
+            _context5.next = 15;
+            return doSubmit();
+          case 15:
+          case "end":
+            return _context5.stop();
+        }
+      }, _callee5, null, [[0, 6]]);
+    }));
+    return function handlePickupRefConfirm(_x2) {
+      return _ref4.apply(this, arguments);
     };
   }();
+  var handlePickupRefCancel = function handlePickupRefCancel() {
+    if (submitting) return;
+    setPickupRefOpen(false);
+  };
   var noteContent = /*#__PURE__*/React.createElement("div", {
     className: "pisell-scan-order-check-note"
   }, /*#__PURE__*/React.createElement("div", {
@@ -149,7 +317,15 @@ export default function Check() {
   }));
   return /*#__PURE__*/React.createElement("div", {
     className: "pisell-scan-order-check"
-  }, /*#__PURE__*/React.createElement(Cart, {
+  }, tableName ? /*#__PURE__*/React.createElement("div", {
+    className: "pisell-scan-order-check-current-table"
+  }, /*#__PURE__*/React.createElement("span", {
+    className: "pisell-scan-order-check-current-table-label"
+  }, currentTableText), /*#__PURE__*/React.createElement("span", {
+    className: "pisell-scan-order-check-current-table-value"
+  }, tableName)) : null, !isAdditionalOrder ? /*#__PURE__*/React.createElement(FulfillmentMode, null) : null, /*#__PURE__*/React.createElement("div", {
+    className: "pisell-scan-order-check-products-title"
+  }, productsTitle), /*#__PURE__*/React.createElement(Cart, {
     embedded: true,
     open: true,
     onCancel: function onCancel() {},
@@ -157,6 +333,11 @@ export default function Check() {
     items: (viewModel === null || viewModel === void 0 ? void 0 : viewModel.cartItems) || [],
     summary: (viewModel === null || viewModel === void 0 ? void 0 : viewModel.summary) || {},
     confirmLoading: submitting,
-    extraContent: isShowOrderNote ? noteContent : undefined
+    extraContent: !isAdditionalOrder && isShowOrderNote ? noteContent : undefined
+  }), /*#__PURE__*/React.createElement(ManualPickupRefModal, {
+    open: pickupRefOpen,
+    confirmLoading: submitting,
+    onCancel: handlePickupRefCancel,
+    onConfirm: handlePickupRefConfirm
   }));
 }

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

@@ -3,6 +3,36 @@
   flex-direction: column;
 }
 
+.pisell-scan-order-check-current-table {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  gap: 12px;
+  padding: 12px 16px;
+  background: #fff;
+  border-radius: 12px;
+
+  .pisell-scan-order-check-current-table-label {
+    color: #101828;
+    font-size: 16px;
+    font-weight: 500;
+  }
+
+  .pisell-scan-order-check-current-table-value {
+    color: #344054;
+    font-size: 14px;
+    font-weight: 500;
+  }
+}
+
+.pisell-scan-order-check-products-title {
+  padding: 0 16px;
+  margin-bottom: 8px;
+  color: #101828;
+  font-size: 16px;
+  font-weight: 500;
+}
+
 .pisell-scan-order-check-note {
   padding: 0;
   margin-top: 30px;