Merge pull request #3855 from craftcms/feature/pt-2374-4x-can-not-set…

…-a-shipping-address-on-the-order-that-is-not [4.x] Fixed PHP error when updating an unsaved cart with an address
craftcms · Jan 22, 2025 · 73085ca · 73085ca
2 parents 218810c + f06eafe
commit 73085ca
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,7 @@
 ## Unreleased
 
 - Fixed a bug where Edit Product pages would allow duplication for users that didn’t have permission to duplicate the product. ([#3819](https://github.com/craftcms/commerce/issues/3819))
+- Fixed a PHP error that could occur when updating a cart. ([#3842](https://github.com/craftcms/commerce/issues/3842))
 - Fixed a PHP error that could occur when adding an invalid address to a cart. ([#3848](https://github.com/craftcms/commerce/issues/3848))
 
 ## 4.7.2 - 2024-12-18

diff --git a/src/controllers/CartController.php b/src/controllers/CartController.php
@@ -138,6 +138,7 @@ public function actionUpdateCart(): ?Response
 
         // When we are about to update the cart, we consider it a real cart at this point, and want to actually create it in the DB.
         if ($this->_cart->id === null) {
+            // Make sure we have a fully saved cart before attempting any mutations.
             $this->_cart = $this->_getCart(true);
         }