@pisell/private-materials 6.4.9 → 6.4.11

package/es/components/checkout/PaymentModal.js

@@ -185,13 +185,13 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
             // 从支付方式列表中查找现金支付方式
             cashPaymentMethod = paymentMethods.find(function (method) {
               var _method$name;
-              return method.code === 'cash' || method.type === 'cash' || ((_method$name = method.name) === null || _method$name === void 0 ? void 0 : _method$name.toLowerCase().includes('cash'));
+              return method.code === 'CASHMANUAL' || method.type === 'CASHMANUAL' || ((_method$name = method.name) === null || _method$name === void 0 ? void 0 : _method$name.toLowerCase().includes('cash'));
             });
             _context.next = 3;
             return checkoutModule === null || checkoutModule === void 0 ? void 0 : checkoutModule.addPaymentItemAsync({
               amount: result.amount,
               /** 支付类型，跟支付列表上对应的支付方式保持一致 */
-              code: result.type,
+              code: cashPaymentMethod === null || cashPaymentMethod === void 0 ? void 0 : cashPaymentMethod.code,
               /** 支付类型id，跟支付列表上对应的支付方式保持一致 */
               id: cashPaymentMethod === null || cashPaymentMethod === void 0 ? void 0 : cashPaymentMethod.id,
               /** 支付类型名称，跟支付列表上对应的支付方式保持一致 */
@@ -532,12 +532,16 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
             }
             // 判断是否为现金支付
             var paymentMethodName = data.paymentMethodName || data.name || '';
-            var isCashPayment = data.paymentMethodCode === 'cash' || data.paymentMethodCode === 'CASH' || /现金|現金/i.test(paymentMethodName) || /cash/i.test(paymentMethodName);
+            var isCashPayment = data.paymentMethodCode === 'CASHMANUAL' || /现金|現金/i.test(paymentMethodName) || /cash/i.test(paymentMethodName);
             if (isCashPayment) {
-              var _interaction$utils, _interaction$utils$as;
+              var _interaction$utils, _interaction$utils$po;
+              logger === null || logger === void 0 || logger.addLog({
+                type: 'info',
+                title: 'open_till',
+                metadata: {}
+              });
               // handleToastClose();
-              // TODO: 等红阳的方法
-              interaction === null || interaction === void 0 || (_interaction$utils = interaction.utils) === null || _interaction$utils === void 0 || (_interaction$utils$as = _interaction$utils.asyncDataManager) === null || _interaction$utils$as === void 0 || _interaction$utils$as.call(_interaction$utils, {
+              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'
               });
@@ -1763,13 +1767,15 @@ var PaymentModal = function PaymentModal(_ref17) {
     if (data && open) {
       initCheckoutData();
     }
+  }, [data, open]);
+  useEffect(function () {
     return function () {
       if (typeof unsubscribeRef.current === 'function') {
         var _unsubscribeRef$curre;
         (_unsubscribeRef$curre = unsubscribeRef.current) === null || _unsubscribeRef$curre === void 0 || _unsubscribeRef$curre.call(unsubscribeRef);
       }
     };
-  }, [data, open]);
+  }, []);
 
   // 创建PaymentResultToast配置对象
   var paymentResultToastConfig = {

package/es/components/checkout/components/CashPaymentModule/index.js

@@ -88,7 +88,7 @@ export function CashPaymentModule(_ref) {
       }
       var finalAmount = typeof amount === 'number' ? amount : Number(amount) || 0;
       onPaymentComplete({
-        type: 'cash',
+        type: 'CASHMANUAL',
         amount: finalAmount,
         totalAmount: Number(customAmount) || 0,
         change: finalAmount - (Number(customAmount) || 0),

package/lib/components/checkout/PaymentModal.js

@@ -144,13 +144,13 @@ var PaymentContent = (0, import_react.forwardRef)(
       const cashPaymentMethod = paymentMethods.find(
         (method) => {
           var _a2;
-          return method.code === "cash" || method.type === "cash" || ((_a2 = method.name) == null ? void 0 : _a2.toLowerCase().includes("cash"));
+          return method.code === "CASHMANUAL" || method.type === "CASHMANUAL" || ((_a2 = method.name) == null ? void 0 : _a2.toLowerCase().includes("cash"));
         }
       );
       await (checkoutModule == null ? void 0 : checkoutModule.addPaymentItemAsync({
         amount: result.amount,
         /** 支付类型，跟支付列表上对应的支付方式保持一致 */
-        code: result.type,
+        code: cashPaymentMethod == null ? void 0 : cashPaymentMethod.code,
         /** 支付类型id，跟支付列表上对应的支付方式保持一致 */
         id: cashPaymentMethod == null ? void 0 : cashPaymentMethod.id,
         /** 支付类型名称，跟支付列表上对应的支付方式保持一致 */
@@ -427,9 +427,14 @@ var PaymentContent = (0, import_react.forwardRef)(
                   );
                 }
                 const paymentMethodName = data.paymentMethodName || data.name || "";
-                const isCashPayment = data.paymentMethodCode === "cash" || data.paymentMethodCode === "CASH" || /现金|現金/i.test(paymentMethodName) || /cash/i.test(paymentMethodName);
+                const isCashPayment = data.paymentMethodCode === "CASHMANUAL" || /现金|現金/i.test(paymentMethodName) || /cash/i.test(paymentMethodName);
                 if (isCashPayment) {
-                  (_b2 = (_a2 = interaction == null ? void 0 : interaction.utils) == null ? void 0 : _a2.asyncDataManager) == null ? void 0 : _b2.call(_a2, {
+                  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"
                   });
@@ -1309,13 +1314,15 @@ var PaymentModal = ({
     if (data && open) {
       initCheckoutData();
     }
+  }, [data, open]);
+  (0, import_react.useEffect)(() => {
     return () => {
       var _a2;
       if (typeof unsubscribeRef.current === "function") {
         (_a2 = unsubscribeRef.current) == null ? void 0 : _a2.call(unsubscribeRef);
       }
     };
-  }, [data, open]);
+  }, []);
   const paymentResultToastConfig = {
     context,
     pisellos,

package/lib/components/checkout/components/CashPaymentModule/index.js

@@ -92,7 +92,7 @@ function CashPaymentModule({
       }
       const finalAmount = typeof amount === "number" ? amount : Number(amount) || 0;
       onPaymentComplete({
-        type: "cash",
+        type: "CASHMANUAL",
         amount: finalAmount,
         totalAmount: Number(customAmount) || 0,
         change: finalAmount - (Number(customAmount) || 0),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/private-materials",
-  "version": "6.4.9",
+  "version": "6.4.11",
   "scripts": {
     "dev": "father dev",
     "build": "father build",