@pisell/private-materials 6.3.139 → 6.3.140

package/lib/components/scanOrder/utils/toShoppingCartProducts.js

@@ -73,6 +73,76 @@ function normalizeOptions(product) {
     };
   });
 }
+function getProductOriginRich(product) {
+  var _a, _b, _c;
+  return ((_a = product == null ? void 0 : product.metadata) == null ? void 0 : _a.origin) || ((_c = (_b = product == null ? void 0 : product._origin) == null ? void 0 : _b.callbackData) == null ? void 0 : _c.origin) || {};
+}
+function findVariantGroupById(groups, groupId) {
+  return groups.find((g) => Number(g == null ? void 0 : g.id) === Number(groupId));
+}
+function findVariantItemDisplayName(variantGroup, variantItemId) {
+  const items = Array.isArray(variantGroup == null ? void 0 : variantGroup.variant_item) ? variantGroup.variant_item : [];
+  const found = items.find(
+    (it) => Number(it == null ? void 0 : it.id) === Number(variantItemId)
+  );
+  const raw = (found == null ? void 0 : found.name) ?? (typeof (found == null ? void 0 : found.title) === "string" ? found.title : found == null ? void 0 : found.title) ?? "";
+  return String(raw ?? "").trim();
+}
+function buildVariantStringFromSkuIds(origin, skuIdsRaw) {
+  const groups = Array.isArray(origin == null ? void 0 : origin.variant_group) ? origin.variant_group : [];
+  const parts = [];
+  const segments = String(skuIdsRaw || "").split("_").map((s) => s.trim()).filter(Boolean);
+  for (const seg of segments) {
+    const colonIdx = seg.indexOf(":");
+    if (colonIdx <= 0) continue;
+    const groupId = Number(seg.slice(0, colonIdx));
+    const itemId = Number(seg.slice(colonIdx + 1));
+    if (Number.isNaN(groupId) || Number.isNaN(itemId)) continue;
+    const vg = findVariantGroupById(groups, groupId);
+    if (!vg) continue;
+    const groupName = String((vg == null ? void 0 : vg.name) ?? "").trim();
+    const itemName = findVariantItemDisplayName(vg, itemId);
+    if (groupName && itemName) parts.push(`${groupName}: ${itemName}`);
+    else if (itemName) parts.push(itemName);
+    else if (groupName) parts.push(groupName);
+  }
+  return parts.join(", ");
+}
+function fallbackVariantLabelFromTitles(origin, variantRow) {
+  const groups = Array.isArray(origin == null ? void 0 : origin.variant_group) ? origin.variant_group : [];
+  const nameObj = (variantRow == null ? void 0 : variantRow.name) || (variantRow == null ? void 0 : variantRow.title);
+  if (!nameObj || typeof nameObj !== "object") return "";
+  const parts = [];
+  for (const g of groups) {
+    const pid = g == null ? void 0 : g.position_id;
+    if (pid == null) continue;
+    const val = nameObj[String(pid)] ?? nameObj[pid];
+    if (val == null || val === "") continue;
+    const groupName = String((g == null ? void 0 : g.name) ?? "").trim();
+    const itemLabel = String(val).trim();
+    if (groupName && itemLabel) parts.push(`${groupName}: ${itemLabel}`);
+    else if (itemLabel) parts.push(itemLabel);
+  }
+  if (parts.length) return parts.join(", ");
+  const vals = Object.values(nameObj).filter(
+    (v) => v != null && String(v).trim() !== ""
+  );
+  return vals.map((v) => String(v).trim()).join(" / ");
+}
+function getVariantProductOptionString(product) {
+  const variantId = product == null ? void 0 : product.product_variant_id;
+  if (variantId == null || variantId === "" || Number(variantId) <= 0) return "";
+  const origin = getProductOriginRich(product);
+  const variants = Array.isArray(origin == null ? void 0 : origin.variant) ? origin.variant : [];
+  const matched = variants.find((v) => Number(v == null ? void 0 : v.id) === Number(variantId));
+  if (!matched) return "";
+  const skuIds = matched == null ? void 0 : matched.sku_ids;
+  if (skuIds != null && String(skuIds).trim() !== "") {
+    const fromSku = buildVariantStringFromSkuIds(origin, String(skuIds));
+    if (fromSku) return fromSku;
+  }
+  return fallbackVariantLabelFromTitles(origin, matched);
+}
 function normalizeBundles(product) {
   var _a;
   const callbackData = ((_a = product == null ? void 0 : product._origin) == null ? void 0 : _a.callbackData) || {};
@@ -112,17 +182,22 @@ function toShoppingCartProducts(params) {
   const { orderProducts, amountSymbol = "$" } = params;
   if (!Array.isArray(orderProducts)) return [];
   return orderProducts.map((productItem, index) => {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _i;
+    var _a, _b, _c, _d;
     const productNum = toSafeNum(productItem == null ? void 0 : productItem.num);
     const unitPrice = getUnitPrice(productItem);
-    const rowKey = ((_b = (_a = productItem == null ? void 0 : productItem._origin) == null ? void 0 : _a.callbackData) == null ? void 0 : _b.rowKey) || ((_d = (_c = productItem == null ? void 0 : productItem._origin) == null ? void 0 : _c.callbackData) == null ? void 0 : _d.key) || ((_f = (_e = productItem == null ? void 0 : productItem._origin) == null ? void 0 : _e.callbackData) == null ? void 0 : _f.unique) || (productItem == null ? void 0 : productItem.identity_key) || `${productItem.product_id ?? "p"}_${productItem.product_variant_id}_${index}`;
+    const callbackData = ((_a = productItem == null ? void 0 : productItem._origin) == null ? void 0 : _a.callbackData) || {};
+    const identityKey = typeof (productItem == null ? void 0 : productItem.identity_key) === "string" && productItem.identity_key.length > 0 ? productItem.identity_key : void 0;
+    const rowKey = identityKey ?? `${productItem.product_id ?? "p"}_${productItem.product_variant_id}_${index}`;
+    const fromCallbackOptionString = typeof (callbackData == null ? void 0 : callbackData.product_option_string) === "string" ? callbackData.product_option_string.trim() : "";
+    const productOptionString = fromCallbackOptionString || getVariantProductOptionString(productItem) || void 0;
     const base = {
       _id: rowKey,
       rowKey,
-      identity_key: (productItem == null ? void 0 : productItem.identity_key) || void 0,
+      identity_key: identityKey,
       id: productItem.product_id,
       product_id: productItem.product_id,
       product_variant_id: productItem.product_variant_id,
+      note: (productItem == null ? void 0 : productItem.note) != null ? String(productItem.note) : "",
       name: getDisplayName(productItem),
       image: getDisplayImage(productItem),
       num: productNum,
@@ -133,9 +208,16 @@ function toShoppingCartProducts(params) {
       options: normalizeOptions(productItem),
       bundle: normalizeBundles(productItem),
       _origin: productItem == null ? void 0 : productItem._origin,
-      isNormalProduct: true
+      isNormalProduct: true,
+      ...productOptionString ? { product_option_string: productOptionString } : {}
     };
-    if ((_g = productItem == null ? void 0 : productItem.metadata) == null ? void 0 : _g.venue_booking) {
+    if (Array.isArray(productItem.product_option_item) && productItem.product_option_item.length) {
+      base.product_option_item = productItem.product_option_item;
+    }
+    if (Array.isArray(productItem.product_bundle) && productItem.product_bundle.length) {
+      base.product_bundle = productItem.product_bundle;
+    }
+    if ((_b = productItem == null ? void 0 : productItem.metadata) == null ? void 0 : _b.venue_booking) {
       const origin = productItem._origin || {};
       const meta = productItem.metadata || {};
       const startDate = origin.start_date;
@@ -148,7 +230,7 @@ function toShoppingCartProducts(params) {
       base.end_time = endTime || "";
       base.duration_type = origin.sub_type || "minutes";
       base.resource_id = meta.resource_id;
-      base.relation_form_name = meta.resource_name || ((_i = (_h = origin.resources) == null ? void 0 : _h[0]) == null ? void 0 : _i.main_field) || "";
+      base.relation_form_name = meta.resource_name || ((_d = (_c = origin.resources) == null ? void 0 : _c[0]) == null ? void 0 : _d.main_field) || "";
       if (Array.isArray(origin.resources)) base.resources = origin.resources;
     }
     return base;

package/lib/components/scanOrder/utils/transformProductDetail.js

@@ -66,6 +66,12 @@ function normalizeBundleItems(bundleItems) {
     };
   });
 }
+function findVariantById(origin, variantId) {
+  if (!origin || !variantId || variantId <= 0) return null;
+  const variants = Array.isArray(origin == null ? void 0 : origin.variant) ? origin.variant : [];
+  const matched = variants.find((v) => Number(v == null ? void 0 : v.id) === variantId);
+  return matched || null;
+}
 function transformProductDetailToOrderProduct(params) {
   var _a;
   const { payload, fallbackProductId = null, sourceItem = {} } = params;
@@ -79,17 +85,18 @@ function transformProductDetailToOrderProduct(params) {
     0
   );
   const callbackOrigin = (payload == null ? void 0 : payload.origin) || ((_a = payload == null ? void 0 : payload._origin) == null ? void 0 : _a.sourceItem) || (payload == null ? void 0 : payload._origin) || {};
+  const matchedVariant = findVariantById(callbackOrigin, productVariantId) ?? findVariantById(sourceItem, productVariantId);
   const sellingPrice = toPriceString(
-    (payload == null ? void 0 : payload.price) ?? (payload == null ? void 0 : payload.selling_price) ?? (callbackOrigin == null ? void 0 : callbackOrigin.price) ?? (sourceItem == null ? void 0 : sourceItem.price) ?? (sourceItem == null ? void 0 : sourceItem.selling_price) ?? (sourceItem == null ? void 0 : sourceItem.base_price),
+    (payload == null ? void 0 : payload.price) ?? (payload == null ? void 0 : payload.selling_price) ?? (matchedVariant == null ? void 0 : matchedVariant.price) ?? (matchedVariant == null ? void 0 : matchedVariant.base_price) ?? (callbackOrigin == null ? void 0 : callbackOrigin.price) ?? (sourceItem == null ? void 0 : sourceItem.price) ?? (sourceItem == null ? void 0 : sourceItem.selling_price) ?? (sourceItem == null ? void 0 : sourceItem.base_price),
     "0.00"
   );
   const originalPrice = sellingPrice;
   const taxFee = toPriceString(
-    (payload == null ? void 0 : payload.tax_fee) ?? (callbackOrigin == null ? void 0 : callbackOrigin.tax_fee) ?? (sourceItem == null ? void 0 : sourceItem.tax_fee),
+    (payload == null ? void 0 : payload.tax_fee) ?? (matchedVariant == null ? void 0 : matchedVariant.tax_fee) ?? (callbackOrigin == null ? void 0 : callbackOrigin.tax_fee) ?? (sourceItem == null ? void 0 : sourceItem.tax_fee),
     "0.00"
   );
   const isChargeTax = toNumber(
-    (payload == null ? void 0 : payload.is_charge_tax) ?? (callbackOrigin == null ? void 0 : callbackOrigin.is_charge_tax) ?? (sourceItem == null ? void 0 : sourceItem.is_charge_tax),
+    (payload == null ? void 0 : payload.is_charge_tax) ?? (matchedVariant == null ? void 0 : matchedVariant.is_charge_tax) ?? (callbackOrigin == null ? void 0 : callbackOrigin.is_charge_tax) ?? (sourceItem == null ? void 0 : sourceItem.is_charge_tax),
     0
   );
   return {

package/lib/components/venueBooking/components/Addons/index.js

@@ -93,11 +93,12 @@ function Addons() {
     }
   };
   const removeOrderProduct = async (params) => {
-    const { product_id, product_variant_id, sourceData } = params;
+    const { product_id, product_variant_id, identity_key, sourceData } = params;
     try {
       await runModuleAction("removeProductFromOrder", {
         product_id,
-        product_variant_id
+        product_variant_id,
+        ...identity_key ? { identity_key } : {}
       });
       await refreshViewModel();
     } catch (error) {
@@ -105,16 +106,18 @@ function Addons() {
         error,
         sourceData,
         product_id,
-        product_variant_id
+        product_variant_id,
+        identity_key
       });
     }
   };
   const updateOrderProduct = async (params) => {
-    const { product_id, product_variant_id, updates, sourceData } = params;
+    const { product_id, product_variant_id, identity_key, updates, sourceData } = params;
     try {
       await runModuleAction("updateProductInOrder", {
         product_id,
         product_variant_id,
+        ...identity_key ? { identity_key } : {},
         updates
       });
       await refreshViewModel();
@@ -124,6 +127,7 @@ function Addons() {
         sourceData,
         product_id,
         product_variant_id,
+        identity_key,
         updates
       });
     }
@@ -158,18 +162,20 @@ function Addons() {
         return;
       }
       const normalizedQuantity = Number.isNaN(nextQuantity) ? 0 : Math.max(0, Math.floor(nextQuantity));
+      const cartItems = Array.isArray(viewModel == null ? void 0 : viewModel.cartItems) ? viewModel.cartItems : [];
+      const existedCartItem = cartItems.find((cartItem) => {
+        return String((cartItem == null ? void 0 : cartItem.product_id) ?? null) === String((orderProduct == null ? void 0 : orderProduct.product_id) ?? null) && Number((cartItem == null ? void 0 : cartItem.product_variant_id) ?? 0) === productVariantId;
+      });
+      const existedIdentityKey = typeof (existedCartItem == null ? void 0 : existedCartItem.identity_key) === "string" && existedCartItem.identity_key.length > 0 ? existedCartItem.identity_key : void 0;
       if (normalizedQuantity <= 0) {
         await removeOrderProduct({
           product_id: (orderProduct == null ? void 0 : orderProduct.product_id) ?? null,
           product_variant_id: productVariantId,
+          identity_key: existedIdentityKey,
           sourceData: quantityData
         });
         return;
       }
-      const cartItems = Array.isArray(viewModel == null ? void 0 : viewModel.cartItems) ? viewModel.cartItems : [];
-      const existedCartItem = cartItems.find((cartItem) => {
-        return String((cartItem == null ? void 0 : cartItem.product_id) ?? null) === String((orderProduct == null ? void 0 : orderProduct.product_id) ?? null) && Number((cartItem == null ? void 0 : cartItem.product_variant_id) ?? 0) === productVariantId;
-      });
       if (!existedCartItem) {
         await addOrderProduct({
           orderProduct: { ...orderProduct, num: normalizedQuantity },
@@ -180,6 +186,7 @@ function Addons() {
       await updateOrderProduct({
         product_id: (orderProduct == null ? void 0 : orderProduct.product_id) ?? null,
         product_variant_id: productVariantId,
+        identity_key: existedIdentityKey,
         updates: {
           num: normalizedQuantity,
           _origin: orderProduct == null ? void 0 : orderProduct._origin

package/lib/components/venueBooking/components/Cart/index.js

@@ -139,7 +139,7 @@ function Cart(props) {
   const isVenueBookingCartItem = (target) => {
     if (!target || typeof target !== "object") return false;
     if ((target == null ? void 0 : target.start_date) && (target == null ? void 0 : target.end_date)) return true;
-    const identity = String((target == null ? void 0 : target.identity_key) || (target == null ? void 0 : target.rowKey) || (target == null ? void 0 : target._id) || "");
+    const identity = String((target == null ? void 0 : target.identity_key) || "");
     if (identity.startsWith("venue:")) return true;
     return false;
   };
@@ -157,8 +157,14 @@ function Cart(props) {
     }
     const productId = (targetItem == null ? void 0 : targetItem.product_id) ?? (targetItem == null ? void 0 : targetItem.id) ?? null;
     const productVariantId = Number((targetItem == null ? void 0 : targetItem.product_variant_id) ?? 0);
-    const identityKey = (targetItem == null ? void 0 : targetItem.identity_key) || (targetItem == null ? void 0 : targetItem.rowKey) || void 0;
+    const identityKey = targetItem == null ? void 0 : targetItem.identity_key;
     if (productId === null && Number.isNaN(productVariantId)) return;
+    if (typeof identityKey !== "string" || identityKey.length === 0) {
+      console.error("[venueBooking] removeProductFromOrder skipped: missing identity_key", {
+        item: targetItem
+      });
+      return;
+    }
     try {
       await runModuleAction("removeProductFromOrder", {
         product_id: productId,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/private-materials",
-  "version": "6.3.139",
+  "version": "6.3.140",
   "scripts": {
     "dev": "father dev",
     "build": "father build",