@pisell/private-materials 3.2.20 → 3.2.22

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

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

package/lib/components/schedules/resources/relationProduct/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import "./index.less";
 declare const RelationProduct: ({ value, onChange, }: {
     value?: any;

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { ScheduleItem } from '../../type';
 import './index.less';
 declare type AllSchedulesPropsType = {

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import type { DrawerProps } from "antd";
 import { ScheduleItem } from "../../type";
 import "./index.less";

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

@@ -1,2 +1,3 @@
+/// <reference types="react" />
 declare const SchedulesConnect: () => JSX.Element;
 export default SchedulesConnect;

package/lib/components/shoppingCart/components/Empty/index.d.ts

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

package/lib/components/shoppingCart/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { shoppingCartProps } from './type';
 declare const shoppingCart: ({ onCard, onChange, onAddProduct, onActiveKey, ...props }: shoppingCartProps) => JSX.Element;
 export default shoppingCart;

package/lib/components/taxSelect/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { SelectProps } from "antd";
 import "./index.less";
 interface TaxSelectProps {

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

@@ -67,7 +67,7 @@ var Detail = (0, import_react.forwardRef)((props, ref) => {
     expire_date = "",
     product = {}
   } = detail;
-  const { description = "" } = product;
+  const { description = "" } = product || {};
   const context = (0, import_useEngineContext.default)();
   const utils = ((_a = context == null ? void 0 : context.appHelper) == null ? void 0 : _a.utils) || {};
   const dvaStore = (_c = (_b = utils == null ? void 0 : utils.getStore) == null ? void 0 : _b.call(utils)) == null ? void 0 : _c.getState();
@@ -145,6 +145,11 @@ var Detail = (0, import_react.forwardRef)((props, ref) => {
         label: import_utils.locales.getText("page.wallet.points"),
         value: balance ? `${Number(balance)}` : ""
       });
+    } else if (tag === "good_pass") {
+      data.splice(2, 0, {
+        label: import_utils.locales.getText("page.wallet.goodPass"),
+        value: balance ? `${Number(balance)}` : ""
+      });
     } else {
       data.splice(2, 0, {
         label: import_utils.locales.getText("page.wallet.balance"),

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

@@ -68,6 +68,7 @@ var Voucher = (0, import_model.Provider)((props) => {
   const renderItem = (item) => /* @__PURE__ */ import_react.default.createElement(
     import_WalletCard.default,
     {
+      balanceTitle: item.tag === "good_pass" ? import_utils.locales.getText("page.wallet.goodPass") : void 0,
       item,
       currentId: globalState.currentId,
       onClick: () => {

package/lib/components/wallet/index.js

@@ -107,6 +107,12 @@ var Wallet = (0, import_model.Provider)(() => {
           return;
         }
       }
+      if (tag === "good_pass") {
+        if (!result["product_voucher"]) {
+          result["product_voucher"] = [];
+        }
+        result["product_voucher"].push(item);
+      }
       result[tag].push(item);
     });
     return result;
@@ -446,10 +452,18 @@ var Wallet = (0, import_model.Provider)(() => {
         }
       });
     };
+    const getBalanceTitle = () => {
+      if (global_wallet.currentTag === "point_card") {
+        return import_utils.locales.getText("page.wallet.points");
+      } else if (global_wallet.currentTag === "good_pass") {
+        return import_utils.locales.getText("page.wallet.goodPass");
+      }
+      return void 0;
+    };
     return /* @__PURE__ */ import_react.default.createElement(
       import_materials.PisellWalletPassCard,
       {
-        balanceTitle: global_wallet.currentTag === "point_card" ? import_utils.locales.getText("page.wallet.points") : void 0,
+        balanceTitle: getBalanceTitle(),
         showDetail: false,
         showRedeem: false,
         showQrCode: false,

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

@@ -19,6 +19,7 @@ declare const _default: {
         'page.wallet.cardBalance': string;
         'page.wallet.voucherBalance': string;
         'page.wallet.points': string;
+        'page.wallet.goodPass': string;
         'page.wallet.cardName': string;
         'page.wallet.carNumber': string;
         'page.wallet.balance': string;
@@ -61,6 +62,7 @@ declare const _default: {
         'page.wallet.cardBalance': string;
         'page.wallet.voucherBalance': string;
         'page.wallet.points': string;
+        'page.wallet.goodPass': string;
         'page.wallet.cardName': string;
         'page.wallet.carNumber': string;
         'page.wallet.balance': string;
@@ -103,6 +105,7 @@ declare const _default: {
         'page.wallet.cardBalance': string;
         'page.wallet.voucherBalance': string;
         'page.wallet.points': string;
+        'page.wallet.goodPass': string;
         'page.wallet.cardName': string;
         'page.wallet.carNumber': string;
         'page.wallet.balance': string;

package/lib/components/wallet/locales.js

@@ -44,6 +44,7 @@ var locales_default = {
     "page.wallet.cardBalance": "Card balance",
     "page.wallet.voucherBalance": "Voucher balance",
     "page.wallet.points": "Points",
+    "page.wallet.goodPass": "Credits remaining",
     "page.wallet.cardName": "Card name",
     "page.wallet.carNumber": "Card number",
     "page.wallet.balance": "Balance",
@@ -89,6 +90,7 @@ var locales_default = {
     "page.wallet.cardBalance": "卡余额",
     "page.wallet.voucherBalance": "代金券余额",
     "page.wallet.points": "积分",
+    "page.wallet.goodPass": "剩余额度",
     "page.wallet.cardName": "卡片名称",
     "page.wallet.carNumber": "卡号",
     "page.wallet.balance": "余额",
@@ -133,6 +135,7 @@ var locales_default = {
     "page.wallet.cardBalance": "卡餘額",
     "page.wallet.voucherBalance": "代金券餘額",
     "page.wallet.points": "積分",
+    "page.wallet.goodPass": "剩餘額度",
     "page.wallet.cardName": "卡片名稱",
     "page.wallet.carNumber": "卡號",
     "page.wallet.balance": "餘額",

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

@@ -9,7 +9,7 @@ export interface WalletCardProps {
     available: WalletCardItemProps[];
     unavailable: WalletCardItemProps[];
 }
-export declare type WalletCardType = 'gift_card' | 'product_voucher' | 'point_card' | 'product_discount_card';
+export declare type WalletCardType = 'gift_card' | 'product_voucher' | 'point_card' | 'product_discount_card' | 'good_pass';
 export interface WalletListProps {
     gift_card: IWalletListItemProps[];
     product_voucher: IWalletListItemProps[];

package/lib/components/wallet/utils/formatUtils.js

@@ -44,7 +44,7 @@ var formatDataToGroups = (dataList) => {
 };
 var calculateTotalValue = (dataList, valueField = "balance") => {
   const enabledCards = dataList.filter(
-    (item) => item.limit_status === "enable"
+    (item) => item.limit_status === "enable" && item.tag !== "good_pass"
   );
   return enabledCards.reduce(
     (sum, item) => sum + Number(item[valueField] || 0),

package/lib/components/walletList/index.js

@@ -377,13 +377,17 @@ var WalletList = (0, import_model.Provider)((props) => {
       (key) => {
         var _a3;
         const balanceKey = (_a3 = Object.entries(balanceKeyMap).find(
-          ([_, value]) => value === key
+          ([_, value2]) => value2 === key
         )) == null ? void 0 : _a3[0];
+        let value = balanceKey ? balance[balanceKey] || 0 : 0;
+        if (balanceKey === "voucher_count") {
+          value += balance.good_pass_count;
+        }
         return {
           key,
           label: key,
           hidden: false,
-          value: balanceKey ? balance[balanceKey] || 0 : 0
+          value
         };
       }
     );

package/lib/components/workSpaceList/components/Modal/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { Modal as AntModal, ModalFuncProps as AntModalFuncProps, ModalProps as AntModalProps } from 'antd';
 import './index.less';
 interface ModalProps extends AntModalProps {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/private-materials",
-  "version": "3.2.20",
+  "version": "3.2.22",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -60,7 +60,7 @@
     "rc-virtual-list": "^3.11.3",
     "decimal.js": "^10.4.3",
     "@pisell/utils": "1.0.42",
-    "@pisell/materials": "3.2.19",
+    "@pisell/materials": "3.2.21",
     "@pisell/date-picker": "3.0.2",
     "@pisell/icon": "0.0.11"
   },