Issue #2926559 by bojanz, rszrama, lisastreeter: Apply order promotions to the subtotal, not the total