Merge remote-tracking branch 'mainline/develop' into MAGETWO_44697-Remove-half-translated-files

Cari Spruiell · Cari Spruiell · commit a161041eea8f · 2015-11-01T15:51:07.000-06:00
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;

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