@pisell/pisellos 0.10.31 → 0.10.33

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

@@ -33,7 +33,7 @@ export declare class OpenDataModule extends BaseModule implements Module {
     getOpenData(): OpenDataConfig | null;
     getInvoiceLayoutConfig(): InvoiceLayoutConfig;
     getInvoiceTemplateSettings(): InvoiceTemplateSettings;
-    ensureInvoiceTemplateSettings(target: string): Promise<InvoiceTemplateSettings>;
+    ensureInvoiceTemplateSettings(target: string, openDataConfig?: OpenDataConfig): Promise<InvoiceTemplateSettings>;
     private commitInvoiceTemplateSettings;
     private resolveInvoiceTemplateSettings;
     private buildInvoiceTemplateCacheKey;

package/dist/modules/OpenData/index.js

@@ -233,39 +233,47 @@ export var OpenDataModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "ensureInvoiceTemplateSettings",
     value: function () {
-      var _ensureInvoiceTemplateSettings = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(target) {
+      var _ensureInvoiceTemplateSettings = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(target, openDataConfig) {
         var normalizedTarget, config, fetchRevision, resolved;
         return _regeneratorRuntime().wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
               normalizedTarget = String(target || '').trim();
+              if (openDataConfig && openDataConfig !== this.store.data) {
+                // 部分解决方案会在初始化参数中直接收到已经拉取完成的 OpenData。
+                // 将它纳入模块状态后再解析 Document，避免为了 Invoice 重复请求 setting，
+                // 同时让后续同步 getter 能校验同一份 document id 与 target。
+                this.fetchRevision += 1;
+                this.store.data = openDataConfig;
+                this.store.lastFetchedAt = Date.now();
+              }
               config = this.store.data;
               if (!(!normalizedTarget || !config)) {
-                _context3.next = 4;
+                _context3.next = 5;
                 break;
               }
               return _context3.abrupt("return", getDefaultInvoiceTemplateSettings());
-            case 4:
+            case 5:
               fetchRevision = this.fetchRevision;
-              _context3.next = 7;
+              _context3.next = 8;
               return this.resolveInvoiceTemplateSettings(config, normalizedTarget);
-            case 7:
+            case 8:
               resolved = _context3.sent;
               if (!(fetchRevision !== this.fetchRevision || this.store.data !== config)) {
-                _context3.next = 10;
+                _context3.next = 11;
                 break;
               }
               return _context3.abrupt("return", getDefaultInvoiceTemplateSettings());
-            case 10:
+            case 11:
               this.commitInvoiceTemplateSettings(normalizedTarget, resolved);
               return _context3.abrupt("return", normalizeRawInvoiceTemplateSettings(resolved.settings));
-            case 12:
+            case 13:
             case "end":
               return _context3.stop();
           }
         }, _callee3, this);
       }));
-      function ensureInvoiceTemplateSettings(_x4) {
+      function ensureInvoiceTemplateSettings(_x4, _x5) {
         return _ensureInvoiceTemplateSettings.apply(this, arguments);
       }
       return ensureInvoiceTemplateSettings;
@@ -367,7 +375,7 @@ export var OpenDataModule = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee4, this);
       }));
-      function resolveInvoiceTemplateSettings(_x5, _x6) {
+      function resolveInvoiceTemplateSettings(_x6, _x7) {
         return _resolveInvoiceTemplateSettings.apply(this, arguments);
       }
       return resolveInvoiceTemplateSettings;
@@ -424,7 +432,7 @@ export var OpenDataModule = /*#__PURE__*/function (_BaseModule) {
           }
         }, _callee5, this);
       }));
-      function fetchInvoiceTemplateDocument(_x7) {
+      function fetchInvoiceTemplateDocument(_x8) {
         return _fetchInvoiceTemplateDocument.apply(this, arguments);
       }
       return fetchInvoiceTemplateDocument;

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

@@ -535,7 +535,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     generateIdempotencyToken(): string;
     syncPaymentsToOrder<T = any>(params: SyncPaymentsToOrderParams): Promise<SyncPaymentsToOrderResult<T>>;
     createOrder(params: CommitOrderParams['query']): {
-        type: "appointment_booking" | "virtual";
+        type: "virtual" | "appointment_booking";
         platform: string;
         sales_channel: string;
         order_sales_channel: string;
@@ -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.d.ts

@@ -33,9 +33,12 @@ export interface SmallTicketProduct {
     product_title: string;
     product_quantity: number;
     selling_price: string;
+    total_selling_price: string;
     original_price: string;
-    base_price?: string;
+    base_price: string;
     total_original_price: string;
+    options_total_price?: string;
+    package_items_total_price?: string;
     extension_list: any[];
     product_uid?: string | number;
     booking_uid?: string | number;
@@ -44,6 +47,7 @@ export interface SmallTicketProduct {
         name: string;
         num?: number;
         price?: string;
+        total_price: string;
         value?: string;
     }>;
     variant?: string;