Merge branch '4.x' of github.com:craftcms/commerce into 4.x

CHANGELOG.md

@@ -2,13 +2,14 @@
 
 ## Unreleased
 
+- Fixed a bug where the `commerce/cart/update-cart` action could return unnecessary validation errors. ([3873](https://github.com/craftcms/commerce/issues/3873))
 - Improved logging when a user deletion is prevented due to the user having Commerce orders. ([#3686](https://github.com/craftcms/commerce/issues/3686))
 - Added `craft\commerce\base\Gateway::transactionsSupportsRefund()`.
 
 ## 4.8.0.1 - 2025-02-03
 
-- Fixed a bug where the deprecated `TaxRate::$isVat` property was still being set. ([#3874](https://github.com/craftcms/commerce/issues/3874))
-- Fixed a PHP error that could occur when updating an order’s status on console requests. ([#3858](https://github.com/craftcms/commerce/issues/3858))
+- Fixed a bug where the deprecated `craft\commerce\models\TaxRate::$isVat` property was still being set. ([#3874](https://github.com/craftcms/commerce/issues/3874))
+- Fixed a PHP error that could occur when updating an order’s status from the CLI. ([#3858](https://github.com/craftcms/commerce/issues/3858))
 
 ## 4.8.0 - 2025-01-30
 

src/controllers/CartController.php

@@ -526,6 +526,9 @@ private function _returnCart(): ?Response
 
         $updateCartSearchIndexes = Plugin::getInstance()->getSettings()->updateCartSearchIndexes;
 
+        $this->_cart->recalculate();
+        $this->_cart->recalculationMode = Order::RECALCULATION_MODE_NONE;
+
         // Do not clear errors, as errors could be added to the cart before _returnCart is called.
         if (!$this->_cart->validate($attributes, false) || !Craft::$app->getElements()->saveElement($this->_cart, false, false, $updateCartSearchIndexes)) {
             $error = Craft::t('commerce', 'Unable to update cart.');
@@ -559,6 +562,8 @@ private function _returnCart(): ?Response
             $this->_mutex->release($this->_mutexLockName);
         }
 
+        $this->_cart->recalculationMode = Order::RECALCULATION_MODE_ALL;
+
         return $this->asModelSuccess(
             $this->_cart,
             $message,