MAGETWO-24173: "Void" button available after "Deny Payment" operation

Viktor Tymchynskyi · Viktor Tymchynskyi · commit d3b0e89ea628 · 2015-04-02T17:11:24.000+03:00
diff --git a/app/code/Magento/Sales/Model/Order.php b/app/code/Magento/Sales/Model/Order.php
@@ -519,7 +519,7 @@ public function canVoidPayment()
      */
     protected function _canVoidOrder()
     {
-        return !($this->canUnhold() || $this->isPaymentReview());
+        return !($this->isCanceled() || $this->canUnhold() || $this->isPaymentReview());
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -519,7 +519,7 @@ public function canVoidPayment()`
`519`	`519`	`*/`
`520`	`520`	`protected function _canVoidOrder()`
`521`	`521`	`{`
`522`		`- return !($this->canUnhold() \|\| $this->isPaymentReview());`
	`522`	`+ return !($this->isCanceled() \|\| $this->canUnhold() \|\| $this->isPaymentReview());`
`523`	`523`	`}`
`524`	`524`
`525`	`525`	`/**`