@pisell/pisellos 2.2.197 → 2.2.199

package/lib/modules/SalesSummary/utils.js

@@ -78,8 +78,8 @@ function getBundleUnitPrice(product, useOriginal = false) {
   const bundleItems = product.product_bundle || [];
   return bundleItems.reduce((sum, item) => {
     const quantity = getSafeNum(item == null ? void 0 : item.num);
-    const price = useOriginal ? toDecimal((item == null ? void 0 : item.original_price) ?? (item == null ? void 0 : item.product_price) ?? (item == null ? void 0 : item.price)) : toDecimal((item == null ? void 0 : item.bundle_selling_price) ?? (item == null ? void 0 : item.price));
-    return sum.plus(price.times(quantity));
+    const signedUnit = (0, import_utils2.getBundleSignedUnit)(item, { useOriginal });
+    return sum.plus(signedUnit.times(quantity));
   }, new import_decimal.default(0));
 }
 function getUnitPaymentTotal(product) {
@@ -107,6 +107,7 @@ function buildSurchargeServiceItems(products) {
     const quantity = getSafeNum(product.num);
     const unitTotal = getUnitPaymentTotal(product);
     const options = (0, import_utils2.getProductSkuOptions)(product);
+    const persistedSurchargeFee = getPersistedMainSurchargeFee(product);
     return {
       id: product.product_id,
       num: quantity,
@@ -125,7 +126,10 @@ function buildSurchargeServiceItems(products) {
       option: options,
       options,
       relation_details: [],
-      metadata: product.metadata || {},
+      metadata: {
+        ...product.metadata || {},
+        __persisted_surcharge_fee: persistedSurchargeFee == null ? void 0 : persistedSurchargeFee.toFixed(2)
+      },
       start_date: ((_a = product.metadata) == null ? void 0 : _a.start_date) || "",
       start_time: ((_b = product.metadata) == null ? void 0 : _b.start_time) || ""
     };
@@ -133,10 +137,11 @@ function buildSurchargeServiceItems(products) {
 }
 function getRelationSurchargeIds(item) {
   var _a;
-  const ids = (item == null ? void 0 : item.relation_surcharge_ids) ?? ((_a = item == null ? void 0 : item.metadata) == null ? void 0 : _a.relation_surcharge_ids);
-  if (!Array.isArray(ids))
-    return [];
-  return ids.filter((id) => id !== void 0 && id !== null && id !== "");
+  const ids = [
+    ...Array.isArray(item == null ? void 0 : item.relation_surcharge_ids) ? item.relation_surcharge_ids : [],
+    ...Array.isArray((_a = item == null ? void 0 : item.metadata) == null ? void 0 : _a.relation_surcharge_ids) ? item.metadata.relation_surcharge_ids : []
+  ];
+  return [...new Set(ids.filter((id) => id !== void 0 && id !== null && id !== ""))];
 }
 function getSurchargeConfigId(config) {
   return (config == null ? void 0 : config.id) ?? (config == null ? void 0 : config.surcharge_id);
@@ -169,6 +174,50 @@ function getBundleProductId(bundle) {
     return null;
   return parsed;
 }
+function getPersistedMainSurchargeFee(product) {
+  var _a;
+  if ((product == null ? void 0 : product.order_detail_id) === void 0 || (product == null ? void 0 : product.order_detail_id) === null)
+    return null;
+  const value = (product == null ? void 0 : product.surcharge_fee) ?? (product == null ? void 0 : product.main_product_attached_bundle_surcharge_fee) ?? ((_a = product == null ? void 0 : product.metadata) == null ? void 0 : _a.main_product_attached_bundle_surcharge_fee);
+  if (value === void 0 || value === null || value === "")
+    return null;
+  return toDecimal(value);
+}
+function getPersistedSourceSurchargeFee(sourceItem) {
+  var _a;
+  const value = (_a = sourceItem == null ? void 0 : sourceItem.metadata) == null ? void 0 : _a.__persisted_surcharge_fee;
+  if (value === void 0 || value === null || value === "")
+    return null;
+  return toDecimal(value);
+}
+function getPersistedSurchargeRemainder(item, sourceItem) {
+  var _a, _b;
+  const value = ((_a = sourceItem == null ? void 0 : sourceItem.metadata) == null ? void 0 : _a.surcharge_rounding_remainder) ?? (item == null ? void 0 : item.surcharge_rounding_remainder) ?? ((_b = item == null ? void 0 : item.metadata) == null ? void 0 : _b.surcharge_rounding_remainder);
+  if (value === void 0 || value === null || value === "")
+    return null;
+  return toDecimal(value);
+}
+function getPersistedQuantity(item, fallbackQuantity) {
+  const isPersistedLine = (item == null ? void 0 : item.order_detail_id) !== void 0 && (item == null ? void 0 : item.order_detail_id) !== null;
+  if (!isPersistedLine)
+    return new import_decimal.default(0);
+  const value = (item == null ? void 0 : item.product_quantity) ?? (item == null ? void 0 : item.quantity);
+  const parsed = new import_decimal.default(value || 0);
+  if (parsed.lte(0))
+    return import_decimal.default.min(fallbackQuantity, 1);
+  return import_decimal.default.min(fallbackQuantity, parsed);
+}
+function getPersistedBundleSurchargeFee(bundle, product) {
+  var _a;
+  if ((bundle == null ? void 0 : bundle.order_detail_id) === void 0 && (product == null ? void 0 : product.order_detail_id) === void 0)
+    return null;
+  if ((bundle == null ? void 0 : bundle.order_detail_id) === null && (product == null ? void 0 : product.order_detail_id) === null)
+    return null;
+  const value = (bundle == null ? void 0 : bundle.surcharge_fee) ?? ((_a = bundle == null ? void 0 : bundle.metadata) == null ? void 0 : _a.surcharge_fee);
+  if (value === void 0 || value === null || value === "")
+    return null;
+  return toDecimal(value);
+}
 function createSurchargeAllocationNodes(products, sourceItems) {
   var _a;
   const nodes = [];
@@ -188,7 +237,10 @@ function createSurchargeAllocationNodes(products, sourceItems) {
         productId: getBundleProductId(bundle),
         unitAmount: getBundleSurchargeUnitAmount(bundle),
         quantity: new import_decimal.default(getSafeNum((bundle == null ? void 0 : bundle.num) ?? (bundle == null ? void 0 : bundle.quantity))).times(productQuantity),
-        relationSurchargeIds: getRelationSurchargeIds(sourceBundle)
+        persistedQuantity: getPersistedQuantity(bundle, new import_decimal.default(getSafeNum((bundle == null ? void 0 : bundle.num) ?? (bundle == null ? void 0 : bundle.quantity))).times(productQuantity)),
+        relationSurchargeIds: getRelationSurchargeIds(sourceBundle).length ? getRelationSurchargeIds(sourceBundle) : getRelationSurchargeIds(bundle),
+        persistedUnitSurchargeFee: getPersistedBundleSurchargeFee(bundle, product),
+        persistedSurchargeRemainder: getPersistedSurchargeRemainder(bundle, sourceBundle)
       });
     }
     nodes.push({
@@ -198,7 +250,10 @@ function createSurchargeAllocationNodes(products, sourceItems) {
       productId: product.product_id ?? null,
       unitAmount: getMainSurchargeUnitAmount(product),
       quantity: productQuantity,
-      relationSurchargeIds: getRelationSurchargeIds(sourceItem)
+      persistedQuantity: getPersistedQuantity(product, productQuantity),
+      relationSurchargeIds: getRelationSurchargeIds(sourceItem).length ? getRelationSurchargeIds(sourceItem) : getRelationSurchargeIds(product),
+      persistedUnitSurchargeFee: getPersistedSourceSurchargeFee(sourceItem) ?? getPersistedMainSurchargeFee(product),
+      persistedSurchargeRemainder: getPersistedSurchargeRemainder(product, sourceItem)
     });
   }
   return nodes;
@@ -221,6 +276,17 @@ function resetProductSurchargeFields(products) {
     }
   }
 }
+function getPersistedSurchargeIds(nodes) {
+  const ids = /* @__PURE__ */ new Set();
+  for (const node of nodes) {
+    if (!node.persistedUnitSurchargeFee || node.persistedUnitSurchargeFee.lte(0))
+      continue;
+    for (const surchargeId of node.relationSurchargeIds) {
+      ids.add(surchargeId);
+    }
+  }
+  return ids;
+}
 function buildSurchargeQuantityTotals(nodes) {
   const totals = /* @__PURE__ */ new Map();
   for (const node of nodes) {
@@ -261,6 +327,24 @@ function getBackendSurchargeState(stateMap, surchargeId, config) {
   }
   return state;
 }
+function buildSurchargeResultItem(config, surchargeId, amount, index) {
+  const name = (config == null ? void 0 : config.name) || (config == null ? void 0 : config.label) || {};
+  return {
+    key: `custom_surcharge_${index}`,
+    label: name,
+    name,
+    value: amount.toNumber(),
+    surcharge_id: surchargeId,
+    description: config == null ? void 0 : config.description,
+    type: "default",
+    fixed: config == null ? void 0 : config.fixed,
+    amount: amount.toNumber(),
+    percentage: config == null ? void 0 : config.percentage,
+    metadata: {
+      open_product: config == null ? void 0 : config.open_product
+    }
+  };
+}
 function applySurchargeNodeResult(node, params) {
   const { unitSurchargeFee, roundingRemainder, surchargeIds } = params;
   if (node.kind === "main") {
@@ -290,16 +374,64 @@ function calculateBackendProductSurcharges(params) {
       node.relationSurchargeIds = fallbackAllProductSurchargeIds;
     }
   }
+  const persistedSurchargeIds = getPersistedSurchargeIds(nodes);
   const quantityTotals = buildSurchargeQuantityTotals(nodes);
   const stateMap = /* @__PURE__ */ new Map();
   for (const node of nodes) {
     let unitSurchargeFee = new import_decimal.default(0);
     let roundingRemainder = new import_decimal.default(0);
     const appliedSurchargeIds = [];
+    let persistedRemainderApplied = false;
     for (const surchargeId of node.relationSurchargeIds) {
       const config = configById.get(surchargeId);
       const totalQuantity = quantityTotals.get(surchargeId) || new import_decimal.default(0);
-      if (!config || totalQuantity.lte(0))
+      if (totalQuantity.lte(0))
+        continue;
+      const persistedUnitSurchargeFee = node.persistedUnitSurchargeFee;
+      if (persistedUnitSurchargeFee && persistedUnitSurchargeFee.gt(0)) {
+        const persistedQuantity = import_decimal.default.min(node.persistedQuantity, node.quantity);
+        const deltaQuantity = import_decimal.default.max(node.quantity.minus(persistedQuantity), 0);
+        const state2 = getBackendSurchargeState(
+          stateMap,
+          surchargeId,
+          config || { surcharge_id: surchargeId }
+        );
+        const persistedSurchargeRemainder = !persistedRemainderApplied && node.persistedSurchargeRemainder ? node.persistedSurchargeRemainder : new import_decimal.default(0);
+        state2.amount = bcAdd(
+          bcAdd(
+            state2.amount,
+            bcMul(persistedUnitSurchargeFee, persistedQuantity, 2),
+            2
+          ),
+          persistedSurchargeRemainder,
+          2
+        );
+        const fixed2 = new import_decimal.default((config == null ? void 0 : config.fixed) || 0);
+        if (fixed2.gt(0))
+          state2.fixedIncluded = true;
+        let nodeTotalSurcharge = bcAdd(
+          bcMul(persistedUnitSurchargeFee, persistedQuantity, 2),
+          persistedSurchargeRemainder,
+          2
+        );
+        if (config && deltaQuantity.gt(0)) {
+          const percentage2 = new import_decimal.default(config.percentage || 0);
+          const deltaUnitPercentageFee = import_decimal.default.max(0, bcMul(node.unitAmount, percentage2, 2));
+          const deltaSurcharge = bcMul(deltaQuantity, deltaUnitPercentageFee, 2);
+          state2.amount = bcAdd(state2.amount, deltaSurcharge, 2);
+          nodeTotalSurcharge = bcAdd(nodeTotalSurcharge, deltaSurcharge, 2);
+        }
+        if (node.quantity.gt(0)) {
+          unitSurchargeFee = bcAdd(unitSurchargeFee, bcDiv(nodeTotalSurcharge, node.quantity, 2), 2);
+        }
+        if (!persistedSurchargeRemainder.eq(0)) {
+          roundingRemainder = bcAdd(roundingRemainder, persistedSurchargeRemainder, 2);
+          persistedRemainderApplied = true;
+        }
+        appliedSurchargeIds.push(surchargeId);
+        continue;
+      }
+      if (!config)
         continue;
       const percentage = new import_decimal.default(config.percentage || 0);
       const fixed = new import_decimal.default(config.fixed || 0);
@@ -307,7 +439,7 @@ function calculateBackendProductSurcharges(params) {
       const percentageTotalFee = bcMul(node.quantity, unitPercentageFee, 2);
       let unitFixedFee = new import_decimal.default(0);
       let fixedRemainder = new import_decimal.default(0);
-      if (fixed.gt(0)) {
+      if (fixed.gt(0) && !persistedSurchargeIds.has(surchargeId)) {
         unitFixedFee = bcDiv(fixed, totalQuantity, 2);
         const distributedFixed = bcMul(unitFixedFee, totalQuantity, 2);
         fixedRemainder = bcSub(fixed, distributedFixed, 2);
@@ -328,7 +460,7 @@ function calculateBackendProductSurcharges(params) {
         6
       );
       state.calculatedQuantity = bcAdd(state.calculatedQuantity, node.quantity, 6);
-      if (!state.fixedIncluded && fixed.gt(0)) {
+      if (!state.fixedIncluded && fixed.gt(0) && !persistedSurchargeIds.has(surchargeId)) {
         state.amount = bcAdd(state.amount, fixed, 2);
         state.fixedIncluded = true;
       }
@@ -351,31 +483,25 @@ function calculateBackendProductSurcharges(params) {
       surchargeIds: appliedSurchargeIds
     });
   }
-  return (surchargeList || []).reduce((result, config, index) => {
+  const result = (surchargeList || []).reduce((items, config, index) => {
     const surchargeId = getSurchargeConfigId(config);
     if (surchargeId === void 0)
-      return result;
+      return items;
     const state = stateMap.get(surchargeId);
     if (!state || state.amount.lte(0))
-      return result;
-    const name = config.name || config.label || {};
-    result.push({
-      key: `custom_surcharge_${index}`,
-      label: name,
-      name,
-      value: state.amount.toNumber(),
-      surcharge_id: surchargeId,
-      description: config.description,
-      type: "default",
-      fixed: config.fixed,
-      amount: state.amount.toNumber(),
-      percentage: config.percentage,
-      metadata: {
-        open_product: config.open_product
-      }
-    });
-    return result;
+      return items;
+    items.push(buildSurchargeResultItem(config, surchargeId, state.amount, index));
+    return items;
   }, []);
+  const includedIds = new Set(
+    result.map((item) => item == null ? void 0 : item.surcharge_id).filter((id) => id !== void 0)
+  );
+  for (const [surchargeId, state] of stateMap.entries()) {
+    if (includedIds.has(surchargeId) || state.amount.lte(0))
+      continue;
+    result.push(buildSurchargeResultItem(state.config, surchargeId, state.amount, result.length));
+  }
+  return result;
 }
 function getProductDepositData(product) {
   var _a, _b, _c;
@@ -481,20 +607,28 @@ function calculateSingleItemTax(params) {
     return new import_decimal.default(0);
   return price.dividedBy(divisor).times(rate);
 }
-function getMainProductPaymentTotal(product) {
+function getMainAttachedBundleSellingTotal(product) {
   var _a, _b;
   const mainSelling = ((_a = product.metadata) == null ? void 0 : _a.main_product_selling_price) ?? ((_b = product.metadata) == null ? void 0 : _b.main_product_original_price) ?? 0;
   let total = toDecimal(mainSelling);
   const bundleItems = product.product_bundle || [];
   for (const bundleItem of bundleItems) {
     if (isBundleMarkupOrDiscount(bundleItem)) {
-      const unit = toDecimal(bundleItem.bundle_selling_price ?? bundleItem.price ?? 0);
+      const unit = (0, import_utils2.getBundleSignedUnit)(bundleItem);
       const qty = getSafeNum(bundleItem.num ?? bundleItem.quantity);
       total = total.plus(unit.times(qty));
     }
   }
   return import_decimal.default.max(total, 0);
 }
+function getMainProductPaymentTotal(product) {
+  var _a;
+  const attachedPayment = (_a = product.metadata) == null ? void 0 : _a.main_product_attached_bundle_payment_price;
+  if (attachedPayment !== void 0 && attachedPayment !== null && attachedPayment !== "") {
+    return import_decimal.default.max(toDecimal(attachedPayment), 0);
+  }
+  return getMainAttachedBundleSellingTotal(product);
+}
 function getExplicitTaxRemainder(item) {
   var _a;
   const value = (item == null ? void 0 : item.tax_fee_rounding_remainder) ?? ((_a = item == null ? void 0 : item.metadata) == null ? void 0 : _a.tax_fee_rounding_remainder);
@@ -508,6 +642,15 @@ function getPersistedTaxRemainder(item, parentProduct) {
     return null;
   return getExplicitTaxRemainder(item);
 }
+function getPersistedMainTaxFee(product) {
+  var _a;
+  if ((product == null ? void 0 : product.order_detail_id) === void 0 || (product == null ? void 0 : product.order_detail_id) === null)
+    return null;
+  const value = ((_a = product == null ? void 0 : product.metadata) == null ? void 0 : _a.main_product_attached_bundle_tax_fee) ?? (product == null ? void 0 : product.main_product_attached_bundle_tax_fee) ?? (product == null ? void 0 : product.tax_fee);
+  if (value === void 0 || value === null || value === "")
+    return null;
+  return toDecimal(value);
+}
 function writeTaxRemainder(item, roundingRemainder) {
   item.tax_fee_rounding_remainder = roundingRemainder.toNumber();
   if (item.metadata && typeof item.metadata === "object") {
@@ -517,15 +660,24 @@ function writeTaxRemainder(item, roundingRemainder) {
 function resetTaxRemainderFields(products) {
   for (const product of products) {
     const productRemainder = getPersistedTaxRemainder(product);
-    product.tax_fee_rounding_remainder = (productRemainder == null ? void 0 : productRemainder.toNumber()) ?? 0;
+    if (productRemainder !== null) {
+      product.tax_fee_rounding_remainder = productRemainder.toNumber();
+    } else {
+      delete product.tax_fee_rounding_remainder;
+    }
     product.original_tax_fee_rounding_remainder = 0;
     for (const bundle of product.product_bundle || []) {
       const bundleRemainder = getPersistedTaxRemainder(bundle, product);
       bundle.metadata = {
-        ...bundle.metadata || {},
-        tax_fee_rounding_remainder: (bundleRemainder == null ? void 0 : bundleRemainder.toFixed(2)) ?? "0.00"
+        ...bundle.metadata || {}
       };
-      bundle.tax_fee_rounding_remainder = (bundleRemainder == null ? void 0 : bundleRemainder.toNumber()) ?? 0;
+      if (bundleRemainder !== null) {
+        bundle.metadata.tax_fee_rounding_remainder = bundleRemainder.toFixed(2);
+        bundle.tax_fee_rounding_remainder = bundleRemainder.toNumber();
+      } else {
+        delete bundle.metadata.tax_fee_rounding_remainder;
+        delete bundle.tax_fee_rounding_remainder;
+      }
       bundle.original_tax_fee_rounding_remainder = 0;
     }
   }
@@ -617,17 +769,22 @@ function calculateProductsTax(products, taxRate, isPriceIncludeTax) {
       isChargeTax: product.is_charge_tax ?? 0
     });
     const mainTaxRounded = toBackendTaxFee(mainTaxPrecise);
-    product.main_product_attached_bundle_tax_fee = mainTaxRounded.toFixed(2);
     const persistedMainRemainder = getPersistedTaxRemainder(product);
-    const mainRemainder = persistedMainRemainder ?? applyBackendTaxRemainder({
+    const persistedMainTaxFee = getPersistedMainTaxFee(product);
+    const persistedQuantity = getPersistedQuantity(product, quantity);
+    const deltaQuantity = import_decimal.default.max(quantity.minus(persistedQuantity), 0);
+    const shouldUsePersistedMainTax = persistedMainTaxFee && persistedMainTaxFee.gt(0) && persistedQuantity.gte(quantity);
+    const shouldSplitPersistedMainTax = persistedMainTaxFee && persistedMainTaxFee.gt(0) && persistedQuantity.gt(0) && deltaQuantity.gt(0);
+    const mainRemainder = shouldUsePersistedMainTax || shouldSplitPersistedMainTax ? new import_decimal.default(0) : persistedMainRemainder ?? applyBackendTaxRemainder({
       target: product,
       rawTax: mainTaxPrecise,
       formattedTax: mainTaxRounded,
       quantity,
       state: taxRemainderState
     });
-    if (persistedMainRemainder)
+    if (persistedMainRemainder && !shouldSplitPersistedMainTax) {
       writeTaxRemainder(product, persistedMainRemainder);
+    }
     const originalTotal = getUnitOriginalTotal(product);
     const originalTaxableBase = originalTotal.lte(0) ? surchargeFee : originalTotal.plus(surchargeFee);
     const originalTaxPrecise = calculateSingleItemTax({
@@ -637,18 +794,64 @@ function calculateProductsTax(products, taxRate, isPriceIncludeTax) {
       isChargeTax: product.is_charge_tax ?? 0
     });
     const originalTaxRounded = toAmountFormat(originalTaxPrecise);
-    productUnitTax = productUnitTax.plus(mainTaxRounded);
+    const effectiveMainUnitTax = shouldUsePersistedMainTax ? persistedMainTaxFee : shouldSplitPersistedMainTax ? persistedMainTaxFee.times(persistedQuantity).plus(mainTaxRounded.times(deltaQuantity)).div(quantity).toDecimalPlaces(2, import_decimal.default.ROUND_HALF_UP) : mainTaxRounded;
+    productUnitTax = productUnitTax.plus(effectiveMainUnitTax);
     productUnitOriginTax = productUnitOriginTax.plus(originalTaxRounded);
+    product.main_product_attached_bundle_tax_fee = effectiveMainUnitTax.toDecimalPlaces(2, import_decimal.default.ROUND_HALF_UP).toFixed(2);
     product.tax_fee = productUnitTax.toDecimalPlaces(2, import_decimal.default.ROUND_HALF_UP).toFixed(2);
     product.original_tax_fee = productUnitOriginTax.toDecimalPlaces(2, import_decimal.default.ROUND_HALF_UP).toNumber();
-    totalTax = totalTax.plus(mainTaxRounded.times(quantity)).plus(mainRemainder);
+    totalTax = totalTax.plus(
+      shouldUsePersistedMainTax ? persistedMainTaxFee.times(quantity).plus(persistedMainRemainder || 0) : shouldSplitPersistedMainTax ? persistedMainTaxFee.times(persistedQuantity).plus(mainTaxRounded.times(deltaQuantity)) : mainTaxRounded.times(quantity).plus(mainRemainder)
+    );
     totalOriginTax = totalOriginTax.plus(originalTaxRounded.times(quantity));
+    if (product.tax_fee_rounding_remainder === void 0) {
+      product.tax_fee_rounding_remainder = 0;
+    }
   }
   return {
     tax: totalTax.toDecimalPlaces(2, import_decimal.default.ROUND_HALF_UP),
     originTax: totalOriginTax.toDecimalPlaces(2, import_decimal.default.ROUND_HALF_UP)
   };
 }
+function allocateShopDiscountToPayment(products, productAmount, shopDiscountAmount) {
+  const effectiveDiscount = productAmount.lte(0) ? new import_decimal.default(0) : import_decimal.default.max(import_decimal.default.min(productAmount, shopDiscountAmount), 0);
+  let allocatedDiscount = new import_decimal.default(0);
+  products.forEach((product, index) => {
+    const quantity = new import_decimal.default(getSafeNum(product.num));
+    const sellingUnit = getUnitPaymentTotal(product);
+    const lineSellingTotal = sellingUnit.times(quantity);
+    const lineDiscount = effectiveDiscount.lte(0) ? new import_decimal.default(0) : index === products.length - 1 ? import_decimal.default.max(effectiveDiscount.minus(allocatedDiscount), 0) : toAmountFormat(lineSellingTotal.div(productAmount).times(effectiveDiscount));
+    allocatedDiscount = allocatedDiscount.plus(lineDiscount);
+    const unitDiscount = quantity.lte(0) ? new import_decimal.default(0) : lineDiscount.div(quantity);
+    const paymentUnit = import_decimal.default.max(sellingUnit.minus(unitDiscount), 0);
+    const rate = sellingUnit.lte(0) ? new import_decimal.default(1) : toBcScale(paymentUnit.div(sellingUnit), 6);
+    const mainSellingTotal = getMainAttachedBundleSellingTotal(product);
+    const mainPaymentTotal = toAmountFormat(bcMul(mainSellingTotal, rate, 6));
+    product.metadata = {
+      ...product.metadata || {},
+      average_discount_amount_rate: rate.toString(),
+      main_product_attached_bundle_selling_price: mainSellingTotal.toFixed(2),
+      main_product_attached_bundle_payment_price: mainPaymentTotal.toFixed(2)
+    };
+    for (const bundle of product.product_bundle || []) {
+      if (isBundleOriginalPrice(bundle)) {
+        const bundleSelling = toDecimal(
+          bundle.bundle_selling_price ?? bundle.bundle_sum_price ?? bundle.price ?? 0
+        );
+        bundle.bundle_payment_price = toAmountFormat(bcMul(bundleSelling, rate, 6)).toFixed(2);
+        continue;
+      }
+      if ((0, import_utils2.isMarkdownBundle)(bundle)) {
+        const magnitude = (0, import_utils2.getBundleSellingMagnitude)(bundle);
+        bundle.custom_price = bundle.custom_price ?? bundle.price;
+        bundle.price = magnitude.toFixed(2);
+        bundle.bundle_selling_price = magnitude.toFixed(2);
+        bundle.bundle_payment_price = toAmountFormat(bcMul(magnitude, rate, 6)).toFixed(2);
+      }
+    }
+    product.payment_price = paymentUnit.toFixed(2);
+  });
+}
 function createEmptySalesSummary() {
   return {
     product_quantity: 0,
@@ -700,6 +903,14 @@ function calculateSalesSummary(params) {
     (sum, item) => sum.plus(getUnitPaymentTotal(item).times(getSafeNum(item.num))),
     new import_decimal.default(0)
   );
+  const shopDiscountAmount = import_decimal.default.max(new import_decimal.default(Number(shopDiscount) || 0), 0);
+  const hasPersistedSurchargeSnapshot = summaryProducts.some((product) => {
+    var _a;
+    return (_a = getPersistedMainSurchargeFee(product)) == null ? void 0 : _a.gt(0);
+  });
+  if (!hasPersistedSurchargeSnapshot) {
+    allocateShopDiscountToPayment(summaryProducts, productAmount, shopDiscountAmount);
+  }
   const surchargeServiceItems = buildSurchargeServiceItems(summaryProducts);
   (0, import_utils.getSurcharge)(
     {
@@ -738,9 +949,8 @@ function calculateSalesSummary(params) {
       new import_decimal.default(0)
     );
   }
-  const shopDiscountAmount = import_decimal.default.max(new import_decimal.default(Number(shopDiscount) || 0), 0);
-  const preTaxExpectAmount = import_decimal.default.max(0, productAmount.plus(surchargeAmount).minus(shopDiscountAmount));
-  const totalAmount = isPriceIncludeTax === 1 ? preTaxExpectAmount : preTaxExpectAmount.plus(productTaxFee);
+  const orderAmountBeforeDiscount = productAmount.plus(surchargeAmount).plus(isPriceIncludeTax === 1 ? 0 : productTaxFee);
+  const totalAmount = import_decimal.default.max(0, orderAmountBeforeDiscount.minus(shopDiscountAmount));
   const deposit = calculateProductsDeposit(summaryProducts);
   return {
     product_quantity: productQuantity,

package/lib/server/index.d.ts

@@ -287,6 +287,8 @@ declare class Server {
     private handleOrderSalesCheckout;
     private handleOrderCheckout;
     private handleOrderCheckoutSubmit;
+    private handlePendingSyncCheckoutOrder;
+    private buildPendingSyncCheckoutOrder;
     private handleOrderSalesDetail;
     /**
      * 解析 order_ids 入参，兼容 url query / data 字段、字符串(csv) / 数组两种形态。
@@ -320,6 +322,7 @@ declare class Server {
     private extractOrderDataFromCheckoutResponse;
     private normalizeCheckoutResponse;
     private extractBackendErrorResponse;
+    private isExplicitBackendErrorResponse;
     /**
      * 从 url 或路由 path 解析 pathname（不含 query，去掉末尾 /）
      */

package/lib/server/index.js

@@ -1749,7 +1749,12 @@ var Server = class {
     });
     if (!((_a = this.app) == null ? void 0 : _a.request)) {
       this.logError(`${title}: app.request 不可用`);
-      return { code: 500, status: false, message: "app.request 不可用", data: null };
+      return this.handlePendingSyncCheckoutOrder({
+        backendPath,
+        data,
+        title,
+        reason: "app.request 不可用"
+      });
     }
     try {
       const response = await this.app.request.post(backendPath, data, {
@@ -1759,7 +1764,8 @@ var Server = class {
       });
       const fresh = this.extractOrderDataFromCheckoutResponse(response);
       if (fresh && this.order) {
-        await this.order.upsertOrdersFromRemote([fresh]);
+        const syncedOrder = { ...fresh, need_sync: 0 };
+        await this.order.upsertOrdersFromRemote([syncedOrder]);
         this.logInfo(`${title}: 订单已同步到本地`, {
           order_id: fresh.order_id,
           external_sale_number: fresh.external_sale_number,
@@ -1778,9 +1784,77 @@ var Server = class {
       const backendError = this.extractBackendErrorResponse(error);
       if (backendError)
         return backendError;
+      return this.handlePendingSyncCheckoutOrder({
+        backendPath,
+        data,
+        title,
+        reason: errorMessage
+      });
+    }
+  }
+  async handlePendingSyncCheckoutOrder(params) {
+    const { backendPath, data, title, reason } = params;
+    const pendingOrder = this.buildPendingSyncCheckoutOrder(data);
+    if (!pendingOrder) {
+      this.logError(`${title}: checkout 失败且订单缺少本地存储标识`, {
+        backendPath,
+        reason
+      });
+      return {
+        code: 500,
+        status: false,
+        message: "订单缺少本地存储标识，无法写入待同步队列",
+        data: null
+      };
+    }
+    if (!this.order || typeof this.order.upsertPendingSyncOrders !== "function") {
+      this.logError(`${title}: Order 模块不支持本地待同步写入`, {
+        backendPath,
+        reason
+      });
+      return {
+        code: 500,
+        status: false,
+        message: "Order 模块不支持本地待同步写入",
+        data: null
+      };
+    }
+    try {
+      await this.order.upsertPendingSyncOrders([pendingOrder]);
+      this.logWarning(`${title}: 后端未明确报错，订单已写入本地待同步`, {
+        backendPath,
+        reason,
+        order_id: pendingOrder.order_id,
+        external_sale_number: pendingOrder.external_sale_number,
+        order_number: pendingOrder.order_number
+      });
+      return {
+        code: 200,
+        status: true,
+        message: "",
+        data: pendingOrder
+      };
+    } catch (error) {
+      const errorMessage = error instanceof Error ? error.message : String(error);
+      this.logError(`${title}: 写入本地待同步订单失败`, {
+        backendPath,
+        reason,
+        error: errorMessage
+      });
       return { code: 500, status: false, message: errorMessage, data: null };
     }
   }
+  buildPendingSyncCheckoutOrder(data) {
+    if (!data || typeof data !== "object")
+      return null;
+    const hasStorageKey = data.external_sale_number !== void 0 && data.external_sale_number !== null && data.external_sale_number !== "" ? true : data.order_id !== void 0 && data.order_id !== null && data.order_id !== "";
+    if (!hasStorageKey)
+      return null;
+    return {
+      ...data,
+      need_sync: 1
+    };
+  }
   /**
    * 解析 order_ids 入参，兼容 url query / data 字段、字符串(csv) / 数组两种形态。
    * 自动 trim、去空、按字符串去重，输出归一化后的字符串数组。
@@ -1993,9 +2067,14 @@ var Server = class {
       error == null ? void 0 : error.body
     ];
     return candidates.find(
-      (candidate) => candidate && typeof candidate === "object"
+      (candidate) => this.isExplicitBackendErrorResponse(candidate)
     ) || null;
   }
+  isExplicitBackendErrorResponse(candidate) {
+    if (!candidate || typeof candidate !== "object")
+      return false;
+    return candidate.code !== void 0 || candidate.status !== void 0 || typeof candidate.message === "string";
+  }
   /**
    * 从 url 或路由 path 解析 pathname（不含 query，去掉末尾 /）
    */

package/lib/server/modules/order/index.d.ts

@@ -92,6 +92,11 @@ export declare class OrderModule extends BaseModule implements Module {
      * 供 /update/localOrder 等在「本地尚无该单」时写入新建单。
      */
     upsertOrdersFromRemote(freshOrders: OrderData[]): Promise<void>;
+    /**
+     * 将本地待同步订单按 SQLite storage key 合并进 store 并落库。
+     * checkout 离线兜底可能没有 order_id，但通常会有 external_sale_number。
+     */
+    upsertPendingSyncOrders(pendingOrders: OrderData[]): Promise<void>;
     /**
      * 通过 SSE 按自定义 query 拉取订单（支持 select/with 精简字段）
      */
@@ -172,6 +177,9 @@ export declare class OrderModule extends BaseModule implements Module {
     private getStorageItem;
     private setStorageItem;
     private loadOrdersFromSQLite;
+    private isPendingSyncOrder;
+    private normalizeRemoteSyncedOrder;
+    private mergeRemoteSnapshotWithPendingOrders;
     /**
      * 串行执行订单 SQLite 写入任务，避免快照替换与增量 upsert 并发交错。
      *