create-brainerce-store 1.27.5 → 1.27.6

package/templates/nextjs/base/src/app/products/[slug]/product-client-section.tsx

@@ -157,20 +157,35 @@ export function ProductClientSection({ product: initialProduct }: ProductClientS
   // Price info - use variant price if selected, else product price
   const priceInfo = useMemo(() => {
     if (selectedVariant?.price) {
+      const variantBase = parseFloat(selectedVariant.price);
+      const variantSale = selectedVariant.salePrice ? parseFloat(selectedVariant.salePrice) : null;
+      const variantEffective =
+        variantSale != null && variantSale < variantBase ? variantSale : variantBase;
+
+      // Overlay any product-level discount rule onto the variant price using the rule's ratio
+      if (product.discount) {
+        const ruleOriginal = parseFloat(product.discount.originalPrice) || 0;
+        const ruleDiscounted = parseFloat(product.discount.discountedPrice) || 0;
+        const ratio = ruleOriginal > 0 ? ruleDiscounted / ruleOriginal : 1;
+        const discounted = variantEffective * ratio;
+        const amount = Math.max(0, variantEffective - discounted);
+        return {
+          price: discounted,
+          originalPrice: variantEffective,
+          isOnSale: discounted < variantEffective,
+          discountAmount: amount,
+          discountPercent:
+            variantEffective > 0 ? Math.round((amount / variantEffective) * 100) : 0,
+        };
+      }
+
       return {
-        price: parseFloat(selectedVariant.salePrice || selectedVariant.price),
-        originalPrice: parseFloat(selectedVariant.price),
-        isOnSale:
-          selectedVariant.salePrice != null &&
-          parseFloat(selectedVariant.salePrice) < parseFloat(selectedVariant.price),
+        price: variantEffective,
+        originalPrice: variantBase,
+        isOnSale: variantEffective < variantBase,
         discountPercent:
-          selectedVariant.salePrice != null &&
-          parseFloat(selectedVariant.salePrice) < parseFloat(selectedVariant.price)
-            ? Math.round(
-                ((parseFloat(selectedVariant.price) - parseFloat(selectedVariant.salePrice)) /
-                  parseFloat(selectedVariant.price)) *
-                  100
-              )
+          variantEffective < variantBase && variantBase > 0
+            ? Math.round(((variantBase - variantEffective) / variantBase) * 100)
             : 0,
       };
     }