@pisell/private-materials 6.12.361 → 6.12.362

package/lib/plus/walletEditor/locales.js

@@ -3,6 +3,14 @@ var locales_default = {
 	en: {
 		walletName: "Wallet name",
 		validityPeriod: "Validity Period",
+		passesShownInWallet: "Passes shown in this Wallet:",
+		showPassesIssuedBy: "Show passes issued by:",
+		passIssuerCurrentShop: "Current store",
+		passIssuerAllShops: "All stores in the chain",
+		passIssuerSpecifiedShops: "Specified stores",
+		passIssuerSelectShops: "Select stores",
+		passIssuerShopsRequired: "Please select at least one store",
+		passIssuerLoadFailedRetry: "Failed to load stores. Click to retry.",
 		linkedPasses: "Linked passes",
 		linkedPassesDesc: "Select the passes that will be available in this Wallet.",
 		sort: "Sort",
@@ -54,6 +62,14 @@ var locales_default = {
 	"zh-CN": {
 		walletName: "钱包名称",
 		validityPeriod: "有效期",
+		passesShownInWallet: "此钱包中显示的卡券：",
+		showPassesIssuedBy: "显示由以下门店发放的卡券：",
+		passIssuerCurrentShop: "当前门店",
+		passIssuerAllShops: "连锁内所有门店",
+		passIssuerSpecifiedShops: "指定门店",
+		passIssuerSelectShops: "选择门店",
+		passIssuerShopsRequired: "请至少选择一个门店",
+		passIssuerLoadFailedRetry: "门店加载失败，点击重试",
 		linkedPasses: "包含的卡券",
 		linkedPassesDesc: "选择此 Wallet 中可展示与使用的卡券。",
 		sort: "排序",
@@ -105,6 +121,14 @@ var locales_default = {
 	"zh-HK": {
 		walletName: "錢包名稱",
 		validityPeriod: "有效期",
+		passesShownInWallet: "此錢包中顯示的卡券：",
+		showPassesIssuedBy: "顯示由以下門店發放的卡券：",
+		passIssuerCurrentShop: "目前門店",
+		passIssuerAllShops: "連鎖內所有門店",
+		passIssuerSpecifiedShops: "指定門店",
+		passIssuerSelectShops: "選擇門店",
+		passIssuerShopsRequired: "請至少選擇一個門店",
+		passIssuerLoadFailedRetry: "門店載入失敗，點擊重試",
 		linkedPasses: "包含的卡券",
 		linkedPassesDesc: "選擇此 Wallet 中可展示與使用的卡券。",
 		sort: "排序",
@@ -156,6 +180,14 @@ var locales_default = {
 	ja: {
 		walletName: "ウォレット名",
 		validityPeriod: "有効期間",
+		passesShownInWallet: "このウォレットに表示するパス：",
+		showPassesIssuedBy: "次の店舗が発行したパスを表示：",
+		passIssuerCurrentShop: "現在の店舗",
+		passIssuerAllShops: "チェーン内のすべての店舗",
+		passIssuerSpecifiedShops: "指定した店舗",
+		passIssuerSelectShops: "店舗を選択",
+		passIssuerShopsRequired: "店舗を1つ以上選択してください",
+		passIssuerLoadFailedRetry: "店舗を読み込めませんでした。クリックして再試行。",
 		linkedPasses: "リンクされたパス",
 		linkedPassesDesc: "このウォレットで利用可能なパスを選択します。",
 		sort: "並び替え",
@@ -207,6 +239,14 @@ var locales_default = {
 	pt: {
 		walletName: "Nome da carteira",
 		validityPeriod: "Período de Validade",
+		passesShownInWallet: "Passes exibidos nesta carteira:",
+		showPassesIssuedBy: "Mostrar passes emitidos por:",
+		passIssuerCurrentShop: "Loja atual",
+		passIssuerAllShops: "Todas as lojas da rede",
+		passIssuerSpecifiedShops: "Lojas específicas",
+		passIssuerSelectShops: "Selecionar lojas",
+		passIssuerShopsRequired: "Selecione pelo menos uma loja",
+		passIssuerLoadFailedRetry: "Falha ao carregar lojas. Clique para tentar novamente.",
 		linkedPasses: "Passes vinculados",
 		linkedPassesDesc: "Selecione os passes que estarão disponíveis nesta Carteira.",
 		sort: "Ordenar",

package/lib/plus/walletEditor/types.d.ts

@@ -27,6 +27,12 @@ interface SendConfig {
   type: string;
   [key: string]: any;
 }
+/** 在原展示范围上追加子店卡券的配置。 */
+interface PassDisplayConfigValue {
+  type: 'self' | 'all_franchisees' | 'selected_franchisees';
+  /** 仅 selected_franchisees 使用，其他模式忽略。 */
+  shop_ids?: number[];
+}
 interface WalletMetadata {
   mobile_wallet_id?: string | number;
   showcaseWalletPass?: string[];
@@ -35,6 +41,7 @@ interface WalletMetadata {
   customerName?: string;
   coverImage?: string;
   send_config?: SendConfig;
+  pass_visibility?: PassDisplayConfigValue;
 }
 interface WalletEditorValue {
   name?: MultiLanguageTitle;
@@ -56,4 +63,4 @@ interface WalletEditorProps {
   style?: React.CSSProperties;
 }
 //#endregion
-export { MultiLanguageTitle, SendConfig, ShowcaseWalletPassItem, ValidForConfig, WalletEditorProps, WalletEditorRef, WalletEditorValue, WalletMetadata, WalletPassType };
+export { MultiLanguageTitle, PassDisplayConfigValue, SendConfig, ShowcaseWalletPassItem, ValidForConfig, WalletEditorProps, WalletEditorRef, WalletEditorValue, WalletMetadata, WalletPassType };

package/lib/plus/walletPassGallery/index.js

@@ -45,7 +45,7 @@ const KEYS = {
 const ARow = antd.Row;
 const ACol = antd.Col;
 const WalletPassGallery = (props) => {
-	var _context$appHelper, _context$appHelper2, _context$engine, _utils$translation, _getWalletDetail$data;
+	var _context$appHelper, _context$appHelper2, _utils$businessUtils, _utils$businessUtils$, _context$engine, _utils$translation, _getWalletDetail$data;
 	const { hideAddButton, hideTitle, customer, platform: platformProp } = props;
 	const [activeKey, setActiveKey] = (0, react.useState)("available");
 	const [currentItemId, setCurrentItemId] = (0, react.useState)(void 0);
@@ -56,6 +56,7 @@ const WalletPassGallery = (props) => {
 	const context = require_useEngineContext.default();
 	const utils = (context === null || context === void 0 || (_context$appHelper = context.appHelper) === null || _context$appHelper === void 0 ? void 0 : _context$appHelper.utils) || {};
 	const { apiPrefix } = ((_context$appHelper2 = context.appHelper) === null || _context$appHelper2 === void 0 ? void 0 : _context$appHelper2.constants) || { apiPrefix: "/h5" };
+	const includeFranchiseePasses = Boolean((_utils$businessUtils = utils.businessUtils) === null || _utils$businessUtils === void 0 || (_utils$businessUtils$ = _utils$businessUtils.getAppByModal) === null || _utils$businessUtils$ === void 0 ? void 0 : _utils$businessUtils$.call(_utils$businessUtils, "franchisor"));
 	const { isTerminal, isApp, interaction, action, isWebPos } = utils;
 	const isTerminalEnv = (typeof isTerminal === "function" ? isTerminal() : !!isTerminal) || (isApp === null || isApp === void 0 ? void 0 : isApp());
 	const platform = (0, react.useMemo)(() => {
@@ -72,7 +73,7 @@ const WalletPassGallery = (props) => {
 			const _searchParams = new URLSearchParams(window.location.search);
 			const walletId = _searchParams.get("id");
 			const holderId = _searchParams.get("holder_id");
-			const res = yield require_serve.getWalletPassList(require_objectSpread2._objectSpread2({
+			const res = yield require_serve.getWalletPassList(require_objectSpread2._objectSpread2(require_objectSpread2._objectSpread2({
 				available: 1,
 				num: 20,
 				skip: (d === null || d === void 0 ? void 0 : d.nextId) || 1,
@@ -86,7 +87,7 @@ const WalletPassGallery = (props) => {
 				],
 				customer_id: customer === null || customer === void 0 ? void 0 : customer.id,
 				limit_status: "enable"
-			}, isWebPos ? { with_franchisor_data: true } : {}), { apiPrefix });
+			}, isWebPos ? { with_franchisor_data: true } : {}), {}, { include_franchisee_passes: includeFranchiseePasses ? 1 : void 0 }), { apiPrefix });
 			return {
 				list: (res === null || res === void 0 ? void 0 : res.list) || [],
 				count: (res === null || res === void 0 ? void 0 : res.count) || 0,
@@ -109,7 +110,7 @@ const WalletPassGallery = (props) => {
 			const _searchParams = new URLSearchParams(window.location.search);
 			const walletId = _searchParams.get("id");
 			const holderId = _searchParams.get("holder_id");
-			const res = yield require_serve.getWalletPassList(require_objectSpread2._objectSpread2({
+			const res = yield require_serve.getWalletPassList(require_objectSpread2._objectSpread2(require_objectSpread2._objectSpread2({
 				available: 0,
 				num: 20,
 				skip: (d === null || d === void 0 ? void 0 : d.nextId) || 1,
@@ -123,7 +124,7 @@ const WalletPassGallery = (props) => {
 				],
 				customer_id: customer === null || customer === void 0 ? void 0 : customer.id,
 				limit_status: "enable"
-			}, isWebPos ? { with_franchisor_data: true } : {}), { apiPrefix });
+			}, isWebPos ? { with_franchisor_data: true } : {}), {}, { include_franchisee_passes: includeFranchiseePasses ? 1 : void 0 }), { apiPrefix });
 			return {
 				list: (res === null || res === void 0 ? void 0 : res.list) || [],
 				count: (res === null || res === void 0 ? void 0 : res.count) || 0,
@@ -202,7 +203,11 @@ const WalletPassGallery = (props) => {
 				}
 			}
 		});
-	}, [customer]);
+	}, [
+		customer,
+		apiPrefix,
+		includeFranchiseePasses
+	]);
 	(0, react.useEffect)(() => {
 		var _interaction$utils, _interaction$utils$mo;
 		interaction === null || interaction === void 0 || (_interaction$utils = interaction.utils) === null || _interaction$utils === void 0 || (_interaction$utils$mo = _interaction$utils.mountFunction) === null || _interaction$utils$mo === void 0 || _interaction$utils$mo.call(_interaction$utils, "customer", "new", () => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/private-materials",
-  "version": "6.12.361",
+  "version": "6.12.362",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -75,9 +75,9 @@
     "use-sync-external-store": "^1.6.0",
     "@pisell/pi-payment-sdk": "0.0.4",
     "@pisell/utils": "3.0.7",
-    "@pisell/date-picker": "3.0.12",
     "@pisell/materials": "6.12.86",
-    "@pisell/icon": "0.0.11"
+    "@pisell/icon": "0.0.11",
+    "@pisell/date-picker": "3.0.12"
   },
   "peerDependencies": {
     "react": "^18.0.0",