@pisell/pisellos 0.10.31 → 0.10.32

package/dist/model/strategy/adapter/promotion/index.js

@@ -0,0 +1,9 @@
+// 导出评估器
+export { PromotionEvaluator } from "./evaluator";
+
+// 导出适配器
+export { PromotionAdapter } from "./adapter";
+export { default } from "./adapter";
+
+// 导出策略配置示例常量
+export { X_ITEMS_FOR_Y_PRICE_STRATEGY, BUY_X_GET_Y_FREE_STRATEGY, ITEM_REWARD_STRATEGY } from "./examples";

package/dist/modules/Order/index.d.ts

@@ -566,6 +566,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
      */
     createOrderByCheckout(params: CheckoutOrderParams): Promise<any>;
     submitSalesOrder<T = any>(params: SubmitSalesOrderParams): Promise<T>;
+    private isSalesCheckoutHandledByOsServer;
     /**
      * 发送支付链接邮件。
      *

package/dist/modules/Order/index.js

@@ -35,6 +35,7 @@ import { OrderHooks } from "./types";
 import { composeLinePrice, generateDuration, getAllDiscountList, mergeRelationForms, ensureCartItemOriginHolder, buildSubmitPayload, createDefaultTempOrder, createDefaultOrderRulesHooks, createEmptySummary, createUuidV4, formatDateTime, isTempOrder, normalizeOrderMetaList, normalizeBookingIsAll, normalizeBookingSubType, mapPaymentItemsToOrderPayments, normalizeOrderProductDiscountList, resolveEffectivePerUnitDiscount, ensureProductSku, getProductSkuOptions, normalizeProductSkuOptions, sumOptionUnitPrice, clearTempOrderHolderAssignments, getOrderProductLineUid, indexOrderProductsByUid, calculateOrderProductsDeposit, buildPointCardSnapshotFromWalletPassList, mergeOrderProductDisplayFields, resolveIsFormSubject, isMarkdownBundle } from "./utils";
 import { isNormalProduct } from "../Product/utils";
 import dayjs from 'dayjs';
+import { stripOsPrivatePayloadFields } from "../../utils/os-private-payload";
 import { ensureOrderPaymentNumber, mergeOrderPaymentRecord, resolveOrderPaymentIdentity } from "./payment-utils";
 import { resolvePaymentNumberDevicePrefix, resolvePaymentNumberDevicePrefixFromDeviceId } from "../../utils/payment-number";
 import { processCartPromotion, appendPromotionTags as _appendPromotionTags, getOrderProductUid as getPromotionUid, PRODUCT_LINE_MERGE_DISABLED_METADATA_KEY } from "../../solution/BaseSales/utils/cartPromotion";
@@ -6283,17 +6284,18 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "submitSalesOrder",
     value: function () {
       var _submitSalesOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee40(params) {
-        var url, query, fetchUrl;
+        var url, query, fetchUrl, requestQuery;
         return _regeneratorRuntime().wrap(function _callee40$(_context43) {
           while (1) switch (_context43.prev = _context43.next) {
             case 0:
               url = params.url, query = params.query;
               fetchUrl = url || '/order/sales/checkout';
-              return _context43.abrupt("return", this.request.post(fetchUrl, query, {
+              requestQuery = this.isSalesCheckoutHandledByOsServer(fetchUrl) ? query : stripOsPrivatePayloadFields(query);
+              return _context43.abrupt("return", this.request.post(fetchUrl, requestQuery, {
                 osServer: true,
                 customToast: function customToast() {}
               }));
-            case 3:
+            case 4:
             case "end":
               return _context43.stop();
           }
@@ -6304,6 +6306,19 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       }
       return submitSalesOrder;
     }()
+  }, {
+    key: "isSalesCheckoutHandledByOsServer",
+    value: function isSalesCheckoutHandledByOsServer(fetchUrl) {
+      var _this$core2, _this$request;
+      var server = (_this$core2 = this.core) === null || _this$core2 === void 0 ? void 0 : _this$core2.server;
+      if (!server || typeof server.hasRoute !== 'function') return false;
+      var requestBaseUrl = String(((_this$request = this.request) === null || _this$request === void 0 ? void 0 : _this$request.baseUrl) || '/shop').replace(/\/+$/, '');
+      if (!requestBaseUrl.startsWith('/')) return false;
+      var normalizedFetchUrl = fetchUrl.startsWith('/') ? fetchUrl : "/".concat(fetchUrl);
+      var routePath = normalizedFetchUrl === requestBaseUrl || normalizedFetchUrl.startsWith("".concat(requestBaseUrl, "/")) ? normalizedFetchUrl : "".concat(requestBaseUrl).concat(normalizedFetchUrl);
+      return server.hasRoute('post', routePath) === true;
+    }
+
     /**
      * 发送支付链接邮件。
      *

package/dist/server/index.js

@@ -44,6 +44,7 @@ import { buildSmallTicketData, hasSmallTicketData } from "./utils/small-ticket";
 import { BaseSalesImpl } from "../solution/BaseSales";
 import { getOrderPaymentIdentityKeys, isIdentifiedPendingOrderPayment, isPendingOrderPayment, mergeOrderPaymentListsByIdentity } from "../modules/Order/payment-utils";
 import { normalizeOrderCollections } from "../modules/Order/utils/orderCollectionIdentity";
+import { stripOsPrivatePayloadFields } from "../utils/os-private-payload";
 import { getDefaultInvoiceLayoutConfig, getDefaultInvoiceTemplateSettings, normalizeRawInvoiceTemplateSettings, resolveInvoiceReceiptLocales } from "../modules/OpenData";
 var OS_FULFILLMENT_REF_MODE_FIELD = '_os_fulfillment_ref_mode';
 var OS_INVOICE_LAYOUT_CONFIG_FIELD = '_os_invoice_layout_config';
@@ -2573,7 +2574,7 @@ var Server = /*#__PURE__*/function () {
               return this.ensureCheckoutOrderNumbers(normalizedData, title);
             case 6:
               numberedData = _context32.sent;
-              checkoutData = this.normalizeCheckoutCollections(this.applyCheckoutFulfillmentBuzzer(numberedData, title));
+              checkoutData = this.normalizeCheckoutCollections(stripOsPrivatePayloadFields(this.applyCheckoutFulfillmentBuzzer(numberedData, title)));
               remoteCheckoutData = this.buildRemoteCheckoutData(checkoutData, title);
               _context32.next = 11;
               return this.buildCheckoutDeviceHeaders(title);
@@ -2675,11 +2676,9 @@ var Server = /*#__PURE__*/function () {
   }, {
     key: "buildRemoteCheckoutData",
     value: function buildRemoteCheckoutData(data, title) {
-      var next = cloneDeep(this.omitCheckoutSyncMode(data));
+      var next = stripOsPrivatePayloadFields(this.omitCheckoutSyncMode(data));
       if (!next || _typeof(next) !== 'object') return next;
       var record = next;
-      delete record[OS_FULFILLMENT_REF_MODE_FIELD];
-      delete record[OS_INVOICE_LAYOUT_CONFIG_FIELD];
       this.applyKioskCheckoutOperator(record);
       if (!Array.isArray(record.payments)) return next;
       var originalPayments = record.payments;
@@ -6372,7 +6371,7 @@ var Server = /*#__PURE__*/function () {
               return this.ensureCheckoutOrderNumbers(normalizedData, title);
             case 14:
               numberedData = _context62.sent;
-              checkoutData = this.normalizeCheckoutCollections(this.applyCheckoutFulfillmentBuzzer(numberedData, title));
+              checkoutData = this.normalizeCheckoutCollections(stripOsPrivatePayloadFields(this.applyCheckoutFulfillmentBuzzer(numberedData, title)));
               _context62.next = 18;
               return this.handlePendingSyncCheckoutOrder({
                 backendPath: backendPath,

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

@@ -39,7 +39,7 @@ var LABELS = {
     balance: 'Balance',
     remainingAmount: 'Remaining amount',
     redeemPoints: 'Redeem points',
-    remainingPoints: 'Remaining points',
+    remainingPoints: 'Point Balance',
     table: 'Table',
     orderDiscount: 'Order discount',
     manualDiscount: 'Manual discount',
@@ -72,7 +72,7 @@ var LABELS = {
     balance: '余额',
     remainingAmount: '剩余金额',
     redeemPoints: '本次使用积分',
-    remainingPoints: '剩余积分',
+    remainingPoints: '积分余额',
     table: '桌台',
     orderDiscount: '整单折扣',
     manualDiscount: '手动折扣',
@@ -105,7 +105,7 @@ var LABELS = {
     balance: '餘額',
     remainingAmount: '剩餘金額',
     redeemPoints: '本次使用積分',
-    remainingPoints: '剩餘積分',
+    remainingPoints: '積分餘額',
     table: '桌台',
     orderDiscount: '整單折扣',
     manualDiscount: '手動折扣',
@@ -136,7 +136,7 @@ var LABELS = {
     balance: '残高',
     remainingAmount: '残高',
     redeemPoints: '利用ポイント',
-    remainingPoints: '残りポイント',
+    remainingPoints: 'ポイント残高',
     table: 'テーブル',
     orderDiscount: '注文割引',
     manualDiscount: '手動割引',
@@ -168,7 +168,7 @@ var LABELS = {
     balance: 'Saldo',
     remainingAmount: 'Saldo restante',
     redeemPoints: 'Pontos utilizados',
-    remainingPoints: 'Pontos restantes',
+    remainingPoints: 'Saldo de pontos',
     table: 'Mesa',
     orderDiscount: 'Desconto do pedido',
     manualDiscount: 'Desconto manual',
@@ -371,10 +371,14 @@ function normalizeProductDiscounts(params) {
     locale = params.locale,
     currencySymbol = params.currencySymbol,
     quantity = params.quantity;
-  return normalizeArray(product.discount_list).map(function (discount) {
+  return normalizeArray(product.discount_list).filter(function (discount) {
     var _ref8, _discount$amount;
-    var title = resolveDiscountTitleWithPercent(discount, locale);
     var amount = (_ref8 = (_discount$amount = discount.amount) !== null && _discount$amount !== void 0 ? _discount$amount : discount.value) !== null && _ref8 !== void 0 ? _ref8 : discount.discount_amount;
+    return isNonZero(amount);
+  }).map(function (discount) {
+    var _ref9, _discount$amount2;
+    var title = resolveDiscountTitleWithPercent(discount, locale);
+    var amount = (_ref9 = (_discount$amount2 = discount.amount) !== null && _discount$amount2 !== void 0 ? _discount$amount2 : discount.value) !== null && _ref9 !== void 0 ? _ref9 : discount.discount_amount;
     var formattedAmount = formatNegativeMoney(new Decimal(toMoneyNumber(amount)).mul(quantity), currencySymbol);
     return {
       item: title,
@@ -458,8 +462,8 @@ function resolveDiscountTitleWithPercent(discount, locale) {
   return "".concat(title, " (").concat(percent, "%)");
 }
 function resolveDiscountTitle(discount, locale) {
-  var _ref9, _ref10, _ref11, _ref12, _discount$discount$na, _discount$discount3, _discount$discount4, _discount$discount5;
-  var title = getLocalizedValue((_ref9 = (_ref10 = (_ref11 = (_ref12 = (_discount$discount$na = (_discount$discount3 = discount.discount) === null || _discount$discount3 === void 0 ? void 0 : _discount$discount3.name) !== null && _discount$discount$na !== void 0 ? _discount$discount$na : (_discount$discount4 = discount.discount) === null || _discount$discount4 === void 0 ? void 0 : _discount$discount4.title) !== null && _ref12 !== void 0 ? _ref12 : (_discount$discount5 = discount.discount) === null || _discount$discount5 === void 0 ? void 0 : _discount$discount5.message) !== null && _ref11 !== void 0 ? _ref11 : discount.name) !== null && _ref10 !== void 0 ? _ref10 : discount.title) !== null && _ref9 !== void 0 ? _ref9 : discount.message, locale);
+  var _ref10, _ref11, _ref12, _ref13, _discount$discount$na, _discount$discount3, _discount$discount4, _discount$discount5;
+  var title = getLocalizedValue((_ref10 = (_ref11 = (_ref12 = (_ref13 = (_discount$discount$na = (_discount$discount3 = discount.discount) === null || _discount$discount3 === void 0 ? void 0 : _discount$discount3.name) !== null && _discount$discount$na !== void 0 ? _discount$discount$na : (_discount$discount4 = discount.discount) === null || _discount$discount4 === void 0 ? void 0 : _discount$discount4.title) !== null && _ref13 !== void 0 ? _ref13 : (_discount$discount5 = discount.discount) === null || _discount$discount5 === void 0 ? void 0 : _discount$discount5.message) !== null && _ref12 !== void 0 ? _ref12 : discount.name) !== null && _ref11 !== void 0 ? _ref11 : discount.title) !== null && _ref10 !== void 0 ? _ref10 : discount.message, locale);
   if (title) return title;
   if (discount.type === 'product') return label(locale, 'manualDiscount');
   return '';
@@ -484,9 +488,9 @@ function normalizeProductOptions(params) {
     parentProduct = params.parentProduct;
   var rawOptions = Array.isArray(params.options) ? params.options : Array.isArray(product.options) ? product.options : Array.isArray((_product$product_sku = product.product_sku) === null || _product$product_sku === void 0 ? void 0 : _product$product_sku.option) ? product.product_sku.option : [];
   return rawOptions.map(function (option) {
-    var _ref13, _option$original_pric, _ref14, _option$value, _option$num;
-    var price = (_ref13 = (_option$original_pric = option.original_price) !== null && _option$original_pric !== void 0 ? _option$original_pric : option.add_price) !== null && _ref13 !== void 0 ? _ref13 : option.price;
-    var value = (_ref14 = (_option$value = option.value) !== null && _option$value !== void 0 ? _option$value : option.option) !== null && _ref14 !== void 0 ? _ref14 : option.item;
+    var _ref14, _option$original_pric, _ref15, _option$value, _option$num;
+    var price = (_ref14 = (_option$original_pric = option.original_price) !== null && _option$original_pric !== void 0 ? _option$original_pric : option.add_price) !== null && _ref14 !== void 0 ? _ref14 : option.price;
+    var value = (_ref15 = (_option$value = option.value) !== null && _option$value !== void 0 ? _option$value : option.option) !== null && _ref15 !== void 0 ? _ref15 : option.item;
     var name = getProductTitleSource(option, locale) || resolveOptionTitleFromParentProduct({
       option: option,
       parentProduct: parentProduct,
@@ -511,7 +515,7 @@ function normalizeProductCombinations(params) {
     parentProduct = params.parentProduct;
   var bundles = Array.isArray(product.product_bundle) ? product.product_bundle : [];
   return bundles.map(function (bundle) {
-    var _ref15, _bundle$num;
+    var _ref16, _bundle$num;
     var combinationsOptions = normalizeProductOptions({
       product: {},
       locale: locale,
@@ -529,7 +533,7 @@ function normalizeProductCombinations(params) {
     var nestedCombinations = Array.isArray(bundle.combinations) ? normalizeExistingCombinations(bundle.combinations, locale) : [];
     return _objectSpread(_objectSpread({
       product_title: baseTitle,
-      product_quantity: toNumber((_ref15 = (_bundle$num = bundle.num) !== null && _bundle$num !== void 0 ? _bundle$num : bundle.quantity) !== null && _ref15 !== void 0 ? _ref15 : 1, 1),
+      product_quantity: toNumber((_ref16 = (_bundle$num = bundle.num) !== null && _bundle$num !== void 0 ? _bundle$num : bundle.quantity) !== null && _ref16 !== void 0 ? _ref16 : 1, 1),
       price: formatBundlePrice(bundle, currencySymbol),
       combinations_options: combinationsOptions
     }, productNote ? {
@@ -562,7 +566,7 @@ function resolveProductNote(product, locale) {
   return getLocalizedValue(product.note, locale).trim();
 }
 function resolveBundleProductTitle(params) {
-  var _ref16, _ref17, _bundle$bundle_produc;
+  var _ref17, _ref18, _bundle$bundle_produc;
   var bundle = params.bundle,
     productMap = params.productMap,
     locale = params.locale,
@@ -575,7 +579,7 @@ function resolveBundleProductTitle(params) {
   });
   var parentBundleTitle = parentBundleItem ? getProductTitleSource(parentBundleItem, locale) : '';
   if (parentBundleTitle) return parentBundleTitle;
-  var productId = (_ref16 = (_ref17 = (_bundle$bundle_produc = bundle.bundle_product_id) !== null && _bundle$bundle_produc !== void 0 ? _bundle$bundle_produc : bundle._bundle_product_id) !== null && _ref17 !== void 0 ? _ref17 : bundle.product_id) !== null && _ref16 !== void 0 ? _ref16 : bundle.id;
+  var productId = (_ref17 = (_ref18 = (_bundle$bundle_produc = bundle.bundle_product_id) !== null && _bundle$bundle_produc !== void 0 ? _bundle$bundle_produc : bundle._bundle_product_id) !== null && _ref18 !== void 0 ? _ref18 : bundle.product_id) !== null && _ref17 !== void 0 ? _ref17 : bundle.id;
   var fallbackProduct = resolveProductFromMap(productId, productMap);
   if (!fallbackProduct) return '';
   return getProductTitleSource(fallbackProduct, locale);
@@ -627,10 +631,10 @@ function resolveVariantTextFromSkuKey(params) {
 }
 function resolveVariantTextFromNameMap(params) {
   if (!params.nameMap || _typeof(params.nameMap) !== 'object') return '';
-  return Object.entries(params.nameMap).map(function (_ref18) {
-    var _ref19 = _slicedToArray(_ref18, 2),
-      groupPositionId = _ref19[0],
-      value = _ref19[1];
+  return Object.entries(params.nameMap).map(function (_ref19) {
+    var _ref20 = _slicedToArray(_ref19, 2),
+      groupPositionId = _ref20[0],
+      value = _ref20[1];
     var group = resolveVariantGroup(params.parentProduct, groupPositionId);
     if (!group) return '';
     var groupName = getLocalizedValue(group.name, params.locale);
@@ -664,12 +668,12 @@ function getProductTitleSource(source, locale) {
   return resolveTitleValue(source.product_title, locale) || resolveTitleValue(source.title, locale) || resolveTitleValue(source.name, locale);
 }
 function resolveTitleValue(value, locale) {
-  var _ref20, _ref21, _ref22, _ref23, _value$locale;
+  var _ref21, _ref22, _ref23, _ref24, _value$locale;
   if (value === undefined || value === null) return '';
   if (_typeof(value) !== 'object') return stringify(value);
   var dashedLocale = locale.replace('_', '-');
   var underscoredLocale = locale.replace('-', '_');
-  return stringify((_ref20 = (_ref21 = (_ref22 = (_ref23 = (_value$locale = value[locale]) !== null && _value$locale !== void 0 ? _value$locale : value[dashedLocale]) !== null && _ref23 !== void 0 ? _ref23 : value[underscoredLocale]) !== null && _ref22 !== void 0 ? _ref22 : value.original) !== null && _ref21 !== void 0 ? _ref21 : value.auto) !== null && _ref20 !== void 0 ? _ref20 : '');
+  return stringify((_ref21 = (_ref22 = (_ref23 = (_ref24 = (_value$locale = value[locale]) !== null && _value$locale !== void 0 ? _value$locale : value[dashedLocale]) !== null && _ref24 !== void 0 ? _ref24 : value[underscoredLocale]) !== null && _ref23 !== void 0 ? _ref23 : value.original) !== null && _ref22 !== void 0 ? _ref22 : value.auto) !== null && _ref21 !== void 0 ? _ref21 : '');
 }
 function resolveOptionTitleFromParentProduct(params) {
   var option = params.option,
@@ -687,17 +691,17 @@ function flattenOptionItems(parentProduct) {
   return optionGroups.flatMap(function (group) {
     var items = normalizeArray(group.option_item || group.option_items || group.option || group.options || group.items || group.children || group.product_option_item);
     return items.map(function (item) {
-      var _ref24, _item$option_group_id;
+      var _ref25, _item$option_group_id;
       return _objectSpread(_objectSpread({}, item), {}, {
-        option_group_id: (_ref24 = (_item$option_group_id = item.option_group_id) !== null && _item$option_group_id !== void 0 ? _item$option_group_id : group.id) !== null && _ref24 !== void 0 ? _ref24 : group.option_group_id
+        option_group_id: (_ref25 = (_item$option_group_id = item.option_group_id) !== null && _item$option_group_id !== void 0 ? _item$option_group_id : group.id) !== null && _ref25 !== void 0 ? _ref25 : group.option_group_id
       });
     });
   });
 }
 function isOptionItemMatch(option, item) {
-  var _ref25, _option$option_group_, _ref26, _item$option_group_it, _option$option_group_2, _item$option_group_id2;
-  var optionItemId = (_ref25 = (_option$option_group_ = option.option_group_item_id) !== null && _option$option_group_ !== void 0 ? _option$option_group_ : option.product_option_item_id) !== null && _ref25 !== void 0 ? _ref25 : option.id;
-  var itemId = (_ref26 = (_item$option_group_it = item.option_group_item_id) !== null && _item$option_group_it !== void 0 ? _item$option_group_it : item.product_option_item_id) !== null && _ref26 !== void 0 ? _ref26 : item.id;
+  var _ref26, _option$option_group_, _ref27, _item$option_group_it, _option$option_group_2, _item$option_group_id2;
+  var optionItemId = (_ref26 = (_option$option_group_ = option.option_group_item_id) !== null && _option$option_group_ !== void 0 ? _option$option_group_ : option.product_option_item_id) !== null && _ref26 !== void 0 ? _ref26 : option.id;
+  var itemId = (_ref27 = (_item$option_group_it = item.option_group_item_id) !== null && _item$option_group_it !== void 0 ? _item$option_group_it : item.product_option_item_id) !== null && _ref27 !== void 0 ? _ref27 : item.id;
   if (!isSameId(optionItemId, itemId)) return false;
   var optionGroupId = (_option$option_group_2 = option.option_group_id) !== null && _option$option_group_2 !== void 0 ? _option$option_group_2 : option.group_id;
   var itemGroupId = (_item$option_group_id2 = item.option_group_id) !== null && _item$option_group_id2 !== void 0 ? _item$option_group_id2 : item.group_id;
@@ -707,16 +711,16 @@ function isOptionItemMatch(option, item) {
   return true;
 }
 function resolveBundleItemFromParentProduct(params) {
-  var _ref27, _bundle$bundle_varian, _bundle$bundle_id, _bundle$bundle_group_, _ref29, _bundle$bundle_produc2;
+  var _ref28, _bundle$bundle_varian, _bundle$bundle_id, _bundle$bundle_group_, _ref30, _bundle$bundle_produc2;
   var bundle = params.bundle,
     parentProduct = params.parentProduct;
   if (!parentProduct) return null;
   var bundleItems = flattenBundleItems(parentProduct);
-  var bundleVariantId = (_ref27 = (_bundle$bundle_varian = bundle.bundle_variant_id) !== null && _bundle$bundle_varian !== void 0 ? _bundle$bundle_varian : bundle.variant_id) !== null && _ref27 !== void 0 ? _ref27 : bundle.product_variant_id;
+  var bundleVariantId = (_ref28 = (_bundle$bundle_varian = bundle.bundle_variant_id) !== null && _bundle$bundle_varian !== void 0 ? _bundle$bundle_varian : bundle.variant_id) !== null && _ref28 !== void 0 ? _ref28 : bundle.product_variant_id;
   if (isNonZeroId(bundleVariantId)) {
     var matchedByVariant = bundleItems.find(function (item) {
-      var _ref28, _item$bundle_variant_;
-      return isSameId((_ref28 = (_item$bundle_variant_ = item.bundle_variant_id) !== null && _item$bundle_variant_ !== void 0 ? _item$bundle_variant_ : item.variant_id) !== null && _ref28 !== void 0 ? _ref28 : item.product_variant_id, bundleVariantId);
+      var _ref29, _item$bundle_variant_;
+      return isSameId((_ref29 = (_item$bundle_variant_ = item.bundle_variant_id) !== null && _item$bundle_variant_ !== void 0 ? _item$bundle_variant_ : item.variant_id) !== null && _ref29 !== void 0 ? _ref29 : item.product_variant_id, bundleVariantId);
     });
     if (matchedByVariant) return matchedByVariant;
   }
@@ -729,18 +733,18 @@ function resolveBundleItemFromParentProduct(params) {
     if (matchedByBundleId) return matchedByBundleId;
   }
   var bundleGroupId = (_bundle$bundle_group_ = bundle.bundle_group_id) !== null && _bundle$bundle_group_ !== void 0 ? _bundle$bundle_group_ : bundle.group_id;
-  var bundleProductId = (_ref29 = (_bundle$bundle_produc2 = bundle.bundle_product_id) !== null && _bundle$bundle_produc2 !== void 0 ? _bundle$bundle_produc2 : bundle._bundle_product_id) !== null && _ref29 !== void 0 ? _ref29 : bundle.product_id;
+  var bundleProductId = (_ref30 = (_bundle$bundle_produc2 = bundle.bundle_product_id) !== null && _bundle$bundle_produc2 !== void 0 ? _bundle$bundle_produc2 : bundle._bundle_product_id) !== null && _ref30 !== void 0 ? _ref30 : bundle.product_id;
   if (isPresentId(bundleGroupId) && isPresentId(bundleProductId)) {
     var matchedByGroupAndProduct = bundleItems.find(function (item) {
-      var _item$group_id, _ref30, _item$bundle_product_;
-      return isSameId((_item$group_id = item.group_id) !== null && _item$group_id !== void 0 ? _item$group_id : item.bundle_group_id, bundleGroupId) && isSameId((_ref30 = (_item$bundle_product_ = item.bundle_product_id) !== null && _item$bundle_product_ !== void 0 ? _item$bundle_product_ : item._bundle_product_id) !== null && _ref30 !== void 0 ? _ref30 : item.product_id, bundleProductId);
+      var _item$group_id, _ref31, _item$bundle_product_;
+      return isSameId((_item$group_id = item.group_id) !== null && _item$group_id !== void 0 ? _item$group_id : item.bundle_group_id, bundleGroupId) && isSameId((_ref31 = (_item$bundle_product_ = item.bundle_product_id) !== null && _item$bundle_product_ !== void 0 ? _item$bundle_product_ : item._bundle_product_id) !== null && _ref31 !== void 0 ? _ref31 : item.product_id, bundleProductId);
     });
     if (matchedByGroupAndProduct) return matchedByGroupAndProduct;
   }
   if (isPresentId(bundleProductId)) {
     return bundleItems.find(function (item) {
-      var _ref31, _item$bundle_product_2;
-      return isSameId((_ref31 = (_item$bundle_product_2 = item.bundle_product_id) !== null && _item$bundle_product_2 !== void 0 ? _item$bundle_product_2 : item._bundle_product_id) !== null && _ref31 !== void 0 ? _ref31 : item.product_id, bundleProductId);
+      var _ref32, _item$bundle_product_2;
+      return isSameId((_ref32 = (_item$bundle_product_2 = item.bundle_product_id) !== null && _item$bundle_product_2 !== void 0 ? _item$bundle_product_2 : item._bundle_product_id) !== null && _ref32 !== void 0 ? _ref32 : item.product_id, bundleProductId);
     }) || null;
   }
   return null;
@@ -750,9 +754,9 @@ function flattenBundleItems(parentProduct) {
   return bundleGroups.flatMap(function (group) {
     var items = Array.isArray(group.bundle_item) ? group.bundle_item : [];
     return items.map(function (item) {
-      var _ref32, _item$group_id2;
+      var _ref33, _item$group_id2;
       return _objectSpread(_objectSpread({}, item), {}, {
-        group_id: (_ref32 = (_item$group_id2 = item.group_id) !== null && _item$group_id2 !== void 0 ? _item$group_id2 : group.id) !== null && _ref32 !== void 0 ? _ref32 : group.group_id
+        group_id: (_ref33 = (_item$group_id2 = item.group_id) !== null && _item$group_id2 !== void 0 ? _item$group_id2 : group.id) !== null && _ref33 !== void 0 ? _ref33 : group.group_id
       });
     });
   });
@@ -776,8 +780,8 @@ function isSameId(left, right) {
   return String(left) === String(right);
 }
 function formatBundlePrice(bundle, currencySymbol) {
-  var _ref33, _ref34, _bundle$bundle_sellin;
-  var value = (_ref33 = (_ref34 = (_bundle$bundle_sellin = bundle.bundle_selling_price) !== null && _bundle$bundle_sellin !== void 0 ? _bundle$bundle_sellin : bundle.bundle_sum_price) !== null && _ref34 !== void 0 ? _ref34 : bundle.price) !== null && _ref33 !== void 0 ? _ref33 : 0;
+  var _ref34, _ref35, _bundle$bundle_sellin;
+  var value = (_ref34 = (_ref35 = (_bundle$bundle_sellin = bundle.bundle_selling_price) !== null && _bundle$bundle_sellin !== void 0 ? _bundle$bundle_sellin : bundle.bundle_sum_price) !== null && _ref35 !== void 0 ? _ref35 : bundle.price) !== null && _ref34 !== void 0 ? _ref34 : 0;
   var amount = new Decimal(toMoneyNumber(value));
   // 套餐价格协议：只有 markdown 是减价；加价与商品原价都保持正数。
   var isNegative = bundle.price_type === 'markdown';
@@ -795,9 +799,9 @@ function buildFees(params) {
     financials = params.financials;
   var fees = [];
   for (var _i = 0, _normalizeArray = normalizeArray(order.surcharges || summary.surcharges); _i < _normalizeArray.length; _i++) {
-    var _ref35, _surcharge$amount;
+    var _ref36, _surcharge$amount;
     var surcharge = _normalizeArray[_i];
-    var value = (_ref35 = (_surcharge$amount = surcharge.amount) !== null && _surcharge$amount !== void 0 ? _surcharge$amount : surcharge.value) !== null && _ref35 !== void 0 ? _ref35 : surcharge.total_amount;
+    var value = (_ref36 = (_surcharge$amount = surcharge.amount) !== null && _surcharge$amount !== void 0 ? _surcharge$amount : surcharge.value) !== null && _ref36 !== void 0 ? _ref36 : surcharge.total_amount;
     if (!isNonZero(value)) continue;
     fees.push({
       item: getLocalizedValue(surcharge.name || surcharge.title || surcharge.item, locale),
@@ -903,9 +907,9 @@ function resolveTaxTitle(params) {
 }
 function calculateProductOriginalAmount(order) {
   return normalizeArray(order.products).reduce(function (total, product) {
-    var _ref36, _ref37, _product$product_quan2, _ref38, _ref39, _ref40, _product$original_pri2;
-    var quantity = toNumber((_ref36 = (_ref37 = (_product$product_quan2 = product.product_quantity) !== null && _product$product_quan2 !== void 0 ? _product$product_quan2 : product.quantity) !== null && _ref37 !== void 0 ? _ref37 : product.num) !== null && _ref36 !== void 0 ? _ref36 : 1, 1);
-    var originalPrice = (_ref38 = (_ref39 = (_ref40 = (_product$original_pri2 = product.original_price) !== null && _product$original_pri2 !== void 0 ? _product$original_pri2 : product.selling_price) !== null && _ref40 !== void 0 ? _ref40 : product.payment_price) !== null && _ref39 !== void 0 ? _ref39 : product.price) !== null && _ref38 !== void 0 ? _ref38 : 0;
+    var _ref37, _ref38, _product$product_quan2, _ref39, _ref40, _ref41, _product$original_pri2;
+    var quantity = toNumber((_ref37 = (_ref38 = (_product$product_quan2 = product.product_quantity) !== null && _product$product_quan2 !== void 0 ? _product$product_quan2 : product.quantity) !== null && _ref38 !== void 0 ? _ref38 : product.num) !== null && _ref37 !== void 0 ? _ref37 : 1, 1);
+    var originalPrice = (_ref39 = (_ref40 = (_ref41 = (_product$original_pri2 = product.original_price) !== null && _product$original_pri2 !== void 0 ? _product$original_pri2 : product.selling_price) !== null && _ref41 !== void 0 ? _ref41 : product.payment_price) !== null && _ref40 !== void 0 ? _ref40 : product.price) !== null && _ref39 !== void 0 ? _ref39 : 0;
     return total.plus(new Decimal(toMoneyNumber(originalPrice)).mul(quantity));
   }, new Decimal(0));
 }
@@ -993,8 +997,8 @@ function sortBookings(bookings) {
     }
     var bookingUidOrder = compareOptionalValues(firstPresentValue((_left$booking2 = left.booking) === null || _left$booking2 === void 0 || (_left$booking2 = _left$booking2.metadata) === null || _left$booking2 === void 0 ? void 0 : _left$booking2.unique_identification_number, (_left$booking3 = left.booking) === null || _left$booking3 === void 0 ? void 0 : _left$booking3.booking_uid), firstPresentValue((_right$booking2 = right.booking) === null || _right$booking2 === void 0 || (_right$booking2 = _right$booking2.metadata) === null || _right$booking2 === void 0 ? void 0 : _right$booking2.unique_identification_number, (_right$booking3 = right.booking) === null || _right$booking3 === void 0 ? void 0 : _right$booking3.booking_uid));
     return bookingUidOrder || left.index - right.index;
-  }).map(function (_ref41) {
-    var booking = _ref41.booking;
+  }).map(function (_ref42) {
+    var booking = _ref42.booking;
     return booking;
   });
 }
@@ -1037,7 +1041,9 @@ function buildPaymentData(params) {
       payment: payment,
       locale: params.locale,
       currencySymbol: params.currencySymbol,
-      includeFundRecordBalance: false
+      includeFundRecordBalance: false,
+      includeFundRecordUsage: true,
+      includePaymentAmount: true
     });
   });
 }
@@ -1054,8 +1060,8 @@ function buildRefundData(params) {
       result.set(identity, candidate);
     }
     return result;
-  }, new Map()).values()).filter(function (_ref42) {
-    var refund = _ref42.refund;
+  }, new Map()).values()).filter(function (_ref43) {
+    var refund = _ref43.refund;
     return isPrintableRefund(refund);
   }).sort(function (left, right) {
     var leftTime = refundTimestamp(left.refund);
@@ -1063,9 +1069,9 @@ function buildRefundData(params) {
     if (leftTime !== rightTime) return leftTime < rightTime ? -1 : 1;
     return left.index - right.index;
   });
-  return refunds.map(function (_ref43) {
+  return refunds.map(function (_ref44) {
     var _firstPresentValue7;
-    var refund = _ref43.refund;
+    var refund = _ref44.refund;
     var payment = resolveRefundPayment(refund, payments);
     var methodName = paymentMethodName(payment, params.locale) || label(params.locale, 'refund');
     var amount = (_firstPresentValue7 = firstPresentValue(refund.amount, refund.refund_amount, refund.total_amount)) !== null && _firstPresentValue7 !== void 0 ? _firstPresentValue7 : 0;
@@ -1133,7 +1139,9 @@ function buildWallets(params) {
       payment: payment,
       locale: params.locale,
       currencySymbol: params.currencySymbol,
-      includeFundRecordBalance: true
+      includeFundRecordBalance: true,
+      includeFundRecordUsage: false,
+      includePaymentAmount: false
     });
   });
   var displayedWalletPassIds = collectDisplayedWalletPassIds(displayedWalletPayments);
@@ -1254,11 +1262,13 @@ function buildPaymentItems(params) {
   var payment = params.payment,
     locale = params.locale,
     currencySymbol = params.currencySymbol,
-    includeFundRecordBalance = params.includeFundRecordBalance;
+    includeFundRecordBalance = params.includeFundRecordBalance,
+    includeFundRecordUsage = params.includeFundRecordUsage,
+    includePaymentAmount = params.includePaymentAmount;
   var serviceFee = getPaymentServiceFee(payment);
   var items = [{
     item: paymentMethodName(payment, locale),
-    value: formatMoney(resolveReceiptPaymentAmount(payment, serviceFee), currencySymbol)
+    value: includePaymentAmount ? formatMoney(resolveReceiptPaymentAmount(payment, serviceFee), currencySymbol) : ''
   }];
   items.push.apply(items, _toConsumableArray(buildCashChangePaymentItems({
     payment: payment,
@@ -1278,11 +1288,12 @@ function buildPaymentItems(params) {
       fundRecord: fundRecord,
       locale: locale,
       currencySymbol: currencySymbol,
-      includeBalance: includeFundRecordBalance
+      includeBalance: includeFundRecordBalance,
+      includeUsage: includeFundRecordUsage
     })));
   } else {
-    var _ref44, _payment$remaining_am, _payment$metadata;
-    var remainingAmount = (_ref44 = (_payment$remaining_am = payment.remaining_amount) !== null && _payment$remaining_am !== void 0 ? _payment$remaining_am : payment.balance) !== null && _ref44 !== void 0 ? _ref44 : (_payment$metadata = payment.metadata) === null || _payment$metadata === void 0 ? void 0 : _payment$metadata.remaining_amount;
+    var _ref45, _payment$remaining_am, _payment$metadata;
+    var remainingAmount = (_ref45 = (_payment$remaining_am = payment.remaining_amount) !== null && _payment$remaining_am !== void 0 ? _payment$remaining_am : payment.balance) !== null && _ref45 !== void 0 ? _ref45 : (_payment$metadata = payment.metadata) === null || _payment$metadata === void 0 ? void 0 : _payment$metadata.remaining_amount;
     if (remainingAmount !== undefined && remainingAmount !== null) {
       items.push({
         item: label(locale, 'remainingAmount'),
@@ -1342,16 +1353,19 @@ function buildFundRecordPaymentItems(params) {
     fundRecord = params.fundRecord,
     locale = params.locale,
     currencySymbol = params.currencySymbol,
-    includeBalance = params.includeBalance;
+    includeBalance = params.includeBalance,
+    includeUsage = params.includeUsage;
   var items = [];
   var usingBeforeValue = fundRecord.using_before_value;
   var usingAfterValue = fundRecord.using_after_value;
   if (isPointCardPayment(payment) && usingBeforeValue !== undefined && usingAfterValue !== undefined) {
     var usedPoints = new Decimal(toMoneyNumber(usingBeforeValue)).minus(toMoneyNumber(usingAfterValue));
-    items.push({
-      item: label(locale, 'redeemPoints'),
-      value: trimDecimal(usedPoints)
-    });
+    if (includeUsage) {
+      items.push({
+        item: label(locale, 'redeemPoints'),
+        value: trimDecimal(usedPoints)
+      });
+    }
     if (includeBalance) {
       items.push({
         item: label(locale, 'remainingPoints'),
@@ -1362,7 +1376,7 @@ function buildFundRecordPaymentItems(params) {
   }
   if (includeBalance && usingAfterValue !== undefined && usingAfterValue !== null) {
     items.push({
-      item: label(locale, 'remainingAmount'),
+      item: label(locale, 'balance'),
       value: formatMoney(usingAfterValue, currencySymbol)
     });
   }
@@ -1433,12 +1447,12 @@ function label(locale, key) {
   return ((_LABELS$locale = LABELS[locale]) === null || _LABELS$locale === void 0 ? void 0 : _LABELS$locale[key]) || LABELS.en[key] || key;
 }
 function getLocalizedValue(value, locale) {
-  var _ref45, _ref46, _ref47, _ref48, _ref49, _ref50, _value$locale2;
+  var _ref46, _ref47, _ref48, _ref49, _ref50, _ref51, _value$locale2;
   if (value === undefined || value === null) return '';
   if (_typeof(value) !== 'object') return stringify(value);
   var dashedLocale = locale.replace('_', '-');
   var underscoredLocale = locale.replace('-', '_');
-  return stringify((_ref45 = (_ref46 = (_ref47 = (_ref48 = (_ref49 = (_ref50 = (_value$locale2 = value[locale]) !== null && _value$locale2 !== void 0 ? _value$locale2 : value[dashedLocale]) !== null && _ref50 !== void 0 ? _ref50 : value[underscoredLocale]) !== null && _ref49 !== void 0 ? _ref49 : value.original) !== null && _ref48 !== void 0 ? _ref48 : value.auto) !== null && _ref47 !== void 0 ? _ref47 : value.default) !== null && _ref46 !== void 0 ? _ref46 : value.en) !== null && _ref45 !== void 0 ? _ref45 : '');
+  return stringify((_ref46 = (_ref47 = (_ref48 = (_ref49 = (_ref50 = (_ref51 = (_value$locale2 = value[locale]) !== null && _value$locale2 !== void 0 ? _value$locale2 : value[dashedLocale]) !== null && _ref51 !== void 0 ? _ref51 : value[underscoredLocale]) !== null && _ref50 !== void 0 ? _ref50 : value.original) !== null && _ref49 !== void 0 ? _ref49 : value.auto) !== null && _ref48 !== void 0 ? _ref48 : value.default) !== null && _ref47 !== void 0 ? _ref47 : value.en) !== null && _ref46 !== void 0 ? _ref46 : '');
 }
 function resolveServiceTypeLabelKey(serviceType, order) {
   var normalized = serviceType.trim().toLowerCase().replace(/[\s-]+/g, '_');

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

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

package/dist/utils/os-private-payload.d.ts

@@ -0,0 +1,5 @@
+/**
+ * Remove top-level fields reserved for communication with the PisellOS proxy.
+ * Nested business payloads are intentionally left untouched.
+ */
+export declare function stripOsPrivatePayloadFields<T>(data: T): T;

package/dist/utils/os-private-payload.js

@@ -0,0 +1,17 @@
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+import { cloneDeep } from 'lodash-es';
+var OS_PRIVATE_FIELD_PREFIX = '_os_';
+
+/**
+ * Remove top-level fields reserved for communication with the PisellOS proxy.
+ * Nested business payloads are intentionally left untouched.
+ */
+export function stripOsPrivatePayloadFields(data) {
+  var next = cloneDeep(data);
+  if (!next || _typeof(next) !== 'object' || Array.isArray(next)) return next;
+  var record = next;
+  Object.keys(record).forEach(function (key) {
+    if (key.startsWith(OS_PRIVATE_FIELD_PREFIX)) delete record[key];
+  });
+  return next;
+}

package/lib/modules/Order/index.d.ts

@@ -566,6 +566,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
      */
     createOrderByCheckout(params: CheckoutOrderParams): Promise<any>;
     submitSalesOrder<T = any>(params: SubmitSalesOrderParams): Promise<T>;
+    private isSalesCheckoutHandledByOsServer;
     /**
      * 发送支付链接邮件。
      *

package/lib/modules/Order/index.js

@@ -9,6 +9,7 @@ var _types = require("./types");
 var _utils = require("./utils");
 var _utils2 = require("../Product/utils");
 var _dayjs = _interopRequireDefault(require("dayjs"));
+var _osPrivatePayload = require("../../utils/os-private-payload");
 var _paymentUtils = require("./payment-utils");
 var _paymentNumber = require("../../utils/payment-number");
 var _cartPromotion = require("../../solution/BaseSales/utils/cartPromotion");
@@ -4358,11 +4359,21 @@ class OrderModule extends _BaseModule.BaseModule {
       query
     } = params;
     const fetchUrl = url || '/order/sales/checkout';
-    return this.request.post(fetchUrl, query, {
+    const requestQuery = this.isSalesCheckoutHandledByOsServer(fetchUrl) ? query : (0, _osPrivatePayload.stripOsPrivatePayloadFields)(query);
+    return this.request.post(fetchUrl, requestQuery, {
       osServer: true,
       customToast: () => {}
     });
   }
+  isSalesCheckoutHandledByOsServer(fetchUrl) {
+    const server = this.core?.server;
+    if (!server || typeof server.hasRoute !== 'function') return false;
+    const requestBaseUrl = String(this.request?.baseUrl || '/shop').replace(/\/+$/, '');
+    if (!requestBaseUrl.startsWith('/')) return false;
+    const normalizedFetchUrl = fetchUrl.startsWith('/') ? fetchUrl : `/${fetchUrl}`;
+    const routePath = normalizedFetchUrl === requestBaseUrl || normalizedFetchUrl.startsWith(`${requestBaseUrl}/`) ? normalizedFetchUrl : `${requestBaseUrl}${normalizedFetchUrl}`;
+    return server.hasRoute('post', routePath) === true;
+  }
 
   /**
    * 发送支付链接邮件。

package/lib/server/index.js

@@ -28,6 +28,7 @@ var _smallTicket = require("./utils/small-ticket");
 var _BaseSales = require("../solution/BaseSales");
 var _paymentUtils = require("../modules/Order/payment-utils");
 var _orderCollectionIdentity = require("../modules/Order/utils/orderCollectionIdentity");
+var _osPrivatePayload = require("../utils/os-private-payload");
 var _OpenData = require("../modules/OpenData");
 var _modules = require("./modules");
 Object.keys(_modules).forEach(function (key) {
@@ -642,7 +643,7 @@ class Server {
     } = params;
     const normalizedData = await this.normalizeCheckoutSubmitData(params.data, title);
     const numberedData = await this.ensureCheckoutOrderNumbers(normalizedData, title);
-    const checkoutData = this.normalizeCheckoutCollections(this.applyCheckoutFulfillmentBuzzer(numberedData, title));
+    const checkoutData = this.normalizeCheckoutCollections((0, _osPrivatePayload.stripOsPrivatePayloadFields)(this.applyCheckoutFulfillmentBuzzer(numberedData, title)));
     const remoteCheckoutData = this.buildRemoteCheckoutData(checkoutData, title);
     const deviceHeaders = await this.buildCheckoutDeviceHeaders(title);
     if (!this.app?.request?.post) {
@@ -714,11 +715,9 @@ class Server {
     return next;
   }
   buildRemoteCheckoutData(data, title) {
-    const next = (0, _lodashEs.cloneDeep)(this.omitCheckoutSyncMode(data));
+    const next = (0, _osPrivatePayload.stripOsPrivatePayloadFields)(this.omitCheckoutSyncMode(data));
     if (!next || typeof next !== 'object') return next;
     const record = next;
-    delete record[OS_FULFILLMENT_REF_MODE_FIELD];
-    delete record[OS_INVOICE_LAYOUT_CONFIG_FIELD];
     this.applyKioskCheckoutOperator(record);
     if (!Array.isArray(record.payments)) return next;
     const originalPayments = record.payments;
@@ -4294,7 +4293,7 @@ class Server {
     }
     const normalizedData = await this.normalizeCheckoutSubmitData(data, title);
     const numberedData = await this.ensureCheckoutOrderNumbers(normalizedData, title);
-    const checkoutData = this.normalizeCheckoutCollections(this.applyCheckoutFulfillmentBuzzer(numberedData, title));
+    const checkoutData = this.normalizeCheckoutCollections((0, _osPrivatePayload.stripOsPrivatePayloadFields)(this.applyCheckoutFulfillmentBuzzer(numberedData, title)));
     const pendingResult = await this.handlePendingSyncCheckoutOrder({
       backendPath,
       data: checkoutData,

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

@@ -31,7 +31,7 @@ const LABELS = {
     balance: 'Balance',
     remainingAmount: 'Remaining amount',
     redeemPoints: 'Redeem points',
-    remainingPoints: 'Remaining points',
+    remainingPoints: 'Point Balance',
     table: 'Table',
     orderDiscount: 'Order discount',
     manualDiscount: 'Manual discount',
@@ -64,7 +64,7 @@ const LABELS = {
     balance: '余额',
     remainingAmount: '剩余金额',
     redeemPoints: '本次使用积分',
-    remainingPoints: '剩余积分',
+    remainingPoints: '积分余额',
     table: '桌台',
     orderDiscount: '整单折扣',
     manualDiscount: '手动折扣',
@@ -97,7 +97,7 @@ const LABELS = {
     balance: '餘額',
     remainingAmount: '剩餘金額',
     redeemPoints: '本次使用積分',
-    remainingPoints: '剩餘積分',
+    remainingPoints: '積分餘額',
     table: '桌台',
     orderDiscount: '整單折扣',
     manualDiscount: '手動折扣',
@@ -128,7 +128,7 @@ const LABELS = {
     balance: '残高',
     remainingAmount: '残高',
     redeemPoints: '利用ポイント',
-    remainingPoints: '残りポイント',
+    remainingPoints: 'ポイント残高',
     table: 'テーブル',
     orderDiscount: '注文割引',
     manualDiscount: '手動割引',
@@ -160,7 +160,7 @@ const LABELS = {
     balance: 'Saldo',
     remainingAmount: 'Saldo restante',
     redeemPoints: 'Pontos utilizados',
-    remainingPoints: 'Pontos restantes',
+    remainingPoints: 'Saldo de pontos',
     table: 'Mesa',
     orderDiscount: 'Desconto do pedido',
     manualDiscount: 'Desconto manual',
@@ -371,7 +371,10 @@ function normalizeProductDiscounts(params) {
     currencySymbol,
     quantity
   } = params;
-  return normalizeArray(product.discount_list).map(discount => {
+  return normalizeArray(product.discount_list).filter(discount => {
+    const amount = discount.amount ?? discount.value ?? discount.discount_amount;
+    return isNonZero(amount);
+  }).map(discount => {
     const title = resolveDiscountTitleWithPercent(discount, locale);
     const amount = discount.amount ?? discount.value ?? discount.discount_amount;
     const formattedAmount = formatNegativeMoney(new _decimal.default(toMoneyNumber(amount)).mul(quantity), currencySymbol);
@@ -1004,7 +1007,9 @@ function buildPaymentData(params) {
     payment,
     locale: params.locale,
     currencySymbol: params.currencySymbol,
-    includeFundRecordBalance: false
+    includeFundRecordBalance: false,
+    includeFundRecordUsage: true,
+    includePaymentAmount: true
   }));
 }
 function buildRefundData(params) {
@@ -1093,7 +1098,9 @@ function buildWallets(params) {
     payment,
     locale: params.locale,
     currencySymbol: params.currencySymbol,
-    includeFundRecordBalance: true
+    includeFundRecordBalance: true,
+    includeFundRecordUsage: false,
+    includePaymentAmount: false
   }));
   const displayedWalletPassIds = collectDisplayedWalletPassIds(displayedWalletPayments);
   return [...paymentWallets, ...buildVoucherAssets(params), ...buildPointCardSnapshotAssets({
@@ -1212,12 +1219,14 @@ function buildPaymentItems(params) {
     payment,
     locale,
     currencySymbol,
-    includeFundRecordBalance
+    includeFundRecordBalance,
+    includeFundRecordUsage,
+    includePaymentAmount
   } = params;
   const serviceFee = getPaymentServiceFee(payment);
   const items = [{
     item: paymentMethodName(payment, locale),
-    value: formatMoney(resolveReceiptPaymentAmount(payment, serviceFee), currencySymbol)
+    value: includePaymentAmount ? formatMoney(resolveReceiptPaymentAmount(payment, serviceFee), currencySymbol) : ''
   }];
   items.push(...buildCashChangePaymentItems({
     payment,
@@ -1237,7 +1246,8 @@ function buildPaymentItems(params) {
       fundRecord,
       locale,
       currencySymbol,
-      includeBalance: includeFundRecordBalance
+      includeBalance: includeFundRecordBalance,
+      includeUsage: includeFundRecordUsage
     }));
   } else {
     const remainingAmount = payment.remaining_amount ?? payment.balance ?? payment.metadata?.remaining_amount;
@@ -1301,17 +1311,20 @@ function buildFundRecordPaymentItems(params) {
     fundRecord,
     locale,
     currencySymbol,
-    includeBalance
+    includeBalance,
+    includeUsage
   } = params;
   const items = [];
   const usingBeforeValue = fundRecord.using_before_value;
   const usingAfterValue = fundRecord.using_after_value;
   if (isPointCardPayment(payment) && usingBeforeValue !== undefined && usingAfterValue !== undefined) {
     const usedPoints = new _decimal.default(toMoneyNumber(usingBeforeValue)).minus(toMoneyNumber(usingAfterValue));
-    items.push({
-      item: label(locale, 'redeemPoints'),
-      value: trimDecimal(usedPoints)
-    });
+    if (includeUsage) {
+      items.push({
+        item: label(locale, 'redeemPoints'),
+        value: trimDecimal(usedPoints)
+      });
+    }
     if (includeBalance) {
       items.push({
         item: label(locale, 'remainingPoints'),
@@ -1322,7 +1335,7 @@ function buildFundRecordPaymentItems(params) {
   }
   if (includeBalance && usingAfterValue !== undefined && usingAfterValue !== null) {
     items.push({
-      item: label(locale, 'remainingAmount'),
+      item: label(locale, 'balance'),
       value: formatMoney(usingAfterValue, currencySymbol)
     });
   }

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

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

package/lib/utils/os-private-payload.d.ts

@@ -0,0 +1,5 @@
+/**
+ * Remove top-level fields reserved for communication with the PisellOS proxy.
+ * Nested business payloads are intentionally left untouched.
+ */
+export declare function stripOsPrivatePayloadFields<T>(data: T): T;

package/lib/utils/os-private-payload.js

@@ -0,0 +1,22 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.stripOsPrivatePayloadFields = stripOsPrivatePayloadFields;
+var _lodashEs = require("lodash-es");
+const OS_PRIVATE_FIELD_PREFIX = '_os_';
+
+/**
+ * Remove top-level fields reserved for communication with the PisellOS proxy.
+ * Nested business payloads are intentionally left untouched.
+ */
+function stripOsPrivatePayloadFields(data) {
+  const next = (0, _lodashEs.cloneDeep)(data);
+  if (!next || typeof next !== 'object' || Array.isArray(next)) return next;
+  const record = next;
+  Object.keys(record).forEach(key => {
+    if (key.startsWith(OS_PRIVATE_FIELD_PREFIX)) delete record[key];
+  });
+  return next;
+}

package/package.json

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