@pisell/private-materials 6.8.75 → 6.8.76

package/lib/components/booking/info/service2/utils.js

@@ -179,7 +179,7 @@ var handleChangeHolder = (products, currentItem, other) => {
         ...item,
         _extend: {
           ...item._extend,
-          holder_id: (0, import_utils2.isArr)(other) ? other.map((item2) => item2.id) : item._extend.quantity > 1 ? [other.id] : other.id
+          holder_id: (0, import_utils2.isArr)(other) ? other.map((item2) => item2.id) : item._extend.quantity > 1 ? [other.id] : other == null ? void 0 : other.id
         }
       };
     }
@@ -531,6 +531,7 @@ var getGeneralParams = (item, state, isParallelResource) => {
     holders: formatHolders(holders),
     isShowChangeHolder: !isNormalProduct,
     isShowAction: (0, import_utils4.isShowAddTime)(state, item),
+    allowClearHolder: true,
     actionText: import_utils2.locales.getText("page.booking.text.add-time"),
     actionIcon: "pisell2-clock-plus",
     isMultipleResource: true,
@@ -578,6 +579,7 @@ var formatProducts = (lists, state, isRenderGroup = true, isGeneral, isParallelR
       title: item == null ? void 0 : item.title,
       // 购物车显示需要 title 字段
       price: (_g = item == null ? void 0 : item._extend) == null ? void 0 : _g.price,
+      totalDifference: (0, import_amount.getProductDiscountProductDiscountDifference)(item),
       total: calcAddTimeTotalPrice((_h = item == null ? void 0 : item._extend) == null ? void 0 : _h.total, (_i = item == null ? void 0 : item._extend) == null ? void 0 : _i.relation_details),
       origin_total: calcAddTimeTotalPrice((_j = item == null ? void 0 : item._extend) == null ? void 0 : _j.origin_total, (_k = item == null ? void 0 : item._extend) == null ? void 0 : _k.relation_details),
       num: item == null ? void 0 : item._extend.quantity,

package/lib/components/booking/info2/cartClientCard/index.js

@@ -55,7 +55,7 @@ var CartClientCard = (0, import_react.forwardRef)(({
   beforeSwitchModalOpen,
   onClientChange
 }, ref) => {
-  var _a, _b, _c, _d;
+  var _a, _b, _c, _d, _e, _f;
   const clientSearchRef = (0, import_react.useRef)(null);
   const [searchModalVisible, setSearchModalVisible] = (0, import_react.useState)(false);
   const [switchModalVisible, setSwitchModalVisible] = (0, import_react.useState)(false);
@@ -75,6 +75,10 @@ var CartClientCard = (0, import_react.forwardRef)(({
     import_locales.default,
     ((_c = (_b = (_a = context.appHelper) == null ? void 0 : _a.utils) == null ? void 0 : _b.storage) == null ? void 0 : _c.get("umi_locale")) || "en"
   );
+  const boardConfig = (0, import_react.useMemo)(() => {
+    var _a2, _b2, _c2;
+    return ((_c2 = (_b2 = (_a2 = state == null ? void 0 : state.bookingConfig) == null ? void 0 : _a2.config) == null ? void 0 : _b2.basic) == null ? void 0 : _c2.appointment_subject) || {};
+  }, [(_e = (_d = state == null ? void 0 : state.bookingConfig) == null ? void 0 : _d.config) == null ? void 0 : _e.basic]);
   const {
     customers,
     loading,
@@ -86,23 +90,23 @@ var CartClientCard = (0, import_react.forwardRef)(({
     hasMore,
     loadMore
   } = (0, import_useCustomer.useCustomer)({});
-  const selectedCustomer = (_d = state.client) == null ? void 0 : _d.value;
+  const selectedCustomer = (_f = state.client) == null ? void 0 : _f.value;
   const handleSearchClient = async (keyword2) => {
     var _a2, _b2;
-    await initLoad(keyword2);
+    await initLoad(keyword2, boardConfig == null ? void 0 : boardConfig.form_id);
     (_b2 = (_a2 = clientSearchRef.current) == null ? void 0 : _a2.resetScrollPosition) == null ? void 0 : _b2.call(_a2);
   };
   const _debouncedSearch = (0, import_ahooks.useDebounceFn)(
-    async (_keyword) => {
+    async (_keyword, formId) => {
       var _a2, _b2;
-      await initLoad(keyword);
+      await initLoad(keyword, formId);
       (_b2 = (_a2 = clientSearchRef.current) == null ? void 0 : _a2.resetScrollPosition) == null ? void 0 : _b2.call(_a2);
     },
     { wait: 500 }
   );
   (0, import_react.useEffect)(() => {
-    _debouncedSearch.run(keyword);
-  }, [keyword]);
+    _debouncedSearch.run(keyword, boardConfig == null ? void 0 : boardConfig.form_id);
+  }, [keyword, boardConfig == null ? void 0 : boardConfig.form_id]);
   (0, import_react.useEffect)(() => {
     if (state.action) {
       state.action({
@@ -195,7 +199,7 @@ var CartClientCard = (0, import_react.forwardRef)(({
     };
   }, [pagination, loading]);
   const handleSetClient = (0, import_ahooks.useMemoizedFn)(async (record, options) => {
-    var _a2, _b2, _c2, _d2, _e;
+    var _a2, _b2, _c2, _d2, _e2;
     if ((0, import_utils2.isWalkIn)(selectedCustomer == null ? void 0 : selectedCustomer.id) && ((_a2 = options == null ? void 0 : options.fullData) == null ? void 0 : _a2.searchType) === "walletPass" && ((_b2 = options == null ? void 0 : options.fullData) == null ? void 0 : _b2.scanCode)) {
       window.dispatchEvent(
         new CustomEvent("onScanWallPassCode", {
@@ -214,7 +218,7 @@ var CartClientCard = (0, import_react.forwardRef)(({
     }
     if ((selectedCustomer == null ? void 0 : selectedCustomer.id) === (record == null ? void 0 : record.id)) {
       if (options == null ? void 0 : options.sameClientTip) {
-        (_e = Toast == null ? void 0 : Toast.info) == null ? void 0 : _e.call(Toast, options.sameClientTip);
+        (_e2 = Toast == null ? void 0 : Toast.info) == null ? void 0 : _e2.call(Toast, options.sameClientTip);
       }
       setSearchModalVisible(false);
       return;
@@ -308,13 +312,15 @@ var CartClientCard = (0, import_react.forwardRef)(({
         open: searchModalVisible,
         onCancel: handleModalCancel,
         // 同时存在两个搜索弹窗时，内部的无限滚动组件会发生冲突
-        destroyOnClose: true
+        destroyOnClose: true,
+        width: 880
       },
       isShowNewButton: false,
       resultProps,
       onAddClient: handleAddClientSuccess,
       onLoadMore: loadMore,
-      hasMore
+      hasMore,
+      state
     }
   ), /* @__PURE__ */ import_react.default.createElement(
     import_materials.PisellModal,

package/lib/components/booking/info2/service/actions/index.d.ts

@@ -1,5 +1,6 @@
+import React from 'react';
 import '../../../info/service/actions/index.less';
 declare const Actions: ({ currentService }: {
     currentService: any;
-}) => JSX.Element;
+}) => React.JSX.Element;
 export default Actions;

package/lib/components/booking/info2/service/addService/index.d.ts

@@ -1,3 +1,4 @@
+import React from 'react';
 import { PisellDrawerProps } from '../../../components/drawer';
 import '../../../info/service/addService/index.less';
 interface AddServiceProps {
@@ -7,5 +8,5 @@ interface AddServiceProps {
     drawerProps?: PisellDrawerProps;
     renderMode?: 'current' | 'drawer';
 }
-declare const Info: (props: AddServiceProps) => JSX.Element;
+declare const Info: (props: AddServiceProps) => React.JSX.Element;
 export default Info;

package/lib/components/booking/info2/service/addTimeModal/index.d.ts

@@ -1,4 +1,4 @@
 import React from 'react';
 import '../../../info/service/addTimeModal/index.less';
-declare const _default: React.MemoExoticComponent<() => JSX.Element>;
+declare const _default: React.MemoExoticComponent<() => React.JSX.Element>;
 export default _default;

package/lib/components/booking/info2/service/contactInfoMode/index.d.ts

@@ -1,2 +1,3 @@
-declare const ContactInfoMode: () => JSX.Element;
+import React from 'react';
+declare const ContactInfoMode: () => React.JSX.Element;
 export default ContactInfoMode;

package/lib/components/booking/info2/service/index.d.ts

@@ -1,4 +1,4 @@
 import React from 'react';
 import '../../info/service/index.less';
-declare const _default: React.MemoExoticComponent<() => JSX.Element>;
+declare const _default: React.MemoExoticComponent<() => React.JSX.Element>;
 export default _default;

package/lib/components/booking/info2/service/serviceItem/index.d.ts

@@ -1,3 +1,4 @@
+import React from 'react';
 import './index.less';
-declare const ServiceItem: ({ d, handleEditService, state, handleLike, errorMessage, handleDeleteService, }: any) => JSX.Element;
+declare const ServiceItem: ({ d, handleEditService, state, handleLike, errorMessage, handleDeleteService, }: any) => React.JSX.Element;
 export default ServiceItem;

package/lib/components/booking/info2/service/serviceList/index.d.ts

@@ -1,5 +1,6 @@
+import React from 'react';
 import './index.less';
 declare const ServiceList: ({ onEdit }: {
     onEdit: any;
-}) => JSX.Element;
+}) => React.JSX.Element;
 export default ServiceList;

package/lib/components/booking/locales.js

@@ -380,7 +380,7 @@ var locales_default = {
     "pisell2.text.form.link.to.another.record.more": "View More",
     // 联系信息
     "pisell2.booking.text.contact-info.title": "Contact info",
-    "pisell2.booking.text.search-placeholder": "Search Customers / Contacts",
+    "pisell2.booking.text.search-placeholder": "Customers / Contacts / Holder",
     "pisell-select-holder-please-select": "Please Select",
     "pisell-select-holder-selected": "Selected: "
   },
@@ -735,7 +735,7 @@ var locales_default = {
     "pisell2.text.form.link.to.another.record.more": "查看更多",
     // 联系信息
     "pisell2.booking.text.contact-info.title": "联系信息",
-    "pisell2.booking.text.search-placeholder": "搜索客户/联系信息",
+    "pisell2.booking.text.search-placeholder": "搜索客户/联系信息/持有人",
     "pisell-select-holder-please-select": "请选择",
     "pisell-select-holder-selected": "已选择："
   },
@@ -1090,7 +1090,7 @@ var locales_default = {
     "pisell2.text.form.link.to.another.record.more": "查看更多",
     // 联系信息
     "pisell2.booking.text.contact-info.title": "聯繫信息",
-    "pisell2.booking.text.search-placeholder": "搜索客戶/聯系信息",
+    "pisell2.booking.text.search-placeholder": "搜索客戶/聯系信息/持有人",
     "pisell-select-holder-please-select": "請選擇",
     "pisell-select-holder-selected": "已選擇："
   }

package/lib/components/booking/materiels/contacts/index.d.ts

@@ -1,3 +1,4 @@
+import React from "react";
 import "./index.less";
 declare type ContactType = {
     country_calling_code: string;
@@ -11,5 +12,5 @@ declare type ContactsPropsType = {
     value: ContactType[];
     onChange: (value: ContactType[]) => void;
 };
-declare const Contacts: (props: ContactsPropsType) => JSX.Element;
+declare const Contacts: (props: ContactsPropsType) => React.JSX.Element;
 export default Contacts;

package/lib/components/booking/materiels/duration/index.d.ts

@@ -1,4 +1,5 @@
 import { SelectProps } from 'antd';
+import React from 'react';
 interface DurationProps extends SelectProps {
     locale?: string;
     slice?: number;
@@ -9,5 +10,5 @@ interface DurationProps extends SelectProps {
     startDate?: any;
     timeObj?: any;
 }
-declare const Duration: (props: DurationProps) => JSX.Element;
+declare const Duration: (props: DurationProps) => React.JSX.Element;
 export default Duration;

package/lib/components/booking/materiels/holder/index.d.ts

@@ -1,7 +1,7 @@
-/// <reference types="react" />
 import { SelectProps } from 'antd';
+import React from 'react';
 interface HolderProps extends SelectProps {
     selectProps?: SelectProps;
 }
-declare const Holder: (props: HolderProps) => JSX.Element;
+declare const Holder: (props: HolderProps) => React.JSX.Element;
 export default Holder;

package/lib/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/lib/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/lib/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/lib/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/lib/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/lib/components/checkout/PaymentModal.js

@@ -218,7 +218,8 @@ var PaymentContent = (0, import_react.forwardRef)(
         "EFTPOS_LINKLY",
         "EFTPOS_PAYO",
         "EFTPOS_WINDCAVE",
-        "EFTPOS_TYRO"
+        "EFTPOS_TYRO",
+        "EFTPOS_HUIFU"
       ];
       const mx51Code = "EFTPOS";
       let payType = "";
@@ -299,7 +300,9 @@ var PaymentContent = (0, import_react.forwardRef)(
               orderId: data.orderId,
               symbol: getData("shop_symbol"),
               amount: finalAmount,
-              surcharge: processSurcharge(method.surcharge)
+              surcharge: processSurcharge(method.surcharge),
+              operator_type: "shop",
+              platform: "pos"
             },
             mode: "pay"
           },
@@ -1728,10 +1731,10 @@ var PaymentModal = ({
       setTimeout(() => {
         (0, import_PaymentResultToast.closePaymentResultToast)();
       }, 0);
-      const { isTerminal, isWebPos: isWebPos2 } = (_a2 = context.appHelper) == null ? void 0 : _a2.utils;
+      const { isTerminal, isWebPos: isWebPos2, NativePage } = (_a2 = context.appHelper) == null ? void 0 : _a2.utils;
+      const checkout = pisellos.getModule("checkout");
+      const orderId = await checkout.getCurrentOrderId();
       if (isTerminal == null ? void 0 : isTerminal()) {
-        const checkout = pisellos.getModule("checkout");
-        const orderId = await checkout.getCurrentOrderId();
         return interaction.utils.postMessageToApp({
           module: "booking",
           key: "view_order",
@@ -1741,6 +1744,9 @@ var PaymentModal = ({
           origin: "/booking"
         });
       }
+      if (isWebPos2) {
+        NativePage.open({ page: "/native/order/detail", params: { order_id: orderId } });
+      }
     };
     const handlePrintReceiptClick = async () => {
       setTimeout(() => {

package/lib/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/lib/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/lib/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/lib/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;