@pisell/pisellos 2.3.20 → 2.3.21

package/dist/modules/BookingContext/utils/buildCacheItemFromOrderLine.js

@@ -121,6 +121,10 @@ function resolveProductTitle(product, booking, sourceProduct) {
   var metadata = product.metadata || {};
   return (_ref = (_ref2 = (_ref3 = (_ref4 = (_ref5 = (_title = sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.title) !== null && _title !== void 0 ? _title : sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.name) !== null && _ref5 !== void 0 ? _ref5 : metadata.product_title) !== null && _ref4 !== void 0 ? _ref4 : metadata.product_name) !== null && _ref3 !== void 0 ? _ref3 : booking === null || booking === void 0 || (_booking$product = booking.product) === null || _booking$product === void 0 ? void 0 : _booking$product.title) !== null && _ref2 !== void 0 ? _ref2 : booking === null || booking === void 0 || (_booking$detail = booking.detail) === null || _booking$detail === void 0 ? void 0 : _booking$detail.product_title) !== null && _ref !== void 0 ? _ref : '';
 }
+function resolveProductCover(product, booking, sourceProduct) {
+  var _ref6, _cover;
+  return (_ref6 = (_cover = sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.cover) !== null && _cover !== void 0 ? _cover : product.product_cover) !== null && _ref6 !== void 0 ? _ref6 : '';
+}
 function resolveMainProductPrice(product, fallback) {
   var _metadata$main_produc;
   var metadata = product.metadata || {};
@@ -130,9 +134,9 @@ function resolveMainProductPrice(product, fallback) {
 }
 function mapOrderBundleToOtherBundle(bundle) {
   return bundle.map(function (item) {
-    var _ref6, _item$original_price;
+    var _ref7, _item$original_price;
     return _objectSpread(_objectSpread({}, item), {}, {
-      original_price: (_ref6 = (_item$original_price = item.original_price) !== null && _item$original_price !== void 0 ? _item$original_price : item.bundle_selling_price) !== null && _ref6 !== void 0 ? _ref6 : item.price
+      original_price: (_ref7 = (_item$original_price = item.original_price) !== null && _item$original_price !== void 0 ? _item$original_price : item.bundle_selling_price) !== null && _ref7 !== void 0 ? _ref7 : item.price
     });
   });
 }
@@ -163,10 +167,10 @@ function synthesizeProductResourceFromBooking(booking) {
   });
   if (relationIdsByForm.size === 0) return undefined;
   return {
-    resources: Array.from(relationIdsByForm.entries()).map(function (_ref7) {
-      var _ref8 = _slicedToArray(_ref7, 2),
-        formId = _ref8[0],
-        relationIds = _ref8[1];
+    resources: Array.from(relationIdsByForm.entries()).map(function (_ref8) {
+      var _ref9 = _slicedToArray(_ref8, 2),
+        formId = _ref9[0],
+        relationIds = _ref9[1];
       return {
         id: formId,
         status: 1,
@@ -186,7 +190,7 @@ function synthesizeProductResourceFromBooking(booking) {
  * 调用方须传入与该行关联的 booking（通常 bookings[].product_uid === product.metadata.unique_identification_number）。
  */
 export function buildCacheItemFromOrderLine(input) {
-  var _product$product_id, _product$selling_pric, _product$original_pri, _booking$metadata$hol, _booking$metadata2, _product$product_vari, _product$num, _ref9, _product$note, _booking$detail2, _product$metadata, _product$metadata2, _ref10, _extension_type, _booking$product2, _booking$product3, _price, _product$order_detail, _ref11, _booking$id;
+  var _product$product_id, _product$selling_pric, _product$original_pri, _booking$metadata$hol, _booking$metadata2, _product$product_vari, _product$num, _ref10, _product$note, _booking$detail2, _product$metadata, _product$metadata2, _ref11, _extension_type, _booking$product2, _booking$product3, _price, _product$order_detail, _ref12, _booking$id;
   var product = input.product,
     booking = input.booking,
     sourceProduct = input.sourceProduct;
@@ -202,6 +206,7 @@ export function buildCacheItemFromOrderLine(input) {
   var capacity = resolveCapacityFromBooking(booking);
   var holderId = (_booking$metadata$hol = (_booking$metadata2 = booking.metadata) === null || _booking$metadata2 === void 0 ? void 0 : _booking$metadata2.holder_id) !== null && _booking$metadata$hol !== void 0 ? _booking$metadata$hol : booking.holder_id;
   var productTitle = resolveProductTitle(product, booking, sourceProduct);
+  var productCover = resolveProductCover(product, booking, sourceProduct);
   var productOptionString = buildProductOptionStringFromOrderLine(product);
   var other = {
     product_variant_id: (_product$product_vari = product.product_variant_id) !== null && _product$product_vari !== void 0 ? _product$product_vari : 0,
@@ -219,7 +224,8 @@ export function buildCacheItemFromOrderLine(input) {
     sub_type: booking.sub_type,
     quantity: (_product$num = product.num) !== null && _product$num !== void 0 ? _product$num : 1,
     product_name: productTitle,
-    note: (_ref9 = (_product$note = product.note) !== null && _product$note !== void 0 ? _product$note : booking === null || booking === void 0 || (_booking$detail2 = booking.detail) === null || _booking$detail2 === void 0 ? void 0 : _booking$detail2.note) !== null && _ref9 !== void 0 ? _ref9 : '',
+    product_cover: productCover,
+    note: (_ref10 = (_product$note = product.note) !== null && _product$note !== void 0 ? _product$note : booking === null || booking === void 0 || (_booking$detail2 = booking.detail) === null || _booking$detail2 === void 0 ? void 0 : _booking$detail2.note) !== null && _ref10 !== void 0 ? _ref10 : '',
     price: mainProductPrice,
     total: selling,
     origin_total: original,
@@ -254,7 +260,7 @@ export function buildCacheItemFromOrderLine(input) {
   var base = _objectSpread(_objectSpread(_objectSpread({}, sourceProduct || {}), {}, {
     id: resolvedId,
     product_id: resolvedId,
-    extension_type: (_ref10 = (_extension_type = sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.extension_type) !== null && _extension_type !== void 0 ? _extension_type : booking === null || booking === void 0 || (_booking$product2 = booking.product) === null || _booking$product2 === void 0 ? void 0 : _booking$product2.extension_type) !== null && _ref10 !== void 0 ? _ref10 : sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.extension_type,
+    extension_type: (_ref11 = (_extension_type = sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.extension_type) !== null && _extension_type !== void 0 ? _extension_type : booking === null || booking === void 0 || (_booking$product2 = booking.product) === null || _booking$product2 === void 0 ? void 0 : _booking$product2.extension_type) !== null && _ref11 !== void 0 ? _ref11 : sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.extension_type,
     title: productTitle || (sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.title) || (booking === null || booking === void 0 || (_booking$product3 = booking.product) === null || _booking$product3 === void 0 ? void 0 : _booking$product3.title),
     price: (_price = sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.price) !== null && _price !== void 0 ? _price : selling,
     selling_price: product.selling_price,
@@ -266,7 +272,7 @@ export function buildCacheItemFromOrderLine(input) {
     new: 0,
     autoClose: false,
     order_detail_id: (_product$order_detail = product.order_detail_id) !== null && _product$order_detail !== void 0 ? _product$order_detail : null,
-    booking_id: (_ref11 = (_booking$id = booking.id) !== null && _booking$id !== void 0 ? _booking$id : booking.booking_id) !== null && _ref11 !== void 0 ? _ref11 : 0
+    booking_id: (_ref12 = (_booking$id = booking.id) !== null && _booking$id !== void 0 ? _booking$id : booking.booking_id) !== null && _ref12 !== void 0 ? _ref12 : 0
   });
   if ((sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.capacity) !== undefined) {
     base.capacity = sourceProduct.capacity;

package/dist/modules/BookingContext/utils/buildNormalProductCacheItemFromOrderLine.js

@@ -75,7 +75,7 @@ function mapOrderBundleToOtherBundle(bundle) {
   });
 }
 export function buildNormalProductCacheItemFromOrderLine(input) {
-  var _product$product_id, _product$selling_pric2, _product$original_pri, _product$metadata, _product$metadata2, _product$product_vari, _originExtend$other, _product$num, _product$product_vari2, _product$num2, _title, _product$note, _originExtend$price, _originExtend$total, _originExtend$origin_, _product$metadata3, _ref6, _title2, _price3, _product$order_detail;
+  var _product$product_id, _product$selling_pric2, _product$original_pri, _product$metadata, _product$metadata2, _product$product_vari, _originExtend$other, _product$num, _product$product_vari2, _product$num2, _title, _product$note, _originExtend$price, _originExtend$total, _originExtend$origin_, _product$metadata3, _ref6, _title2, _ref7, _cover, _price3, _product$order_detail;
   var product = input.product,
     sourceProduct = input.sourceProduct;
   var resolvedId = (_product$product_id = product.product_id) !== null && _product$product_id !== void 0 ? _product$product_id : sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.id;
@@ -132,6 +132,7 @@ export function buildNormalProductCacheItemFromOrderLine(input) {
     product_id: resolvedId,
     _id: uid,
     title: (_ref6 = (_title2 = sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.title) !== null && _title2 !== void 0 ? _title2 : product.product_title) !== null && _ref6 !== void 0 ? _ref6 : '',
+    cover: (_ref7 = (_cover = sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.cover) !== null && _cover !== void 0 ? _cover : product.product_cover) !== null && _ref7 !== void 0 ? _ref7 : '',
     price: (_price3 = sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.price) !== null && _price3 !== void 0 ? _price3 : sourcePrice,
     selling_price: product.selling_price,
     original_price: product.original_price

package/dist/modules/Order/index.js

@@ -711,7 +711,6 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "applyDiscount",
     value: function applyDiscount(options) {
       var _this$store$discount9,
-        _tempOrder$holder2,
         _this$store$summary2,
         _this2 = this;
       var tempOrder = this.store.tempOrder;
@@ -726,11 +725,10 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       if (shouldSkipDiscountCalculation) return;
       var rulesModule = this.store.rules;
       if (!rulesModule) return;
-      var holders = ((_tempOrder$holder2 = tempOrder.holder) === null || _tempOrder$holder2 === void 0 ? void 0 : _tempOrder$holder2.form_record) || [];
       var result = rulesModule.calcDiscount({
         productList: tempOrder.products,
         discountList: discountList,
-        holders: holders,
+        holders: [],
         isFormSubject: function isFormSubject(product) {
           return resolveIsFormSubject(tempOrder, product);
         },
@@ -2019,13 +2017,21 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "restoreOriginalSnapshotIfProductsUnchanged",
     value: function restoreOriginalSnapshotIfProductsUnchanged(tempOrder, snapshot) {
       var currentFingerprint = this.buildOrderProductsFingerprint(tempOrder.products);
+      var manualDepositOverride = this.getManualDepositOverride(tempOrder);
       if (currentFingerprint !== snapshot.productFingerprint) {
         var currentStructuralFingerprint = this.buildOrderProductsStructuralFingerprint(tempOrder.products);
         var snapshotStructuralFingerprint = this.buildOrderProductsStructuralFingerprint(Array.isArray(snapshot.products) ? snapshot.products : []);
         if (currentStructuralFingerprint !== snapshotStructuralFingerprint) return null;
       }
       var summary = _objectSpread(_objectSpread({}, createEmptySummary()), cloneDeep(snapshot.summary || {}));
-      if (!this.isSnapshotPayableAmountUnchanged(tempOrder, snapshot, summary)) return null;
+      var shouldUseManualDepositOverride = Boolean(manualDepositOverride && manualDepositOverride.productStructuralFingerprint === this.buildOrderProductsStructuralFingerprint(tempOrder.products));
+      if (shouldUseManualDepositOverride) {
+        summary = this.applyDepositAmountToSummary(tempOrder, summary, manualDepositOverride.amount);
+      } else if (manualDepositOverride) {
+        this.clearManualDepositOverride(tempOrder);
+      }
+      var isPayableAmountUnchanged = this.isSnapshotPayableAmountUnchanged(tempOrder, snapshot, summary);
+      if (!isPayableAmountUnchanged) return null;
       if (Array.isArray(snapshot.products)) {
         tempOrder.products = cloneDeep(snapshot.products);
       }
@@ -2526,7 +2532,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "buildTempOrderHolderFromBookings",
     value: function buildTempOrderHolderFromBookings(tempOrder) {
-      var _baseHolder$customer_, _baseHolder, _ref46, _baseHolder$form_id, _baseHolder2, _tempOrder$holder3, _baseHolder3, _this$otherParams;
+      var _baseHolder$customer_, _baseHolder, _ref46, _baseHolder$form_id, _baseHolder2, _tempOrder$holder2, _baseHolder3, _this$otherParams;
       var holderRecords = [];
       var holderNames = [];
       var baseHolder = null;
@@ -2573,7 +2579,7 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       }
       var nextHolder = {
         customer_id: (_baseHolder$customer_ = (_baseHolder = baseHolder) === null || _baseHolder === void 0 ? void 0 : _baseHolder.customer_id) !== null && _baseHolder$customer_ !== void 0 ? _baseHolder$customer_ : tempOrder.customer_id,
-        form_id: (_ref46 = (_baseHolder$form_id = (_baseHolder2 = baseHolder) === null || _baseHolder2 === void 0 ? void 0 : _baseHolder2.form_id) !== null && _baseHolder$form_id !== void 0 ? _baseHolder$form_id : (_tempOrder$holder3 = tempOrder.holder) === null || _tempOrder$holder3 === void 0 ? void 0 : _tempOrder$holder3.form_id) !== null && _ref46 !== void 0 ? _ref46 : 0,
+        form_id: (_ref46 = (_baseHolder$form_id = (_baseHolder2 = baseHolder) === null || _baseHolder2 === void 0 ? void 0 : _baseHolder2.form_id) !== null && _baseHolder$form_id !== void 0 ? _baseHolder$form_id : (_tempOrder$holder2 = tempOrder.holder) === null || _tempOrder$holder2 === void 0 ? void 0 : _tempOrder$holder2.form_id) !== null && _ref46 !== void 0 ? _ref46 : 0,
         form_record: holderRecords
       };
       if (holderNames.length) {
@@ -5700,6 +5706,8 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
       if (!existingIdentity) {
         row.metadata.unique_identification_number = createUuidV4();
       }
+      // 从云端、本地数据库中获取到的商品数据，先打上 runtime 标记，提供给 UI 做 saved items.
+      row.metadata.is_edit_for_runtime = true;
       var normalized = normalizeOrderProduct(row);
       normalized.discount_list = normalizeOrderProductDiscountList(normalized.discount_list);
       var result = _objectSpread(_objectSpread(_objectSpread({}, row), normalized), {}, {

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

@@ -198,6 +198,7 @@ export interface OrderProduct extends OrderProductIdentity {
     product_bundle: any[];
     booking_uid?: string;
     product_title?: OrderLocalizedText;
+    product_cover?: string;
     metadata: Record<string, any>;
     note?: string;
 }

package/dist/modules/Order/utils.js

@@ -924,6 +924,9 @@ function normalizeSubmitProduct(product) {
   if (rawMetadata.is_rule !== undefined) {
     cleanMetadata.is_rule = rawMetadata.is_rule;
   }
+  if (rawMetadata.holder_config !== undefined) {
+    cleanMetadata.holder_config = rawMetadata.holder_config;
+  }
   var productSku = _objectSpread(_objectSpread({}, submitProduct.product_sku && _typeof(submitProduct.product_sku) === 'object' ? submitProduct.product_sku : {}), {}, {
     option: formatSubmitOptionItems((_submitProduct$produc = submitProduct.product_sku) === null || _submitProduct$produc === void 0 ? void 0 : _submitProduct$produc.option)
   });
@@ -1361,11 +1364,16 @@ export function isHolderConfigRequired(holderConfig) {
   return Number(holderConfig.required) === 1;
 }
 export function productRequiresFormSubject(tempOrder, product) {
+  var _tempOrder$products, _orderProduct$metadat;
+  var _orderProduct = tempOrder === null || tempOrder === void 0 || (_tempOrder$products = tempOrder.products) === null || _tempOrder$products === void 0 ? void 0 : _tempOrder$products.find(function (item) {
+    return item.metadata.unique_identification_number === product._id || item.product_id === product.id;
+  });
   var runtimeOrigin = getRuntimeProductOrigin(tempOrder, product);
-  return isHolderConfigRequired(product === null || product === void 0 ? void 0 : product.holder_config) || isHolderConfigRequired(runtimeOrigin === null || runtimeOrigin === void 0 ? void 0 : runtimeOrigin.holder_config);
+  return isHolderConfigRequired(_orderProduct === null || _orderProduct === void 0 || (_orderProduct$metadat = _orderProduct.metadata) === null || _orderProduct$metadat === void 0 ? void 0 : _orderProduct$metadat.holder_config) || isHolderConfigRequired(runtimeOrigin === null || runtimeOrigin === void 0 ? void 0 : runtimeOrigin.holder_config) || isHolderConfigRequired(product === null || product === void 0 ? void 0 : product.holder_config);
 }
 export function resolveIsFormSubject(tempOrder, product) {
   var _tempOrder$holder;
+  debugger;
   // 旧版预约维度的 holder 类型仍然生效；新版则从当前商品 holder_config 判断。
   if ((tempOrder === null || tempOrder === void 0 || (_tempOrder$holder = tempOrder.holder) === null || _tempOrder$holder === void 0 ? void 0 : _tempOrder$holder.type) === 'form') return true;
   if (product) return productRequiresFormSubject(tempOrder, product);
@@ -1405,7 +1413,7 @@ export function isEmptyOrderProductDisplayValue(value) {
  */
 export function mergeOrderProductDisplayFields(previous, next) {
   var merged = _objectSpread({}, next);
-  var displayFields = ['product_title', 'product_name', 'product_cover', 'cover', 'variant_title', 'product_sku', 'payment_price'];
+  var displayFields = ['product_title', 'product_name', 'product_cover', 'cover', 'product_cover', 'variant_title', 'product_sku', 'payment_price'];
   displayFields.forEach(function (field) {
     if (isEmptyOrderProductDisplayValue(merged[field]) && !isEmptyOrderProductDisplayValue(previous[field])) {
       merged[field] = previous[field];

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

@@ -49,5 +49,5 @@ export declare class Product extends BaseModule implements Module {
     getCategories(): ProductCategory[];
     setOtherParams(key: string, value: any): void;
     getOtherParams(): any;
-    getProductType(): "normal" | "duration" | "session";
+    getProductType(): "duration" | "session" | "normal";
 }

package/dist/server/index.d.ts

@@ -445,6 +445,10 @@ declare class Server {
     private sumPaidOrderPayments;
     private toAmountNumber;
     private buildSmallTicketProductMap;
+    private collectSalesDetailProductIds;
+    private buildSalesDetailProductSnapshotMap;
+    private withProductCatalogSnapshots;
+    private withSalesDetailProductSnapshots;
     private withPendingSyncProductTitles;
     private buildProductTitleSnapshot;
     private getProductTitleSnapshotCurrentLocale;