@pisell/private-materials 3.3.95 → 3.3.97

package/lib/components/eventBooking/locales.d.ts

@@ -71,6 +71,14 @@ declare const _default: {
         'pisell2.event.capacity.limit.reached.tip': string;
         'pisell2.event.schedule.item.expand': string;
         'pisell2.event.schedule.item.collapse': string;
+        'pisell2.appointment.deposit': string;
+        'pisell2.appointment.deposit.agreed': string;
+        'pisell2.appointment.deposit.agree.policy': string;
+        'pisell2.appointment.deposit.and': string;
+        'pisell2.appointment.deposit.amount.tip1': string;
+        'pisell2.appointment.deposit.amount.tip2': string;
+        'pisell2.appointment.deposit.close': string;
+        'pisell2.appointment.booking.empty.data': string;
     };
     'zh-CN': {
         'pisell2.event.calendar.limit.unavailable': string;
@@ -144,6 +152,14 @@ declare const _default: {
         'pisell2.event.capacity.limit.reached.tip': string;
         'pisell2.event.schedule.item.expand': string;
         'pisell2.event.schedule.item.collapse': string;
+        'pisell2.appointment.deposit': string;
+        'pisell2.appointment.deposit.agreed': string;
+        'pisell2.appointment.deposit.agree.policy': string;
+        'pisell2.appointment.deposit.and': string;
+        'pisell2.appointment.deposit.amount.tip1': string;
+        'pisell2.appointment.deposit.amount.tip2': string;
+        'pisell2.appointment.deposit.close': string;
+        'pisell2.appointment.booking.empty.data': string;
     };
     'zh-HK': {
         'pisell2.event.calendar.limit.unavailable': string;
@@ -217,6 +233,14 @@ declare const _default: {
         'pisell2.event.capacity.limit.reached.tip': string;
         'pisell2.event.schedule.item.expand': string;
         'pisell2.event.schedule.item.collapse': string;
+        'pisell2.appointment.deposit': string;
+        'pisell2.appointment.deposit.agreed': string;
+        'pisell2.appointment.deposit.agree.policy': string;
+        'pisell2.appointment.deposit.and': string;
+        'pisell2.appointment.deposit.amount.tip1': string;
+        'pisell2.appointment.deposit.amount.tip2': string;
+        'pisell2.appointment.deposit.close': string;
+        'pisell2.appointment.booking.empty.data': string;
     };
 };
 export default _default;

package/lib/components/eventBooking/locales.js

@@ -94,7 +94,15 @@ var locales_default = {
     "pisell2.event.capacity.limit.reached.title": "Capacity limit reached",
     "pisell2.event.capacity.limit.reached.tip": "One or more events in your cart are no longer available due to full capacity. Please remove unavailable events from your cart to complete checkout.",
     "pisell2.event.schedule.item.expand": "See more",
-    "pisell2.event.schedule.item.collapse": "See less"
+    "pisell2.event.schedule.item.collapse": "See less",
+    "pisell2.appointment.deposit": "Deposit",
+    "pisell2.appointment.deposit.agreed": "I have read and agree to the ",
+    "pisell2.appointment.deposit.agree.policy": "You need to agree the policy to proceed",
+    "pisell2.appointment.deposit.and": " & ",
+    "pisell2.appointment.deposit.amount.tip1": " needs to be paid as deposit.",
+    "pisell2.appointment.deposit.amount.tip2": " ",
+    "pisell2.appointment.deposit.close": "Close",
+    "pisell2.appointment.booking.empty.data": "No data"
   },
   "zh-CN": {
     "pisell2.event.calendar.limit.unavailable": "不可预约",
@@ -167,7 +175,15 @@ var locales_default = {
     "pisell2.event.capacity.limit.reached.title": "活动名额已满",
     "pisell2.event.capacity.limit.reached.tip": "购物车中有一个或多个活动已达预约上限，请将已满额的活动从购物车中移除后再完成结算。",
     "pisell2.event.schedule.item.expand": "查看更多",
-    "pisell2.event.schedule.item.collapse": "收起"
+    "pisell2.event.schedule.item.collapse": "收起",
+    "pisell2.appointment.deposit": "定金",
+    "pisell2.appointment.deposit.agreed": "我已阅读并同意 ",
+    "pisell2.appointment.deposit.agree.policy": "您需要同意协议才能继续",
+    "pisell2.appointment.deposit.and": " 和 ",
+    "pisell2.appointment.deposit.amount.tip1": "请支付 ",
+    "pisell2.appointment.deposit.amount.tip2": " 定金。",
+    "pisell2.appointment.deposit.close": "关闭",
+    "pisell2.appointment.booking.empty.data": "暂无数据"
   },
   "zh-HK": {
     "pisell2.event.calendar.limit.unavailable": "不可預約",
@@ -240,6 +256,14 @@ var locales_default = {
     "pisell2.event.capacity.limit.reached.title": "活動名額已滿",
     "pisell2.event.capacity.limit.reached.tip": "購物車中有一個或多個活動已達預約上限，請將已滿額的活動從購物車中移除後再完成結算。",
     "pisell2.event.schedule.item.expand": "查看更多",
-    "pisell2.event.schedule.item.collapse": "收起"
+    "pisell2.event.schedule.item.collapse": "收起",
+    "pisell2.appointment.deposit": "定金",
+    "pisell2.appointment.deposit.agreed": "我已閱讀並同意 ",
+    "pisell2.appointment.deposit.agree.policy": "您需要同意協議才能繼續",
+    "pisell2.appointment.deposit.and": " 和 ",
+    "pisell2.appointment.deposit.amount.tip1": "請支付 ",
+    "pisell2.appointment.deposit.amount.tip2": " 定金。",
+    "pisell2.appointment.deposit.close": "关闭",
+    "pisell2.appointment.booking.empty.data": "暫無數據"
   }
 };

package/lib/components/pay/toC/PaymentMethods/StripePay/Stripe/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.module.less';
 declare const StripePayment: () => JSX.Element;
 export default StripePayment;

package/lib/components/pay/toC/PaymentMethods/index.js

@@ -65,7 +65,7 @@ var isOfflinePayment = (type) => {
   ].includes(type);
 };
 var PaymentMethods = (props, ref) => {
-  var _a;
+  var _a, _b, _c;
   const MWCreditCardRef2 = (0, import_react.useRef)(null);
   const SuperPayAliPayH5Ref2 = (0, import_react.useRef)(null);
   const StripePayRef2 = (0, import_react.useRef)(null);
@@ -83,9 +83,9 @@ var PaymentMethods = (props, ref) => {
   const context = (0, import_useEngineContext.default)();
   const { interaction } = (_a = context.appHelper) == null ? void 0 : _a.utils;
   const init = async ({ type, payGroup }) => {
-    var _a2, _b;
+    var _a2, _b2;
     const waitAmount = (payGroup == null ? void 0 : payGroup.wait_amount) || 0;
-    const cards = (_b = (_a2 = payGroup == null ? void 0 : payGroup.walletPass) == null ? void 0 : _a2.cards) == null ? void 0 : _b.length;
+    const cards = (_b2 = (_a2 = payGroup == null ? void 0 : payGroup.walletPass) == null ? void 0 : _a2.cards) == null ? void 0 : _b2.length;
     if (cards && (waitAmount <= 0 || isOfflinePayment(type))) {
       try {
         await (0, import_serve.walletPassPay)((0, import_utils.formatWalletPassParams)(payGroup));
@@ -115,10 +115,11 @@ var PaymentMethods = (props, ref) => {
     }
     await onPayByType({ type, payGroup });
   };
+  console.log("paymentResult isAppEnv", (_c = (_b = interaction == null ? void 0 : interaction.utils) == null ? void 0 : _b.isAppEnv) == null ? void 0 : _c.call(_b), interaction, context);
   (0, import_react.useEffect)(() => {
-    var _a2, _b, _c, _d;
-    console.log("paymentResult isAppEnv", (_b = (_a2 = interaction == null ? void 0 : interaction.utils) == null ? void 0 : _a2.isAppEnv) == null ? void 0 : _b.call(_a2));
-    if ((_d = (_c = interaction == null ? void 0 : interaction.utils) == null ? void 0 : _c.isAppEnv) == null ? void 0 : _d.call(_c)) {
+    var _a2, _b2, _c2, _d;
+    console.log("paymentResult isAppEnv", (_b2 = (_a2 = interaction == null ? void 0 : interaction.utils) == null ? void 0 : _a2.isAppEnv) == null ? void 0 : _b2.call(_a2));
+    if ((_d = (_c2 = interaction == null ? void 0 : interaction.utils) == null ? void 0 : _c2.isAppEnv) == null ? void 0 : _d.call(_c2)) {
       interaction.utils.mountFunction("global", "paymentResult", (strResult) => {
         console.log("paymentResult", strResult);
         if (!(0, import_utils2.isJson)(strResult)) return;
@@ -134,18 +135,18 @@ var PaymentMethods = (props, ref) => {
     }
   }, []);
   const onPayByType = async ({ type, payGroup }) => {
-    var _a2, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n;
+    var _a2, _b2, _c2, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n;
     console.log(type, payGroup);
     if (type === "mw.apple") {
       await ((_a2 = ApplePayRef2.current) == null ? void 0 : _a2.init({ payGroup }));
       return;
     }
     if (type === "mw.google") {
-      await ((_b = GooglePayRef2.current) == null ? void 0 : _b.init({ payGroup }));
+      await ((_b2 = GooglePayRef2.current) == null ? void 0 : _b2.init({ payGroup }));
       return;
     }
     if (type === "mw.credit_card") {
-      (_c = MWCreditCardRef2.current) == null ? void 0 : _c.init({ payGroup });
+      (_c2 = MWCreditCardRef2.current) == null ? void 0 : _c2.init({ payGroup });
       return;
     }
     if (type === "superpay.alipay.h5") {

package/lib/components/pay/toC/model.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 export interface FormState {
     platform: 'pc' | 'h5' | '' | undefined;
     order: any;
@@ -29,11 +28,4 @@ export interface PayGroup {
     pay_number?: string;
     _order: any;
 }
-export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
-    state: FormState;
-} & {
-    dispatch: (params: {
-        type: string;
-        payload: any;
-    }) => void;
-}>;
+export declare const Provider: any, Context: any;

package/lib/components/schedules/components/CurrentDay/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import "./index.less";
 declare type CurrentDayProps = {
     onClose: () => void;

package/lib/components/schedules/model.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { CalendarDataItem, ScheduleItem } from "./type";
 import dayjs from "dayjs";
 export interface FormState {
@@ -69,11 +68,4 @@ export interface FormState {
     };
     setGlobalState: Function | null;
 }
-export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
-    state: FormState;
-} & {
-    dispatch: (params: {
-        type: string;
-        payload: any;
-    }) => void;
-}>;
+export declare const Provider: any, Context: any;

package/lib/components/schedules/products/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 declare const Products: () => JSX.Element;
 export default Products;

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

@@ -17,6 +17,6 @@ declare let modal: Omit<ModalStaticFunctions, "warn">;
 export declare const setModal: (m: Omit<ModalStaticFunctions, "warn">) => void;
 export declare const saveConfirm: () => Promise<{
     destroy: () => void;
-    update: (configUpdate: import("antd").ModalFuncProps | ((prevConfig: import("antd").ModalFuncProps) => import("antd").ModalFuncProps)) => void;
+    update: (configUpdate: import("antd/es/modal/interface").ModalFuncProps | ((prevConfig: import("antd/es/modal/interface").ModalFuncProps) => import("antd/es/modal/interface").ModalFuncProps)) => void;
 }>;
 export { modal };

package/lib/components/schedules/utils.js

@@ -27,8 +27,8 @@ __export(utils_exports, {
 module.exports = __toCommonJS(utils_exports);
 var import_utils = require("@pisell/utils");
 var Request = class {
+  request = {};
   constructor() {
-    this.request = {};
   }
   setRequest(val) {
     this.request = val;

package/lib/components/ticketBooking/components/addServiceVariant/addService.js

@@ -406,7 +406,7 @@ var AddSerivce = (props) => {
             isTitle: 1,
             isSubtitle: 1,
             isPrice: 1,
-            isOriginPrice: 1,
+            isOriginPrice: 0,
             isStock: 1
           }
         }

package/lib/components/ticketBooking/components/ticketBooking/index.js

@@ -46,6 +46,9 @@ var import_utils2 = require("../../utils");
 var import_addServiceVariant = __toESM(require("../addServiceVariant"));
 var import_timeBar = __toESM(require("../timeBar"));
 var import_index = require("./index.less");
+var import_utils3 = require("../../../booking/info/service2/utils");
+var import_amount = require("../../../booking/components/footer/amount");
+var import_formatProductMessage = __toESM(require("../../utils/formatProductMessage"));
 var _formatBookingDetail = (data, modalState) => {
   var _a, _b, _c, _d;
   let {
@@ -189,7 +192,17 @@ var TicketBooking = () => {
   const [state, setState] = (0, import_miniRedux.useStore)();
   const engineContext = (0, import_useEngineContext.default)();
   const { props: engineProps } = engineContext.engine;
-  const { action, isTerminal, lowcodeRef, interaction, store, storage, Toast } = (_a = engineContext.appHelper) == null ? void 0 : _a.utils;
+  const {
+    action,
+    isTerminal,
+    lowcodeRef,
+    interaction,
+    store,
+    storage,
+    Toast,
+    getSymbolic,
+    translation
+  } = (_a = engineContext.appHelper) == null ? void 0 : _a.utils;
   const _persistentRef = (0, import_react.useRef)(false);
   const _initStateRef = (0, import_react.useRef)({});
   const _listTimerRef = (0, import_react.useRef)();
@@ -276,6 +289,112 @@ var TicketBooking = () => {
       intervalSetTime: isInterval
     });
   };
+  (0, import_react.useEffect)(() => {
+    var _a2, _b, _c, _d, _e, _f, _g, _h, _i, _j;
+    const cartItems = (_b = (_a2 = state == null ? void 0 : state.modalState) == null ? void 0 : _a2.service) == null ? void 0 : _b.value;
+    if (!Array.isArray(cartItems) || cartItems.length === 0) {
+      (_d = (_c = interaction == null ? void 0 : interaction.utils) == null ? void 0 : _c.postMessageToApp) == null ? void 0 : _d.call(_c, {
+        module: "cds",
+        key: "cartUpdate",
+        data: {
+          currency_symbol: getSymbolic(),
+          total: "0",
+          // 小计
+          products: [],
+          fees: []
+        }
+      });
+    }
+    const total = (0, import_amount.getSumTotal)(state.modalState, true);
+    let formatedProducts = [];
+    try {
+      formatedProducts = (0, import_utils3.formatProducts)(
+        cartItems,
+        state.modalState,
+        false,
+        true,
+        true
+      );
+    } catch (error) {
+      console.error(error);
+    }
+    console.log("formatedProducts", total, formatedProducts);
+    let fees = [];
+    let products = [];
+    for (const item of formatedProducts) {
+      const { id, name, image, origin_total, total: total2, num, note, _origin } = item;
+      (_e = _origin == null ? void 0 : _origin.discount_list) == null ? void 0 : _e.forEach((dl) => {
+        fees.push({
+          isReduce: dl.type === "good_pass",
+          title: translation(dl == null ? void 0 : dl.discount.title),
+          price: dl.amount,
+          type: dl.type
+        });
+      });
+      let msg = "";
+      try {
+        msg = (0, import_formatProductMessage.default)(
+          {
+            ...item,
+            currency_symbol: getSymbolic()
+          },
+          (_f = engineContext.appHelper) == null ? void 0 : _f.utils
+        );
+      } catch (error) {
+        console.error(error);
+      }
+      let _item = {
+        productID: id,
+        title: name,
+        cover: image,
+        //  封面图
+        price: total2,
+        // 售价
+        buyCount: num,
+        // 购买数量
+        productFormatMessage: msg,
+        note
+      };
+      if (origin_total !== total2) _item.modifyPrice = origin_total;
+      products.push(_item);
+    }
+    console.log(
+      "formatedProducts",
+      (_g = import_utils.locales.getText("pisell2.product.card.cart-items")) == null ? void 0 : _g(products.length)
+    );
+    if (products.length > 0) {
+      fees.unshift({
+        title: import_utils.locales.getText("pisell2.product.card.subtotal"),
+        price: total.productAmount,
+        type: "subtotal",
+        message: (_h = import_utils.locales.getText("pisell2.product.card.cart-items")) == null ? void 0 : _h(
+          products.length
+        )
+      });
+    }
+    console.log("start post message, config:", {
+      module: "cds",
+      key: "cartUpdate",
+      data: {
+        currency_symbol: getSymbolic(),
+        total: total.productAmount,
+        // 小计
+        products,
+        fees
+      }
+    });
+    (_j = (_i = interaction == null ? void 0 : interaction.utils) == null ? void 0 : _i.postMessageToApp) == null ? void 0 : _j.call(_i, {
+      module: "cds",
+      key: "cartUpdate",
+      data: {
+        currency_symbol: getSymbolic(),
+        total: total.expectAmount,
+        // 小计
+        products,
+        fees
+      }
+    });
+  }, [state.modalState]);
   const _setModalState = (props) => {
     var _a2, _b;
     console.log("同步state到外层", props);