MAGETWO-41590: PR Preparation and processing

magento · Aug 28, 2015 · 5acea4a · 5acea4a
1 parent d1726d1
commit 5acea4a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/app/code/Magento/Cms/Test/Unit/Ui/Component/Listing/Column/PageActionsTest.php b/app/code/Magento/Cms/Test/Unit/Ui/Component/Listing/Column/PageActionsTest.php
@@ -50,8 +50,8 @@ public function testPrepareItemsByPageId()
                         'href' => 'test/url/delete',
                         'label' => __('Delete'),
                         'confirm' => [
-                            'title' => __('Delete "${ $.$data.title }"'),
-                            'message' => __('Are you sure you wan\'t to delete a "${ $.$data.title }" record?')
+                            'title' => __('Delete ${ $.$data.title }'),
+                            'message' => __('Are you sure you wan\'t to delete a ${ $.$data.title } record?')
                         ],
                     ]
                 ],

diff --git a/app/code/Magento/Sales/Block/Adminhtml/Transactions/Detail.php b/app/code/Magento/Sales/Block/Adminhtml/Transactions/Detail.php
@@ -79,10 +79,12 @@ protected function _construct()
             ['label' => __('Back'), 'onclick' => "setLocation('{$backUrl}')", 'class' => 'back']
         );
 
-        if ($this->_authorization->isAllowed(
-            'Magento_Sales::transactions_fetch'
-        ) && $this->orderPaymentRepository->get($this->_txn->getPaymentId())->getMethodInstance()->canFetchTransactionInfo()
-        ) {
+        $fetchTransactionAllowed = $this->_authorization->isAllowed('Magento_Sales::transactions_fetch');
+        $canFetchTransaction = $this->orderPaymentRepository->get($this->_txn->getPaymentId())
+            ->getMethodInstance()
+            ->canFetchTransactionInfo();
+
+        if ($fetchTransactionAllowed && $canFetchTransaction) {
             $fetchUrl = $this->getUrl('sales/*/fetch', ['_current' => true]);
             $this->buttonList->add(
                 'fetch',