diff --git a/app/code/Magento/Braintree/Model/PaymentMethod.php b/app/code/Magento/Braintree/Model/PaymentMethod.php index da5ff0d88e29a..e4a00ea38d805 100644 --- a/app/code/Magento/Braintree/Model/PaymentMethod.php +++ b/app/code/Magento/Braintree/Model/PaymentMethod.php @@ -918,8 +918,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;