MOL-1299: Correct VAT Promotion Calculation

mollie · Apr 5, 2024 · 595deac · 595deac
1 parent abff673
commit 595deac
Showing 1 changed file with 9 additions and 8 deletions.
diff --git a/...src/module/mollie-payments/components/mollie-refund-manager/services/RefundItemService.js b/...src/module/mollie-payments/components/mollie-refund-manager/services/RefundItemService.js
@@ -214,22 +214,23 @@ export default class RefundItemService {
             if (item.refundQuantity > 0 && item.refundQuantity + item.refunded === item.shopware.quantity) {
                 refundTaxAmount += item.shopware.tax.totalToPerItemRoundingDiff;
             }
-        }
-
-        if (item.refundPromotion) {
-            // we have to calculate the amount of a single item, because
-            // the promotion discount is the full discount on all of these items.
-            const discountPerQty = item.shopware.promotion.discount / item.shopware.promotion.quantity;
-            const discount = (item.refundQuantity * discountPerQty);
             const promotionTaxValuePerQty = item.shopware.promotion.taxValue / item.shopware.promotion.quantity;
 
             let promotionTaxValue = 0;
             if (item.refundTax) {
                 promotionTaxValue = promotionTaxValuePerQty * item.refundQuantity;
             }
 
-            item.refundAmount = newRefundAmount + refundTaxAmount - discount - promotionTaxValue;
+            refundTaxAmount -= promotionTaxValue;
+        }
+
+        if (item.refundPromotion) {
+            // we have to calculate the amount of a single item, because
+            // the promotion discount is the full discount on all of these items.
+            const discountPerQty = item.shopware.promotion.discount / item.shopware.promotion.quantity;
+            const discount = (item.refundQuantity * discountPerQty);
 
+            item.refundAmount = newRefundAmount + refundTaxAmount - discount;
         } else {
             item.refundAmount = newRefundAmount + refundTaxAmount;
         }