Merge remote-tracking branch 'mainline/develop' into S50

Conflicts: lib/internal/Magento/Framework/App/Test/Unit/View/Deployment/VersionTest.php
magento · Apr 3, 2015 · 677e8cb · 677e8cb
2 parents f61786c + 9ae0a13
commit 677e8cb
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/app/code/Magento/Quote/Model/Quote.php b/app/code/Magento/Quote/Model/Quote.php
@@ -1538,8 +1538,8 @@ public function addProduct(
         /**
          * Error message
          */
-        if (is_string($cartCandidates)) {
-            return $cartCandidates;
+        if (is_string($cartCandidates) || $cartCandidates instanceof \Magento\Framework\Phrase) {
+            return strval($cartCandidates);
         }
 
         /**

diff --git a/app/code/Magento/Sales/view/adminhtml/web/order/create/scripts.js b/app/code/Magento/Sales/view/adminhtml/web/order/create/scripts.js
@@ -668,6 +668,7 @@ AdminOrder.prototype = {
         if (confirm(confirmMessage)) {
             this.collectElementsValue = false;
             order.sidebarApplyChanges({'sidebar[empty_customer_cart]': 1});
+            this.collectElementsValue = true;
         }
     },