@pisell/private-materials 6.4.42 → 6.4.44

package/lib/components/checkout/PaymentModal.js

@@ -33,6 +33,7 @@ __export(PaymentModal_exports, {
 });
 module.exports = __toCommonJS(PaymentModal_exports);
 var import_react = __toESM(require("react"));
+var import_decimal = __toESM(require("decimal.js"));
 var import_utils = require("@pisell/utils");
 var import_locales = require("../../utils/locales");
 var import_ahooks = require("ahooks");
@@ -62,6 +63,7 @@ var import_lodash = require("lodash");
 var import_utils2 = require("./utils");
 var import_usePaymentLogger = __toESM(require("./hooks/usePaymentLogger"));
 var import_antd = require("antd");
+var import_priceKeyboard = require("../../pro/priceKeyboard");
 var CheckoutHooks = {
   OnStateAmountChanged: "checkout:onStateAmountChanged",
   OnBalanceDueAmountChanged: "checkout:onBalanceDueAmountChanged",
@@ -93,7 +95,9 @@ var PaymentContent = (0, import_react.forwardRef)(
     dynamicMaxHeight = "600px",
     onOrderSyncFailed,
     generateActionButtons,
-    paymentResultToastConfig
+    paymentResultToastConfig,
+    updateOrderInfo,
+    setCurrentEditOrderId
   }, ref) => {
     var _a, _b, _c;
     const context = (0, import_useEngineContext.default)();
@@ -115,6 +119,7 @@ var PaymentContent = (0, import_react.forwardRef)(
     const walletPassRef = (0, import_react.useRef)(null);
     const [paymentItems, setPaymentItems] = (0, import_react.useState)([]);
     const [walletPassData, setWalletPassData] = (0, import_react.useState)({});
+    const [syncingLock, setSyncingLock] = (0, import_react.useState)(false);
     const isOrderFree = (0, import_react.useMemo)(() => {
       if (!customAmount) return false;
       const amount = parseFloat(customAmount);
@@ -184,8 +189,9 @@ var PaymentContent = (0, import_react.forwardRef)(
       return surcharge;
     };
     const onPaymentOptionClick = async (method) => {
-      var _a2;
+      var _a2, _b2, _c2, _d;
       const { id, code, name, type } = method || {};
+      const finalAmount = method.totalAmount ?? customAmount;
       const eftposCodes = [
         "EFTPOS_LINKLY",
         "EFTPOS_PAYO",
@@ -217,7 +223,7 @@ var PaymentContent = (0, import_react.forwardRef)(
             params: {
               orderId: data.orderId,
               symbol: getData("shop_symbol"),
-              amount: customAmount,
+              amount: finalAmount,
               surcharge: processSurcharge(method.surcharge)
             },
             mode: "pay"
@@ -272,8 +278,19 @@ var PaymentContent = (0, import_react.forwardRef)(
             percentage: (method == null ? void 0 : method.percentage) || "0"
           };
         }
+        if (method.type === "custom" && ((_b2 = method.metadata) == null ? void 0 : _b2.order_open_cash_drawer)) {
+          logger == null ? void 0 : logger.addLog({
+            type: "info",
+            title: "open_till",
+            metadata: {}
+          });
+          (_d = (_c2 = interaction == null ? void 0 : interaction.utils) == null ? void 0 : _c2.postMessageToApp) == null ? void 0 : _d.call(_c2, {
+            module: "till",
+            key: "open_till"
+          });
+        }
         await (checkoutModule == null ? void 0 : checkoutModule.addPaymentItemAsync({
-          amount: customAmount,
+          amount: finalAmount,
           /** 支付类型，跟支付列表上对应的支付方式保持一致 */
           code: method.code,
           /** 支付类型id，跟支付列表上对应的支付方式保持一致 */
@@ -327,6 +344,9 @@ var PaymentContent = (0, import_react.forwardRef)(
             );
           }
         });
+        checkoutModule.getCurrentOrderPaymentItemsAsync().then((items) => {
+          setPaymentItems(items);
+        });
       }
     }, [checkoutModule, orderInfo]);
     (0, import_react.useEffect)(() => {
@@ -388,6 +408,7 @@ var PaymentContent = (0, import_react.forwardRef)(
               CheckoutHooks.OnOrderSubmitStart,
               () => {
                 var _a2;
+                setSyncingLock(true);
                 (_a2 = Toast == null ? void 0 : Toast.loading) == null ? void 0 : _a2.call(Toast);
               }
             );
@@ -395,6 +416,7 @@ var PaymentContent = (0, import_react.forwardRef)(
               CheckoutHooks.OnOrderSubmitEnd,
               (res) => {
                 var _a2, _b2;
+                setSyncingLock(false);
                 if (res.success) {
                   (_a2 = Toast == null ? void 0 : Toast.hide) == null ? void 0 : _a2.call(Toast);
                 } else {
@@ -412,18 +434,33 @@ var PaymentContent = (0, import_react.forwardRef)(
             const orderPaymentAddedUnsubscribe = core.effects.on(
               CheckoutHooks.OnOrderPaymentAdded,
               async (data) => {
+                var _a2, _b2;
                 console.log("orderPaymentAddedUnsubscribe>>>>", data);
+                const orderInfo2 = checkoutModule.getCurrentOrderInfo();
+                updateOrderInfo == null ? void 0 : updateOrderInfo(orderInfo2);
                 const balanceDueAmount2 = checkoutModule.getBalanceDueAmount();
                 if (Number(balanceDueAmount2) > 0) {
                   const autoCloseConfig = (0, import_PaymentResultToastUtils.calculateAutoCloseConfig)(
                     "partially_paid",
                     false
                   );
-                  const orderInfo2 = checkoutModule.getCurrentOrderInfo();
+                  const paymentItems2 = await checkoutModule.getCurrentOrderPaymentItemsAsync();
+                  let totalAmount2 = new import_decimal.default(orderInfo2.isDeposit ? orderInfo2.depositAmount : orderInfo2.totalAmount);
+                  if (paymentItems2.length > 0 && paymentItems2.filter((n) => n.isSynced).some((item) => item.service_charge)) {
+                    const serviceChargeTotal = paymentItems2.reduce((acc, item) => {
+                      var _a3, _b3;
+                      const chargeAmount = new import_decimal.default(((_a3 = item.service_charge) == null ? void 0 : _a3.amount) || 0);
+                      const chargePercentage = new import_decimal.default(((_b3 = item.service_charge) == null ? void 0 : _b3.percentage) || 0);
+                      const itemAmount = new import_decimal.default(item.amount || 0);
+                      const itemServiceCharge = chargeAmount.add(chargePercentage.mul(itemAmount));
+                      return acc.add(itemServiceCharge);
+                    }, new import_decimal.default(0));
+                    totalAmount2 = totalAmount2.add(serviceChargeTotal);
+                  }
                   await (0, import_PaymentResultToastUtils.displayPaymentResultToast)(
                     {
                       paymentStatus: "partially_paid",
-                      orderTotalAmount: orderInfo2.totalAmount,
+                      orderTotalAmount: totalAmount2.toNumber(),
                       gapAmount: balanceDueAmount2,
                       failureReason: "",
                       autoCloseConfig,
@@ -440,6 +477,19 @@ 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"
+                  });
+                }
               }
             );
             return () => {
@@ -504,6 +554,12 @@ var PaymentContent = (0, import_react.forwardRef)(
       const result = await checkoutModule.manualSyncOrderAsync();
       await (showSuccessToast == null ? void 0 : showSuccessToast(result));
       if (result.success) {
+        const orderInfo2 = checkoutModule.getCurrentOrderInfo();
+        setCurrentEditOrderId == null ? void 0 : setCurrentEditOrderId(result.orderId);
+        if (result.is_deposit && Number(orderInfo2.depositAmount < orderInfo2.totalAmount)) {
+          updateOrderInfo == null ? void 0 : updateOrderInfo(orderInfo2);
+          return;
+        }
         const responseData = (_a2 = result.response) == null ? void 0 : _a2.data;
         console.log("print_order_onOrderSynced>>>>", result);
         try {
@@ -598,6 +654,9 @@ var PaymentContent = (0, import_react.forwardRef)(
         return 0;
       }
     }, [state, showPriceAdjustModal]);
+    const currentTotalPriceAfterDiscount = (0, import_react.useMemo)(() => {
+      return new import_decimal.default(currentTotalPrice).minus(state.shop_discount || 0).toNumber();
+    }, [state.shop_discount, currentTotalPrice]);
     const handleSelectWalletChange = (0, import_ahooks.useMemoizedFn)(
       async (select) => {
         if (walletPassDetail.isShow) {
@@ -635,16 +694,10 @@ var PaymentContent = (0, import_react.forwardRef)(
         }
       }
     );
-    const handlePriceAdjustConfirm = async (newPrice) => {
+    const handlePriceAdjustConfirm = async (discountAmount) => {
       try {
         if (checkoutModule && (orderInfo == null ? void 0 : orderInfo.totalAmount)) {
           if (dispatch) {
-            const { ScheduleModule } = pisellosAllModule;
-            const { productAmount } = (0, import_amount.getSumTotal)(state, {
-              isEdit: true,
-              ScheduleModule
-            });
-            const discountAmount = Math.max(0, productAmount - newPrice);
             dispatch({
               type: "setState",
               payload: {
@@ -817,7 +870,7 @@ var PaymentContent = (0, import_react.forwardRef)(
           import_WalletPassModule.default,
           {
             clientId: (_b = (_a = state == null ? void 0 : state.client) == null ? void 0 : _a.value) == null ? void 0 : _b.id,
-            customAmount,
+            customAmount: balanceDueAmount,
             orderInfo: orderInfo || void 0,
             ref: walletPassRef,
             paymentItems,
@@ -860,8 +913,10 @@ var PaymentContent = (0, import_react.forwardRef)(
           /* @__PURE__ */ import_react.default.createElement(
             import_CashPaymentModule.default,
             {
+              disabled: isOrderFree,
               isModalOpen,
-              amountSymbol: state.amountSymbol,
+              syncingLock,
+              amountSymbol: getData("shop_symbol"),
               orderInfo: orderInfo || void 0,
               onPaymentComplete: handleAddCashPayment,
               amountButtons: recommendAmounts,
@@ -935,42 +990,22 @@ var PaymentContent = (0, import_react.forwardRef)(
           sendPaymentLink: handleSendCustomerPaymentLink
         }
       ),
-      showPriceAdjustModal && (0, import_react_dom.createPortal)(
-        /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-price-adjust-overlay" }, /* @__PURE__ */ import_react.default.createElement(
-          "button",
-          {
-            className: "pisell-price-adjust-backdrop",
-            style: {
-              cursor: "pointer",
-              border: "none",
-              background: "transparent",
-              width: "100%",
-              height: "100%",
-              position: "absolute",
-              top: 0,
-              left: 0
-            },
-            onClick: () => setShowPriceAdjustModal(false),
-            "aria-label": import_utils.locales.getText(
-              "pisell2.checkout.modal.close-price-adjustment"
-            ) || "Close price adjustment modal"
-          }
-        ), /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-price-adjust-container" }, /* @__PURE__ */ import_react.default.createElement(
-          import_materials.PisellAdjustPrice,
-          {
-            selectType: "dark",
-            originValue: currentTotalPrice,
-            value: currentTotalPrice,
-            onChange: handlePriceAdjustConfirm,
-            resetText: import_utils.locales.getText(
-              "pisell2.checkout.modal.reset-price-adjustment"
-            ),
-            doneText: import_utils.locales.getText(
-              "pisell2.checkout.modal.done-price-adjustment"
-            )
-          }
-        ))),
-        document.body
+      /* @__PURE__ */ import_react.default.createElement(
+        import_priceKeyboard.DiscountKeyboard,
+        {
+          containerProps: {
+            renderType: "modal",
+            open: showPriceAdjustModal,
+            onCancel: () => setShowPriceAdjustModal(false)
+          },
+          selectType: "dark",
+          originalValue: currentTotalPrice,
+          defaultValue: currentTotalPriceAfterDiscount,
+          resetText: import_utils.locales.getText(
+            "pisell2.checkout.modal.reset-price-adjustment"
+          ),
+          onEnter: handlePriceAdjustConfirm
+        }
       ),
       /* @__PURE__ */ import_react.default.createElement(
         import_SavePayLaterHandler.default,
@@ -990,7 +1025,9 @@ var PaymentModal = ({
   callback,
   onClose,
   dispatch,
-  state
+  state,
+  setEditCartMode,
+  editOrderId
 }) => {
   var _a, _b, _c, _d, _e, _f, _g, _h;
   const context = (0, import_useEngineContext.default)();
@@ -1004,6 +1041,7 @@ var PaymentModal = ({
   const [actualShowCashPayment, setActualShowCashPayment] = (0, import_react.useState)(true);
   const [windowHeight, setWindowHeight] = (0, import_react.useState)(0);
   const [showRetryModal, setShowRetryModal] = (0, import_react.useState)(false);
+  const [currentEditOrderId, setCurrentEditOrderId] = (0, import_react.useState)(editOrderId || 0);
   const Toast = (0, import_materials.useToast)();
   const handleRetry = async () => {
     const checkoutModule = pisellos == null ? void 0 : pisellos.getModule("checkout");
@@ -1059,7 +1097,7 @@ var PaymentModal = ({
       const matrix = new DOMMatrix(bodyTransform);
       scaleY = matrix.d;
     }
-    return `${Math.floor((windowHeight * 0.9 - 72) / scaleY)}px`;
+    return `${Math.floor(windowHeight * 0.9 / scaleY)}px`;
   }, [windowHeight]);
   const moduleConfig = {
     showCashPayment: true
@@ -1297,6 +1335,21 @@ var PaymentModal = ({
     checkout.cancelCurrentOrderAsync();
     onClose == null ? void 0 : onClose(reset || false);
   };
+  const handleSetEditCartMode = async (closeModal = false) => {
+    const checkout = pisellos.getModule("checkout");
+    const orderId = checkout.getCurrentOrderId();
+    const paymentData = await checkout.getCurrentOrderPaymentItemsAsync();
+    const paidAmount = paymentData.reduce((total, item) => {
+      return total + Number(item.amount);
+    }, 0);
+    const paidAmountWithoutSurcharge = paymentData.reduce((total, item) => {
+      var _a2;
+      return total + Number(item.amount) - Number(((_a2 = item.service_charge) == null ? void 0 : _a2.amount) || 0);
+    }, 0);
+    console.log("paidAmount>>>>", paidAmount, paidAmountWithoutSurcharge);
+    checkout.updateVoucherPaymentItemsAsync([]);
+    setEditCartMode == null ? void 0 : setEditCartMode(orderId, { paidAmount, paidAmountWithoutSurcharge }, closeModal);
+  };
   const CustomHeader = () => /* @__PURE__ */ import_react.default.createElement("div", { className: "payment-modal-custom-header" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "header__left" }, /* @__PURE__ */ import_react.default.createElement(
     import_antd.Button,
     {
@@ -1306,7 +1359,7 @@ var PaymentModal = ({
       onClick: () => {
         const checkout = pisellos.getModule("checkout");
         if (checkout.isCurrentOrderSynced()) {
-          handlePaymentCancel(true);
+          handleSetEditCartMode(true);
         } else {
           handlePaymentCancel(false);
         }
@@ -1332,7 +1385,7 @@ var PaymentModal = ({
   const unsubscribeRef = (0, import_react.useRef)(void 0);
   (0, import_react.useEffect)(() => {
     const initCheckoutData = async () => {
-      var _a2, _b2;
+      var _a2, _b2, _c2, _d2;
       try {
         const checkout = pisellos == null ? void 0 : pisellos.getModule("checkout");
         if (checkout && data && !isLocalOrderCreated.current) {
@@ -1351,13 +1404,24 @@ var PaymentModal = ({
             shop_wallet_pass_id
           });
           const newData = (0, import_lodash.cloneDeep)(data);
-          await checkout.createLocalOrderAsync({
-            orderData: newData.order_info,
-            cartSummary: (_a2 = newData.subtotal_info) == null ? void 0 : _a2.subTotalList,
-            autoPayment: true,
-            totalInfo: newData.subtotal_info
-          });
+          if (editOrderId || currentEditOrderId) {
+            await checkout.updateLocalOrderAsync({
+              orderId: editOrderId || currentEditOrderId,
+              orderData: newData.order_info,
+              cartSummary: (_a2 = newData.subtotal_info) == null ? void 0 : _a2.subTotalList,
+              autoPayment: true,
+              totalInfo: newData.subtotal_info
+            });
+          } else {
+            await checkout.createLocalOrderAsync({
+              orderData: newData.order_info,
+              cartSummary: (_b2 = newData.subtotal_info) == null ? void 0 : _b2.subTotalList,
+              autoPayment: true,
+              totalInfo: newData.subtotal_info
+            });
+          }
           const orderInfo2 = checkout.getCurrentOrderInfo();
+          console.log(orderInfo2);
           if (orderInfo2 && orderInfo2.totalAmount) {
             setTotalAmount(orderInfo2.totalAmount);
           }
@@ -1374,7 +1438,9 @@ var PaymentModal = ({
           unsubscribeRef.current = checkout.core.effects.on(
             "checkout:onOrderSynced",
             async (data2) => {
-              var _a3, _b3, _c2, _d2, _e2;
+              var _a3, _b3, _c3, _d3, _e2;
+              const currentOrderId = checkout.getCurrentOrderId();
+              setCurrentEditOrderId(currentOrderId);
               const responseData = (_a3 = data2.response) == null ? void 0 : _a3.data;
               const paymentStatus = responseData == null ? void 0 : responseData.payment_status;
               if (data2.isManual) return;
@@ -1385,7 +1451,7 @@ var PaymentModal = ({
               const orderTotalAmount = Number((responseData == null ? void 0 : responseData.total_amount) || 0);
               const gapAmount = Number((responseData == null ? void 0 : responseData.amount_gap) || 0);
               const currentChangeGivenAmount = Number(
-                ((_b3 = responseData == null ? void 0 : responseData.payment_info) == null ? void 0 : _b3.current_change_given_amount) || 0
+                (_b3 = responseData == null ? void 0 : responseData.payment_info) == null ? void 0 : _b3.current_change_given_amount
               );
               const failureReason = responseData == null ? void 0 : responseData.failure_reason;
               if (paymentStatus) {
@@ -1404,7 +1470,7 @@ var PaymentModal = ({
                     data: {
                       order_id: responseData.order_id,
                       machine_code_print_info: responseData == null ? void 0 : responseData.machine_code_print_info,
-                      small_ticket_data: (_c2 = responseData == null ? void 0 : responseData.payment_info) == null ? void 0 : _c2.small_ticket_data
+                      small_ticket_data: (_c3 = responseData == null ? void 0 : responseData.payment_info) == null ? void 0 : _c3.small_ticket_data
                     }
                   };
                   console.log("print_order_onOrderSynced_params>>>>", params);
@@ -1440,14 +1506,15 @@ var PaymentModal = ({
                   paymentStatus,
                   !!currentChangeGivenAmount
                 );
-                const enabledAutoPrint = await ((_e2 = (_d2 = interaction == null ? void 0 : interaction.utils) == null ? void 0 : _d2.asyncDataManager) == null ? void 0 : _e2.call(_d2, {
+                const enabledAutoPrint = await ((_e2 = (_d3 = interaction == null ? void 0 : interaction.utils) == null ? void 0 : _d3.asyncDataManager) == null ? void 0 : _e2.call(_d3, {
                   module: "get",
                   key: "auto_print_receipt"
                 }));
+                const orderInfo3 = checkout.getCurrentOrderInfo();
                 await (0, import_PaymentResultToastUtils.displayPaymentResultToast)(
                   {
                     paymentStatus,
-                    orderTotalAmount,
+                    orderTotalAmount: orderInfo3.isDeposit ? orderInfo3.depositAmount : orderTotalAmount,
                     gapAmount: paymentStatus === "partially_paid" ? gapAmount : currentChangeGivenAmount,
                     failureReason,
                     autoCloseConfig,
@@ -1479,12 +1546,22 @@ var PaymentModal = ({
           );
           isLocalOrderCreated.current = false;
           await checkout.cancelCurrentOrderAsync();
-          await checkout.createLocalOrderAsync({
-            orderData: data == null ? void 0 : data.order_info,
-            cartSummary: (_b2 = data == null ? void 0 : data.subtotal_info) == null ? void 0 : _b2.subTotalList,
-            autoPayment: true,
-            totalInfo: data == null ? void 0 : data.subtotal_info
-          });
+          if (editOrderId || currentEditOrderId) {
+            await checkout.updateLocalOrderAsync({
+              orderId: editOrderId || currentEditOrderId,
+              orderData: data == null ? void 0 : data.order_info,
+              cartSummary: (_c2 = data == null ? void 0 : data.subtotal_info) == null ? void 0 : _c2.subTotalList,
+              autoPayment: true,
+              totalInfo: data == null ? void 0 : data.subtotal_info
+            });
+          } else {
+            await checkout.createLocalOrderAsync({
+              orderData: data == null ? void 0 : data.order_info,
+              cartSummary: (_d2 = data == null ? void 0 : data.subtotal_info) == null ? void 0 : _d2.subTotalList,
+              autoPayment: true,
+              totalInfo: data == null ? void 0 : data.subtotal_info
+            });
+          }
           const orderInfo2 = checkout.getCurrentOrderInfo();
           if (orderInfo2 && orderInfo2.totalAmount) {
             setTotalAmount(orderInfo2.totalAmount);
@@ -1860,7 +1937,9 @@ var PaymentModal = ({
         dynamicMaxHeight,
         onOrderSyncFailed: () => setShowRetryModal(true),
         generateActionButtons,
-        paymentResultToastConfig
+        paymentResultToastConfig,
+        updateOrderInfo: (orderInfo2) => setOrderInfo(orderInfo2),
+        setCurrentEditOrderId: (orderId) => setCurrentEditOrderId(orderId)
       }
     )
   ), noteModalOpen && (0, import_react_dom.createPortal)(

package/lib/components/checkout/components/AdditionalModule/index.less

@@ -1,5 +1,5 @@
 .additional-module {
-  padding-bottom: 16px; // 底部间距
+  // padding-bottom: 16px; // 底部间距
 
   // 标题样式
   &-title {