Merge pull request #96 from magento-mpi/MAGETWO-44600

[MPI] Bug Fixes
magento · Nov 1, 2015 · fc7a956 · fc7a956
2 parents 8e3ca1f + ddd81f2
commit fc7a956
Showing 1 changed file with 2 additions and 2 deletions.
diff --git 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;