@pisell/private-materials 6.2.27 → 6.2.29

package/es/components/Sales/Summary/utils.d.ts

@@ -30,7 +30,7 @@ export declare const calculateSubtotal: (items: CartItem[]) => string;
  * @return {*}
  * @Author: xiangfeng.xue
  */
-export declare const calculateTaxFee: (shopInfo: any, items: CartItem[]) => "0.00" | Decimal;
+export declare const calculateTaxFee: (shopInfo: any, items: CartItem[]) => Decimal | "0.00";
 /**
  * 计算所有价格明细
  * @param items - 购物车商品数组

package/es/components/booking/utils.d.ts

@@ -165,10 +165,10 @@ export declare const getProductTotalPrice: (item: any) => number;
 export declare const getDuration: (duration: number | {
     type: string;
     value: number;
-}) => number | "flexible" | {
+}) => number | {
     type: string;
     value: number;
-};
+} | "flexible";
 export declare const isWalkIn: (customer_id?: number | string) => boolean;
 export declare const getIsEdit: (state: any) => boolean;
 export {};

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

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

package/es/components/shoppingCart/components/Cart/Product.js

@@ -1,7 +1,7 @@
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 import React, { useMemo } from 'react';
-// import { ProductCard } from '@pisell/materials';
-import ProductCard from "../../../../../../materials/src/components/productCard";
+import { ProductCard } from '@pisell/materials';
+// import ProductCard from '../../../../../../materials/src/components/productCard';
 import useClearCart from "../../hooks/useClearCart";
 import { useContext } from "../../hooks/useContext";
 import useAddService from "../../hooks/useAddService";

package/es/plus/clientCard/index.less

@@ -470,6 +470,9 @@
       font-size: 12px;
       color: #8c8c8c;
       margin-top: 2px;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
     }
 
     .pisell-client-card__plugin-icon {

package/lib/components/Sales/Summary/utils.d.ts

@@ -30,7 +30,7 @@ export declare const calculateSubtotal: (items: CartItem[]) => string;
  * @return {*}
  * @Author: xiangfeng.xue
  */
-export declare const calculateTaxFee: (shopInfo: any, items: CartItem[]) => "0.00" | Decimal;
+export declare const calculateTaxFee: (shopInfo: any, items: CartItem[]) => Decimal | "0.00";
 /**
  * 计算所有价格明细
  * @param items - 购物车商品数组

package/lib/components/booking/utils.d.ts

@@ -165,10 +165,10 @@ export declare const getProductTotalPrice: (item: any) => number;
 export declare const getDuration: (duration: number | {
     type: string;
     value: number;
-}) => number | "flexible" | {
+}) => number | {
     type: string;
     value: number;
-};
+} | "flexible";
 export declare const isWalkIn: (customer_id?: number | string) => boolean;
 export declare const getIsEdit: (state: any) => boolean;
 export {};

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

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

package/lib/components/shoppingCart/components/Cart/Product.js

@@ -33,7 +33,7 @@ __export(Product_exports, {
 });
 module.exports = __toCommonJS(Product_exports);
 var import_react = __toESM(require("react"));
-var import_productCard = __toESM(require("../../../../../../materials/src/components/productCard"));
+var import_materials = require("@pisell/materials");
 var import_useClearCart = __toESM(require("../../hooks/useClearCart"));
 var import_useContext = require("../../hooks/useContext");
 var import_useAddService = __toESM(require("../../hooks/useAddService"));
@@ -95,11 +95,11 @@ var Product = (props) => {
   return (0, import_react.useMemo)(() => {
     console.log("render cart");
     return /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__shopping-cart-content" }, clearCart, lists == null ? void 0 : lists.map((item) => {
-      let Comp = import_productCard.default;
+      let Comp = import_materials.ProductCard;
       let isRetail;
       if (state.scenario === "booking2") {
         isRetail = (0, import_utils.isNormalProductByDurationSchedule)(item == null ? void 0 : item._origin);
-        Comp = isRetail ? import_productCard.default.V2 : import_productCard.default;
+        Comp = isRetail ? import_materials.ProductCard.V2 : import_materials.ProductCard;
       }
       return /* @__PURE__ */ import_react.default.createElement(
         Comp,

package/lib/plus/clientCard/index.less

@@ -470,6 +470,9 @@
       font-size: 12px;
       color: #8c8c8c;
       margin-top: 2px;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
     }
 
     .pisell-client-card__plugin-icon {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/private-materials",
-  "version": "6.2.27",
+  "version": "6.2.29",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -60,8 +60,8 @@
     "react-resizable": "^3.0.5",
     "styled-components": "^6.0.0-rc.3",
     "@pisell/icon": "0.0.11",
+    "@pisell/materials": "6.2.28",
     "@pisell/utils": "3.0.0",
-    "@pisell/materials": "6.2.27",
     "@pisell/date-picker": "3.0.4"
   },
   "peerDependencies": {