@pisell/pisellos 2.2.315 → 2.2.316

package/dist/server/modules/products/replication.d.ts

@@ -0,0 +1,8 @@
+import type { CommittedProducts, ReplicatedProducts } from './types';
+/** A separate committed view: failed writes must never leak into recovery snapshots. */
+export declare class CommittedProductState {
+    private products;
+    private revision;
+    commit(change: ReplicatedProducts): CommittedProducts;
+    snapshot(): CommittedProducts;
+}

package/dist/server/modules/products/replication.js

@@ -0,0 +1,69 @@
+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); }
+function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
+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 _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+/** A separate committed view: failed writes must never leak into recovery snapshots. */
+export var CommittedProductState = /*#__PURE__*/function () {
+  function CommittedProductState() {
+    _classCallCheck(this, CommittedProductState);
+    _defineProperty(this, "products", new Map());
+    _defineProperty(this, "revision", 0);
+  }
+  _createClass(CommittedProductState, [{
+    key: "commit",
+    value: function commit(change) {
+      var copy = structuredClone(change);
+      if (copy.kind === 'snapshot') this.products.clear();
+      var _iterator = _createForOfIteratorHelper(copy.deletedIds),
+        _step;
+      try {
+        for (_iterator.s(); !(_step = _iterator.n()).done;) {
+          var id = _step.value;
+          this.products.delete(id);
+        }
+      } catch (err) {
+        _iterator.e(err);
+      } finally {
+        _iterator.f();
+      }
+      var _iterator2 = _createForOfIteratorHelper(copy.upserts),
+        _step2;
+      try {
+        for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+          var product = _step2.value;
+          this.products.set(product.id, product);
+        }
+      } catch (err) {
+        _iterator2.e(err);
+      } finally {
+        _iterator2.f();
+      }
+      return _objectSpread(_objectSpread({}, copy), {}, {
+        revision: ++this.revision
+      });
+    }
+  }, {
+    key: "snapshot",
+    value: function snapshot() {
+      return {
+        kind: 'snapshot',
+        revision: this.revision,
+        upserts: structuredClone(_toConsumableArray(this.products.values())),
+        deletedIds: []
+      };
+    }
+  }]);
+  return CommittedProductState;
+}();

package/dist/server/modules/products/types.d.ts

@@ -32,6 +32,15 @@ export interface ProductSnapshot {
     cover?: ProductData['cover'];
     holder_config?: ProductData['holder_config'];
 }
+/** Raw product data only; each screen applies its own query/pricing context. */
+export interface ReplicatedProducts {
+    kind: 'snapshot' | 'delta';
+    upserts: ProductData[];
+    deletedIds: number[];
+}
+export interface CommittedProducts extends ReplicatedProducts {
+    revision: number;
+}
 /**
  * 加载报价单商品价格参数
  */
@@ -96,7 +105,9 @@ export declare enum ProductsHooks {
     onProductSelected = "products:onProductSelected",
     onProductsPriceApplied = "products:onProductsPriceApplied",
     /** pubsub 同步批次处理完成后触发，Server 层监听此事件重新计算并推送 */
-    onProductsSyncCompleted = "products:onProductsSyncCompleted"
+    onProductsSyncCompleted = "products:onProductsSyncCompleted",
+    onProductsCommitted = "products:onProductsCommitted",
+    onProductSyncDestroyed = "products:onProductSyncDestroyed"
 }
 /** pubsub 商品同步消息结构 */
 export interface ProductSyncMessage {

package/dist/server/modules/products/types.js

@@ -10,6 +10,8 @@
  * 商品轻量查询范围
  */
 
+/** Raw product data only; each screen applies its own query/pricing context. */
+
 /**
  * 加载报价单商品价格参数
  */
@@ -35,6 +37,8 @@ export var ProductsHooks = /*#__PURE__*/function (ProductsHooks) {
   ProductsHooks["onProductSelected"] = "products:onProductSelected";
   ProductsHooks["onProductsPriceApplied"] = "products:onProductsPriceApplied";
   ProductsHooks["onProductsSyncCompleted"] = "products:onProductsSyncCompleted";
+  ProductsHooks["onProductsCommitted"] = "products:onProductsCommitted";
+  ProductsHooks["onProductSyncDestroyed"] = "products:onProductSyncDestroyed";
   return ProductsHooks;
 }({});
 

package/dist/shared/receipt/small-ticket.js

@@ -20,6 +20,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 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 dayjs from 'dayjs';
 import Decimal from 'decimal.js';
+import { getProductHolderRelations, hasProductBooking } from "../../modules/Order/holderRelations";
 import { isFulfillmentTimingBooking } from "../../modules/Order/pickupTiming";
 import { resolveInvoiceDataVisibility } from "./templateVisibility";
 var DEFAULT_LOCALES = ['en', 'zh_CN'];
@@ -115,6 +116,7 @@ var LABELS = {
     bookingDateTime: 'Date & time',
     bookingResource: 'Resource',
     bookingHolder: 'Holder',
+    productHolder: 'Holder',
     orderDiscount: 'Order discount',
     manualDiscount: 'Manual discount',
     manualMarkup: 'Manual markup',
@@ -160,6 +162,7 @@ var LABELS = {
     bookingDateTime: '日期和时间',
     bookingResource: '资源',
     bookingHolder: '预约人',
+    productHolder: '持有人',
     orderDiscount: '整单折扣',
     manualDiscount: '手动折扣',
     manualMarkup: '手动加价',
@@ -205,6 +208,7 @@ var LABELS = {
     bookingDateTime: '日期和時間',
     bookingResource: '資源',
     bookingHolder: '預約人',
+    productHolder: '持有人',
     orderDiscount: '整單折扣',
     manualDiscount: '手動折扣',
     manualMarkup: '手動加價',
@@ -248,6 +252,7 @@ var LABELS = {
     bookingDateTime: '日時',
     bookingResource: 'リソース',
     bookingHolder: '予約者',
+    productHolder: '利用者',
     orderDiscount: '注文割引',
     manualDiscount: '手動割引',
     manualMarkup: '手動値上げ',
@@ -292,6 +297,7 @@ var LABELS = {
     bookingDateTime: 'Data e hora',
     bookingResource: 'Recurso',
     bookingHolder: 'Titular',
+    productHolder: 'Titular',
     orderDiscount: 'Desconto do pedido',
     manualDiscount: 'Desconto manual',
     manualMarkup: 'Acréscimo manual',
@@ -357,7 +363,7 @@ function buildLocaleData(params) {
       financials: financials
     }),
     customer: buildCustomer(order, locale, visibility.customer),
-    appointment: buildAppointment(order, locale)
+    appointment: buildAppointment(order, locale, visibility.lineGroups.resourceTitle)
   }, delivery.length ? {
     delivery: delivery
   } : {}), {}, {
@@ -461,6 +467,17 @@ function buildProducts(order, locale, productMap) {
       quantity: quantity,
       originalPrice: originalPrice
     });
+    var holderName = hasProductBooking(product) ? '' : getProductHolderRelations(order, product).map(function (relation) {
+      var _relation$metadata;
+      return getLocalizedValue((_relation$metadata = relation.metadata) === null || _relation$metadata === void 0 ? void 0 : _relation$metadata.name, locale).trim();
+    }).filter(Boolean).join(', ');
+    if (holderName) {
+      // 复用 Web Invoice / 原生均支持的文本扩展行，不混入金额或商品备注。
+      extensionList.push(_objectSpread(_objectSpread({}, receiptKey(rawProduct, 'product-holder')), {}, {
+        item: "".concat(label(locale, 'productHolder'), ": ").concat(holderName),
+        value: ''
+      }));
+    }
     var productNote = resolveProductNote(product, locale);
     var allergy = isPresentId(productUid) ? allergyByProductUid.get(String(productUid).trim()) || '' : '';
     var basePrice = resolveProductBasePrice(product);
@@ -1222,12 +1239,6 @@ function buildFees(params) {
   var isPriceIncludeTax = firstPresentValue(summary.is_price_include_tax, order.is_price_include_tax, shopInfo.is_price_include_tax);
   var roundingAmount = firstPresentValue(summary.rounding_amount, order.rounding_amount);
   var payProcessingFee = financials.payProcessingFee;
-  if (isNonZero(payProcessingFee)) {
-    fees.push(_objectSpread(_objectSpread({}, receiptKey(order, 'payment-processing-fee')), {}, {
-      item: label(locale, 'payProcessingFee'),
-      value: formatMoney(payProcessingFee, currencySymbol)
-    }));
-  }
   var productExpectAmount = firstPresentValue(summary.product_expect_amount, summary.product_amount, order.product_expect_amount);
   var productOriginalAmount = (_firstPresentValue2 = firstPresentValue(summary.product_original_amount, order.product_original_amount)) !== null && _firstPresentValue2 !== void 0 ? _firstPresentValue2 : calculateProductOriginalAmount(order);
   var totalSavingsAmount = new Decimal(toMoneyNumber(productOriginalAmount)).minus(toMoneyNumber(productExpectAmount)).plus(toMoneyNumber(discountAmount));
@@ -1383,7 +1394,7 @@ function formatPickupBookingStart(bookings, locale) {
   var dateText = locale === 'en' ? "".concat(day, "/").concat(month, "/").concat(year) : "".concat(year, "/").concat(month, "/").concat(day);
   return "".concat(time.slice(0, 5), " ").concat(dateText);
 }
-function buildAppointment(order, locale) {
+function buildAppointment(order, locale, showResourceTitle) {
   var _order$metadata13, _order$metadata14, _order$metadata15, _order$form_data;
   var parentScheduleId = (_order$metadata13 = order.metadata) === null || _order$metadata13 === void 0 ? void 0 : _order$metadata13.appointment_booking_parent_schedule_id;
   var bookings = sortBookings(normalizeArray(order.bookings).filter(function (booking) {
@@ -1396,7 +1407,8 @@ function buildAppointment(order, locale) {
         booking: booking,
         allResources: allResources,
         bookingCount: bookings.length,
-        locale: locale
+        locale: locale,
+        showResourceTitle: showResourceTitle
       });
     });
   }
@@ -1434,7 +1446,7 @@ function buildAppointmentRows(params) {
   };
   var bookingId = stringify(firstPresentValue(booking.booking_id, booking.schedule_event_id, bookingUid)).trim();
   var bookingTime = formatBookingRange(booking, locale);
-  var resourceText = formatBookingResources(resolveBookingResourcesForReceipt(booking, allResources, bookingCount), locale);
+  var resourceText = formatBookingResources(resolveBookingResourcesForReceipt(booking, allResources, bookingCount), locale, params.showResourceTitle);
   var holder = getLocalizedValue((_booking$holder$name = (_booking$holder = booking.holder) === null || _booking$holder === void 0 ? void 0 : _booking$holder.name) !== null && _booking$holder$name !== void 0 ? _booking$holder$name : (_booking$metadata3 = booking.metadata) === null || _booking$metadata3 === void 0 || (_booking$metadata3 = _booking$metadata3.holder) === null || _booking$metadata3 === void 0 ? void 0 : _booking$metadata3.name, locale).trim();
   return [_objectSpread(_objectSpread({}, receiptKey(booking, 'booking-id')), {}, {
     item: label(locale, 'bookingId'),
@@ -1512,10 +1524,10 @@ function resolveBookingResourcesForReceipt(booking, allResources, bookingCount)
   if (bookingCount === 1 && allResources.length) return allResources;
   return [];
 }
-function formatBookingResources(resources, locale) {
+function formatBookingResources(resources, locale, showResourceTitle) {
   return resources.map(function (resource) {
     var _resource$metadata, _resource$metadata2, _resource$metadata3, _resource$metadata4;
-    return [getLocalizedValue(resource.form_title || ((_resource$metadata = resource.metadata) === null || _resource$metadata === void 0 ? void 0 : _resource$metadata.form_name) || resource.relation_form_name || ((_resource$metadata2 = resource.metadata) === null || _resource$metadata2 === void 0 ? void 0 : _resource$metadata2.relation_form_name), locale), getLocalizedValue(resource.title || resource.name || resource.main_field || ((_resource$metadata3 = resource.metadata) === null || _resource$metadata3 === void 0 ? void 0 : _resource$metadata3.main_field) || ((_resource$metadata4 = resource.metadata) === null || _resource$metadata4 === void 0 ? void 0 : _resource$metadata4.resource_name), locale)].filter(Boolean).join(' ');
+    return [showResourceTitle ? getLocalizedValue(resource.form_title || ((_resource$metadata = resource.metadata) === null || _resource$metadata === void 0 ? void 0 : _resource$metadata.form_name) || resource.relation_form_name || ((_resource$metadata2 = resource.metadata) === null || _resource$metadata2 === void 0 ? void 0 : _resource$metadata2.relation_form_name), locale) : '', getLocalizedValue(resource.title || resource.name || resource.main_field || ((_resource$metadata3 = resource.metadata) === null || _resource$metadata3 === void 0 ? void 0 : _resource$metadata3.main_field) || ((_resource$metadata4 = resource.metadata) === null || _resource$metadata4 === void 0 ? void 0 : _resource$metadata4.resource_name), locale)].filter(Boolean).join(' ');
   }).filter(Boolean).join(', ');
 }
 function sortBookings(bookings) {

package/dist/shared/receipt/templateVisibility.d.ts

@@ -1,5 +1,8 @@
 /** Template children are direct module members; legacy missing values stay visible. */
 export interface InvoiceDataVisibility {
+    lineGroups: {
+        resourceTitle: boolean;
+    };
     handover: {
         show: boolean;
         method: boolean;

package/dist/shared/receipt/templateVisibility.js

@@ -36,6 +36,9 @@ export function resolveInvoiceDataVisibility(settings) {
     return typeof tag === 'string' && tag.length > 0;
   })) : null;
   return {
+    lineGroups: {
+      resourceTitle: field(module('line_groups'), 'resource_title')
+    },
     handover: {
       show: invoiceSettingIsVisible(handover === null || handover === void 0 ? void 0 : handover.is_show),
       method: field(handover, 'method'),
@@ -59,6 +62,7 @@ export function requiresInvoiceDataFiltering(settings) {
   var _resolveInvoiceDataVi = resolveInvoiceDataVisibility(settings),
     handover = _resolveInvoiceDataVi.handover,
     customer = _resolveInvoiceDataVi.customer,
-    card = _resolveInvoiceDataVi.card;
-  return !handover.show || !handover.method || !handover.fulfillmentTime || !customer.show || !customer.name || !customer.email || !customer.phone || !card.show || card.passTypes !== null;
+    card = _resolveInvoiceDataVi.card,
+    lineGroups = _resolveInvoiceDataVi.lineGroups;
+  return !lineGroups.resourceTitle || !handover.show || !handover.method || !handover.fulfillmentTime || !customer.show || !customer.name || !customer.email || !customer.phone || !card.show || card.passTypes !== null;
 }

package/dist/shared/sales/loadSalesOrderSnapshot.js

@@ -4,7 +4,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
-export var SALES_ORDER_RELATIONS = ['products', 'bookings', 'payments', 'customer', 'summary', 'contacts_info', 'order_meta_list', 'refunds', 'notes'];
+export var SALES_ORDER_RELATIONS = ['products', 'bookings', 'payments', 'customer', 'summary', 'contacts_info', 'order_meta_list', 'refunds', 'notes', 'holder_relations'];
 
 /** Shared transport contract; remote callers use their host's /h5 prefix. */
 export function loadSalesOrderSnapshot(request, params) {

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

@@ -5,6 +5,7 @@ import { BaseSalesOrderProduct, BaseSalesOrderProductIdentity, BaseSalesPaymentS
 import { OrderModule } from '../../modules/Order';
 import { type PickupTimingBookingInput } from '../../modules/Order/pickupTiming';
 import type { PickupTimingAvailability, PickupTimingSelection, PickupTimingValidationResult } from '../../modules/FulfillmentTiming';
+import { type ContactInfoConfig } from '../../modules/OpenData/contactInfo';
 import type { AddProductBookingInput, AddProductToOrderOptions, LoadSalesDetailParams, OrderPaymentData, OrderPaymentUpdateOptions, OrderPaymentUpdateResult, OrderPaymentSource, SendCustomerPayLinkParams, SyncPaymentsToOrderParams, SyncPaymentsToOrderResult, UpdateTempOrderCustomerInput, UpdateOrderBookingParams, UpdateOrderProductParams, OrderTempOrder, OrderSummary, OrderPromotionEvaluator, OrderGiftSelectResolver, OrderUnfulfilledPromotion, OrderLastGiftActions, RemoveProductsFromOrderOptions, ReplaceTempOrderOptions, SalesNote, SalesNotesMutationSnapshot, SetSalesNoteInput, PickupReferenceMode, ShopServiceData, ShopServiceType } from '../../modules/Order/types';
 import type { SubmitPayloadEnhancer } from '../../modules/Order/utils';
 import type { Discount, VirtualCurrencyAsset } from '../../modules/Discount/types';
@@ -281,6 +282,9 @@ export declare class BaseSalesImpl extends BaseModule implements Module {
     setPickupTimingBooking(input: PickupTimingBookingInput): import("../../modules/Order").PickupTimingBooking;
     clearPickupTimingBooking(): void;
     updateTempOrderContactsInfo(contactsInfo: Record<string, any> | null): Record<string, any> | null;
+    protected loadContactInfoOpenData(): Promise<OpenDataConfig | null>;
+    getContactInfoConfig(): Promise<ContactInfoConfig>;
+    validateContactInfo(): Promise<void>;
     /** @deprecated OrderModule 不再负责 tempOrder localStorage 持久化。 */
     setEnableTempOrderPersist(enabled: boolean): void;
     /** 是否允许 saveDraft 写入 IndexedDB 草稿。 */