@pisell/private-materials 3.0.193 → 3.0.195

package/lib/components/eftpos/group/index.js

@@ -54,7 +54,6 @@ var CheckboxGroup = ({
 var RadioGroup = ({
   direction,
   options,
-  component,
   ...props
 }) => {
   if (direction === "vertical") {

package/lib/components/eftpos/index.js

@@ -73,7 +73,7 @@ var PosTabs = (0, import_react.forwardRef)(
           {
             className: `pisell-lowcode__pos_circle ${active2 ? "active" : ""}`
           },
-          /* @__PURE__ */ import_react.default.createElement(import_device2.default, { color: active2 ? "#fff" : "#98A2B3" })
+          /* @__PURE__ */ import_react.default.createElement(import_apiKey.default, { color: active2 ? "#fff" : "#98A2B3" })
         ), /* @__PURE__ */ import_react.default.createElement(
           "span",
           {
@@ -90,7 +90,7 @@ var PosTabs = (0, import_react.forwardRef)(
           {
             className: `pisell-lowcode__pos_circle ${active2 ? "active" : ""}`
           },
-          /* @__PURE__ */ import_react.default.createElement(import_apiKey.default, { color: active2 ? "#fff" : "#98A2B3" })
+          /* @__PURE__ */ import_react.default.createElement(import_device2.default, { color: active2 ? "#fff" : "#98A2B3" })
         ), /* @__PURE__ */ import_react.default.createElement(
           "span",
           {

package/lib/components/eftpos/receipt/index.d.ts

@@ -0,0 +1,24 @@
+import React from 'react';
+/**
+ * @title: 自定义组件设置
+ * @description: 自定义组件设置
+ * @param {any} commConfig 当前组件配置
+ * @param {string} name 上游name(用于嵌套 xxx:{yyy:''})
+ * @return {*}
+ * @Author: hongbing.wang
+ * @Date: 2024-08-20 11:10
+ */
+export declare const getCommName: (commConfig: any, name: string[]) => any;
+/**
+ * @title: 自定义组件结果设置
+ * @description: 自定义组件结果设置
+ * @param {any} commConfig 当前组件配置
+ * @return {*}
+ * @Author: hongbing.wang
+ * @Date: 2024-08-20 11:11
+ */
+export declare const getCommDefaultVal: (commConfig: any) => {
+    [x: number]: any;
+};
+declare const _default: (props: any) => React.JSX.Element;
+export default _default;

package/lib/components/eftpos/receipt/index.js

@@ -0,0 +1,88 @@
+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/components/eftpos/receipt/index.tsx
+var receipt_exports = {};
+__export(receipt_exports, {
+  default: () => receipt_default,
+  getCommDefaultVal: () => getCommDefaultVal,
+  getCommName: () => getCommName
+});
+module.exports = __toCommonJS(receipt_exports);
+var import_react = __toESM(require("react"));
+var import_antd = require("antd");
+var import_group = require("../group");
+var getCommName = (commConfig, name) => {
+  commConfig.receipts.__sourceName = commConfig.receipts.name;
+  commConfig.receiptList.__sourceName = commConfig.receiptList.name;
+  commConfig.receipts.name = name.length > 0 ? [...name, commConfig.receipts.name] : commConfig.receipts.name;
+  commConfig.receiptList.name = name.length > 0 ? [...name, commConfig.receiptList.name] : commConfig.receiptList.name;
+  return commConfig;
+};
+var getCommDefaultVal = (commConfig) => {
+  const receipts = commConfig.receipts.input.defaultValue;
+  const receiptList = commConfig.receiptList.input.defaultValue;
+  console.log("receipts = ", receipts);
+  return {
+    [commConfig.receipts.__sourceName]: typeof receipts === "undefined" ? true : receipts,
+    [commConfig.receiptList.__sourceName]: typeof receiptList === "undefined" ? ["merchant", "customer"] : receiptList
+  };
+};
+var receipt_default = (props) => {
+  const { receipts, receiptList } = props;
+  const [receiptsInput, receiptsOther] = (0, import_react.useMemo)(() => {
+    const { input, ...other } = receipts;
+    return [input, other];
+  }, [receipts]);
+  const [receiptListInput, receiptListOther] = (0, import_react.useMemo)(() => {
+    const { input, ...other } = receiptList;
+    return [input, other];
+  }, [receipts]);
+  const [type, setType] = (0, import_react.useState)(receiptsInput.defaultValue);
+  return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, /* @__PURE__ */ import_react.default.createElement(import_antd.Form.Item, { style: { marginBottom: "12px" }, ...receiptsOther }, /* @__PURE__ */ import_react.default.createElement(
+    import_group.RadioGroup,
+    {
+      ...receiptsInput,
+      onChange: (event) => {
+        setType(event.target.value);
+      }
+    }
+  )), /* @__PURE__ */ import_react.default.createElement(
+    import_antd.Form.Item,
+    {
+      ...receiptListOther,
+      style: type ? { marginLeft: "24px", display: "none" } : { marginLeft: "24px" }
+    },
+    /* @__PURE__ */ import_react.default.createElement(import_group.CheckboxGroup, { ...receiptListInput })
+  ));
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  getCommDefaultVal,
+  getCommName
+});

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

@@ -74,4 +74,5 @@ export declare function getPayAmonunt({ money, amount, surRate, surMoney }: Amou
     surRateMoney: string;
     totalUnit: string;
 };
+export declare function getBrowserVersion(): string;
 export {};

package/lib/components/eftposPay/helper.js

@@ -21,6 +21,7 @@ var helper_exports = {};
 __export(helper_exports, {
   cloneDeep: () => cloneDeep,
   getAmonunt: () => getAmonunt,
+  getBrowserVersion: () => getBrowserVersion,
   getPayAmonunt: () => getPayAmonunt,
   getPayParams: () => getPayParams,
   getUuid: () => getUuid,
@@ -185,10 +186,30 @@ function getPayAmonunt({ money, amount, surRate, surMoney }, formatAmount) {
     totalUnit: formatAmount(total)
   };
 }
+function getBrowserVersion() {
+  const Sys = {};
+  const ua = navigator.userAgent.toLowerCase();
+  let s;
+  (s = ua.match(/rv:([\d.]+)\) like gecko/)) ? Sys.ie = s[1] : (s = ua.match(/msie ([\d\.]+)/)) ? Sys.ie = s[1] : (s = ua.match(/edge\/([\d\.]+)/)) ? Sys.edge = s[1] : (s = ua.match(/firefox\/([\d\.]+)/)) ? Sys.firefox = s[1] : (s = ua.match(/(?:opera|opr).([\d\.]+)/)) ? Sys.opera = s[1] : (s = ua.match(/chrome\/([\d\.]+)/)) ? Sys.chrome = s[1] : (s = ua.match(/version\/([\d\.]+).*safari/)) ? Sys.safari = s[1] : 0;
+  if (Sys.ie)
+    return "IE: " + Sys.ie;
+  if (Sys.edge)
+    return "EDGE: " + Sys.edge;
+  if (Sys.firefox)
+    return "Firefox: " + Sys.firefox;
+  if (Sys.chrome)
+    return "Chrome: " + Sys.chrome;
+  if (Sys.opera)
+    return "Opera: " + Sys.opera;
+  if (Sys.safari)
+    return "Safari: " + Sys.safari;
+  return "Unkonwn";
+}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   cloneDeep,
   getAmonunt,
+  getBrowserVersion,
   getPayAmonunt,
   getPayParams,
   getUuid,

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

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

package/lib/components/eftposPay/tyro/index.js

@@ -64,6 +64,20 @@ var tyro_default = ({
   const requestIdRef = (0, import_react.useRef)((custom == null ? void 0 : custom.requestId) || "");
   const unloadRef = (0, import_react.useRef)(false);
   const clearRef = (0, import_react.useRef)();
+  const isPrint = (key) => {
+    var _a, _b, _c, _d;
+    if ((_b = (_a = deviceRef.current) == null ? void 0 : _a.setting) == null ? void 0 : _b.receipts) {
+      return false;
+    }
+    const receiptList = (_d = (_c = deviceRef.current) == null ? void 0 : _c.setting) == null ? void 0 : _d.receiptList;
+    if (!Array.isArray(receiptList)) {
+      return true;
+    }
+    if (Array.isArray(receiptList) && receiptList.some((item) => item === key)) {
+      return true;
+    }
+    return false;
+  };
   (0, import_react.useEffect)(() => {
     listRef.current = (custom == null ? void 0 : custom.list) || [];
   }, [custom == null ? void 0 : custom.list]);
@@ -114,12 +128,16 @@ var tyro_default = ({
     );
     requestParams.current = {
       amount: new import_decimal.Decimal(amountRef.current || 0).mul(100).toFixed(0, import_decimal.Decimal.ROUND_HALF_UP),
-      // 打印小票 true 打印到系统上 false 打印到pos机上
+      // 打印小票 true 打印到Pisell系统上 false 打印到pos机上
       integratedReceipt: !((_b = (_a = deviceRef.current) == null ? void 0 : _a.setting) == null ? void 0 : _b.receipts),
       integrationKey,
       transactionId: numRef.current,
       mid,
-      tid
+      tid,
+      device: JSON.stringify(deviceRef.current),
+      isPrintMerchant: isPrint("merchant"),
+      isPrintCustomer: isPrint("customer"),
+      browserVersion: (0, import_helper.getBrowserVersion)()
     };
     dispatch(
       (0, import_store.updateCustom)({
@@ -186,7 +204,11 @@ var tyro_default = ({
       integrationKey,
       transactionId: numRef.current,
       mid,
-      tid
+      tid,
+      device: JSON.stringify(deviceRef.current),
+      isPrintMerchant: isPrint("merchant"),
+      isPrintCustomer: isPrint("customer"),
+      browserVersion: (0, import_helper.getBrowserVersion)()
     };
     dispatch(
       (0, import_store.updateCustom)({
@@ -244,8 +266,14 @@ var tyro_default = ({
     console.log("商家小票 客户端是否打印小票 = ", signatureRequired);
     console.log("商家小票 小票内容 = \n", merchantReceipt);
     const receipt = [merchantReceipt].filter((item) => typeof item === "string").filter(Boolean);
-    onChange("print", receipt);
     merchantReceiptRef.current = { signatureRequired, merchantReceipt };
+    if (signatureRequired) {
+      onChange("print", receipt);
+      return;
+    }
+    if (isPrint("merchant")) {
+      onChange("print", receipt);
+    }
   };
   const statusMessageCallbackImpl = (message) => {
     var _a;
@@ -381,7 +409,6 @@ var tyro_default = ({
         })
       );
       clearRef.current = setTimeout(() => {
-        var _a2;
         const params = (0, import_helper.getPayParams)(
           {
             mode: modeRef.current,
@@ -398,14 +425,16 @@ var tyro_default = ({
         );
         onChange("success", {
           ...params,
-          receipt: ((_a2 = deviceRef.current) == null ? void 0 : _a2.setting.receipts) ? [] : receipt
+          receipt: isPrint("customer") ? receipt : []
         });
       }, 1e3);
       return;
     } else {
       const current = ((_b = deviceRef.current) == null ? void 0 : _b.setting.receipts) ? [] : receipt;
       if (current.length > 0) {
-        onChange("print", current);
+        if (isPrint("customer")) {
+          onChange("print", receipt);
+        }
       }
     }
     if (response.result === "UNKNOWN") {

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

@@ -1,3 +1,3 @@
 import "./index.less";
-declare const Schedules: (props: any) => JSX.Element;
+declare const Schedules: (props: any) => any;
 export default Schedules;

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

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/private-materials",
-  "version": "3.0.193",
+  "version": "3.0.195",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -61,8 +61,8 @@
     "decimal.js": "^10.4.3",
     "@pisell/materials": "3.0.55",
     "@pisell/icon": "0.0.11",
-    "@pisell/utils": "1.0.42",
-    "@pisell/date-picker": "1.0.100"
+    "@pisell/date-picker": "1.0.100",
+    "@pisell/utils": "1.0.42"
   },
   "peerDependencies": {
     "react": "^18.0.0",