Merge branch '4.x' into 5.x

# Conflicts: # CHANGELOG.md # src/controllers/OrdersController.php
craftcms · Dec 6, 2024 · 1d92fc9 · 1d92fc9
2 parents bf0c75f + 12e7920
commit 1d92fc9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Release Notes for Craft Commerce
 
+## Unreleased
+
+- Fixed a bug where order errors weren't showing on the Edit Order page.
+
 ## 5.2.8 - 2024-12-04
 
 - Fixed a bug where line items weren’t getting hyperlinked within Edit Order pages. ([#3792](https://github.com/craftcms/commerce/issues/3792))

diff --git a/src/controllers/OrdersController.php b/src/controllers/OrdersController.php
@@ -1444,6 +1444,7 @@ private function _registerJavascript(array $variables): void
 
         if ($order->hasErrors()) {
             $response['order']['errors'] = $order->getErrors();
+            $response['errors'] = $order->getErrors();
             $response['error'] = Craft::t('commerce', 'The order is not valid.');
         }