@pisell/pisellos 2.3.6 → 2.3.8

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

@@ -1,7 +1,3 @@
-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 _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 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); }
@@ -132,6 +128,14 @@ function resolveMainProductPrice(product, fallback) {
   var parsed = Number(value);
   return Number.isFinite(parsed) ? parsed : fallback;
 }
+function mapOrderBundleToOtherBundle(bundle) {
+  return bundle.map(function (item) {
+    var _ref6, _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
+    });
+  });
+}
 
 /**
  * catalog 缺 product_resource 时，从 booking.resources 反推最小 product_resource 结构，
@@ -159,10 +163,10 @@ function synthesizeProductResourceFromBooking(booking) {
   });
   if (relationIdsByForm.size === 0) return undefined;
   return {
-    resources: Array.from(relationIdsByForm.entries()).map(function (_ref6) {
-      var _ref7 = _slicedToArray(_ref6, 2),
-        formId = _ref7[0],
-        relationIds = _ref7[1];
+    resources: Array.from(relationIdsByForm.entries()).map(function (_ref7) {
+      var _ref8 = _slicedToArray(_ref7, 2),
+        formId = _ref8[0],
+        relationIds = _ref8[1];
       return {
         id: formId,
         status: 1,
@@ -182,7 +186,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, _ref8, _product$note, _booking$detail2, _product$metadata, _product$metadata2, _ref9, _extension_type, _booking$product2, _booking$product3, _price, _product$order_detail, _ref10, _booking$id;
+  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 = input.product,
     booking = input.booking,
     sourceProduct = input.sourceProduct;
@@ -202,7 +206,7 @@ export function buildCacheItemFromOrderLine(input) {
   var other = {
     product_variant_id: (_product$product_vari = product.product_variant_id) !== null && _product$product_vari !== void 0 ? _product$product_vari : 0,
     option: getProductSkuOptions(product),
-    bundle: Array.isArray(product.product_bundle) ? _toConsumableArray(product.product_bundle) : []
+    bundle: mapOrderBundleToOtherBundle(Array.isArray(product.product_bundle) ? product.product_bundle : [])
   };
   var extend = _objectSpread({
     start_date: startDate ? dayjs(startDate) : undefined,
@@ -215,7 +219,7 @@ 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: (_ref8 = (_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 && _ref8 !== void 0 ? _ref8 : '',
+    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 : '',
     price: mainProductPrice,
     total: selling,
     origin_total: original,
@@ -250,7 +254,7 @@ export function buildCacheItemFromOrderLine(input) {
   var base = _objectSpread(_objectSpread(_objectSpread({}, sourceProduct || {}), {}, {
     id: resolvedId,
     product_id: resolvedId,
-    extension_type: (_ref9 = (_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 && _ref9 !== void 0 ? _ref9 : sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.extension_type,
+    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,
     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,
@@ -262,7 +266,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: (_ref10 = (_booking$id = booking.id) !== null && _booking$id !== void 0 ? _booking$id : booking.booking_id) !== null && _ref10 !== void 0 ? _ref10 : 0
+    booking_id: (_ref11 = (_booking$id = booking.id) !== null && _booking$id !== void 0 ? _booking$id : booking.booking_id) !== null && _ref11 !== void 0 ? _ref11 : 0
   });
   if ((sourceProduct === null || sourceProduct === void 0 ? void 0 : sourceProduct.capacity) !== undefined) {
     base.capacity = sourceProduct.capacity;

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

@@ -312,13 +312,27 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
     updateOrderPayment(paymentIdentity: string | number, updates: Partial<OrderPaymentData> & Record<string, any>): OrderPaymentData[];
     /** 从当前订单支付项中移除指定支付项。 */
     deleteOrderPayment(paymentIdentity: string | number): OrderPaymentData[];
+    private confirmPendingVoucherPaymentsInList;
+    private discardPendingVoucherPaymentsFromList;
+    private prepareVoucherPaymentsForSubmit;
+    private applyPaymentLifecycleChange;
+    confirmPendingVoucherPayments(options?: {
+        persist?: boolean;
+        recalculateSummary?: boolean;
+    }): OrderPaymentData[];
+    discardPendingVoucherPayments(options?: {
+        persist?: boolean;
+        recalculateSummary?: boolean;
+    }): OrderPaymentData[];
     /**
      * 覆盖当前订单中的 wallet pass 支付项。
      *
      * 判断口径与 PaymentModal 保持一致：voucher_id 存在且不为 0 的支付项
      * 视为 wallet pass；其它支付项保持不变。
      */
-    updateVoucherOrderPayments(payments: OrderPaymentSource[]): OrderPaymentData[];
+    updateVoucherOrderPayments(payments: OrderPaymentSource[], options?: {
+        status?: 'paid' | 'payment_pending';
+    }): OrderPaymentData[];
     private shouldMergeProductToOrder;
     private hasOrderProductLineNote;
     /**
@@ -418,6 +432,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
         payments?: OrderPaymentSource[];
         paymentStatus?: SubmitSalesOrderParams['query']['payment_status'];
         smallTicketDataFlag?: number;
+        confirmPendingVoucherPayments?: boolean;
         enhancePayload?: SubmitPayloadEnhancer;
     }): Promise<T>;
     submitTempOrderAsync<T = any>(params?: {
@@ -429,6 +444,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
         payments?: OrderPaymentSource[];
         paymentStatus?: SubmitSalesOrderParams['query']['payment_status'];
         smallTicketDataFlag?: number;
+        confirmPendingVoucherPayments?: boolean;
         enhancePayload?: SubmitPayloadEnhancer;
     }): Promise<T>;
     private runSubmitTempOrder;
@@ -442,7 +458,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: "virtual" | "appointment_booking";
+        type: "appointment_booking" | "virtual";
         platform: string;
         sales_channel: string;
         order_sales_channel: string;