@pisell/private-materials 6.6.101 → 6.6.103

package/lib/components/eftposPay/amount.js

@@ -39,10 +39,12 @@ var import_react = __toESM(require("react"));
 var import_ahooks = require("ahooks");
 var import_alert = __toESM(require("./component/alert"));
 var import_titlebar = __toESM(require("./component/header/titlebar"));
+var import_const = require("./const");
 var import_manufacturer = require("./manufacturer");
 var import_helper = require("./helper");
 var import_store = require("./store");
 var import_payLog = __toESM(require("./utils/payLog"));
+var import_useCardSurchargeReadOnly = __toESM(require("../../hooks/useCardSurchargeReadOnly"));
 var amount_default = ({
   className = "",
   onChange,
@@ -55,6 +57,15 @@ var amount_default = ({
   const dispatch = (0, import_store.useDispatch)();
   const [status, setStatus] = (0, import_react.useState)(true);
   const store = (0, import_store.useContextData)();
+  const isPayment = store.mode === import_const.ModeEnum.Pay || store.mode === import_const.ModeEnum.FullPay;
+  const surchargeReadOnly = (0, import_useCardSurchargeReadOnly.default)(store.eftpos, {
+    includePos: isPayment
+  });
+  const hideSurchargeEdit = isPayment && surchargeReadOnly;
+  const isAmountPage = status || hideSurchargeEdit;
+  (0, import_react.useEffect)(() => {
+    if (hideSurchargeEdit) setStatus(true);
+  }, [hideSurchargeEdit]);
   const {
     name,
     symbol,
@@ -101,6 +112,7 @@ var amount_default = ({
   const onSubmit = () => {
     if (!status) {
       setStatus(true);
+      if (surchargeReadOnly) return;
       setSurRate(tempSurRate);
       setSurMoney(tempSurMoney);
       return;
@@ -139,12 +151,13 @@ var amount_default = ({
     onClose();
   };
   const onEdit = () => {
+    if (surchargeReadOnly || useOriginSurcharge) return;
     import_payLog.default.log("金额页-点击编辑");
     setStatus(false);
     setTempSurRate(curSurRate);
     setTempSurMoney(curSurMoney);
   };
-  return /* @__PURE__ */ import_react.default.createElement("div", { className: `pisell-lowcode__eft-pay-amount ${className}` }, isMobile ? null : /* @__PURE__ */ import_react.default.createElement(import_titlebar.default, { type: "left-title-close", onClose }, status ? name : import_utils.locales.getText("page.eftpos-pay.text.surcharge.edit.title")), status ? /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__eft-pay-amount-body" }, /* @__PURE__ */ import_react.default.createElement(
+  return /* @__PURE__ */ import_react.default.createElement("div", { className: `pisell-lowcode__eft-pay-amount ${className}` }, isMobile ? null : /* @__PURE__ */ import_react.default.createElement(import_titlebar.default, { type: "left-title-close", onClose }, isAmountPage ? name : import_utils.locales.getText("page.eftpos-pay.text.surcharge.edit.title")), isAmountPage ? /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__eft-pay-amount-body" }, /* @__PURE__ */ import_react.default.createElement(
     "div",
     {
       className: "pisell-lowcode__eft-pay-cash",
@@ -177,10 +190,19 @@ var amount_default = ({
     "page.eftpos-pay.text.surcharge.edit.actual.pay"
   ), ":", formatAmount(`${total}`, 2, symbol)), /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__eft-pay-money" }, import_utils.locales.getText(
     "page.eftpos-pay.text.surcharge.edit.inc.surcharge"
-  ), ": ", formatAmount(`${totalSurMoney}`, 2, symbol), " (", import_utils.locales.getText("page.eftpos-pay.text.surcharge.edit.rate"), ":", curSurRate, "% + ", formatAmount(`${curSurMoney}`, 2, symbol), ")")), /* @__PURE__ */ import_react.default.createElement(import_antd.Button, { type: "link", onClick: onEdit, disabled: useOriginSurcharge }, import_utils.locales.getText("page.eftpos-pay.text.surcharge.edit.surcharge")))) : /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__eft-pay-amount-body" }, /* @__PURE__ */ import_react.default.createElement(import_alert.default, null, import_utils.locales.getText("page.eftpos-pay.text.surcharge.percentage-fixed")), /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__eft-pay-amount-form" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__eft-pay-amount-item" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__eft-pay-amount-item-title" }, import_utils.locales.getText("page.eftpos-pay.text.surcharge.percentage")), /* @__PURE__ */ import_react.default.createElement(
+  ), ": ", formatAmount(`${totalSurMoney}`, 2, symbol), " (", import_utils.locales.getText("page.eftpos-pay.text.surcharge.edit.rate"), ":", curSurRate, "% + ", formatAmount(`${curSurMoney}`, 2, symbol), ")")), !hideSurchargeEdit && /* @__PURE__ */ import_react.default.createElement(
+    import_antd.Button,
+    {
+      type: "link",
+      onClick: onEdit,
+      disabled: surchargeReadOnly || useOriginSurcharge
+    },
+    import_utils.locales.getText("page.eftpos-pay.text.surcharge.edit.surcharge")
+  ))) : /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__eft-pay-amount-body" }, /* @__PURE__ */ import_react.default.createElement(import_alert.default, null, import_utils.locales.getText("page.eftpos-pay.text.surcharge.percentage-fixed")), /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__eft-pay-amount-form" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__eft-pay-amount-item" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__eft-pay-amount-item-title" }, import_utils.locales.getText("page.eftpos-pay.text.surcharge.percentage")), /* @__PURE__ */ import_react.default.createElement(
     import_antd.InputNumber,
     {
       type: "number",
+      disabled: surchargeReadOnly,
       value: tempSurRate,
       min: 0,
       max: 100,
@@ -195,6 +217,7 @@ var amount_default = ({
     import_antd.InputNumber,
     {
       type: "number",
+      disabled: surchargeReadOnly,
       value: tempSurMoney,
       min: 0,
       max: 1e5,
@@ -220,7 +243,7 @@ var amount_default = ({
       className: "pisell-lowcode__eft-pay-step-item-btn",
       type: "primary",
       onClick: onSubmit,
-      disabled: currentMoney <= 0 && status
+      disabled: currentMoney <= 0 && isAmountPage
     },
     import_utils.locales.getText("page.eftpos-pay.text.sure")
   )));

package/lib/components/eftposPay/hooks.d.ts

@@ -19,7 +19,7 @@ export declare const useStoreRef: <T extends {
     readonly netRef: React.MutableRefObject<boolean | undefined>;
     readonly symbolRef: React.MutableRefObject<string>;
     readonly amountRef: React.MutableRefObject<string | number>;
-    readonly eftposRef: React.MutableRefObject<"stripe" | "tyro" | "mx51" | "payo" | "windcave" | "linkly" | "huifu" | "adyenpos" | "adyenalipay" | "adyenwechat">;
+    readonly eftposRef: React.MutableRefObject<"stripe" | "payo" | "tyro" | "windcave" | "linkly" | "mx51" | "adyenpos" | "huifu" | "adyenalipay" | "adyenwechat">;
     readonly clientRef: React.MutableRefObject<ClientEnum>;
     readonly dataRef: React.MutableRefObject<import("./store").State>;
 };

package/lib/components/eftposPay/store/index.d.ts

@@ -301,7 +301,7 @@ export declare const backUpFree: (payload: Partial<State>) => {
         amount?: string | number | undefined;
         mode?: "pay" | "refund" | "fullPay" | "query" | undefined;
         order_id?: string | number | undefined;
-        eftpos?: "stripe" | "tyro" | "mx51" | "payo" | "windcave" | "linkly" | "huifu" | "adyenpos" | "adyenalipay" | "adyenwechat" | undefined;
+        eftpos?: "stripe" | "payo" | "tyro" | "windcave" | "linkly" | "mx51" | "adyenpos" | "huifu" | "adyenalipay" | "adyenwechat" | undefined;
         action?: "pay" | "amount" | "deviceList" | undefined;
         key?: number | undefined;
         step?: number | undefined;

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

@@ -190,13 +190,13 @@ var addService = (list, addItem, state, isMultiDay) => {
     let isSetCount = false;
     value = list.map((item) => {
       var _a, _b, _c, _d, _e;
-      const isGoodPassDiscountProduct = (item.discount_list || []).some((item2) => item2.type === "good_pass");
+      const isGoodPassDiscountProduct = (item.discount_list || []).some((item2) => ["good_pass", "entitlement_pass"].includes(item2.tag || item2.type));
       const isEdit = item == null ? void 0 : item.edit;
       const bundleDiscountList = [];
       (((_b = (_a = item == null ? void 0 : item._extend) == null ? void 0 : _a.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");
+      const isGoodPassBundleProduct = bundleDiscountList.some((item2) => ["good_pass", "entitlement_pass"].includes(item2.tag || item2.type));
       if (isSameProduct(item, addItem) && !isSetCount && !isGoodPassDiscountProduct && !isEdit && !isGoodPassBundleProduct) {
         isNotSame = false;
         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);

package/lib/hooks/useCardSurchargeReadOnly.d.ts

@@ -0,0 +1,4 @@
+/** POS opts in only for payment amount pages; configuration keeps the Shop policy. */
+export default function useCardSurchargeReadOnly(paymentType: string, { includePos }?: {
+    includePos?: boolean;
+}): boolean;

package/lib/hooks/useCardSurchargeReadOnly.js

@@ -0,0 +1,86 @@
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/hooks/useCardSurchargeReadOnly.ts
+var useCardSurchargeReadOnly_exports = {};
+__export(useCardSurchargeReadOnly_exports, {
+  default: () => useCardSurchargeReadOnly
+});
+module.exports = __toCommonJS(useCardSurchargeReadOnly_exports);
+var import_react = require("react");
+var import_useEngineContext = __toESM(require("./useEngineContext"));
+var cardEftposTypes = /* @__PURE__ */ new Set([
+  "payo",
+  "tyro",
+  "windcave",
+  "stripe",
+  "linkly",
+  "mx51",
+  "adyenpos"
+]);
+function useCardSurchargeReadOnly(paymentType, { includePos = false } = {}) {
+  var _a, _b;
+  const context = (0, import_useEngineContext.default)();
+  const { platform } = ((_a = context == null ? void 0 : context.appHelper) == null ? void 0 : _a.constants) || {};
+  const { store, getData, isCardSurchargeReadOnly } = ((_b = context == null ? void 0 : context.appHelper) == null ? void 0 : _b.utils) || {};
+  const isPosCardPayment = includePos && (platform === "webpos" || platform === "pos") && cardEftposTypes.has(paymentType.toLowerCase().replace(/^eftpos_/, ""));
+  const getReadOnly = (0, import_react.useCallback)(() => {
+    var _a2, _b2, _c, _d;
+    if (platform === "shop") {
+      return typeof isCardSurchargeReadOnly === "function" && Boolean(isCardSurchargeReadOnly(paymentType));
+    }
+    if (!isPosCardPayment) return false;
+    const state = (_a2 = store == null ? void 0 : store.getState) == null ? void 0 : _a2.call(store);
+    const shopInfo = ((_b2 = state == null ? void 0 : state.core) == null ? void 0 : _b2.shopInfo) || (getData == null ? void 0 : getData("shop_info"));
+    const shopId = (_d = (_c = state == null ? void 0 : state.core) == null ? void 0 : _c.core) == null ? void 0 : _d.id;
+    if (shopId != null && (shopInfo == null ? void 0 : shopInfo.id) != null && String(shopId) !== String(shopInfo.id)) {
+      return true;
+    }
+    const countryCode = String((shopInfo == null ? void 0 : shopInfo.country_code) || "").toUpperCase();
+    return !countryCode || countryCode === "AU";
+  }, [
+    platform,
+    isCardSurchargeReadOnly,
+    paymentType,
+    isPosCardPayment,
+    store,
+    getData
+  ]);
+  const [, setReadOnly] = (0, import_react.useState)(getReadOnly);
+  (0, import_react.useEffect)(() => {
+    var _a2;
+    if (!isPosCardPayment && (platform !== "shop" || typeof isCardSurchargeReadOnly !== "function")) {
+      return;
+    }
+    const update = () => setReadOnly(getReadOnly());
+    const unsubscribe = (_a2 = store == null ? void 0 : store.subscribe) == null ? void 0 : _a2.call(store, update);
+    update();
+    return () => unsubscribe == null ? void 0 : unsubscribe();
+  }, [store, getReadOnly, platform, isCardSurchargeReadOnly, isPosCardPayment]);
+  return getReadOnly();
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/private-materials",
-  "version": "6.6.101",
+  "version": "6.6.103",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -64,9 +64,9 @@
     "@react-spring/web": "^9.6.1",
     "@use-gesture/react": "^10.3.1",
     "@pisell/utils": "3.0.2",
-    "@pisell/date-picker": "3.0.7",
-    "@pisell/materials": "6.6.23",
-    "@pisell/icon": "0.0.11"
+    "@pisell/materials": "6.6.25",
+    "@pisell/icon": "0.0.11",
+    "@pisell/date-picker": "3.0.7"
   },
   "peerDependencies": {
     "react": "^18.0.0",