@pisell/pisellos 2.2.243 → 2.2.245

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

@@ -180,6 +180,9 @@ export interface OrderProductSku {
     option: any[];
     [key: string]: any;
 }
+export interface OrderLocalizedText {
+    [locale: string]: string | null;
+}
 export interface OrderProduct extends OrderProductIdentity {
     order_detail_id: number | null;
     num: number;
@@ -193,6 +196,7 @@ export interface OrderProduct extends OrderProductIdentity {
     discount_list: OrderProductDiscountItem[];
     product_bundle: any[];
     booking_uid?: string;
+    product_title?: OrderLocalizedText;
     metadata: Record<string, any>;
     note?: string;
 }
@@ -212,6 +216,7 @@ export interface OrderSummary {
     deposit?: {
         total: string;
         deposit_policy_ids: number[];
+        deposit_policy_data?: any[];
         hasDeposit: boolean;
     };
     expect_amount: string;
@@ -479,6 +484,7 @@ export interface OrderPaymentData {
     amount: string;
     code: string;
     custom_payment_id: number;
+    custom_payment_type?: string;
     name: string;
     type: string;
     voucher_id?: string | number;
@@ -648,6 +654,7 @@ export interface OrderModuleAPI {
         (note: string, sync: boolean): string | Promise<string>;
     };
     updateTempOrderShopDiscount: (amount: string | number) => string;
+    updateTempOrderDepositAmount: (amount: string | number) => OrderSummary;
     updateTempOrderCustomer: (customer: UpdateTempOrderCustomerInput) => OrderSnapshot['customer'];
     updateTempOrderBuzzer: (buzzer: string) => string;
     updateTempOrderContactsInfo: (contactsInfo: Record<string, any> | null) => Record<string, any> | null;

package/dist/modules/Order/utils.js

@@ -1121,12 +1121,15 @@ export function mapPaymentItemToOrderPayment(paymentItem) {
   var timestamp = dayjs().format('YYYY-MM-DD HH:mm:ss');
   var paymentTime = (_item$payment_time = item.payment_time) !== null && _item$payment_time !== void 0 ? _item$payment_time : timestamp;
   var createdAt = (_item$created_at = item.created_at) !== null && _item$created_at !== void 0 ? _item$created_at : timestamp;
-  return _objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread({}, item.order_payment_id !== undefined ? {
+  return _objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread({}, item.order_payment_id !== undefined ? {
     order_payment_id: item.order_payment_id
   } : {}), {}, {
     amount: String((_item$amount = item.amount) !== null && _item$amount !== void 0 ? _item$amount : '0.00'),
     code: String(item.code || ''),
-    custom_payment_id: Number(customPaymentId !== null && customPaymentId !== void 0 ? customPaymentId : 0),
+    custom_payment_id: Number(customPaymentId !== null && customPaymentId !== void 0 ? customPaymentId : 0)
+  }, item.custom_payment_type !== undefined ? {
+    custom_payment_type: String(item.custom_payment_type)
+  } : {}), {}, {
     name: String(item.name || ''),
     type: String(item.type || '')
   }, item.voucher_id !== undefined ? {

package/dist/modules/Payment/walletpass.js

@@ -363,10 +363,13 @@ export var WalletPassPaymentImpl = /*#__PURE__*/function () {
                 sale_channel: params.sale_channel,
                 payment_order_id: (_this$walletParams = this.walletParams) === null || _this$walletParams === void 0 ? void 0 : _this$walletParams.payment_order_id
               });
-              _context4.next = 4;
+              if (typeof params.payment_order_id === 'string' && params.payment_order_id.startsWith('LOCAL_')) {
+                params.payment_order_id = undefined;
+              }
+              _context4.next = 5;
               return this.paymentModule.request.post('/machinecode/prepare/deduction/recommend', params // 将 params 作为请求体数据
               );
-            case 4:
+            case 5:
               response = _context4.sent;
               this.walletRecommendList = (response === null || response === void 0 ? void 0 : response.data) || [];
 
@@ -386,8 +389,8 @@ export var WalletPassPaymentImpl = /*#__PURE__*/function () {
                 })
               });
               return _context4.abrupt("return", this.walletRecommendList);
-            case 11:
-              _context4.prev = 11;
+            case 12:
+              _context4.prev = 12;
               _context4.t0 = _context4["catch"](0);
               this.paymentModule.logError('[WalletPass] 获取钱包推荐列表失败', _context4.t0, {
                 customer_id: params.customer_id,
@@ -396,11 +399,11 @@ export var WalletPassPaymentImpl = /*#__PURE__*/function () {
               });
               // throw error;
               return _context4.abrupt("return", []);
-            case 15:
+            case 16:
             case "end":
               return _context4.stop();
           }
-        }, _callee4, this, [[0, 11]]);
+        }, _callee4, this, [[0, 12]]);
       }));
       function getWalletPassRecommendListAsync(_x4) {
         return _getWalletPassRecommendListAsync.apply(this, arguments);
@@ -429,6 +432,9 @@ export var WalletPassPaymentImpl = /*#__PURE__*/function () {
               this.paymentModule.logInfo('[WalletPass] 商品列表为空，跳过获取用户识别码列表');
               return _context5.abrupt("return", []);
             case 5:
+              if (typeof newParams.payment_order_id === 'string' && newParams.payment_order_id.startsWith('LOCAL_')) {
+                newParams.payment_order_id = undefined;
+              }
               this.paymentModule.logInfo('[WalletPass] 开始获取用户识别码列表', {
                 customer_id: newParams.customer_id,
                 available: newParams.available,
@@ -436,9 +442,9 @@ export var WalletPassPaymentImpl = /*#__PURE__*/function () {
                 filter_prepare_wallet_pass: newParams.filter_prepare_wallet_pass,
                 payment_order_id: (_this$walletParams2 = this.walletParams) === null || _this$walletParams2 === void 0 ? void 0 : _this$walletParams2.payment_order_id
               });
-              _context5.next = 8;
+              _context5.next = 9;
               return this.paymentModule.request.post('/machinecode/prepare/deduction', newParams);
-            case 8:
+            case 9:
               response = _context5.sent;
               // 对获取到的数据进行排序，将错误码为 500100、500200、500300 的项目排到最后
               sortedData = sortUserIdentificationCodeList((response === null || response === void 0 ? void 0 : response.data) || []);
@@ -459,19 +465,19 @@ export var WalletPassPaymentImpl = /*#__PURE__*/function () {
                 })
               });
               return _context5.abrupt("return", this.userIdentificationCodes);
-            case 16:
-              _context5.prev = 16;
+            case 17:
+              _context5.prev = 17;
               _context5.t0 = _context5["catch"](0);
               this.paymentModule.logError('[WalletPass] 获取用户识别码列表失败', _context5.t0, {
                 customer_id: params.customer_id,
                 available: params.available
               });
               return _context5.abrupt("return", []);
-            case 20:
+            case 21:
             case "end":
               return _context5.stop();
           }
-        }, _callee5, this, [[0, 16]]);
+        }, _callee5, this, [[0, 17]]);
       }));
       function getUserIdentificationCodeListAsync(_x5) {
         return _getUserIdentificationCodeListAsync.apply(this, arguments);
@@ -572,31 +578,34 @@ export var WalletPassPaymentImpl = /*#__PURE__*/function () {
                 multiple: searchParams.multiple,
                 payment_order_id: baseWalletParams === null || baseWalletParams === void 0 ? void 0 : baseWalletParams.payment_order_id
               });
+              if (typeof searchParams.payment_order_id === 'string' && searchParams.payment_order_id.startsWith('LOCAL_')) {
+                searchParams.payment_order_id = undefined;
+              }
               if (!(!searchParams.products || ((_ref = searchParams.products || []) === null || _ref === void 0 ? void 0 : _ref.length) === 0)) {
-                _context6.next = 21;
+                _context6.next = 22;
                 break;
               }
               response = {
                 data: []
               };
-              _context6.next = 24;
+              _context6.next = 25;
               break;
-            case 21:
-              _context6.next = 23;
+            case 22:
+              _context6.next = 24;
               return this.paymentModule.request.post('/machinecode/prepare/deduction/search', searchParams);
-            case 23:
-              response = _context6.sent;
             case 24:
+              response = _context6.sent;
+            case 25:
               searchResults = ((_response2 = response) === null || _response2 === void 0 ? void 0 : _response2.data) || [];
               if (!config.noCache) {
-                _context6.next = 27;
+                _context6.next = 28;
                 break;
               }
               return _context6.abrupt("return", {
                 type: 'normalCode',
                 data: searchResults
               });
-            case 27:
+            case 28:
               // 将搜索结果存储到缓存数组中
               if (searchResults.length > 0) {
                 // 避免重复存储相同的识别码
@@ -626,8 +635,8 @@ export var WalletPassPaymentImpl = /*#__PURE__*/function () {
                 type: 'normalCode',
                 data: searchResults
               });
-            case 33:
-              _context6.prev = 33;
+            case 34:
+              _context6.prev = 34;
               _context6.t0 = _context6["catch"](1);
               this.paymentModule.logError('[WalletPass] 搜索识别码信息失败', _context6.t0, {
                 code: params.code,
@@ -635,11 +644,11 @@ export var WalletPassPaymentImpl = /*#__PURE__*/function () {
                 order_expect_amount: params.order_expect_amount
               });
               throw _context6.t0;
-            case 37:
+            case 38:
             case "end":
               return _context6.stop();
           }
-        }, _callee6, this, [[1, 33]]);
+        }, _callee6, this, [[1, 34]]);
       }));
       function searchIdentificationCodeAsync(_x6) {
         return _searchIdentificationCodeAsync.apply(this, arguments);

package/dist/modules/Rules/index.js

@@ -18,6 +18,8 @@ function _asyncToGenerator(fn) { return function () { var self = this, args = ar
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, _toPropertyKey(descriptor.key), descriptor); } }
 function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
+function _get() { if (typeof Reflect !== "undefined" && Reflect.get) { _get = Reflect.get.bind(); } else { _get = function _get(target, property, receiver) { var base = _superPropBase(target, property); if (!base) return; var desc = Object.getOwnPropertyDescriptor(base, property); if (desc.get) { return desc.get.call(arguments.length < 3 ? target : receiver); } return desc.value; }; } return _get.apply(this, arguments); }
+function _superPropBase(object, property) { while (!Object.prototype.hasOwnProperty.call(object, property)) { object = _getPrototypeOf(object); if (object === null) break; } return object; }
 function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); Object.defineProperty(subClass, "prototype", { writable: false }); if (superClass) _setPrototypeOf(subClass, superClass); }
 function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
@@ -2266,7 +2268,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
               return this.core.effects.emit("".concat(this.name, ":onDestroy"), {});
             case 3:
               console.log('[Rules] 已销毁');
-            case 4:
+              _get(_getPrototypeOf(RulesModule.prototype), "destroy", this).call(this);
+            case 5:
             case "end":
               return _context3.stop();
           }

package/dist/server/index.js

@@ -3994,9 +3994,11 @@ var Server = /*#__PURE__*/function () {
                 shop_order_number: next.shop_order_number,
                 shop_full_order_number: next.shop_full_order_number
               });
+              // 删除 数据体中的 vouchers,对小票和后端来说他们不需要，这个字段只是单向同步给前端用的，而且目前对订单来说还没什么用
+              delete next.vouchers;
               return _context42.abrupt("return", next);
-            case 27:
-              _context42.prev = 27;
+            case 28:
+              _context42.prev = 28;
               _context42.t0 = _context42["catch"](16);
               this.logWarning("".concat(title, ": checkout \u67E5\u627E\u672C\u5730\u8BA2\u5355\u5931\u8D25"), {
                 external_sale_number: externalSaleNumber,
@@ -4004,11 +4006,11 @@ var Server = /*#__PURE__*/function () {
                 error_detail: this.normalizeUnknownError(_context42.t0)
               });
               return _context42.abrupt("return", next);
-            case 31:
+            case 32:
             case "end":
               return _context42.stop();
           }
-        }, _callee42, this, [[16, 27]]);
+        }, _callee42, this, [[16, 28]]);
       }));
       function normalizeCheckoutSubmitData(_x44, _x45) {
         return _normalizeCheckoutSubmitData.apply(this, arguments);

package/dist/server/modules/order/index.d.ts

@@ -73,6 +73,7 @@ export declare class OrderModule extends BaseModule implements Module {
      * // => { route: 'httpRefresh.batchIds', ... }
      */
     private resolveSyncMessageRoute;
+    private updateCreateStore;
     private getOrderSyncThrottleMs;
     preload(): Promise<void>;
     getOrders(): OrderData[];

package/dist/server/modules/order/index.js

@@ -128,7 +128,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       var _initialize = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(core, options) {
         var _options$initialState,
           _this3 = this;
-        var appPlugin, app, _this$store$createdAt, coreData, today, operatingDayBoundary, boundaryTime, boundaryStart, isAfterBoundary, queryStart, queryEnd;
+        var appPlugin, app;
         return _regeneratorRuntime().wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
@@ -141,39 +141,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 this.dbManager = app.sqlite;
                 this.logger = app.logger;
                 this.storage = app.storage;
-                coreData = app.data.store.getStore().getDataByModel('core');
-                if (!((_this$store$createdAt = this.store.createdAtQuery) !== null && _this$store$createdAt !== void 0 && _this$store$createdAt.sales_time_between) && coreData !== null && coreData !== void 0 && coreData.core) {
-                  today = dayjs();
-                  if (coreData !== null && coreData !== void 0 && coreData.core.operating_day_boundary) {
-                    operatingDayBoundary = coreData.core.operating_day_boundary;
-                    if (operatingDayBoundary.type === 'start_time') {
-                      boundaryTime = String(operatingDayBoundary.time || '').trim();
-                      boundaryStart = dayjs("".concat(today.format('YYYY-MM-DD'), " ").concat(boundaryTime));
-                      if (boundaryStart.isValid()) {
-                        isAfterBoundary = today.isAfter(boundaryStart);
-                        queryStart = isAfterBoundary ? today.startOf('day') : today.subtract(1, 'day').startOf('day');
-                        queryEnd = isAfterBoundary ? today.add(1, 'day').endOf('day') : today.endOf('day');
-                        this.store.createdAtQuery = {
-                          sales_time_between: [queryStart.format('YYYY-MM-DD HH:mm:ss'), queryEnd.format('YYYY-MM-DD HH:mm:ss')]
-                        };
-                      } else {
-                        // 边界时间异常时回退到自然日，避免 createdAtQuery 为空导致后续查询异常
-                        this.store.createdAtQuery = {
-                          sales_time_between: [today.startOf('day').format('YYYY-MM-DD HH:mm:ss'), today.endOf('day').format('YYYY-MM-DD HH:mm:ss')]
-                        };
-                      }
-                    } else {
-                      this.store.createdAtQuery = {
-                        sales_time_between: [today.startOf('day').format('YYYY-MM-DD HH:mm:ss'), today.endOf('day').format('YYYY-MM-DD HH:mm:ss')]
-                      };
-                    }
-                  } else {
-                    // TODO: 这里后续可能需要使用店铺营业时间查询
-                    this.store.createdAtQuery = {
-                      sales_time_between: [today.startOf('day').format('YYYY-MM-DD HH:mm:ss'), today.endOf('day').format('YYYY-MM-DD HH:mm:ss')]
-                    };
-                  }
-                }
+                this.updateCreateStore();
               }
               if (Array.isArray(options === null || options === void 0 || (_options$initialState = options.initialState) === null || _options$initialState === void 0 ? void 0 : _options$initialState.list)) {
                 this.store.list = options.initialState.list.map(function (order) {
@@ -469,6 +437,48 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         bodyOrderId: (_normalizedBody$order5 = normalizedBody === null || normalizedBody === void 0 ? void 0 : normalizedBody.order_id) !== null && _normalizedBody$order5 !== void 0 ? _normalizedBody$order5 : null
       };
     }
+  }, {
+    key: "updateCreateStore",
+    value: function updateCreateStore() {
+      var appPlugin = this.core.getPlugin('app');
+      var app = appPlugin === null || appPlugin === void 0 ? void 0 : appPlugin.getApp();
+      if (app) {
+        var _this$store$createdAt;
+        var coreData = app.data.store.getStore().getDataByModel('core');
+        if (!((_this$store$createdAt = this.store.createdAtQuery) !== null && _this$store$createdAt !== void 0 && _this$store$createdAt.sales_time_between) && coreData !== null && coreData !== void 0 && coreData.core) {
+          var today = dayjs();
+          if (coreData !== null && coreData !== void 0 && coreData.core.operating_day_boundary) {
+            var operatingDayBoundary = coreData.core.operating_day_boundary;
+            if (operatingDayBoundary.type === 'start_time') {
+              var boundaryTime = String(operatingDayBoundary.time || '').trim();
+              var boundaryStart = dayjs("".concat(today.format('YYYY-MM-DD'), " ").concat(boundaryTime));
+              if (boundaryStart.isValid()) {
+                var isAfterBoundary = today.isAfter(boundaryStart);
+                var queryStart = isAfterBoundary ? today.startOf('day') : today.subtract(1, 'day').startOf('day');
+                var queryEnd = isAfterBoundary ? today.add(1, 'day').endOf('day') : today.endOf('day');
+                this.store.createdAtQuery = {
+                  sales_time_between: [queryStart.format('YYYY-MM-DD HH:mm:ss'), queryEnd.format('YYYY-MM-DD HH:mm:ss')]
+                };
+              } else {
+                // 边界时间异常时回退到自然日，避免 createdAtQuery 为空导致后续查询异常
+                this.store.createdAtQuery = {
+                  sales_time_between: [today.startOf('day').format('YYYY-MM-DD HH:mm:ss'), today.endOf('day').format('YYYY-MM-DD HH:mm:ss')]
+                };
+              }
+            } else {
+              this.store.createdAtQuery = {
+                sales_time_between: [today.startOf('day').format('YYYY-MM-DD HH:mm:ss'), today.endOf('day').format('YYYY-MM-DD HH:mm:ss')]
+              };
+            }
+          } else {
+            // TODO: 这里后续可能需要使用店铺营业时间查询
+            this.store.createdAtQuery = {
+              sales_time_between: [today.startOf('day').format('YYYY-MM-DD HH:mm:ss'), today.endOf('day').format('YYYY-MM-DD HH:mm:ss')]
+            };
+          }
+        }
+      }
+    }
   }, {
     key: "getOrderSyncThrottleMs",
     value: function getOrderSyncThrottleMs() {
@@ -718,32 +728,34 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
             case 4:
               this.logInfo('silentRefresh 开始');
               _context7.prev = 5;
-              _context7.next = 8;
+              // 刷新前，需要更新当前营业日边界（store.createdAtQuery）
+              this.updateCreateStore();
+              _context7.next = 9;
               return this.loadOrdersByServer();
-            case 8:
+            case 9:
               orders = _context7.sent;
               if (!(orders.length > 0)) {
-                _context7.next = 18;
+                _context7.next = 19;
                 break;
               }
               this.store.list = cloneDeep(orders);
               this.syncOrdersMap();
               this.emitOrdersChanged([], 'silentRefresh');
-              _context7.next = 15;
+              _context7.next = 16;
               return this.core.effects.emit(OrderHooks.onOrdersSyncCompleted, null);
-            case 15:
+            case 16:
               this.logInfo('silentRefresh 完成', {
                 orderCount: orders.length,
                 duration: "".concat(Date.now() - startTime, "ms")
               });
-              _context7.next = 19;
+              _context7.next = 20;
               break;
-            case 18:
-              this.logInfo('silentRefresh: 服务器未返回数据');
             case 19:
+              this.logInfo('silentRefresh: 服务器未返回数据');
+            case 20:
               return _context7.abrupt("return", this.store.list);
-            case 22:
-              _context7.prev = 22;
+            case 23:
+              _context7.prev = 23;
               _context7.t0 = _context7["catch"](5);
               errorMessage = _context7.t0 instanceof Error ? _context7.t0.message : String(_context7.t0);
               this.logError('silentRefresh 失败', {
@@ -751,11 +763,11 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 error: errorMessage
               });
               return _context7.abrupt("return", this.store.list);
-            case 27:
+            case 28:
             case "end":
               return _context7.stop();
           }
-        }, _callee7, this, [[5, 22]]);
+        }, _callee7, this, [[5, 23]]);
       }));
       function silentRefresh() {
         return _silentRefresh.apply(this, arguments);
@@ -1894,6 +1906,8 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       if (!this.isBlankIdentityValue(metadataUid)) return "uid:".concat(String(metadataUid));
       var topLevelUid = record.unique_identification_number;
       if (!this.isBlankIdentityValue(topLevelUid)) return "uid:".concat(String(topLevelUid));
+      var orderDetailId = record.order_detail_id;
+      if (!this.isBlankIdentityValue(orderDetailId)) return "detail:".concat(String(orderDetailId));
       var bookingUid = record.booking_uid;
       if (!this.isBlankIdentityValue(bookingUid)) return "booking:".concat(String(bookingUid));
       return '';

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

@@ -221,8 +221,7 @@ function resolveProductTitle(params) {
     productMap = params.productMap,
     locale = params.locale;
   var ownTitle = getProductTitleSource(product, locale);
-  // if (ownTitle) return ownTitle;
-
+  if (ownTitle) return ownTitle;
   var productId = (_product$product_id2 = product.product_id) !== null && _product$product_id2 !== void 0 ? _product$product_id2 : product.id;
   var fallbackProduct = resolveProductFromMap(productId, productMap);
   if (!fallbackProduct) return ownTitle || '';
@@ -389,12 +388,12 @@ function getProductTitleSource(source, locale) {
   return resolveTitleValue(source.product_title, locale) || resolveTitleValue(source.title, locale) || resolveTitleValue(source.name, locale);
 }
 function resolveTitleValue(value, locale) {
-  var _ref15, _ref16, _value$locale;
+  var _ref15, _ref16, _ref17, _ref18, _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((_ref15 = (_ref16 = (_value$locale = value[locale]) !== null && _value$locale !== void 0 ? _value$locale : value[dashedLocale]) !== null && _ref16 !== void 0 ? _ref16 : value[underscoredLocale]) !== null && _ref15 !== void 0 ? _ref15 : '');
+  return stringify((_ref15 = (_ref16 = (_ref17 = (_ref18 = (_value$locale = value[locale]) !== null && _value$locale !== void 0 ? _value$locale : value[dashedLocale]) !== null && _ref18 !== void 0 ? _ref18 : value[underscoredLocale]) !== null && _ref17 !== void 0 ? _ref17 : value.original) !== null && _ref16 !== void 0 ? _ref16 : value.auto) !== null && _ref15 !== void 0 ? _ref15 : '');
 }
 function resolveOptionTitleFromParentProduct(params) {
   var option = params.option,
@@ -412,17 +411,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 _ref17, _item$option_group_id;
+      var _ref19, _item$option_group_id;
       return _objectSpread(_objectSpread({}, item), {}, {
-        option_group_id: (_ref17 = (_item$option_group_id = item.option_group_id) !== null && _item$option_group_id !== void 0 ? _item$option_group_id : group.id) !== null && _ref17 !== void 0 ? _ref17 : group.option_group_id
+        option_group_id: (_ref19 = (_item$option_group_id = item.option_group_id) !== null && _item$option_group_id !== void 0 ? _item$option_group_id : group.id) !== null && _ref19 !== void 0 ? _ref19 : group.option_group_id
       });
     });
   });
 }
 function isOptionItemMatch(option, item) {
-  var _ref18, _option$option_group_, _ref19, _item$option_group_it, _option$option_group_2, _item$option_group_id2;
-  var optionItemId = (_ref18 = (_option$option_group_ = option.option_group_item_id) !== null && _option$option_group_ !== void 0 ? _option$option_group_ : option.product_option_item_id) !== null && _ref18 !== void 0 ? _ref18 : option.id;
-  var itemId = (_ref19 = (_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 && _ref19 !== void 0 ? _ref19 : item.id;
+  var _ref20, _option$option_group_, _ref21, _item$option_group_it, _option$option_group_2, _item$option_group_id2;
+  var optionItemId = (_ref20 = (_option$option_group_ = option.option_group_item_id) !== null && _option$option_group_ !== void 0 ? _option$option_group_ : option.product_option_item_id) !== null && _ref20 !== void 0 ? _ref20 : option.id;
+  var itemId = (_ref21 = (_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 && _ref21 !== void 0 ? _ref21 : 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;
@@ -432,16 +431,16 @@ function isOptionItemMatch(option, item) {
   return true;
 }
 function resolveBundleItemFromParentProduct(params) {
-  var _ref20, _bundle$bundle_varian, _bundle$bundle_id, _bundle$bundle_group_, _ref22, _bundle$bundle_produc2;
+  var _ref22, _bundle$bundle_varian, _bundle$bundle_id, _bundle$bundle_group_, _ref24, _bundle$bundle_produc2;
   var bundle = params.bundle,
     parentProduct = params.parentProduct;
   if (!parentProduct) return null;
   var bundleItems = flattenBundleItems(parentProduct);
-  var bundleVariantId = (_ref20 = (_bundle$bundle_varian = bundle.bundle_variant_id) !== null && _bundle$bundle_varian !== void 0 ? _bundle$bundle_varian : bundle.variant_id) !== null && _ref20 !== void 0 ? _ref20 : bundle.product_variant_id;
+  var bundleVariantId = (_ref22 = (_bundle$bundle_varian = bundle.bundle_variant_id) !== null && _bundle$bundle_varian !== void 0 ? _bundle$bundle_varian : bundle.variant_id) !== null && _ref22 !== void 0 ? _ref22 : bundle.product_variant_id;
   if (isNonZeroId(bundleVariantId)) {
     var matchedByVariant = bundleItems.find(function (item) {
-      var _ref21, _item$bundle_variant_;
-      return isSameId((_ref21 = (_item$bundle_variant_ = item.bundle_variant_id) !== null && _item$bundle_variant_ !== void 0 ? _item$bundle_variant_ : item.variant_id) !== null && _ref21 !== void 0 ? _ref21 : item.product_variant_id, bundleVariantId);
+      var _ref23, _item$bundle_variant_;
+      return isSameId((_ref23 = (_item$bundle_variant_ = item.bundle_variant_id) !== null && _item$bundle_variant_ !== void 0 ? _item$bundle_variant_ : item.variant_id) !== null && _ref23 !== void 0 ? _ref23 : item.product_variant_id, bundleVariantId);
     });
     if (matchedByVariant) return matchedByVariant;
   }
@@ -454,18 +453,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 = (_ref22 = (_bundle$bundle_produc2 = bundle.bundle_product_id) !== null && _bundle$bundle_produc2 !== void 0 ? _bundle$bundle_produc2 : bundle._bundle_product_id) !== null && _ref22 !== void 0 ? _ref22 : bundle.product_id;
+  var bundleProductId = (_ref24 = (_bundle$bundle_produc2 = bundle.bundle_product_id) !== null && _bundle$bundle_produc2 !== void 0 ? _bundle$bundle_produc2 : bundle._bundle_product_id) !== null && _ref24 !== void 0 ? _ref24 : bundle.product_id;
   if (isPresentId(bundleGroupId) && isPresentId(bundleProductId)) {
     var matchedByGroupAndProduct = bundleItems.find(function (item) {
-      var _item$group_id, _ref23, _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((_ref23 = (_item$bundle_product_ = item.bundle_product_id) !== null && _item$bundle_product_ !== void 0 ? _item$bundle_product_ : item._bundle_product_id) !== null && _ref23 !== void 0 ? _ref23 : item.product_id, bundleProductId);
+      var _item$group_id, _ref25, _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((_ref25 = (_item$bundle_product_ = item.bundle_product_id) !== null && _item$bundle_product_ !== void 0 ? _item$bundle_product_ : item._bundle_product_id) !== null && _ref25 !== void 0 ? _ref25 : item.product_id, bundleProductId);
     });
     if (matchedByGroupAndProduct) return matchedByGroupAndProduct;
   }
   if (isPresentId(bundleProductId)) {
     return bundleItems.find(function (item) {
-      var _ref24, _item$bundle_product_2;
-      return isSameId((_ref24 = (_item$bundle_product_2 = item.bundle_product_id) !== null && _item$bundle_product_2 !== void 0 ? _item$bundle_product_2 : item._bundle_product_id) !== null && _ref24 !== void 0 ? _ref24 : item.product_id, bundleProductId);
+      var _ref26, _item$bundle_product_2;
+      return isSameId((_ref26 = (_item$bundle_product_2 = item.bundle_product_id) !== null && _item$bundle_product_2 !== void 0 ? _item$bundle_product_2 : item._bundle_product_id) !== null && _ref26 !== void 0 ? _ref26 : item.product_id, bundleProductId);
     }) || null;
   }
   return null;
@@ -475,9 +474,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 _ref25, _item$group_id2;
+      var _ref27, _item$group_id2;
       return _objectSpread(_objectSpread({}, item), {}, {
-        group_id: (_ref25 = (_item$group_id2 = item.group_id) !== null && _item$group_id2 !== void 0 ? _item$group_id2 : group.id) !== null && _ref25 !== void 0 ? _ref25 : group.group_id
+        group_id: (_ref27 = (_item$group_id2 = item.group_id) !== null && _item$group_id2 !== void 0 ? _item$group_id2 : group.id) !== null && _ref27 !== void 0 ? _ref27 : group.group_id
       });
     });
   });
@@ -503,8 +502,8 @@ function buildOptionTitleSuffix(options) {
   return text ? "(".concat(text, ")") : '';
 }
 function formatBundlePrice(bundle, currencySymbol) {
-  var _ref26, _ref27, _bundle$bundle_sellin;
-  var value = (_ref26 = (_ref27 = (_bundle$bundle_sellin = bundle.bundle_selling_price) !== null && _bundle$bundle_sellin !== void 0 ? _bundle$bundle_sellin : bundle.bundle_sum_price) !== null && _ref27 !== void 0 ? _ref27 : bundle.price) !== null && _ref26 !== void 0 ? _ref26 : 0;
+  var _ref28, _ref29, _bundle$bundle_sellin;
+  var value = (_ref28 = (_ref29 = (_bundle$bundle_sellin = bundle.bundle_selling_price) !== null && _bundle$bundle_sellin !== void 0 ? _bundle$bundle_sellin : bundle.bundle_sum_price) !== null && _ref29 !== void 0 ? _ref29 : bundle.price) !== null && _ref28 !== void 0 ? _ref28 : 0;
   var amount = new Decimal(toMoneyNumber(value));
   var isNegative = bundle.price_type === 'markdown' || bundle.price_type === 'markup' && bundle.price_type_ext === 'product_price';
   if (isNegative) return "-".concat(currencySymbol).concat(amount.abs().toFixed(2));
@@ -519,9 +518,9 @@ function buildFees(params) {
     currencySymbol = params.currencySymbol;
   var fees = [];
   for (var _i = 0, _normalizeArray = normalizeArray(order.surcharges || summary.surcharges); _i < _normalizeArray.length; _i++) {
-    var _ref28, _surcharge$amount;
+    var _ref30, _surcharge$amount;
     var surcharge = _normalizeArray[_i];
-    var value = (_ref28 = (_surcharge$amount = surcharge.amount) !== null && _surcharge$amount !== void 0 ? _surcharge$amount : surcharge.value) !== null && _ref28 !== void 0 ? _ref28 : surcharge.total_amount;
+    var value = (_ref30 = (_surcharge$amount = surcharge.amount) !== null && _surcharge$amount !== void 0 ? _surcharge$amount : surcharge.value) !== null && _ref30 !== void 0 ? _ref30 : surcharge.total_amount;
     if (!isNonZero(value)) continue;
     fees.push({
       item: getLocalizedValue(surcharge.name || surcharge.title || surcharge.item, locale),
@@ -565,7 +564,7 @@ function buildFees(params) {
       product_quantity: toNumber(summary.product_quantity || products.reduce(function (sum, product) {
         return sum + product.product_quantity;
       }, 0), 0),
-      has_pay: formatMoney(sumPayments(order.payments), currencySymbol),
+      has_pay: formatMoney(calculateReceiptPaidAmount(order, summary), currencySymbol),
       payment_method: '',
       tax_title: stringify(summary.tax_title || order.tax_title || shopInfo.tax_title),
       total_refund_amount: formatMoney(summary.total_refund_amount || order.total_refund_amount, currencySymbol)
@@ -656,8 +655,8 @@ function buildPaymentData(params) {
         currencySymbol: params.currencySymbol
       })));
     } else {
-      var _ref29, _payment$remaining_am, _payment$metadata;
-      var remainingAmount = (_ref29 = (_payment$remaining_am = payment.remaining_amount) !== null && _payment$remaining_am !== void 0 ? _payment$remaining_am : payment.balance) !== null && _ref29 !== void 0 ? _ref29 : (_payment$metadata = payment.metadata) === null || _payment$metadata === void 0 ? void 0 : _payment$metadata.remaining_amount;
+      var _ref31, _payment$remaining_am, _payment$metadata;
+      var remainingAmount = (_ref31 = (_payment$remaining_am = payment.remaining_amount) !== null && _payment$remaining_am !== void 0 ? _payment$remaining_am : payment.balance) !== null && _ref31 !== void 0 ? _ref31 : (_payment$metadata = payment.metadata) === null || _payment$metadata === void 0 ? void 0 : _payment$metadata.remaining_amount;
       if (remainingAmount !== undefined && remainingAmount !== null) {
         items.push({
           item: label(params.locale, 'remainingAmount'),
@@ -765,11 +764,11 @@ 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 _ref30, _ref31, _ref32, _value$locale2;
+  var _ref32, _ref33, _ref34, _value$locale2;
   if (value === undefined || value === null) return '';
   if (_typeof(value) !== 'object') return stringify(value);
   var dashedLocale = locale.replace('_', '-');
-  return stringify((_ref30 = (_ref31 = (_ref32 = (_value$locale2 = value[locale]) !== null && _value$locale2 !== void 0 ? _value$locale2 : value[dashedLocale]) !== null && _ref32 !== void 0 ? _ref32 : value.default) !== null && _ref31 !== void 0 ? _ref31 : value.en) !== null && _ref30 !== void 0 ? _ref30 : '');
+  return stringify((_ref32 = (_ref33 = (_ref34 = (_value$locale2 = value[locale]) !== null && _value$locale2 !== void 0 ? _value$locale2 : value[dashedLocale]) !== null && _ref34 !== void 0 ? _ref34 : value.default) !== null && _ref33 !== void 0 ? _ref33 : value.en) !== null && _ref32 !== void 0 ? _ref32 : '');
 }
 function serviceTypeToLabelKey(serviceType) {
   var normalized = serviceType.toLowerCase();
@@ -794,6 +793,17 @@ function formatMoney(value, currencySymbol) {
   var amount = new Decimal(toMoneyNumber(value));
   return "".concat(currencySymbol).concat(amount.toFixed(2));
 }
+function calculateReceiptPaidAmount(order, summary) {
+  var _summary$pay_service_, _summary$total_amount;
+  var paidAmount = sumPayments(order.payments);
+  var payProcessingFee = new Decimal(toMoneyNumber((_summary$pay_service_ = summary.pay_service_charge_amount) !== null && _summary$pay_service_ !== void 0 ? _summary$pay_service_ : order.pay_service_charge_amount));
+  if (payProcessingFee.lte(0)) return paidAmount;
+  var totalAmount = new Decimal(toMoneyNumber((_summary$total_amount = summary.total_amount) !== null && _summary$total_amount !== void 0 ? _summary$total_amount : order.total_amount));
+  if (totalAmount.gt(0) && paidAmount.gte(totalAmount)) return paidAmount;
+  var paidAmountWithFee = paidAmount.plus(payProcessingFee);
+  if (totalAmount.gt(0) && paidAmountWithFee.gt(totalAmount)) return totalAmount;
+  return paidAmountWithFee;
+}
 function sumPayments(payments) {
   return normalizeArray(payments).filter(function (payment) {
     return isPrintablePayment(payment);