@pisell/private-materials 6.4.36 → 6.4.38

package/es/components/checkout/PaymentModal.js

@@ -176,6 +176,7 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
   }, [paymentMethods]);
   var handleAddCashPayment = /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(result) {
+      var _interaction$utils, _interaction$utils$po;
       var cashPaymentMethod;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
@@ -201,6 +202,19 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
               rounding_amount: result.roundingAmount
             });
           case 3:
+            logger === null || logger === void 0 || logger.addLog({
+              type: 'info',
+              title: 'open_till',
+              metadata: {}
+            });
+            interaction === null || interaction === void 0 || (_interaction$utils = interaction.utils) === null || _interaction$utils === void 0 || (_interaction$utils$po = _interaction$utils.postMessageToApp) === null || _interaction$utils$po === void 0 || _interaction$utils$po.call(_interaction$utils, {
+              module: 'till',
+              key: 'open_till',
+              data: {
+                type: 'cash' // cash 不需要验证钱箱权限
+              }
+            });
+          case 5:
           case "end":
             return _context.stop();
         }
@@ -505,7 +519,7 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
           // );
           var orderPaymentAddedUnsubscribe = core.effects.on(CheckoutHooks.OnOrderPaymentAdded, /*#__PURE__*/function () {
             var _ref8 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(data) {
-              var balanceDueAmount, autoCloseConfig, _orderInfo, paymentMethodName, isCashPayment, _interaction$utils, _interaction$utils$po;
+              var balanceDueAmount, autoCloseConfig, _orderInfo;
               return _regeneratorRuntime().wrap(function _callee5$(_context5) {
                 while (1) switch (_context5.prev = _context5.next) {
                   case 0:
@@ -536,25 +550,6 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
                       }
                     }));
                   case 7:
-                    // 判断是否为现金支付
-                    paymentMethodName = data.paymentMethodName || data.name || '';
-                    isCashPayment = data.paymentMethodCode === 'CASHMANUAL' || /现金|現金/i.test(paymentMethodName) || /cash/i.test(paymentMethodName);
-                    if (isCashPayment) {
-                      logger === null || logger === void 0 || logger.addLog({
-                        type: 'info',
-                        title: 'open_till',
-                        metadata: {}
-                      });
-                      // handleToastClose();
-                      interaction === null || interaction === void 0 || (_interaction$utils = interaction.utils) === null || _interaction$utils === void 0 || (_interaction$utils$po = _interaction$utils.postMessageToApp) === null || _interaction$utils$po === void 0 || _interaction$utils$po.call(_interaction$utils, {
-                        module: 'till',
-                        key: 'open_till',
-                        data: {
-                          type: 'cash' // cash 不需要验证钱箱权限
-                        }
-                      });
-                    }
-                  case 10:
                   case "end":
                     return _context5.stop();
                 }
@@ -1740,6 +1735,13 @@ var PaymentModal = function PaymentModal(_ref18) {
         value: tempEngineContext
       }, children);
     };
+    var orderNote = '';
+    try {
+      var checkoutModule = pisellos === null || pisellos === void 0 ? void 0 : pisellos.getModule('checkout');
+      orderNote = checkoutModule.getOrderNote();
+    } catch (error) {
+      console.warn('Failed to get initial custom amount:', error);
+    }
 
     // 渲染NoteModal
     ReactDOM.render( /*#__PURE__*/React.createElement(EngineContextProvider, null, /*#__PURE__*/React.createElement(ConfigProvider, {

package/es/components/ticketBooking/components/menuBar/index.js

@@ -15,7 +15,7 @@ var index = function index() {
       label: locales.getText('pisell2.ticket-booking.reload')
     }, {
       key: 'version',
-      label: '6.4.13'
+      label: '6.4.38'
     }
     /*
     {

package/lib/components/checkout/PaymentModal.js

@@ -139,10 +139,11 @@ var PaymentContent = (0, import_react.forwardRef)(
       };
     }, [paymentMethods]);
     const handleAddCashPayment = async (result) => {
+      var _a2, _b2;
       const cashPaymentMethod = paymentMethods.find(
         (method) => {
-          var _a2;
-          return method.code === "CASHMANUAL" || method.type === "CASHMANUAL" || ((_a2 = method.name) == null ? void 0 : _a2.toLowerCase().includes("cash"));
+          var _a3;
+          return method.code === "CASHMANUAL" || method.type === "CASHMANUAL" || ((_a3 = method.name) == null ? void 0 : _a3.toLowerCase().includes("cash"));
         }
       );
       await (checkoutModule == null ? void 0 : checkoutModule.addPaymentItemAsync({
@@ -159,6 +160,19 @@ var PaymentContent = (0, import_react.forwardRef)(
         voucher_id: 0,
         rounding_amount: result.roundingAmount
       }));
+      logger == null ? void 0 : logger.addLog({
+        type: "info",
+        title: "open_till",
+        metadata: {}
+      });
+      (_b2 = (_a2 = interaction == null ? void 0 : interaction.utils) == null ? void 0 : _a2.postMessageToApp) == null ? void 0 : _b2.call(_a2, {
+        module: "till",
+        key: "open_till",
+        data: {
+          type: "cash"
+          // cash 不需要验证钱箱权限
+        }
+      });
     };
     const processSurcharge = (surcharge) => {
       if (typeof surcharge === "string") {
@@ -398,7 +412,6 @@ var PaymentContent = (0, import_react.forwardRef)(
             const orderPaymentAddedUnsubscribe = core.effects.on(
               CheckoutHooks.OnOrderPaymentAdded,
               async (data) => {
-                var _a2, _b2;
                 console.log("orderPaymentAddedUnsubscribe>>>>", data);
                 const balanceDueAmount2 = checkoutModule.getBalanceDueAmount();
                 if (Number(balanceDueAmount2) > 0) {
@@ -427,23 +440,6 @@ var PaymentContent = (0, import_react.forwardRef)(
                     }
                   );
                 }
-                const paymentMethodName = data.paymentMethodName || data.name || "";
-                const isCashPayment = data.paymentMethodCode === "CASHMANUAL" || /现金|現金/i.test(paymentMethodName) || /cash/i.test(paymentMethodName);
-                if (isCashPayment) {
-                  logger == null ? void 0 : logger.addLog({
-                    type: "info",
-                    title: "open_till",
-                    metadata: {}
-                  });
-                  (_b2 = (_a2 = interaction == null ? void 0 : interaction.utils) == null ? void 0 : _a2.postMessageToApp) == null ? void 0 : _b2.call(_a2, {
-                    module: "till",
-                    key: "open_till",
-                    data: {
-                      type: "cash"
-                      // cash 不需要验证钱箱权限
-                    }
-                  });
-                }
               }
             );
             return () => {
@@ -1237,6 +1233,13 @@ var PaymentModal = ({
       }, []);
       return /* @__PURE__ */ import_react.default.createElement(TempContext.Provider, { value: tempEngineContext }, children);
     };
+    let orderNote2 = "";
+    try {
+      const checkoutModule = pisellos == null ? void 0 : pisellos.getModule("checkout");
+      orderNote2 = checkoutModule.getOrderNote();
+    } catch (error) {
+      console.warn("Failed to get initial custom amount:", error);
+    }
     import_react_dom2.default.render(
       /* @__PURE__ */ import_react.default.createElement(EngineContextProvider, null, /* @__PURE__ */ import_react.default.createElement(import_materials.ConfigProvider, { prefixCls: "pisell-lowcode", theme: {
         token: {
@@ -1247,7 +1250,7 @@ var PaymentModal = ({
         {
           open: true,
           title: import_utils.locales.getText("pisell2.text.add-order-notes"),
-          value: orderNote,
+          value: orderNote2,
           onConfirm: handleNoteConfirm2,
           onDelete: handleNoteDelete2,
           onCancel: handleNoteCancel2

package/lib/components/ticketBooking/components/menuBar/index.js

@@ -52,7 +52,7 @@ var index = () => {
         },
         {
           key: "version",
-          label: "6.4.13"
+          label: "6.4.38"
         }
         /*
         {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/private-materials",
-  "version": "6.4.36",
+  "version": "6.4.38",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -60,8 +60,8 @@
     "react-resizable": "^3.0.5",
     "styled-components": "^6.0.0-rc.3",
     "@pisell/date-picker": "3.0.7",
-    "@pisell/materials": "6.4.5",
     "@pisell/icon": "0.0.11",
+    "@pisell/materials": "6.4.5",
     "@pisell/utils": "3.0.2"
   },
   "peerDependencies": {