@pisell/pisellos 2.2.246 → 2.2.247

package/lib/server/utils/small-ticket.js

@@ -57,6 +57,7 @@ var LABELS = {
     remainingPoints: "Remaining points",
     table: "Table",
     orderDiscount: "Order discount",
+    manualDiscount: "Manual discount",
     payProcessingFee: "Pay processing fee",
     rounding: "Rounding"
   },
@@ -80,6 +81,7 @@ var LABELS = {
     remainingPoints: "剩余积分",
     table: "桌台",
     orderDiscount: "整单折扣",
+    manualDiscount: "手动折扣",
     payProcessingFee: "支付手续费",
     rounding: "抹零"
   },
@@ -103,6 +105,7 @@ var LABELS = {
     remainingPoints: "剩餘積分",
     table: "桌台",
     orderDiscount: "整單折扣",
+    manualDiscount: "手動折扣",
     payProcessingFee: "支付手續費",
     rounding: "抹零"
   }
@@ -184,6 +187,7 @@ function buildProducts(order, locale, productMap) {
       parentProduct
     });
     const resolvedVariant = resolveProductVariantText({ product, parentProduct, locale });
+    const discountList = normalizeProductDiscounts({ product, locale, currencySymbol });
     return {
       product_title: productTitle,
       product_quantity: quantity,
@@ -191,12 +195,40 @@ function buildProducts(order, locale, productMap) {
       original_price: formatMoney(originalPrice, currencySymbol),
       total_original_price: formatMoney(new import_decimal.default(toMoneyNumber(originalPrice)).mul(quantity), currencySymbol),
       extension_list: Array.isArray(product.extension_list) ? product.extension_list : [],
+      ...discountList.length ? { discount_list: discountList } : {},
       ...options.length ? { options } : {},
       ...resolvedVariant ? { variant: resolvedVariant } : {},
       ...Array.isArray(product.combinations) ? { combinations: product.combinations } : combinations.length ? { combinations } : {}
     };
   });
 }
+function normalizeProductDiscounts(params) {
+  const { product, locale, currencySymbol } = params;
+  return normalizeArray(product.discount_list).map((discount) => {
+    const title = resolveDiscountTitle(discount, locale);
+    const amount = discount.amount ?? discount.value ?? discount.discount_amount;
+    const formattedAmount = formatNegativeMoney(amount, currencySymbol);
+    return {
+      ...discount,
+      item: title,
+      name: title,
+      title,
+      value: formattedAmount
+    };
+  });
+}
+function resolveDiscountTitle(discount, locale) {
+  var _a, _b, _c;
+  const title = getLocalizedValue(
+    ((_a = discount.discount) == null ? void 0 : _a.name) ?? ((_b = discount.discount) == null ? void 0 : _b.title) ?? ((_c = discount.discount) == null ? void 0 : _c.message) ?? discount.name ?? discount.title ?? discount.message,
+    locale
+  );
+  if (title)
+    return title;
+  if (discount.type === "product")
+    return label(locale, "manualDiscount");
+  return "";
+}
 function resolveProductTitle(params) {
   const { product, productMap, locale } = params;
   const ownTitle = getProductTitleSource(product, locale);
@@ -480,11 +512,11 @@ function buildFees(params) {
       value: formatMoney(value, currencySymbol)
     });
   }
-  const discountAmount = summary.discount_amount || order.discount_amount || order.shop_discount;
+  const discountAmount = order.shop_discount ?? summary.discount_amount ?? order.discount_amount;
   if (isNonZero(discountAmount)) {
     fees.push({
       item: label(locale, "orderDiscount"),
-      value: formatMoney(new import_decimal.default(toMoneyNumber(discountAmount)).neg(), currencySymbol)
+      value: formatNegativeMoney(discountAmount, currencySymbol)
     });
   }
   const taxFee = summary.tax_fee || order.tax_fee;
@@ -712,8 +744,9 @@ function getLocalizedValue(value, locale) {
   if (typeof value !== "object")
     return stringify(value);
   const dashedLocale = locale.replace("_", "-");
+  const underscoredLocale = locale.replace("-", "_");
   return stringify(
-    value[locale] ?? value[dashedLocale] ?? value.default ?? value.en ?? ""
+    value[locale] ?? value[dashedLocale] ?? value[underscoredLocale] ?? value.original ?? value.auto ?? value.default ?? value.en ?? ""
   );
 }
 function buildShopAddress(shopInfo) {
@@ -742,6 +775,10 @@ function formatMoney(value, currencySymbol) {
   const amount = new import_decimal.default(toMoneyNumber(value));
   return `${currencySymbol}${amount.toFixed(2)}`;
 }
+function formatNegativeMoney(value, currencySymbol) {
+  const amount = new import_decimal.default(toMoneyNumber(value)).abs();
+  return `-${currencySymbol}${amount.toFixed(2)}`;
+}
 function calculateReceiptPaidAmount(order, summary) {
   const paidAmount = sumPayments(order.payments);
   const payProcessingFee = new import_decimal.default(

package/lib/solution/BookingByStep/index.d.ts

@@ -311,7 +311,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         date: string;
         status: string;
         week: string;
-        weekNum: 0 | 2 | 1 | 6 | 3 | 4 | 5;
+        weekNum: 0 | 5 | 1 | 4 | 2 | 3 | 6;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;

package/lib/solution/BookingTicket/index.d.ts

@@ -322,7 +322,7 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
      * 获取当前的客户搜索条件
      * @returns 当前搜索条件
      */
-    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "skip" | "num">;
+    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "num" | "skip">;
     /**
      * 获取客户列表状态（包含滚动加载相关状态）
      * @returns 客户状态

package/package.json

@@ -1,7 +1,7 @@
 {
   "private": false,
   "name": "@pisell/pisellos",
-  "version": "2.2.246",
+  "version": "2.2.247",
   "description": "一个可扩展的前端模块化SDK框架，支持插件系统",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",