@pisell/pisellos 0.10.56 → 0.10.57

package/lib/server/index.js

@@ -25,6 +25,7 @@ var _types3 = require("./modules/order/types");
 var _filterOrders = require("./modules/order/utils/filterOrders");
 var _filterBookings = require("./modules/order/utils/filterBookings");
 var _smallTicket = require("./utils/small-ticket");
+var _templateVisibility = require("../shared/receipt/templateVisibility");
 var _BaseSales = require("../solution/BaseSales");
 var _paymentUtils = require("../modules/Order/payment-utils");
 var _salesNotes = require("../modules/Order/salesNotes");
@@ -1296,6 +1297,10 @@ class Server {
       method: 'get',
       path: '/shop/pay/custom-payment/all',
       handler: this.handlePaymentMethods.bind(this)
+    }, {
+      method: 'get',
+      path: '/pay/custom-payment/all',
+      handler: this.handlePaymentMethods.bind(this)
     }, {
       method: 'get',
       path: '/shop/quotation/available',
@@ -3847,7 +3852,8 @@ class Server {
     }
     const printableOrder = await this.withLocalSmallTicketData(params.order, {
       requireFullyPaid: params.requireFullyPaid,
-      invoiceTemplateSettings: params.invoiceTemplateSettings
+      invoiceTemplateSettings: params.invoiceTemplateSettings,
+      applyTemplateVisibility: true
     });
     if (!(0, _smallTicket.hasSmallTicketData)(printableOrder.payment_info?.small_ticket_data)) {
       return {
@@ -3869,9 +3875,11 @@ class Server {
       invoiceLayoutConfig: params.invoiceLayoutConfig,
       invoiceTemplateSettings: params.invoiceTemplateSettings
     });
+    // Receipt visibility belongs to this output only. Do not return a filtered
+    // snapshot to callers that may retain the order for later sync or reprints.
     return {
       printed: true,
-      order: printableOrder
+      order: (0, _templateVisibility.requiresInvoiceDataFiltering)(params.invoiceTemplateSettings) ? params.order : printableOrder
     };
   }
   shouldLookupLocalPrintOrder(input) {
@@ -4080,7 +4088,10 @@ class Server {
         small_ticket_data_flag: 1,
         payment_info: paymentInfo
       }, {
-        locales: this.normalizeRequestedReceiptLocales(input.locales)
+        locales: this.normalizeRequestedReceiptLocales(input.locales),
+        invoiceTemplateSettings: input.template_settings === undefined ? undefined : this.normalizePrintInvoiceTemplateSettings(input.template_settings),
+        applyTemplateVisibility: true,
+        includeReceiptKeys: input.template_settings !== undefined
       });
       const smallTicketData = rebuiltOrder.payment_info?.small_ticket_data;
       if (!(0, _smallTicket.hasSmallTicketData)(smallTicketData)) {
@@ -4098,7 +4109,17 @@ class Server {
         status: true,
         message: '',
         data: {
-          small_ticket_data: smallTicketData
+          small_ticket_data: smallTicketData,
+          template_visibility_applied: true,
+          // These products and currency settings are the exact source used for
+          // this receipt, not the potentially newer active tempOrder.
+          source: {
+            ...rebuiltOrder,
+            payment_info: {
+              ...(rebuiltOrder.payment_info || {}),
+              small_ticket_data: undefined
+            }
+          }
         }
       };
     } catch (error) {
@@ -4339,15 +4360,24 @@ class Server {
     });
     if (pendingResult?.status === true) {
       const pendingOrder = pendingResult.data;
-      if (pendingOrder && this.shouldBuildSmallTicketData(checkoutData) && this.isSalesOrderFullyPaid(pendingOrder) && this.shouldAutoPrintCheckoutReceipt()) {
-        await this.dispatchLocalReceiptPrint({
-          checkoutData,
-          order: pendingOrder,
-          response: pendingResult,
-          requireFullyPaid: true,
-          invoiceLayoutConfig,
-          invoiceTemplateSettings
-        });
+      if (pendingOrder && this.shouldBuildSmallTicketData(checkoutData, invoiceTemplateSettings) && this.isSalesOrderFullyPaid(pendingOrder) && this.shouldAutoPrintCheckoutReceipt()) {
+        try {
+          await this.dispatchLocalReceiptPrint({
+            checkoutData,
+            order: pendingOrder,
+            response: pendingResult,
+            requireFullyPaid: true,
+            invoiceLayoutConfig,
+            invoiceTemplateSettings
+          });
+        } catch (error) {
+          // The sale is already persisted. A failed receipt must not cancel its
+          // sync task or send an unfiltered fallback to the printer.
+          pendingResult.receipt_print_error = this.getUnknownErrorMessage(error);
+          this.logError(`${title}: 小票生成失败，订单仍继续同步`, {
+            error: pendingResult.receipt_print_error
+          });
+        }
       }
       await this.dispatchCheckoutSyncTask({
         backendPath,
@@ -4405,16 +4435,24 @@ class Server {
       }
       const response = this.withSyncedOrderIdInCheckoutResponse(syncResult.normalizedResponse, syncResult.syncedOrder);
       const syncedOrder = syncResult.syncedOrder;
-      if (syncedOrder && this.shouldBuildSmallTicketData(syncResult.checkoutData) && this.isSalesOrderFullyPaid(syncedOrder)) {
-        await this.dispatchLocalReceiptPrint({
-          checkoutData: syncResult.checkoutData,
-          order: syncedOrder,
-          response: syncResult.normalizedResponse,
-          requireFullyPaid: true,
-          invoiceLayoutConfig,
-          invoiceTemplateSettings
-          // print_all 的 type=0 是收据打印；不要沿用同步成功后的券/手环打印 type=99。
-        });
+      if (syncedOrder && this.shouldBuildSmallTicketData(syncResult.checkoutData, invoiceTemplateSettings) && this.isSalesOrderFullyPaid(syncedOrder)) {
+        try {
+          await this.dispatchLocalReceiptPrint({
+            checkoutData: syncResult.checkoutData,
+            order: syncedOrder,
+            response: syncResult.normalizedResponse,
+            requireFullyPaid: true,
+            invoiceLayoutConfig,
+            invoiceTemplateSettings
+          });
+        } catch (error) {
+          // Checkout already succeeded remotely; report the receipt failure
+          // separately instead of implying that payment/order creation failed.
+          response.receipt_print_error = this.getUnknownErrorMessage(error);
+          this.logError(`${title}: 小票生成失败，订单已同步`, {
+            error: response.receipt_print_error
+          });
+        }
       }
       return response;
     } catch (error) {
@@ -4623,10 +4661,12 @@ class Server {
     if (this.core.context?.getPlatform?.() !== 'android') return true;
     return this.app?.storage?.getStorage?.(AUTO_PRINT_STORAGE_KEY) !== 'false';
   }
-  shouldBuildSmallTicketData(order) {
+  shouldBuildSmallTicketData(order, invoiceTemplateSettings) {
     if (!order || typeof order !== 'object') return false;
-    // if (hasSmallTicketData(order.payment_info?.small_ticket_data)) return false;
-    return Number(order.small_ticket_data_flag ?? order.smallTicketDataFlag ?? 0) === 1;
+    const flag = order.small_ticket_data_flag ?? order.smallTicketDataFlag;
+    // A synced order can omit the generation flag; required display filtering
+    // still rebuilds its output. An explicit 0 retains the no-auto-print intent.
+    return Number(flag ?? 0) === 1 || flag == null && (0, _templateVisibility.requiresInvoiceDataFiltering)(invoiceTemplateSettings);
   }
   shouldPrintSyncedOrder(params) {
     if (this.hasPaymentStatus(params.syncedOrder)) {
@@ -4930,7 +4970,8 @@ class Server {
     }
   }
   async withLocalSmallTicketData(order, options) {
-    if (!this.shouldBuildSmallTicketData(order)) return order;
+    const mustApplyVisibility = options?.applyTemplateVisibility === true && (0, _templateVisibility.requiresInvoiceDataFiltering)(options.invoiceTemplateSettings);
+    if (!this.shouldBuildSmallTicketData(order) && !mustApplyVisibility) return order;
     if (options?.requireFullyPaid && !this.isSalesOrderFullyPaid(order)) return order;
     try {
       const normalizedCollections = (0, _orderCollectionIdentity.normalizeOrderCollections)(order, {
@@ -4954,7 +4995,9 @@ class Server {
         order: enrichedOrder,
         shopInfo: this.getSmallTicketShopInfo(),
         locales: [...(0, _OpenData.resolveInvoiceReceiptLocales)(options?.invoiceTemplateSettings), ...(options?.locales || [])],
-        productMap
+        productMap,
+        includeReceiptKeys: options?.includeReceiptKeys,
+        templateSettings: options?.applyTemplateVisibility ? options.invoiceTemplateSettings : undefined
       });
       return {
         ...enrichedOrder,
@@ -4967,6 +5010,7 @@ class Server {
       this.logError('withLocalSmallTicketData: 生成本地小票数据失败', {
         error: error instanceof Error ? error.message : String(error)
       });
+      if (mustApplyVisibility) throw error;
       return order;
     }
   }

package/lib/server/modules/floor-plan/index.js

@@ -9,6 +9,30 @@ var _types = require("./types");
 const FLOOR_PLAN_SYNC_DEBOUNCE_MS = 3000;
 const FLOOR_PLAN_STORE_NAME = 'floor_plans';
 
+/**
+ * Request failures can be plain response objects (rather than Error instances).
+ * Keep diagnostics useful without allowing the UI bridge to stringify them as
+ * "[object Object]".
+ */
+function getRequestErrorInfo(error) {
+  if (error instanceof Error && error.message) return {
+    message: error.message
+  };
+  if (typeof error === 'string' && error) return {
+    message: error
+  };
+  const value = error;
+  const response = value?.resData?.res ?? value?.response?.data ?? value?.data ?? value;
+  const candidates = [value?.message, value?.error, response?.message, response?.error];
+  const message = candidates.find(candidate => typeof candidate === 'string' && candidate.trim() !== '');
+  return {
+    message: message || '平面图加载失败（未提供错误详情）',
+    code: response?.code ?? value?.code,
+    status: response?.status ?? value?.status,
+    httpStatus: value?.response?.status
+  };
+}
+
 /**
  * 平面图模块：预加载列表、pubsub 同步、供 OS Server 路由读本地 store
  */
@@ -144,8 +168,12 @@ class FloorPlanModule extends _BaseModule.BaseModule {
       const list = Array.isArray(raw) ? raw : [];
       return list;
     } catch (e) {
+      const errorInfo = getRequestErrorInfo(e);
       this.logWarning('loadListFromServer 失败', {
-        error: e instanceof Error ? e.message : String(e)
+        error: errorInfo.message,
+        code: errorInfo.code,
+        status: errorInfo.status,
+        httpStatus: errorInfo.httpStatus
       });
       return [];
     }

package/lib/server/modules/payment/index.d.ts

@@ -7,22 +7,41 @@ export declare class PaymentServerModule extends BaseModule implements Module {
     private request;
     private app;
     private logger;
+    private dbManager;
     private store;
-    private payMethodMemoryCache;
-    private payMethodListInFlight;
+    private paymentDataSource;
+    private initialLoadInFlight;
+    private refreshInFlight;
+    private hasLoadedPayMethods;
+    private hasEmittedLoaded;
+    private syncTimer;
+    private pendingMessageUuids;
+    private queuedTrailingRefresh;
+    private trailingMessageUuids;
     constructor(name?: string, version?: string);
     initialize(core: PisellCore, options?: ModuleOptions): Promise<void>;
+    preload(): Promise<void>;
     getPayMethodListAsync(options?: {
         shouldFilter?: boolean;
     }): Promise<PaymentMethod[]>;
-    clearPayMethodCache(): void;
-    private loadPayMethodListAsync;
+    private ensureInitialPayMethods;
+    private initPaymentDataSource;
+    private setupPaymentMethodSync;
+    private schedulePaymentMethodRefresh;
+    private refreshPayMethodsSingleFlight;
+    private performRemoteRefresh;
     private fetchRemotePayMethods;
-    private shouldFilterPayMethods;
+    private loadPayMethodsFromSQLite;
+    private replacePayMethodsInSQLite;
+    private resolveCurrentShopScope;
+    private stripSnapshotFields;
+    private arePayMethodsEqual;
     private resolvePayMethods;
     private filterPayMethods;
-    private setPayMethodCache;
+    private setPayMethodMirror;
+    private getErrorMessage;
     private logInfo;
     private logWarning;
     private logError;
+    destroy(): void;
 }