MAGETWO-30913: Error when trying to apply coupon code in backend reorder after unchecking the discount apply checkbox

Olexandr Lysenko · Olexandr Lysenko · commit 5dde9eaa88bd · 2014-12-29T18:02:06.000+02:00
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Create.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Create.php
@@ -291,11 +291,10 @@ protected function _processActionData($action = null)
                 }
             }
             if (!$isApplyDiscount) {
-                $rr = $this->escaper->escapeHtml($couponCode);
                 $this->messageManager->addError(
                     __(
                         '"%1" coupon code was not applied. Do not apply discount is selected for item(s)',
-                        $rr
+                        $this->escaper->escapeHtml($couponCode)
                     )
                 );
             } else {

Original file line number	Diff line number	Diff line change
`@@ -291,11 +291,10 @@ protected function _processActionData($action = null)`
`291`	`291`	`}`
`292`	`292`	`}`
`293`	`293`	`if (!$isApplyDiscount) {`
`294`		`- $rr = $this->escaper->escapeHtml($couponCode);`
`295`	`294`	`$this->messageManager->addError(`
`296`	`295`	`__(`
`297`	`296`	`'"%1" coupon code was not applied. Do not apply discount is selected for item(s)',`
`298`		`- $rr`
	`297`	`+ $this->escaper->escapeHtml($couponCode)`
`299`	`298`	`)`
`300`	`299`	`);`
`301`	`300`	`} else {`