@pisell/private-materials 6.6.61 → 6.6.62

package/es/components/checkout/hooks/useWalletPass.d.ts

@@ -17,7 +17,7 @@ export declare const useWalletPass: (props: {
     cardData: any;
     handleSelectWallet: (value: number[]) => void;
     selectedWalletIds: any[];
-    expiredWalletIds: any[];
+    expiredWalletIds: any;
     expiredWalletData: any;
     disabledWalletData: any[];
     clearAllSelectedWallet: () => void;

package/es/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" | "windcave" | "payo" | "linkly" | "huifu">;
+    readonly eftposRef: React.MutableRefObject<"stripe" | "payo" | "tyro" | "windcave" | "linkly" | "huifu">;
     readonly clientRef: React.MutableRefObject<ClientEnum>;
     readonly dataRef: React.MutableRefObject<import("./store").State>;
 };

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

@@ -301,8 +301,8 @@ 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" | "windcave" | "payo" | "linkly" | "huifu" | undefined;
-        action?: "amount" | "pay" | "deviceList" | undefined;
+        eftpos?: "stripe" | "payo" | "tyro" | "windcave" | "linkly" | "huifu" | undefined;
+        action?: "pay" | "amount" | "deviceList" | undefined;
         key?: number | undefined;
         step?: number | undefined;
         title?: string | undefined;

package/es/components/ticketBooking/utils/formatProductMessage.js

@@ -1,6 +1,20 @@
 import { formatAmount } from '@pisell/utils';
 import { getServiceTime } from "./formatTime";
+import { locales } from '@pisell/utils';
+var UNIT_LABEL = {
+  KILOGRAMS: 'kg',
+  GRAMS: 'g',
+  POUNDS: 'lb',
+  OUNCES: 'oz'
+};
+var DEFAULT_WEIGHT_PRECISION = 3;
+var formatWeightValue = function formatWeightValue(value) {
+  var parsedValue = Number(value);
+  var displayValue = Number.isFinite(parsedValue) ? parsedValue : 0;
+  return displayValue.toFixed(DEFAULT_WEIGHT_PRECISION);
+};
 var formatProductMessage = function formatProductMessage(product, utils) {
+  var _product$_origin;
   var product_option_string = product.product_option_string,
     options = product.options,
     bundle = product.bundle,
@@ -42,6 +56,32 @@ var formatProductMessage = function formatProductMessage(product, utils) {
     });
   }
 
+  // 重量信息
+  var weighing = product === null || product === void 0 || (_product$_origin = product._origin) === null || _product$_origin === void 0 || (_product$_origin = _product$_origin._extend) === null || _product$_origin === void 0 ? void 0 : _product$_origin.weighing;
+  if (weighing) {
+    var mode = weighing.mode,
+      unit_price = weighing.unit_price,
+      unit = weighing.unit,
+      weight = weighing.weight,
+      tare = weighing.tare,
+      net_weight = weighing.net_weight;
+    var unitLabel = UNIT_LABEL[unit] || unit;
+    var weightText = formatWeightValue(weight);
+    var tareText = formatWeightValue(tare === null || tare === void 0 ? void 0 : tare.value);
+    var netWeightText = formatWeightValue(net_weight);
+    var tareValue = Number((tare === null || tare === void 0 ? void 0 : tare.value) || 0);
+    var isManualWeight = mode === 'manual';
+    var unitPriceText = "".concat(currency_symbol || '').concat(unit_price !== null && unit_price !== void 0 ? unit_price : '0.00');
+    var manualPrefix = isManualWeight ? '(M) ' : '';
+    if (tareValue > 0) {
+      str += "".concat(manualPrefix).concat(locales.getText('pisell2.cart.sku-card.weighing.gross'), ": ").concat(weightText, " ").concat(unitLabel, " \n");
+    }
+    if (tareValue > 0) {
+      str += "".concat(locales.getText('pisell2.cart.sku-card.weighing.tare'), ": ").concat(tareText, " ").concat(UNIT_LABEL[tare === null || tare === void 0 ? void 0 : tare.unit] || (tare === null || tare === void 0 ? void 0 : tare.unit) || unitLabel, " \n");
+    }
+    str += "".concat(tareValue > 0 ? '' : manualPrefix).concat(netWeightText, " ").concat(unitLabel, " ").concat(locales.getText('pisell2.cart.sku-card.weighing.net'), " @ ").concat(unitPriceText, "/").concat(unitLabel, " \n");
+  }
+
   // 组合规格 单规格
   if (product_option_string) str += "".concat(product_option_string, "\n");
   if (Array.isArray(options) && options.length) {
@@ -53,8 +93,13 @@ var formatProductMessage = function formatProductMessage(product, utils) {
   // 套餐
   if (Array.isArray(bundle) && bundle.length) {
     bundle.forEach(function (item) {
-      str += "".concat(item.title, " \n");
-      str += "".concat(formatAmount(item.price, 2, currency_symbol), " x ").concat(item.num);
+      str += "".concat(item.title, "  ").concat(formatAmount(item.price, 2, currency_symbol), " x ").concat(item.num, "\n");
+      var bundleOptions = item === null || item === void 0 ? void 0 : item.options;
+      if (Array.isArray(bundleOptions) && bundleOptions.length) {
+        bundleOptions.forEach(function (opt) {
+          str += "  ".concat(opt === null || opt === void 0 ? void 0 : opt.name, "  ").concat(formatAmount(opt === null || opt === void 0 ? void 0 : opt.price, 2, currency_symbol), " x ").concat(opt === null || opt === void 0 ? void 0 : opt.num, "\n");
+        });
+      }
     });
   }
   return str;

package/lib/components/checkout/hooks/useWalletPass.d.ts

@@ -17,7 +17,7 @@ export declare const useWalletPass: (props: {
     cardData: any;
     handleSelectWallet: (value: number[]) => void;
     selectedWalletIds: any[];
-    expiredWalletIds: any[];
+    expiredWalletIds: any;
     expiredWalletData: any;
     disabledWalletData: any[];
     clearAllSelectedWallet: () => void;

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" | "windcave" | "payo" | "linkly" | "huifu">;
+    readonly eftposRef: React.MutableRefObject<"stripe" | "payo" | "tyro" | "windcave" | "linkly" | "huifu">;
     readonly clientRef: React.MutableRefObject<ClientEnum>;
     readonly dataRef: React.MutableRefObject<import("./store").State>;
 };

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

@@ -301,8 +301,8 @@ 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" | "windcave" | "payo" | "linkly" | "huifu" | undefined;
-        action?: "amount" | "pay" | "deviceList" | undefined;
+        eftpos?: "stripe" | "payo" | "tyro" | "windcave" | "linkly" | "huifu" | undefined;
+        action?: "pay" | "amount" | "deviceList" | undefined;
         key?: number | undefined;
         step?: number | undefined;
         title?: string | undefined;

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

@@ -24,7 +24,21 @@ __export(formatProductMessage_exports, {
 module.exports = __toCommonJS(formatProductMessage_exports);
 var import_utils = require("@pisell/utils");
 var import_formatTime = require("./formatTime");
+var import_utils2 = require("@pisell/utils");
+var UNIT_LABEL = {
+  KILOGRAMS: "kg",
+  GRAMS: "g",
+  POUNDS: "lb",
+  OUNCES: "oz"
+};
+var DEFAULT_WEIGHT_PRECISION = 3;
+var formatWeightValue = (value) => {
+  const parsedValue = Number(value);
+  const displayValue = Number.isFinite(parsedValue) ? parsedValue : 0;
+  return displayValue.toFixed(DEFAULT_WEIGHT_PRECISION);
+};
 var formatProductMessage = (product, utils) => {
+  var _a, _b;
   const {
     product_option_string,
     options,
@@ -64,6 +78,28 @@ var formatProductMessage = (product, utils) => {
       }
     });
   }
+  const weighing = (_b = (_a = product == null ? void 0 : product._origin) == null ? void 0 : _a._extend) == null ? void 0 : _b.weighing;
+  if (weighing) {
+    const { mode, unit_price, unit, weight, tare, net_weight } = weighing;
+    const unitLabel = UNIT_LABEL[unit] || unit;
+    const weightText = formatWeightValue(weight);
+    const tareText = formatWeightValue(tare == null ? void 0 : tare.value);
+    const netWeightText = formatWeightValue(net_weight);
+    const tareValue = Number((tare == null ? void 0 : tare.value) || 0);
+    const isManualWeight = mode === "manual";
+    const unitPriceText = `${currency_symbol || ""}${unit_price ?? "0.00"}`;
+    const manualPrefix = isManualWeight ? "(M) " : "";
+    if (tareValue > 0) {
+      str += `${manualPrefix}${import_utils2.locales.getText("pisell2.cart.sku-card.weighing.gross")}: ${weightText} ${unitLabel} 
+`;
+    }
+    if (tareValue > 0) {
+      str += `${import_utils2.locales.getText("pisell2.cart.sku-card.weighing.tare")}: ${tareText} ${UNIT_LABEL[tare == null ? void 0 : tare.unit] || (tare == null ? void 0 : tare.unit) || unitLabel} 
+`;
+    }
+    str += `${tareValue > 0 ? "" : manualPrefix}${netWeightText} ${unitLabel} ${import_utils2.locales.getText("pisell2.cart.sku-card.weighing.net")} @ ${unitPriceText}/${unitLabel} 
+`;
+  }
   if (product_option_string) str += `${product_option_string}
 `;
   if (Array.isArray(options) && options.length) {
@@ -74,9 +110,15 @@ var formatProductMessage = (product, utils) => {
   }
   if (Array.isArray(bundle) && bundle.length) {
     bundle.forEach((item) => {
-      str += `${item.title} 
+      str += `${item.title}  ${(0, import_utils.formatAmount)(item.price, 2, currency_symbol)} x ${item.num}
+`;
+      const bundleOptions = item == null ? void 0 : item.options;
+      if (Array.isArray(bundleOptions) && bundleOptions.length) {
+        bundleOptions.forEach((opt) => {
+          str += `  ${opt == null ? void 0 : opt.name}  ${(0, import_utils.formatAmount)(opt == null ? void 0 : opt.price, 2, currency_symbol)} x ${opt == null ? void 0 : opt.num}
 `;
-      str += `${(0, import_utils.formatAmount)(item.price, 2, currency_symbol)} x ${item.num}`;
+        });
+      }
     });
   }
   return str;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/private-materials",
-  "version": "6.6.61",
+  "version": "6.6.62",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -61,10 +61,10 @@
     "styled-components": "^6.0.0-rc.3",
     "@react-spring/web": "^9.6.1",
     "@use-gesture/react": "^10.3.1",
-    "@pisell/icon": "0.0.11",
-    "@pisell/materials": "6.6.16",
+    "@pisell/utils": "3.0.2",
     "@pisell/date-picker": "3.0.7",
-    "@pisell/utils": "3.0.2"
+    "@pisell/materials": "6.6.17",
+    "@pisell/icon": "0.0.11"
   },
   "peerDependencies": {
     "react": "^18.0.0",