Preserve manual discount when manually editing an order (#60240)

NeosinneR · web-flow · commit 3de58cd2e492 · 2025-08-07T11:40:49.000+02:00
* Only recalculate coupons when real coupon is applied, not when manual discount is used * Add changelog * Add test * Update test This reverts 04db67b because now that the recalculation is not called, tax (additional $20) is also not shown * Better method to fetch coupons
diff --git a/plugins/woocommerce/changelog/wooplug-5271-wc-101-rc12-item-price-edit-is-broken-when-manually-editing b/plugins/woocommerce/changelog/wooplug-5271-wc-101-rc12-item-price-edit-is-broken-when-manually-editing
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fix
+
+Preserve manual discount when manually editing an order
diff --git a/plugins/woocommerce/includes/admin/wc-admin-functions.php b/plugins/woocommerce/includes/admin/wc-admin-functions.php
@@ -454,7 +454,14 @@ function wc_save_order_items( $order_id, $items ) {
 	}
 
 	$order->update_taxes();
-	$order->recalculate_coupons();
+
+	// Only recalculate when a coupon is applied.
+	// This allows manual discounts to be preserved when order items are saved.
+	$order_coupons = $order->get_coupons();
+	if ( ! empty( $order_coupons ) ) {
+		$order->recalculate_coupons();
+	}
+
 	$order->calculate_totals( false );
 
 	// Inform other plugins that the items have been saved.
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/order/create-order.spec.js b/plugins/woocommerce/tests/e2e-pw/tests/order/create-order.spec.js
@@ -414,7 +414,7 @@ test.describe(
 				)
 			).toBeVisible();
 			await expect(
-				page.locator( 'table' ).filter( { hasText: 'Paid: $220.00' } )
+				page.locator( 'table' ).filter( { hasText: 'Paid: $200.00' } )
 			).toBeVisible();
 		} );
 
diff --git a/plugins/woocommerce/tests/legacy/unit-tests/discounts/discounts.php b/plugins/woocommerce/tests/legacy/unit-tests/discounts/discounts.php
@@ -1691,8 +1691,6 @@ public function test_is_coupon_valid_fixed_product_sale_items() {
 
 	/**
 	 * Test that fixed cart discount coupons maintain their total amount when quantities change in admin orders.
-	 *
-	 * @link https://github.com/woocommerce/woocommerce/issues/XXXXX
 	 */
 	public function test_fixed_cart_discount_quantity_change_admin_order() {
 		$price = 20;
@@ -1747,4 +1745,45 @@ public function test_fixed_cart_discount_quantity_change_admin_order() {
 		// Verify order total is $30 (original $40 - $10 discount).
 		$this->assertEquals( 30.0, $order->get_total(), 'Order total should be $30 after quantity change' );
 	}
+
+	/**
+	 * Test that manual discounts are preserved when no coupons are used in order.
+	 * This tests the logic in wc_save_order_items that only recalculates coupons when coupons exist.
+	 */
+	public function test_manual_discount_preservation_no_coupons() {
+		$price = 20;
+
+		// Create a product with a price of $20.
+		$product = WC_Helper_Product::create_simple_product();
+		$product->set_regular_price( $price );
+		$product->save();
+		$this->store_product( $product );
+
+		// Create an order.
+		$order = new WC_Order();
+		$order->set_status( 'processing' );
+		$order->save();
+		$order_item_id = $order->add_product( $product, 1 );
+		$this->store_order( $order );
+
+		// Simulate $5 manual discount.
+		$items = array(
+			'order_item_id' => array( $order_item_id ),
+			'line_total'    => array( $order_item_id => $price - 5 ),
+			'line_subtotal' => array( $order_item_id => $price ),
+		);
+
+		// Save the order items - this should preserve manual discounts since no coupons are applied.
+		wc_save_order_items( $order->get_id(), $items );
+
+		// Reload the order to get updated data.
+		$order       = wc_get_order( $order->get_id() );
+		$order_items = $order->get_items();
+		$order_item  = reset( $order_items );
+
+		// Verify the manual discount is preserved.
+		$this->assertEquals( 20.0, $order_item->get_subtotal(), 'Subtotal should be $20' );
+		$this->assertEquals( 15.0, $order_item->get_total(), 'Total should be $15 preserving manual discount' );
+		$this->assertEquals( 15.0, $order->get_total(), 'Order total should be $15 preserving manual discount' );
+	}
 }

Original file line number	Diff line number	Diff line change
`@@ -414,7 +414,7 @@ test.describe(`
`414`	`414`	`)`
`415`	`415`	`).toBeVisible();`
`416`	`416`	`await expect(`
`417`		`- page.locator( 'table' ).filter( { hasText: 'Paid: $220.00' } )`
	`417`	`+ page.locator( 'table' ).filter( { hasText: 'Paid: $200.00' } )`
`418`	`418`	`).toBeVisible();`
`419`	`419`	`} );`
`420`	`420`