@pisell/private-materials 6.8.75 → 6.8.76

package/es/components/booking/materiels/startTime/index.d.ts

@@ -1,10 +1,10 @@
-/// <reference types="react" />
 import { SelectProps } from "antd";
+import React from "react";
 interface StartTimeProps extends SelectProps {
     locale?: string;
     slice?: number;
     selectProps?: SelectProps;
     timeObjChange?: any;
 }
-declare const StartTime: (props: StartTimeProps) => JSX.Element;
+declare const StartTime: (props: StartTimeProps) => React.JSX.Element;
 export default StartTime;

package/es/components/booking/notes/NoteBlock/NoteItem/index.d.ts

@@ -1,3 +1,4 @@
+import React from "react";
 import "./index.less";
 export interface InfoProps {
     isEdit: boolean;
@@ -5,5 +6,5 @@ export interface InfoProps {
     onChange?: (item: any, type: "edit" | "remove") => void;
     menus?: any[];
 }
-declare const NoteItem: (props: InfoProps) => JSX.Element;
+declare const NoteItem: (props: InfoProps) => React.JSX.Element;
 export default NoteItem;

package/es/components/booking/notes/NoteBlock/index.d.ts

@@ -1,3 +1,4 @@
+import React from "react";
 import "./index.less";
 export interface InfoProps {
     title?: string;
@@ -12,5 +13,5 @@ export interface InfoProps {
     maxLength?: number;
     noteType: string;
 }
-declare const NoteBlock: (props: InfoProps) => JSX.Element;
+declare const NoteBlock: (props: InfoProps) => React.JSX.Element;
 export default NoteBlock;

package/es/components/booking/notes/addNote/index.d.ts

@@ -1,3 +1,4 @@
+import React from "react";
 import "./index.less";
-declare const AddNote: ({ value, onChange, title, placeholder }: any) => JSX.Element;
+declare const AddNote: ({ value, onChange, title, placeholder }: any) => React.JSX.Element;
 export default AddNote;

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

@@ -173,10 +173,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

@@ -289,7 +289,7 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
           case 2:
             _ref4 = method || {}, id = _ref4.id, code = _ref4.code, name = _ref4.name, type = _ref4.type;
             finalAmount = (_method$totalAmount = method.totalAmount) !== null && _method$totalAmount !== void 0 ? _method$totalAmount : customAmount; // 这里需要根据支付方式来判断是 eftpos 还是 mx51
-            eftposCodes = ['EFTPOS_LINKLY', 'EFTPOS_PAYO', 'EFTPOS_WINDCAVE', 'EFTPOS_TYRO'];
+            eftposCodes = ['EFTPOS_LINKLY', 'EFTPOS_PAYO', 'EFTPOS_WINDCAVE', 'EFTPOS_TYRO', 'EFTPOS_HUIFU'];
             mx51Code = 'EFTPOS';
             payType = '';
             if (eftposCodes.includes((method === null || method === void 0 ? void 0 : method.code) || '')) {
@@ -409,7 +409,9 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
                   orderId: data.orderId,
                   symbol: getData('shop_symbol'),
                   amount: finalAmount,
-                  surcharge: processSurcharge(method.surcharge)
+                  surcharge: processSurcharge(method.surcharge),
+                  operator_type: 'shop',
+                  platform: 'pos'
                 },
                 mode: 'pay'
               },
@@ -2449,7 +2451,7 @@ var PaymentModal = function PaymentModal(_ref19) {
     var handleDetailsClick = /*#__PURE__*/function () {
       var _ref31 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee24() {
         var _context$appHelper2;
-        var _context$appHelper$ut9, isTerminal, isWebPos, checkout, _orderId7;
+        var _context$appHelper$ut9, isTerminal, isWebPos, NativePage, checkout, orderId;
         return _regeneratorRuntime().wrap(function _callee24$(_context24) {
           while (1) switch (_context24.prev = _context24.next) {
             case 0:
@@ -2458,25 +2460,35 @@ var PaymentModal = function PaymentModal(_ref19) {
                 closePaymentResultToast();
                 // 不关闭PaymentModal，保持其打开状态
               }, 0);
-              _context$appHelper$ut9 = (_context$appHelper2 = context.appHelper) === null || _context$appHelper2 === void 0 ? void 0 : _context$appHelper2.utils, isTerminal = _context$appHelper$ut9.isTerminal, isWebPos = _context$appHelper$ut9.isWebPos;
+              _context$appHelper$ut9 = (_context$appHelper2 = context.appHelper) === null || _context$appHelper2 === void 0 ? void 0 : _context$appHelper2.utils, isTerminal = _context$appHelper$ut9.isTerminal, isWebPos = _context$appHelper$ut9.isWebPos, NativePage = _context$appHelper$ut9.NativePage;
+              checkout = pisellos.getModule('checkout');
+              _context24.next = 5;
+              return checkout.getCurrentOrderId();
+            case 5:
+              orderId = _context24.sent;
               if (!(isTerminal !== null && isTerminal !== void 0 && isTerminal())) {
                 _context24.next = 8;
                 break;
               }
-              checkout = pisellos.getModule('checkout');
-              _context24.next = 6;
-              return checkout.getCurrentOrderId();
-            case 6:
-              _orderId7 = _context24.sent;
               return _context24.abrupt("return", interaction.utils.postMessageToApp({
                 module: 'booking',
                 key: 'view_order',
                 data: {
-                  order_id: _orderId7
+                  order_id: orderId
                 },
                 origin: '/booking'
               }));
             case 8:
+              if (isWebPos) {
+                NativePage.open({
+                  page: "/native/order/detail",
+                  params: {
+                    order_id: orderId
+                  }
+                });
+              }
+              // 这里可以添加查看详情的逻辑
+            case 9:
             case "end":
               return _context24.stop();
           }
@@ -2488,7 +2500,7 @@ var PaymentModal = function PaymentModal(_ref19) {
     }();
     var handlePrintReceiptClick = /*#__PURE__*/function () {
       var _ref32 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee25() {
-        var checkoutModule, data, isSynced, _orderId8, params;
+        var checkoutModule, data, isSynced, _orderId7, params;
         return _regeneratorRuntime().wrap(function _callee25$(_context25) {
           while (1) switch (_context25.prev = _context25.next) {
             case 0:
@@ -2522,9 +2534,9 @@ var PaymentModal = function PaymentModal(_ref19) {
               _context25.next = 15;
               return checkoutModule.getCurrentOrderId();
             case 15:
-              _orderId8 = _context25.sent;
+              _orderId7 = _context25.sent;
               data = {
-                orderId: _orderId8
+                orderId: _orderId7
               };
             case 17:
               // data.orderId 就是订单号，可以用来打印小票

package/es/components/checkout/components/AdditionalModule/index.d.ts

@@ -1,4 +1,4 @@
-/// <reference types="react" />
+import React from 'react';
 import './index.less';
 import { CurrentOrderInfo } from '../../types';
 interface AdditionalModuleProps {
@@ -11,5 +11,5 @@ interface AdditionalModuleProps {
     isFullWidth?: boolean;
     showMore?: boolean;
 }
-declare function AdditionalModule({ orderInfo, customAmount, handleButtonClick, hasOrderNote, disabled, showCashPayment, isFullWidth, showMore }: AdditionalModuleProps): JSX.Element;
+declare function AdditionalModule({ orderInfo, customAmount, handleButtonClick, hasOrderNote, disabled, showCashPayment, isFullWidth, showMore }: AdditionalModuleProps): React.JSX.Element;
 export default AdditionalModule;

package/es/components/checkout/components/AmountSummary/index.d.ts

@@ -1,6 +1,6 @@
-/// <reference types="react" />
 import './index.less';
 import { CurrentOrderInfo } from '../../types';
+import React from 'react';
 interface AmountSummaryProps {
     amountSymbol?: string;
     orderInfo?: CurrentOrderInfo;
@@ -22,5 +22,5 @@ interface AmountSummaryProps {
     totalAmount?: number;
 }
 export declare type WalletBalanceConfirmAction = 'cancel' | 'save-without-deduct' | 'apply-deduct-now';
-declare function AmountSummary({ amountSymbol, orderInfo, open_deposit, customAmount, balanceDueAmount, clientInfo, onAmountChange, onDepositStatusChange, onBalanceDueAmountClick, onConfirm, paymentItems, cartData, walletPassData, totalAmount, }: AmountSummaryProps): JSX.Element;
+declare function AmountSummary({ amountSymbol, orderInfo, open_deposit, customAmount, balanceDueAmount, clientInfo, onAmountChange, onDepositStatusChange, onBalanceDueAmountClick, onConfirm, paymentItems, cartData, walletPassData, totalAmount, }: AmountSummaryProps): React.JSX.Element;
 export default AmountSummary;

package/es/components/checkout/components/CashPaymentModule/index.d.ts

@@ -1,4 +1,4 @@
-/// <reference types="react" />
+import React from 'react';
 import { CurrentOrderInfo } from '../../types';
 import './index.less';
 export interface CashPaymentModuleProps {
@@ -22,5 +22,5 @@ disabled, // 禁用状态
 roundingFunction, balanceDueAmount, // 当前阶段剩余支付金额（定金或普通支付）
 balanceDueTotalAmount, // 完整订单剩余待付金额
 syncingLock, // 是否锁定
-shortcutsSize, }: CashPaymentModuleProps): JSX.Element;
+shortcutsSize, }: CashPaymentModuleProps): React.JSX.Element;
 export default CashPaymentModule;

package/es/components/checkout/components/PaymentDetailModal/index.d.ts

@@ -1,4 +1,4 @@
-/// <reference types="react" />
+import React from 'react';
 import './index.less';
 interface SummaryItem {
     key: string;
@@ -34,5 +34,5 @@ interface PaymentDetailModalProps {
     };
     clientInfo?: any;
 }
-declare function PaymentDetailModal({ amountSymbol, orderInfo, cartData, onClose, summaryData, labelMaps, paymentItems, customAmount, voidPayment, walletPassData, clientInfo, }: PaymentDetailModalProps): JSX.Element;
+declare function PaymentDetailModal({ amountSymbol, orderInfo, cartData, onClose, summaryData, labelMaps, paymentItems, customAmount, voidPayment, walletPassData, clientInfo, }: PaymentDetailModalProps): React.JSX.Element;
 export default PaymentDetailModal;