Incorrect return total and invalidated discounts in case combining Buy Products for Fixed Price and Spend for Discount on Order

Description

Steps to reproduce

1. Create 2 promotions:

• Buy 3 Mens Shirts / Mens Sweatshirts at $12; priority 1
• Spend $30 get $7 off; priority 2
  2. Create a new order with 4 Graphic Tees + 4 L/S ComfortBlend Tee + 4 Fleece Zip Hood. Ship to New York, so Sales Tax = Shipping Tax = 0.
  3. Complete the order.
  4. Return an order with 1 Graphic Tee.

Expected:
Invalidated Discounts section lists Buy 03 Mens Shirts / Mens Sweatshirts once with values 1.50.
Total Information section lists Invalidated Discounts equal -1.50 and Return Total equal 3.00, as on build 12.3.1

Actual:

• On build 12.4.0, Invalidated Discounts section lists Buy 03 Mens Shirts / Mens Sweatshirts twice, with values of $0.00 and $1.50 respectively.
• On build 12.4.1, Invalidated Discounts section lists Buy 03 Mens Shirts / Mens Sweatshirts twice, with values of $3.50 and $1.50 respectively. Total Information section lists Invalidated Discounts equal to -4.50, and the Return Total equals $0.00.