MAGETWO-44600: Incorrect display of Void button for order placed within Braintree

Dell- · Dell- · commit c318d40a2463 · 2015-11-01T20:36:46.000+02:00
- Fixed bug
diff --git a/app/code/Magento/Braintree/Model/PaymentMethod.php b/app/code/Magento/Braintree/Model/PaymentMethod.php
@@ -916,8 +916,8 @@ protected function processSuccessResult(
      */
     public function canVoid()
     {
-        if (($order = $this->_registry->registry('current_order'))
-            && $order->getId() && $order->hasInvoices() ) {
+        if ((($order = $this->_registry->registry('current_order'))
+            && $order->getId() && $order->hasInvoices()) || $this->_registry->registry('current_invoice')) {
             return false;
         }
         return $this->_canVoid;

Original file line number	Diff line number	Diff line change
`@@ -916,8 +916,8 @@ protected function processSuccessResult(`
`916`	`916`	`*/`
`917`	`917`	`public function canVoid()`
`918`	`918`	`{`
`919`		`- if (($order = $this->_registry->registry('current_order'))`
`920`		`- && $order->getId() && $order->hasInvoices() ) {`
	`919`	`+ if ((($order = $this->_registry->registry('current_order'))`
	`920`	`+ && $order->getId() && $order->hasInvoices()) \|\| $this->_registry->registry('current_invoice')) {`
`921`	`921`	`return false;`
`922`	`922`	`}`
`923`	`923`	`return $this->_canVoid;`