@pisell/private-materials 6.3.139 → 6.3.141

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

@@ -8,10 +8,9 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 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 } from 'react';
+import React, { useMemo, useState, useCallback, useEffect } 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";
@@ -45,31 +44,28 @@ export default function Check() {
     dineInConfig = _useState8[0],
     setDineInConfig = _useState8[1];
   // 去读 pisellos 内的配置
-  var getConfig = /*#__PURE__*/function () {
-    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-      var _otherParams$dineInCo;
-      var otherParams, dineInConfig;
-      return _regeneratorRuntime().wrap(function _callee$(_context) {
-        while (1) switch (_context.prev = _context.next) {
-          case 0:
-            _context.next = 2;
-            return runModuleAction('getOtherParams');
-          case 2:
-            otherParams = _context.sent;
-            console.log('otherParams >>>>> ', otherParams);
-            dineInConfig = (_otherParams$dineInCo = otherParams === null || otherParams === void 0 ? void 0 : otherParams.dineInConfig) !== null && _otherParams$dineInCo !== void 0 ? _otherParams$dineInCo : {};
-            setDineInConfig(dineInConfig);
-          case 6:
-          case "end":
-            return _context.stop();
-        }
-      }, _callee);
-    }));
-    return function getConfig() {
-      return _ref.apply(this, arguments);
-    };
-  }();
-  getConfig();
+  var getConfig = useCallback( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+    var _otherParams$dineInCo;
+    var otherParams, dineInConfig;
+    return _regeneratorRuntime().wrap(function _callee$(_context) {
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          _context.next = 2;
+          return runModuleAction('getOtherParams');
+        case 2:
+          otherParams = _context.sent;
+          console.log('otherParams >>>>> ', otherParams);
+          dineInConfig = (_otherParams$dineInCo = otherParams === null || otherParams === void 0 ? void 0 : otherParams.dineInConfig) !== null && _otherParams$dineInCo !== void 0 ? _otherParams$dineInCo : {};
+          setDineInConfig(dineInConfig);
+        case 6:
+        case "end":
+          return _context.stop();
+      }
+    }, _callee);
+  })), [runModuleAction]);
+  useEffect(function () {
+    getConfig();
+  }, []);
 
   // 是否展示订单级备注
   var isShowOrderNote = useMemo(function () {
@@ -87,54 +83,66 @@ export default function Check() {
   var productsTitle = useMemo(function () {
     return String(locales.getText('pisell2.scan.order.products.title') || 'Products');
   }, []);
+  var showCheckStepEmptyCartTip = function showCheckStepEmptyCartTip() {
+    message.error(locales.getText('pisell2.scan.order.check.cart.empty.tip') || 'Please go back to add 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;
+      var items, res, _res$data, _res$data2, _viewModel$summary, _res$data3, _res$data4, _utils$getApp, _app$history, _app$history2, link, app;
       return _regeneratorRuntime().wrap(function _callee3$(_context3) {
         while (1) switch (_context3.prev = _context3.next) {
           case 0:
-            _context3.prev = 0;
+            items = (viewModel === null || viewModel === void 0 ? void 0 : viewModel.cartItems) || [];
+            if (!(items.length === 0)) {
+              _context3.next = 5;
+              break;
+            }
+            showCheckStepEmptyCartTip();
+            setSubmitting(false);
+            return _context3.abrupt("return");
+          case 5:
+            _context3.prev = 5;
             setSubmitting(true);
-            _context3.next = 4;
+            _context3.next = 9;
             return runModuleAction('updateTempOrderNote', note);
-          case 4:
-            _context3.next = 6;
+          case 9:
+            _context3.next = 11;
             return runModuleAction('submitScanOrder');
-          case 6:
+          case 11:
             res = _context3.sent;
             console.log('submitScanOrder >>>>> ', res);
             // 下单成功：清空步骤缓存（step / gate / entryContext），避免残留影响下次扫码
             clearStepCache();
-            if (!(dineInConfig !== null && dineInConfig !== void 0 && dineInConfig['workflow.require_payment_on_submit'])) {
-              _context3.next = 13;
+            if (!(dineInConfig !== null && dineInConfig !== void 0 && dineInConfig['sale.require_payment_on_submit'] && !isAdditionalOrder)) {
+              _context3.next = 26;
               break;
             }
+            _context3.prev = 15;
+            _context3.next = 18;
+            return runModuleAction('restoreOrder');
+          case 18:
+            _context3.next = 23;
+            break;
+          case 20:
+            _context3.prev = 20;
+            _context3.t0 = _context3["catch"](15);
+            console.warn('[scanOrder] restoreOrder after payment failed', _context3.t0);
+          case 23:
             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
+                total_amount: (res === null || res === void 0 || (_res$data2 = res.data) === null || _res$data2 === void 0 ? void 0 : _res$data2.order_wait_pay_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]]);
+                  }, _callee2);
                 }));
                 function callback(_x) {
                   return _callback.apply(this, arguments);
@@ -142,25 +150,25 @@ export default function Check() {
                 return callback;
               }()
             });
-            _context3.next = 25;
+            _context3.next = 38;
             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;
+          case 26:
+            if (!(res !== null && res !== void 0 && (_res$data3 = res.data) !== null && _res$data3 !== void 0 && _res$data3.order_id)) {
+              _context3.next = 38;
               break;
             }
-            _context3.prev = 14;
-            _context3.next = 17;
+            _context3.prev = 27;
+            _context3.next = 30;
             return runModuleAction('restoreOrder');
-          case 17:
-            _context3.next = 22;
+          case 30:
+            _context3.next = 35;
             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);
+          case 32:
+            _context3.prev = 32;
+            _context3.t1 = _context3["catch"](27);
+            console.warn('[scanOrder] restoreOrder before redirect failed', _context3.t1);
+          case 35:
+            link = "/order/details?id=".concat(res === null || res === void 0 || (_res$data4 = res.data) === null || _res$data4 === void 0 ? void 0 : _res$data4.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);
@@ -169,26 +177,26 @@ export default function Check() {
             } else {
               location.replace(link);
             }
-          case 25:
-            _context3.next = 27;
+          case 38:
+            _context3.next = 40;
             return refreshViewModel();
-          case 27:
-            _context3.next = 33;
+          case 40:
+            _context3.next = 46;
             break;
-          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;
+          case 42:
+            _context3.prev = 42;
+            _context3.t2 = _context3["catch"](5);
+            console.error('[scanOrder] submitScanOrder failed', _context3.t2);
+            message.error((_context3.t2 === null || _context3.t2 === void 0 ? void 0 : _context3.t2.message) || 'Submit order failed');
+          case 46:
+            _context3.prev = 46;
             setSubmitting(false);
-            return _context3.finish(33);
-          case 36:
+            return _context3.finish(46);
+          case 49:
           case "end":
             return _context3.stop();
         }
-      }, _callee3, null, [[0, 29, 33, 36], [14, 19]]);
+      }, _callee3, null, [[5, 42, 46, 49], [15, 20], [27, 32]]);
     }));
     return function doSubmit() {
       return _ref2.apply(this, arguments);
@@ -211,10 +219,7 @@ export default function Check() {
               _context4.next = 6;
               break;
             }
-            PisellToast({
-              content: String(locales.getText('pisell2.scan.order.products.empty.tip') || 'Please select products'),
-              duration: 2
-            });
+            showCheckStepEmptyCartTip();
             return _context4.abrupt("return");
           case 6:
             if (!isAdditionalOrder) {