@pisell/private-materials 6.7.3 → 6.7.5

package/lib/components/ticketBooking/locales.js

@@ -87,7 +87,9 @@ var locales_default = {
     "pisell2.ticket-booking.terminal-upgrade-title": "Terminal Version Reminder",
     "pisell2.ticket-booking.terminal-upgrade-description": "Your Terminal version is outdated. Please upgrade Terminal to use all features.",
     "pisell2.ticket-booking.terminal-upgrade-ok": "I understand",
-    "pisell2.ticket-booking.terminal-upgrade-cancel": "Cancel"
+    "pisell2.ticket-booking.terminal-upgrade-cancel": "Cancel",
+    "pisell2.ticket-booking.collapse": "Collapse",
+    "pisell2.ticket-booking.expand": "Expand"
   },
   "zh-CN": {
     "pisell2.ticket-booking.info": "信息",
@@ -153,7 +155,9 @@ var locales_default = {
     "pisell2.ticket-booking.terminal-upgrade-title": "Terminal版本提醒",
     "pisell2.ticket-booking.terminal-upgrade-description": "检测到您的Terminal版本较低，请升级Terminal以使用完整功能",
     "pisell2.ticket-booking.terminal-upgrade-ok": "我知道了",
-    "pisell2.ticket-booking.terminal-upgrade-cancel": "取消"
+    "pisell2.ticket-booking.terminal-upgrade-cancel": "取消",
+    "pisell2.ticket-booking.collapse": "收起",
+    "pisell2.ticket-booking.expand": "展开"
   },
   "zh-HK": {
     "pisell2.ticket-booking.info": "資訊",
@@ -219,6 +223,8 @@ var locales_default = {
     "pisell2.ticket-booking.terminal-upgrade-title": "Terminal版本提醒",
     "pisell2.ticket-booking.terminal-upgrade-description": "檢測到您的Terminal版本較低，請升級Terminal以使用完整功能",
     "pisell2.ticket-booking.terminal-upgrade-ok": "我知道了",
-    "pisell2.ticket-booking.terminal-upgrade-cancel": "取消"
+    "pisell2.ticket-booking.terminal-upgrade-cancel": "取消",
+    "pisell2.ticket-booking.collapse": "收起",
+    "pisell2.ticket-booking.expand": "展開"
   }
 };

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

@@ -197,12 +197,17 @@ var addService = (list, addItem, state) => {
     let isNotSame = true;
     let isSetCount = false;
     value = list.map((item) => {
-      var _a2, _b, _c;
+      var _a2, _b, _c, _d, _e;
       const isGoodPassDiscountProduct = (item.discount_list || []).some((item2) => item2.type === "good_pass");
       const isEdit = item == null ? void 0 : item.edit;
-      if (isSameProduct(item, addItem) && !isSetCount && !isGoodPassDiscountProduct && !isEdit) {
+      const bundleDiscountList = [];
+      (((_b = (_a2 = item == null ? void 0 : item._extend) == null ? void 0 : _a2.other) == null ? void 0 : _b.bundle) || []).forEach((item2) => {
+        bundleDiscountList.push(...(item2 == null ? void 0 : item2.discount_list) || []);
+      });
+      const isGoodPassBundleProduct = bundleDiscountList.some((item2) => item2.type === "good_pass");
+      if (isSameProduct(item, addItem) && !isSetCount && !isGoodPassDiscountProduct && !isEdit && !isGoodPassBundleProduct) {
         isNotSame = false;
-        const quantity = (((_a2 = item == null ? void 0 : item._extend) == null ? void 0 : _a2.quantity) || 1) + (((_b = addItem == null ? void 0 : addItem._extend) == null ? void 0 : _b.quantity) || 1);
+        const quantity = (((_c = item == null ? void 0 : item._extend) == null ? void 0 : _c.quantity) || 1) + (((_d = addItem == null ? void 0 : addItem._extend) == null ? void 0 : _d.quantity) || 1);
         count = quantity;
         isSetCount = true;
         return {
@@ -211,7 +216,7 @@ var addService = (list, addItem, state) => {
             ...item._extend,
             quantity,
             other: {
-              ...((_c = item._extend) == null ? void 0 : _c.other) || {},
+              ...((_e = item._extend) == null ? void 0 : _e.other) || {},
               quantity
             }
           }
@@ -341,17 +346,21 @@ var getShopDiscountKey = (osKey) => {
 var rulesHooks = {
   // 获取商品关键信息
   getProduct(product) {
+    var _a, _b, _c, _d, _e;
     const detail = {
       booking_id: product.booking_id,
       id: product.id,
       _id: product._id,
-      price: product.price,
+      price: product._extend.price,
       total: product._extend.total,
       discount_list: product.discount_list,
       origin_total: product._extend.origin_total,
       num: product._extend.quantity,
       quantity: product._extend.quantity || 1,
-      vouchersApplicable: product.vouchersApplicable
+      vouchersApplicable: product.vouchersApplicable,
+      startDate: (_a = product._extend) == null ? void 0 : _a.startDate,
+      bundle: ((_c = (_b = product._extend) == null ? void 0 : _b.other) == null ? void 0 : _c.bundle) || [],
+      options: ((_e = (_d = product._extend) == null ? void 0 : _d.other) == null ? void 0 : _e.option) || []
     };
     return detail;
   },
@@ -362,7 +371,12 @@ var rulesHooks = {
       discount_list: values.discount_list,
       _extend: {
         ...product._extend,
+        other: {
+          ...product._extend.other,
+          ..."bundle" in values ? { bundle: values.bundle } : {}
+        },
         ..."total" in values ? { total: values.total } : {},
+        ..."main_product_selling_price" in values ? { main_product_selling_price: values.main_product_selling_price } : {},
         ..."quantity" in values ? { quantity: values.quantity } : {}
       }
     };

package/lib/components/wallet/Detail/index.js

@@ -45,6 +45,7 @@ var import_locales = __toESM(require("./locales"));
 var import_serve = require("./serve");
 var import_utils2 = require("./../../../utils");
 var import_components = require("../components");
+var import_utils3 = require("../utils");
 var import_index = require("./index.less");
 var { Text } = import_materials2.Typography;
 import_dayjs.default.extend(import_timezone.default);
@@ -65,8 +66,10 @@ var Detail = (0, import_react.forwardRef)((props, ref) => {
     encoded = "",
     balance,
     expire_date = "",
-    product = {}
+    product = {},
+    custom_schedule_snapshot
   } = detail;
+  console.log(detail, "detail22");
   const {
     description = "",
     extension_data = [],
@@ -212,8 +215,33 @@ var Detail = (0, import_react.forwardRef)((props, ref) => {
       onGoogleClick();
     }
   };
+  const scheduleList = (0, import_react.useMemo)(() => {
+    return (custom_schedule_snapshot == null ? void 0 : custom_schedule_snapshot.data) || [];
+  }, [custom_schedule_snapshot]);
   (0, import_react.useEffect)(() => {
     var _a2;
+    const detail2 = (0, import_utils3.formatScheduleText)(scheduleList, "zh-CN");
+    let expireText = expire_date ? expire_date : import_utils.locales.getText("page.wallet.expireDate");
+    if (scheduleList.length > 0) {
+      let validityTexts = "";
+      let excludedText = "";
+      let includedText = "";
+      detail2.forEach((item) => {
+        if (item.validityTexts.length > 0) {
+          validityTexts = `${validityTexts}${item.validityTexts.join("\n")}
+`;
+        }
+        if (item.excluded_date.length > 0) {
+          excludedText = `${excludedText}${item.excluded_date.join("\n")}
+`;
+        }
+        if (item.included_date.length > 0) {
+          includedText = `${includedText}${item.included_date.join("\n")}
+`;
+        }
+      });
+      expireText = /* @__PURE__ */ import_react.default.createElement("span", { className: "wallet-detail-expire-text" }, validityTexts, excludedText && /* @__PURE__ */ import_react.default.createElement("div", { className: "wallet-detail-expire-text-title" }, import_utils.locales.getText("page.wallet.notValidDate")), excludedText, includedText && /* @__PURE__ */ import_react.default.createElement("div", { className: "wallet-detail-expire-text-title" }, import_utils.locales.getText("page.wallet.includedDate")), includedText);
+    }
     let data = [
       {
         label: import_utils.locales.getText("page.wallet.cardName"),
@@ -226,11 +254,11 @@ var Detail = (0, import_react.forwardRef)((props, ref) => {
       },
       {
         label: import_utils.locales.getText("page.wallet.validDate"),
-        value: expire_date ? expire_date : import_utils.locales.getText("page.wallet.expireDate")
+        value: expireText
       }
     ];
     if (tag === "product_discount_card") {
-      const isFixedAmount = ((_a2 = detail.metadata) == null ? void 0 : _a2.discount_card_type) === "fixed_amount";
+      const isFixedAmount = ((_a2 = detail2.metadata) == null ? void 0 : _a2.discount_card_type) === "fixed_amount";
       data.splice(2, 0, {
         label: import_utils.locales.getText("page.wallet.discount"),
         value: balance ? isFixedAmount ? `${symbol}${Number(balance)}` : `${Number(balance)}%` : ""

package/lib/components/wallet/Detail/index.less

@@ -373,3 +373,14 @@
   font-weight: 500;
   line-height: 24px;
 }
+
+.wallet-detail-expire-text {
+  white-space: pre-wrap;
+}
+
+.wallet-detail-expire-text-title {
+  font-size: 14px;
+  font-weight: 500;
+  line-height: 20px;
+  color: #667085;
+}

package/lib/components/wallet/Detail/locales.js

@@ -48,6 +48,10 @@ var locales_default = {
     "page.wallet.addGoogle": "Add to Google Wallet",
     "page.wallet.viewDetails": "See details",
     "page.wallet.expireDate": "Long term",
+    "page.wallet.notValidDate": "Not valid on",
+    // 不可用日期
+    "page.wallet.includedDate": "Included dates",
+    // 包含日期
     "page.wallet.urlEmpty": "Wallet link is empty",
     "page.wallet.notIOS": "Apple Wallet is not supported on non-iOS devices",
     "page.wallet.addSuccess": "Successfully added to wallet",
@@ -100,6 +104,10 @@ var locales_default = {
     "page.wallet.addGoogle": "添加到谷歌钱包",
     "page.wallet.viewDetails": "查看详情",
     "page.wallet.expireDate": "长期",
+    "page.wallet.notValidDate": "不可用日期",
+    // 不可用日期
+    "page.wallet.includedDate": "包含日期",
+    // 包含日期
     "page.wallet.urlEmpty": "钱包链接为空",
     "page.wallet.notIOS": "非iOS设备不支持Apple Wallet",
     "page.wallet.addSuccess": "已成功添加到钱包",
@@ -111,7 +119,7 @@ var locales_default = {
     // Usage Rules
     "page.wallet.usageRules": "使用规则",
     "page.wallet.usageRulesSubtitle": "请仔细阅读以下使用条件",
-    "page.wallet.timeUsageLimits": "时间使用限制",
+    "page.wallet.timeUsageLimits": "使用频次限制",
     "page.wallet.totalQuantityControl": "总量控制",
     "page.wallet.dailyLimit": "每日限制:",
     "page.wallet.weeklyLimit": "每周限制:",
@@ -152,6 +160,10 @@ var locales_default = {
     "page.wallet.addGoogle": "添加到谷歌錢包",
     "page.wallet.viewDetails": "查看詳情",
     "page.wallet.expireDate": "長期",
+    "page.wallet.notValidDate": "不可用日期",
+    // 不可用日期
+    "page.wallet.includedDate": "包含日期",
+    // 包含日期
     "page.wallet.urlEmpty": "錢包連結為空",
     "page.wallet.notIOS": "非iOS設備不支持Apple Wallet",
     "page.wallet.addSuccess": "已成功添加到錢包",
@@ -163,7 +175,7 @@ var locales_default = {
     // Usage Rules
     "page.wallet.usageRules": "使用規則",
     "page.wallet.usageRulesSubtitle": "請仔細閱讀以下使用條件",
-    "page.wallet.timeUsageLimits": "時間使用限制",
+    "page.wallet.timeUsageLimits": "使用頻次限制",
     "page.wallet.totalQuantityControl": "總量控制",
     "page.wallet.dailyLimit": "每日限制:",
     "page.wallet.weeklyLimit": "每週限制:",

package/lib/components/wallet/Detail/model.d.ts

@@ -1,13 +1 @@
-/// <reference types="react" />
-interface RechargeState {
-    addWalletCard: any;
-}
-export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
-    walletDetailState: RechargeState;
-} & {
-    dispatch: (params: {
-        type: string;
-        payload: any;
-    }) => void;
-}>;
-export {};
+export declare const Provider: any, Context: any;

package/lib/components/wallet/DiscountCard/model.d.ts

@@ -1,14 +1 @@
-/// <reference types="react" />
-interface RechargeState {
-    total: number;
-    setup?: 'menu' | 'list' | 'detail' | string;
-}
-export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
-    state: RechargeState;
-} & {
-    dispatch: (params: {
-        type: string;
-        payload: any;
-    }) => void;
-}>;
-export {};
+export declare const Provider: any, Context: any;

package/lib/components/wallet/PointCard/model.d.ts

@@ -1,13 +1 @@
-/// <reference types="react" />
-interface RechargeState {
-    total: number;
-}
-export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
-    state: RechargeState;
-} & {
-    dispatch: (params: {
-        type: string;
-        payload: any;
-    }) => void;
-}>;
-export {};
+export declare const Provider: any, Context: any;

package/lib/components/wallet/RechargeableCard/model.d.ts

@@ -1,29 +1 @@
-/// <reference types="react" />
-interface RechargeState {
-    selectedGiftOptionId: string | null;
-    cardList: Array<{
-        id: string;
-        name: string;
-        price: number;
-    }>;
-    selectedItem: {
-        id?: string;
-        gift_price?: number;
-        price?: number;
-        name?: string;
-        variant_id?: string;
-    };
-    productId?: string;
-    detailId?: string;
-    total: string | number;
-    rechargeModalOpen: boolean;
-}
-export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
-    state: RechargeState;
-} & {
-    dispatch: (params: {
-        type: string;
-        payload: any;
-    }) => void;
-}>;
-export {};
+export declare const Provider: any, Context: any;

package/lib/components/wallet/Voucher/index.js

@@ -65,6 +65,14 @@ var Voucher = (0, import_model.Provider)((props) => {
       recordViewRef.current.closeDetailModal();
     }
   }, [globalState.setup]);
+  const handleBack = (0, import_react.useCallback)(() => {
+    if (recordViewRef.current) {
+      recordViewRef.current.closeDetailModal();
+    }
+    setGlobalState({
+      setup: "list"
+    });
+  }, [recordViewRef, setGlobalState]);
   const renderItem = (item) => /* @__PURE__ */ import_react.default.createElement(
     import_WalletCard.default,
     {
@@ -82,14 +90,6 @@ var Voucher = (0, import_model.Provider)((props) => {
   if (isEmpty) {
     return /* @__PURE__ */ import_react.default.createElement(import_materials.PisellEmpty, null);
   }
-  const handleBack = (0, import_react.useCallback)(() => {
-    if (recordViewRef.current) {
-      recordViewRef.current.closeDetailModal();
-    }
-    setGlobalState({
-      setup: "list"
-    });
-  }, [recordViewRef, setGlobalState]);
   return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, platform !== "pc" && /* @__PURE__ */ import_react.default.createElement(Title, { className: "wallet-voucher-title" }, import_utils.locales.getText("page.wallet.voucher")), /* @__PURE__ */ import_react.default.createElement(
     import_materials.CardMetricItem,
     {

package/lib/components/wallet/Voucher/model.d.ts

@@ -1,13 +1 @@
-/// <reference types="react" />
-interface RechargeState {
-    total: 0;
-}
-export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
-    state: RechargeState;
-} & {
-    dispatch: (params: {
-        type: string;
-        payload: any;
-    }) => void;
-}>;
-export {};
+export declare const Provider: any, Context: any;

package/lib/components/wallet/components/WalletCard.js

@@ -55,6 +55,8 @@ var WalletCard = ({
     product_cover = "",
     par_value = "",
     unified_messages = {},
+    custom_schedule_snapshot,
+    metadata,
     ...rest
   } = item;
   const platform = (0, import_react.useMemo)(() => (0, import_utils.isMobile)() ? "h5" : "pc", []);
@@ -66,6 +68,8 @@ var WalletCard = ({
     import_materials.PisellWalletPassCard,
     {
       ...rest,
+      scheduleList: (custom_schedule_snapshot == null ? void 0 : custom_schedule_snapshot.data) || [],
+      validDateBySchedule: (metadata == null ? void 0 : metadata.validity_type) === "custom_schedule_validity",
       balanceTitle,
       showDetail: false,
       showRedeem: false,

package/lib/components/wallet/index.js

@@ -88,7 +88,7 @@ var Wallet = (0, import_model.Provider)(() => {
   import_utils2.request.setRequest(utils == null ? void 0 : utils.request);
   (0, import_react.useEffect)(() => {
     document.body.id = "body";
-    getList({ num: 999, skip: 1 });
+    getList({ num: 999, skip: 1, with: ["customScheduleSnapshot"] });
   }, []);
   const transformData = (data) => {
     const result = {};
@@ -353,7 +353,7 @@ var Wallet = (0, import_model.Provider)(() => {
         content: successMessage,
         duration: 2
       });
-      getList({ num: 999, skip: 1 }, code);
+      getList({ num: 999, skip: 1, with: ["customScheduleSnapshot"] }, code);
     }
     dispatch({
       type: "setState",

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { IWalletListItemProps } from './serve';
 export interface WalletCardItemProps {
     id: string;
@@ -27,11 +26,4 @@ export interface WalletListProps {
     currentSearchListItemCode?: string;
     [key: string]: any;
 }
-export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
-    global_wallet: WalletListProps;
-} & {
-    dispatch: (params: {
-        type: string;
-        payload: any;
-    }) => void;
-}>;
+export declare const Provider: any, Context: any;