@pisell/private-materials 6.4.18 → 6.4.20

package/es/components/Sales/Summary/utils.d.ts

@@ -30,7 +30,7 @@ export declare const calculateSubtotal: (items: CartItem[]) => string;
  * @return {*}
  * @Author: xiangfeng.xue
  */
-export declare const calculateTaxFee: (shopInfo: any, items: CartItem[]) => "0.00" | Decimal;
+export declare const calculateTaxFee: (shopInfo: any, items: CartItem[]) => Decimal | "0.00";
 /**
  * 计算所有价格明细
  * @param items - 购物车商品数组

package/es/components/booking/components/tabPane/index.less

@@ -1,5 +1,5 @@
 .pisell-lowcode__booking-tab-pane-wrap {
-  height: 100vh;
+  height: 100%;
   // padding: 0 32px;
   width: 100%;
   position: relative;

package/es/components/booking/utils.d.ts

@@ -165,10 +165,10 @@ export declare const getProductTotalPrice: (item: any) => number;
 export declare const getDuration: (duration: number | {
     type: string;
     value: number;
-}) => number | {
+}) => number | "flexible" | {
     type: string;
     value: number;
-} | "flexible";
+};
 export declare const isWalkIn: (customer_id?: number | string) => boolean;
 export declare const getIsEdit: (state: any) => boolean;
 export {};

package/es/components/checkout/PaymentModal.js

@@ -1048,25 +1048,35 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
   };
   var handleSendCustomerPaymentLink = /*#__PURE__*/function () {
     var _ref15 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee12(data) {
-      var isCurrentOrderSynced, res;
+      var order, stateAmount, isCurrentOrderSynced, res;
       return _regeneratorRuntime().wrap(function _callee12$(_context12) {
         while (1) switch (_context12.prev = _context12.next) {
           case 0:
             // 先检测订单是否同步过，如果没有，需要先手动下单
+            // 如果是定金模式，则需要设置当前待付金额至 os 的 deposit_amount
+            order = checkoutModule.getCurrentOrderInfo();
+            if (!order.isDeposit) {
+              _context12.next = 5;
+              break;
+            }
+            stateAmount = checkoutModule.getStateAmount();
+            _context12.next = 5;
+            return checkoutModule.setDepositAmountAsync(stateAmount);
+          case 5:
             isCurrentOrderSynced = checkoutModule.isCurrentOrderSynced();
             if (isCurrentOrderSynced) {
-              _context12.next = 4;
+              _context12.next = 9;
               break;
             }
-            _context12.next = 4;
+            _context12.next = 9;
             return checkoutModule.manualSyncOrderAsync();
-          case 4:
-            _context12.next = 6;
+          case 9:
+            _context12.next = 11;
             return checkoutModule.sendCustomerPayLinkAsync({
               emails: data.emails,
               order_ids: [checkoutModule.getCurrentOrderId()]
             });
-          case 6:
+          case 11:
             res = _context12.sent;
             // 支付链接发送成功 转 toC，这边可以关掉了
             if (res.success) {
@@ -1075,7 +1085,7 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
             } else {
               Toast === null || Toast === void 0 || Toast.error(res.message || locales.getText('pisell2.checkout.send-payment-link.error'));
             }
-          case 8:
+          case 13:
           case "end":
             return _context12.stop();
         }
@@ -1603,7 +1613,7 @@ var PaymentModal = function PaymentModal(_ref17) {
               // 获取 checkout 模块并处理订单数据
               checkout = pisellos === null || pisellos === void 0 ? void 0 : pisellos.getModule('checkout');
               if (!(checkout && data && !isLocalOrderCreated.current)) {
-                _context17.next = 20;
+                _context17.next = 19;
                 break;
               }
               isLocalOrderCreated.current = true;
@@ -1651,130 +1661,27 @@ var PaymentModal = function PaymentModal(_ref17) {
                 unsubscribeRef.current();
                 unsubscribeRef.current = undefined;
               }
-              // 监听订单同步完成，同步完成后显示订单完成 toast，关闭当前弹窗
-              unsubscribeRef.current = checkout.core.effects.on('checkout:onOrderSynced', function (data) {
-                var _data$response, _responseData$payment2;
-                // 获取支付状态和相关信息
-                var responseData = (_data$response = data.response) === null || _data$response === void 0 ? void 0 : _data$response.data;
-                // 获取支付状态
-                var paymentStatus = responseData === null || responseData === void 0 ? void 0 : responseData.payment_status;
-                if (data.isManual) return;
-                handlePaymentComplete(data);
-                // 如果正在显示现金支付 toast，跳过自动关闭逻辑
-                if (showingCashToastRef.current) {
-                  return;
-                }
-
-                // 获取订单总金额
-                var orderTotalAmount = Number((responseData === null || responseData === void 0 ? void 0 : responseData.total_amount) || 0);
-                var gapAmount = Number((responseData === null || responseData === void 0 ? void 0 : responseData.amount_gap) || 0);
-                var currentChangeGivenAmount = Number((responseData === null || responseData === void 0 || (_responseData$payment2 = responseData.payment_info) === null || _responseData$payment2 === void 0 ? void 0 : _responseData$payment2.current_change_given_amount) || 0);
-                // const changeDue = Number(responseData?.amount_gap || 0);
-                // 获取失败原因
-                var failureReason = responseData === null || responseData === void 0 ? void 0 : responseData.failure_reason;
-
-                // 根据支付状态弹出对应的支付结果toast
-                if (paymentStatus) {
-                  // 打印订单完整信息
-                  console.log('print_order_onOrderSynced>>>>', responseData);
-                  logger === null || logger === void 0 || logger.addLog({
-                    type: 'info',
-                    title: 'print_order_onOrderSynced',
-                    metadata: {
-                      responseData: responseData
-                    }
-                  });
-                  try {
-                    var _responseData$payment3;
-                    var params = {
-                      type: '99',
-                      // 打印订单全部信息
-                      data: {
-                        order_id: responseData.order_id,
-                        machine_code_print_info: responseData === null || responseData === void 0 ? void 0 : responseData.machine_code_print_info,
-                        small_ticket_data: responseData === null || responseData === void 0 || (_responseData$payment3 = responseData.payment_info) === null || _responseData$payment3 === void 0 ? void 0 : _responseData$payment3.small_ticket_data
-                      }
-                    };
-                    console.log('print_order_onOrderSynced_params>>>>', params);
-                    logger === null || logger === void 0 || logger.addLog({
-                      type: 'info',
-                      title: 'print_order_onOrderSynced_params',
-                      metadata: {
-                        params: params
-                      }
-                    });
-                    webPrint(params, function (res) {
-                      console.log('print_order_onOrderSynced_res>>>>', res);
-                      logger === null || logger === void 0 || logger.addLog({
-                        type: 'info',
-                        title: 'print_order_onOrderSynced_res',
-                        metadata: {
-                          res: res
-                        }
-                      });
-                    });
-                  } catch (error) {
-                    console.error('print_order_onOrderSynced_error>>>>', error);
-                    logger === null || logger === void 0 || logger.addLog({
-                      type: 'info',
-                      title: 'print_order_onOrderSynced_error',
-                      metadata: {
-                        error: error
-                      }
-                    });
-                  }
-
-                  // 确定支付状态
-                  var statusClassName = calculateStatusClassName(paymentStatus);
-                  var autoCloseConfig = calculateAutoCloseConfig(paymentStatus, !!currentChangeGivenAmount);
-
-                  // 根据支付状态展示不同的 toast
-                  displayPaymentResultToast({
-                    paymentStatus: paymentStatus,
-                    orderTotalAmount: orderTotalAmount,
-                    gapAmount: paymentStatus === 'partially_paid' ? gapAmount : currentChangeGivenAmount,
-                    failureReason: failureReason,
-                    autoCloseConfig: autoCloseConfig,
-                    actionButtons: generateActionButtons(paymentStatus)
-                  }, paymentResultToastConfig);
-
-                  // 将支付结果信息传递给回调处理
-                  var paymentResult = _objectSpread(_objectSpread({}, data), {}, {
-                    toastInfo: {
-                      status: paymentStatus,
-                      amount: orderTotalAmount,
-                      gapAmount: currentChangeGivenAmount,
-                      failureReason: failureReason
-                    }
-                  });
-                  handlePaymentComplete(paymentResult);
-                } else {
-                  handlePaymentComplete(data);
-                }
-                // 可以在这里执行同步完成后的业务逻辑
-                // 比如：通知其他系统、更新UI状态等
-              });
-              _context17.next = 31;
+              _context17.next = 30;
               break;
-            case 20:
+            case 19:
               if (!isLocalOrderCreated.current) {
-                _context17.next = 31;
+                _context17.next = 30;
                 break;
               }
               // // 如果本地订单已创建，这时候还更新了 data，则需要销毁当前的订单数据，然后更新新的订单数据了
               console.log('🔄 PaymentModal: data changed, updating checkout data...');
               isLocalOrderCreated.current = false;
-              _context17.next = 25;
+              _context17.next = 24;
               return checkout.cancelCurrentOrderAsync();
-            case 25:
-              _context17.next = 27;
+            case 24:
+              _context17.next = 26;
               return checkout.createLocalOrderAsync({
                 orderData: data === null || data === void 0 ? void 0 : data.order_info,
                 cartSummary: data === null || data === void 0 || (_data$subtotal_info = data.subtotal_info) === null || _data$subtotal_info === void 0 ? void 0 : _data$subtotal_info.subTotalList,
                 autoPayment: true,
                 totalInfo: data === null || data === void 0 ? void 0 : data.subtotal_info
               });
-            case 27:
+            case 26:
               // 获取订单总金额
               _orderInfo3 = checkout.getCurrentOrderInfo();
               if (_orderInfo3 && _orderInfo3.totalAmount) {
@@ -1782,11 +1689,11 @@ var PaymentModal = function PaymentModal(_ref17) {
               }
               setOrderInfo(_orderInfo3);
               isLocalOrderCreated.current = true;
-            case 31:
-              _context17.next = 37;
+            case 30:
+              _context17.next = 36;
               break;
-            case 33:
-              _context17.prev = 33;
+            case 32:
+              _context17.prev = 32;
               _context17.t0 = _context17["catch"](0);
               console.error('Failed to initialize checkout data:', _context17.t0);
               logger === null || logger === void 0 || logger.addLog({
@@ -1796,11 +1703,11 @@ var PaymentModal = function PaymentModal(_ref17) {
                   error: _context17.t0
                 }
               });
-            case 37:
+            case 36:
             case "end":
               return _context17.stop();
           }
-        }, _callee17, null, [[0, 33]]);
+        }, _callee17, null, [[0, 32]]);
       }));
       return function initCheckoutData() {
         return _ref22.apply(this, arguments);
@@ -1811,6 +1718,110 @@ var PaymentModal = function PaymentModal(_ref17) {
     }
   }, [data]);
   useEffect(function () {
+    var checkout = pisellos === null || pisellos === void 0 ? void 0 : pisellos.getModule('checkout');
+    // 监听订单同步完成，同步完成后显示订单完成 toast，关闭当前弹窗
+    unsubscribeRef.current = checkout.core.effects.on('checkout:onOrderSynced', function (data) {
+      var _data$response, _responseData$payment2;
+      // 获取支付状态和相关信息
+      var responseData = (_data$response = data.response) === null || _data$response === void 0 ? void 0 : _data$response.data;
+      // 获取支付状态
+      var paymentStatus = responseData === null || responseData === void 0 ? void 0 : responseData.payment_status;
+      if (data.isManual) return;
+      handlePaymentComplete(data);
+      // 如果正在显示现金支付 toast，跳过自动关闭逻辑
+      if (showingCashToastRef.current) {
+        return;
+      }
+
+      // 获取订单总金额
+      var orderTotalAmount = Number((responseData === null || responseData === void 0 ? void 0 : responseData.total_amount) || 0);
+      var gapAmount = Number((responseData === null || responseData === void 0 ? void 0 : responseData.amount_gap) || 0);
+      var currentChangeGivenAmount = Number((responseData === null || responseData === void 0 || (_responseData$payment2 = responseData.payment_info) === null || _responseData$payment2 === void 0 ? void 0 : _responseData$payment2.current_change_given_amount) || 0);
+      // const changeDue = Number(responseData?.amount_gap || 0);
+      // 获取失败原因
+      var failureReason = responseData === null || responseData === void 0 ? void 0 : responseData.failure_reason;
+
+      // 根据支付状态弹出对应的支付结果toast
+      if (paymentStatus) {
+        // 打印订单完整信息
+        console.log('print_order_onOrderSynced>>>>', responseData);
+        logger === null || logger === void 0 || logger.addLog({
+          type: 'info',
+          title: 'print_order_onOrderSynced',
+          metadata: {
+            responseData: responseData
+          }
+        });
+        try {
+          var _responseData$payment3;
+          var params = {
+            type: '99',
+            // 打印订单全部信息
+            data: {
+              order_id: responseData.order_id,
+              machine_code_print_info: responseData === null || responseData === void 0 ? void 0 : responseData.machine_code_print_info,
+              small_ticket_data: responseData === null || responseData === void 0 || (_responseData$payment3 = responseData.payment_info) === null || _responseData$payment3 === void 0 ? void 0 : _responseData$payment3.small_ticket_data
+            }
+          };
+          console.log('print_order_onOrderSynced_params>>>>', params);
+          logger === null || logger === void 0 || logger.addLog({
+            type: 'info',
+            title: 'print_order_onOrderSynced_params',
+            metadata: {
+              params: params
+            }
+          });
+          webPrint(params, function (res) {
+            console.log('print_order_onOrderSynced_res>>>>', res);
+            logger === null || logger === void 0 || logger.addLog({
+              type: 'info',
+              title: 'print_order_onOrderSynced_res',
+              metadata: {
+                res: res
+              }
+            });
+          });
+        } catch (error) {
+          console.error('print_order_onOrderSynced_error>>>>', error);
+          logger === null || logger === void 0 || logger.addLog({
+            type: 'info',
+            title: 'print_order_onOrderSynced_error',
+            metadata: {
+              error: error
+            }
+          });
+        }
+
+        // 确定支付状态
+        var statusClassName = calculateStatusClassName(paymentStatus);
+        var autoCloseConfig = calculateAutoCloseConfig(paymentStatus, !!currentChangeGivenAmount);
+
+        // 根据支付状态展示不同的 toast
+        displayPaymentResultToast({
+          paymentStatus: paymentStatus,
+          orderTotalAmount: orderTotalAmount,
+          gapAmount: paymentStatus === 'partially_paid' ? gapAmount : currentChangeGivenAmount,
+          failureReason: failureReason,
+          autoCloseConfig: autoCloseConfig,
+          actionButtons: generateActionButtons(paymentStatus)
+        }, paymentResultToastConfig);
+
+        // 将支付结果信息传递给回调处理
+        var paymentResult = _objectSpread(_objectSpread({}, data), {}, {
+          toastInfo: {
+            status: paymentStatus,
+            amount: orderTotalAmount,
+            gapAmount: currentChangeGivenAmount,
+            failureReason: failureReason
+          }
+        });
+        handlePaymentComplete(paymentResult);
+      } else {
+        handlePaymentComplete(data);
+      }
+      // 可以在这里执行同步完成后的业务逻辑
+      // 比如：通知其他系统、更新UI状态等
+    });
     return function () {
       if (typeof unsubscribeRef.current === 'function') {
         var _unsubscribeRef$curre;

package/es/components/checkout/components/WalletPassModule/components/DiscountWallet/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 interface DiscountWalletProps {
     isCardMode: boolean;

package/es/components/eftposPay/hooks.d.ts

@@ -15,11 +15,11 @@ export declare const useStoreRef: <T extends {
     readonly numRef: React.MutableRefObject<string | number | undefined>;
     readonly orderIdRef: React.MutableRefObject<string | number>;
     readonly modeRef: React.MutableRefObject<ModeEnum>;
-    readonly statusRef: React.MutableRefObject<"loading" | "warn" | "success" | "fail" | "pedding" | "resove" | "reject" | "question">;
+    readonly statusRef: React.MutableRefObject<"loading" | "success" | "warn" | "fail" | "pedding" | "resove" | "reject" | "question">;
     readonly netRef: React.MutableRefObject<boolean | undefined>;
     readonly symbolRef: React.MutableRefObject<string>;
     readonly amountRef: React.MutableRefObject<string | number>;
-    readonly eftposRef: React.MutableRefObject<"stripe" | "payo" | "tyro" | "windcave" | "linkly">;
+    readonly eftposRef: React.MutableRefObject<"stripe" | "tyro" | "windcave" | "payo" | "linkly">;
     readonly clientRef: React.MutableRefObject<ClientEnum>;
     readonly dataRef: React.MutableRefObject<import("./store").State>;
 };

package/es/components/eftposPay/store/index.d.ts

@@ -174,7 +174,7 @@ export declare const updateCustom: (payload: {
 export declare const updateStatus: (status: 'loading' | 'warn' | 'fail' | 'success' | 'question') => {
     type: EActionTypes;
     payload: {
-        status: "loading" | "warn" | "success" | "fail" | "question";
+        status: "loading" | "success" | "warn" | "fail" | "question";
     };
 };
 /**
@@ -295,9 +295,9 @@ export declare const backUpFree: (payload: Partial<State>) => {
         name?: string | undefined;
         symbol?: string | undefined;
         amount?: string | number | undefined;
-        mode?: "refund" | "fullPay" | "pay" | "query" | undefined;
+        mode?: "pay" | "refund" | "fullPay" | "query" | undefined;
         order_id?: string | number | undefined;
-        eftpos?: "stripe" | "payo" | "tyro" | "windcave" | "linkly" | undefined;
+        eftpos?: "stripe" | "tyro" | "windcave" | "payo" | "linkly" | undefined;
         action?: "amount" | "pay" | "deviceList" | undefined;
         key?: number | undefined;
         step?: number | undefined;
@@ -308,7 +308,7 @@ export declare const backUpFree: (payload: Partial<State>) => {
         net?: boolean | undefined;
         component?: string | undefined;
         form?: string | undefined;
-        status?: "loading" | "warn" | "success" | "fail" | "pedding" | "resove" | "reject" | "question" | undefined;
+        status?: "loading" | "success" | "warn" | "fail" | "pedding" | "resove" | "reject" | "question" | undefined;
         warn?: string | undefined;
         steps?: {
             /** 用于重置当前步骤 */

package/es/components/ticketBooking/utils/index.d.ts

@@ -41,7 +41,7 @@ declare type ScanData = {
     };
 };
 export declare const formatScanCustomer: (data: ScanData) => {
-    searchType: "product" | "customer" | "wallet" | "walletPass" | "local_product";
+    searchType: "customer" | "product" | "wallet" | "walletPass" | "local_product";
     data: any;
     scanCode: string;
 } | null;

package/lib/components/Sales/Summary/utils.d.ts

@@ -30,7 +30,7 @@ export declare const calculateSubtotal: (items: CartItem[]) => string;
  * @return {*}
  * @Author: xiangfeng.xue
  */
-export declare const calculateTaxFee: (shopInfo: any, items: CartItem[]) => "0.00" | Decimal;
+export declare const calculateTaxFee: (shopInfo: any, items: CartItem[]) => Decimal | "0.00";
 /**
  * 计算所有价格明细
  * @param items - 购物车商品数组

package/lib/components/booking/components/tabPane/index.less

@@ -1,5 +1,5 @@
 .pisell-lowcode__booking-tab-pane-wrap {
-  height: 100vh;
+  height: 100%;
   // padding: 0 32px;
   width: 100%;
   position: relative;

package/lib/components/booking/utils.d.ts

@@ -165,10 +165,10 @@ export declare const getProductTotalPrice: (item: any) => number;
 export declare const getDuration: (duration: number | {
     type: string;
     value: number;
-}) => number | {
+}) => number | "flexible" | {
     type: string;
     value: number;
-} | "flexible";
+};
 export declare const isWalkIn: (customer_id?: number | string) => boolean;
 export declare const getIsEdit: (state: any) => boolean;
 export {};