@pisell/pisellos 2.2.186 → 2.2.188

package/lib/modules/BookingContext/utils/orderLineDisplay.js

@@ -0,0 +1,56 @@
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/modules/BookingContext/utils/orderLineDisplay.ts
+var orderLineDisplay_exports = {};
+__export(orderLineDisplay_exports, {
+  buildProductOptionStringFromOrderLine: () => buildProductOptionStringFromOrderLine
+});
+module.exports = __toCommonJS(orderLineDisplay_exports);
+function pickDisplayText(value) {
+  if (value === void 0 || value === null)
+    return "";
+  if (typeof value === "string")
+    return value;
+  if (typeof value !== "object")
+    return String(value);
+  return value.auto || value.original || value.en || value["zh-CN"] || value["zh-HK"] || "";
+}
+function formatNamePair(group, item) {
+  const groupText = pickDisplayText(group);
+  const itemText = pickDisplayText(item);
+  if (groupText && itemText)
+    return `${groupText}:${itemText}`;
+  return groupText || itemText;
+}
+function buildProductOptionStringFromOrderLine(product) {
+  const segments = [];
+  const sku = (product == null ? void 0 : product.product_sku) || {};
+  if (Array.isArray(sku.variant)) {
+    for (const variant of sku.variant) {
+      const segment = formatNamePair(variant == null ? void 0 : variant.group, variant == null ? void 0 : variant.item);
+      if (segment)
+        segments.push(segment);
+    }
+  }
+  return segments.join(", ");
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  buildProductOptionStringFromOrderLine
+});

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

@@ -312,7 +312,11 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
         recalcOnHydrate?: boolean;
     }): Promise<OrderTempOrder>;
     private normalizeTempOrderForRuntime;
+    private pickHydratedDisplayText;
+    private formatHydratedNamePair;
+    private buildHydratedProductOptionString;
     private normalizeHydratedProductOptionItem;
+    private mergeHydratedProductOptionDisplayFields;
     private resolveHydratedProductOptions;
     private normalizeHydratedOrderProduct;
     getLastOrderInfo(): Record<string, any> | undefined;

package/lib/modules/Order/index.js

@@ -694,7 +694,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     return (0, import_utils.mapPaymentItemsToOrderPayments)(payments, {
       includeVoided: false
     }).reduce((sum, payment) => {
-      const amount = new import_decimal.default(payment.amount || 0);
+      const amount = new import_decimal.default(payment.amount || 0).minus(new import_decimal.default(payment.service_fee || 0));
       const rounding = new import_decimal.default(payment.rounding_amount || 0);
       return sum.plus(amount.minus(rounding));
     }, new import_decimal.default(0));
@@ -719,12 +719,16 @@ var OrderModule = class extends import_BaseModule.BaseModule {
   }
   updateTempOrderPaymentStatus(tempOrder) {
     const paymentTotal = this.calculatePaymentTotal(tempOrder.payments || []);
+    const targetAmount = this.getPaymentTargetAmount();
+    if (targetAmount.lte(0)) {
+      tempOrder.payment_status = "paid";
+      return;
+    }
     if (paymentTotal.lte(0)) {
       tempOrder.payment_status = tempOrder.payment_status || "payment_processing";
       return;
     }
-    const targetAmount = this.getPaymentTargetAmount();
-    tempOrder.payment_status = targetAmount.gt(0) && paymentTotal.gte(targetAmount) ? "paid" : "partially_paid";
+    tempOrder.payment_status = paymentTotal.gte(targetAmount) ? "paid" : "partially_paid";
   }
   calculatePaidPaymentSummary(payments) {
     return (payments || []).reduce(
@@ -1560,7 +1564,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     );
   }
   async updateOrderProduct(params) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _i;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p;
     const {
       product_id,
       product_variant_id,
@@ -1620,7 +1624,20 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     nextProduct.num = (0, import_utils3.getSafeProductNum)(nextProduct.num);
     const callerUpdatesTopPrice = Object.prototype.hasOwnProperty.call(updates || {}, "selling_price") || Object.prototype.hasOwnProperty.call(updates || {}, "original_price");
     const callerUpdatesMainMeta = ((_b = updates == null ? void 0 : updates.metadata) == null ? void 0 : _b.main_product_selling_price) !== void 0 || ((_c = updates == null ? void 0 : updates.metadata) == null ? void 0 : _c.main_product_original_price) !== void 0 || ((_d = updates == null ? void 0 : updates.metadata) == null ? void 0 : _d.source_product_price) !== void 0;
-    if (callerUpdatesTopPrice && !callerUpdatesMainMeta) {
+    const isPersistedOrderLine = targetProduct.order_detail_id !== void 0 && targetProduct.order_detail_id !== null;
+    const callerUpdatesManualPrice = ((_e = updates == null ? void 0 : updates.metadata) == null ? void 0 : _e.price_override) !== void 0 || ((_f = updates == null ? void 0 : updates.metadata) == null ? void 0 : _f.is_manual_discount) !== void 0 || ((_g = updates == null ? void 0 : updates.metadata) == null ? void 0 : _g.product_discount_reason) !== void 0 || Array.isArray(updates == null ? void 0 : updates.discount_list) && updates.discount_list.length > 0;
+    if (isPersistedOrderLine && !callerUpdatesManualPrice) {
+      nextProduct.selling_price = targetProduct.selling_price;
+      nextProduct.original_price = targetProduct.original_price;
+      nextProduct.payment_price = targetProduct.payment_price;
+      nextProduct.metadata = {
+        ...nextProduct.metadata || {},
+        source_product_price: (_h = targetProduct.metadata) == null ? void 0 : _h.source_product_price,
+        main_product_selling_price: (_i = targetProduct.metadata) == null ? void 0 : _i.main_product_selling_price,
+        main_product_original_price: (_j = targetProduct.metadata) == null ? void 0 : _j.main_product_original_price,
+        price_schema_version: (_k = targetProduct.metadata) == null ? void 0 : _k.price_schema_version
+      };
+    } else if (callerUpdatesTopPrice && !callerUpdatesMainMeta) {
       const existedMeta = nextProduct.metadata || {};
       nextProduct.metadata = { ...existedMeta };
       delete nextProduct.metadata.source_product_price;
@@ -1635,7 +1652,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     normalizedProduct.discount_list = (0, import_utils.normalizeOrderProductDiscountList)(
       normalizedProduct.discount_list
     );
-    const preservedBookingUid = nextProduct.booking_uid || ((_e = nextProduct.metadata) == null ? void 0 : _e.booking_uid) || targetProduct.booking_uid || ((_f = targetProduct.metadata) == null ? void 0 : _f.booking_uid);
+    const preservedBookingUid = nextProduct.booking_uid || ((_l = nextProduct.metadata) == null ? void 0 : _l.booking_uid) || targetProduct.booking_uid || ((_m = targetProduct.metadata) == null ? void 0 : _m.booking_uid);
     if (!booking && preservedBookingUid) {
       normalizedProduct.booking_uid = preservedBookingUid;
       normalizedProduct.metadata = {
@@ -1645,7 +1662,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     }
     if (booking) {
       const productUid = String(
-        ((_g = normalizedProduct.metadata) == null ? void 0 : _g.unique_identification_number) || ((_h = targetProduct.metadata) == null ? void 0 : _h.unique_identification_number) || unique_identification_number || (0, import_utils.createUuidV4)()
+        ((_n = normalizedProduct.metadata) == null ? void 0 : _n.unique_identification_number) || ((_o = targetProduct.metadata) == null ? void 0 : _o.unique_identification_number) || unique_identification_number || (0, import_utils.createUuidV4)()
       );
       normalizedProduct.metadata = {
         ...normalizedProduct.metadata || {},
@@ -1675,7 +1692,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       tempOrder,
       updates,
       tempOrder.products[productIndex],
-      (_i = tempOrder.products[productIndex].metadata) == null ? void 0 : _i.unique_identification_number
+      (_p = tempOrder.products[productIndex].metadata) == null ? void 0 : _p.unique_identification_number
     );
     await this.applyPromotion();
     this.applyDiscount();
@@ -1945,7 +1962,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     );
     const paymentTotal = this.calculatePaymentTotal(mappedPayments);
     const targetAmount = this.getPaymentTargetAmount();
-    const isFullyPaid = targetAmount.lte(0) ? false : paymentTotal.gte(targetAmount);
+    const isFullyPaid = targetAmount.lte(0) ? true : paymentTotal.gte(targetAmount);
     const paymentStatus = isFullyPaid ? params.paymentStatus || "paid" : "partially_paid";
     tempOrder.payments = mappedPayments;
     tempOrder.payment_status = paymentStatus;
@@ -2329,9 +2346,19 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       const existed = productsByUid[uid] && typeof productsByUid[uid] === "object" ? productsByUid[uid] : {};
       const rawProduct = rawProducts[index] && typeof rawProducts[index] === "object" ? rawProducts[index] : product;
       const origin = existed.origin ?? rawProduct._origin ?? ((_b = rawProduct.metadata) == null ? void 0 : _b.origin) ?? rawProduct;
+      const originSnapshot = (0, import_lodash_es.cloneDeep)(origin);
+      const productOptionString = this.buildHydratedProductOptionString(rawProduct) || this.buildHydratedProductOptionString(product);
+      if (productOptionString && originSnapshot && typeof originSnapshot === "object") {
+        if (originSnapshot.product_option_string === void 0) {
+          originSnapshot.product_option_string = productOptionString;
+        }
+        if (originSnapshot.product_options_stirng === void 0) {
+          originSnapshot.product_options_stirng = productOptionString;
+        }
+      }
       productsByUid[uid] = {
         ...existed,
-        origin: (0, import_lodash_es.cloneDeep)(origin)
+        origin: originSnapshot
       };
     }
     tempOrderExtend.productsByUid = productsByUid;
@@ -2341,24 +2368,81 @@ var OrderModule = class extends import_BaseModule.BaseModule {
     nextTempOrder.vouchers = raw.vouchers || [];
     return nextTempOrder;
   }
+  pickHydratedDisplayText(value) {
+    if (value === void 0 || value === null)
+      return "";
+    if (typeof value === "string")
+      return value;
+    if (typeof value !== "object")
+      return String(value);
+    return value.auto || value.original || value.en || value["zh-CN"] || value["zh-HK"] || "";
+  }
+  formatHydratedNamePair(group, item) {
+    const groupText = this.pickHydratedDisplayText(group);
+    const itemText = this.pickHydratedDisplayText(item);
+    if (groupText && itemText)
+      return `${groupText}:${itemText}`;
+    return groupText || itemText;
+  }
+  buildHydratedProductOptionString(product) {
+    const segments = [];
+    const sku = (product == null ? void 0 : product.product_sku) || {};
+    if (Array.isArray(sku.variant)) {
+      for (const variant of sku.variant) {
+        const segment = this.formatHydratedNamePair(variant == null ? void 0 : variant.group, variant == null ? void 0 : variant.item);
+        if (segment)
+          segments.push(segment);
+      }
+    }
+    return segments.join(", ");
+  }
   normalizeHydratedProductOptionItem(optionItem) {
     const rawNum = (optionItem == null ? void 0 : optionItem.num) ?? (optionItem == null ? void 0 : optionItem.quantity) ?? 1;
     const parsedNum = Number(rawNum);
     const rawPrice = (optionItem == null ? void 0 : optionItem.price) ?? (optionItem == null ? void 0 : optionItem.add_price) ?? 0;
     const parsedPrice = Number(rawPrice);
-    return {
+    const normalized = {
       option_group_item_id: optionItem == null ? void 0 : optionItem.option_group_item_id,
       option_group_id: optionItem == null ? void 0 : optionItem.option_group_id,
       num: Number.isFinite(parsedNum) && parsedNum > 0 ? parsedNum : 1,
       price: Number.isFinite(parsedPrice) ? parsedPrice : 0
     };
+    if ((optionItem == null ? void 0 : optionItem.name) !== void 0)
+      normalized.name = optionItem.name;
+    if ((optionItem == null ? void 0 : optionItem.group_name) !== void 0)
+      normalized.group_name = optionItem.group_name;
+    if ((optionItem == null ? void 0 : optionItem.id) !== void 0)
+      normalized.id = optionItem.id;
+    return normalized;
+  }
+  mergeHydratedProductOptionDisplayFields(options, skuOptions) {
+    if (!Array.isArray(skuOptions) || skuOptions.length === 0)
+      return options;
+    const displayByItemId = /* @__PURE__ */ new Map();
+    for (const option of skuOptions) {
+      const key = option == null ? void 0 : option.option_group_item_id;
+      if (key === void 0 || key === null || key === "")
+        continue;
+      displayByItemId.set(String(key), option);
+    }
+    return options.map((option) => {
+      const display = displayByItemId.get(String((option == null ? void 0 : option.option_group_item_id) ?? ""));
+      if (!display)
+        return option;
+      return {
+        ...option,
+        ...option.name === void 0 && display.name !== void 0 ? { name: display.name } : {},
+        ...option.group_name === void 0 && display.group_name !== void 0 ? { group_name: display.group_name } : {},
+        ...option.id === void 0 && display.id !== void 0 ? { id: display.id } : {}
+      };
+    });
   }
   resolveHydratedProductOptions(row) {
     var _a;
+    const skuOptions = (_a = row.product_sku) == null ? void 0 : _a.option;
     if (Array.isArray(row.product_option_item) && row.product_option_item.length > 0) {
-      return row.product_option_item;
+      return this.mergeHydratedProductOptionDisplayFields(row.product_option_item, skuOptions);
     }
-    const skuOptions = (_a = row.product_sku) == null ? void 0 : _a.option;
     if (!Array.isArray(skuOptions))
       return [];
     return skuOptions.map(