Merge remote-tracking branch 'magento-mpi/MC-21459' into MPI-PR

Author: arnobsh

app/code/Magento/OfflinePayments/view/adminhtml/templates/info/checkmo.phtml

@@ -7,8 +7,9 @@
 /**
  * @var $block \Magento\OfflinePayments\Block\Info\Checkmo
  */
+$paymentTitle = $block->getMethod()->getConfigData('title', $block->getInfo()->getOrder()->getStoreId());
 ?>
-<?= $block->escapeHtml($block->getMethod()->getTitle()) ?>
+<?= $block->escapeHtml($paymentTitle) ?>
 <?php if ($block->getInfo()->getAdditionalInformation()) : ?>
     <?php if ($block->getPayableTo()) : ?>
         <br /><?= $block->escapeHtml(__('Make Check payable to: %1', $block->getPayableTo())) ?>

app/code/Magento/OfflinePayments/view/adminhtml/templates/info/pdf/checkmo.phtml

@@ -7,8 +7,9 @@
 /**
  * @var $block \Magento\OfflinePayments\Block\Info\Checkmo
  */
+$paymentTitle = $block->getMethod()->getConfigData('title', $block->getInfo()->getOrder()->getStoreId());
 ?>
-<?= $block->escapeHtml($block->getMethod()->getTitle()) ?>
+<?= $block->escapeHtml($paymentTitle) ?>
     {{pdf_row_separator}}
 <?php if ($block->getInfo()->getAdditionalInformation()) : ?>
     {{pdf_row_separator}}

app/code/Magento/OfflinePayments/view/adminhtml/templates/info/purchaseorder.phtml

@@ -6,8 +6,9 @@
 /**
  * @var $block \Magento\OfflinePayments\Block\Info\Purchaseorder
  */
+$paymentTitle = $block->getMethod()->getConfigData('title', $block->getInfo()->getOrder()->getStoreId());
 ?>
-<div class="order-payment-method-name"><?= $block->escapeHtml($block->getMethod()->getTitle()) ?></div>
+<div class="order-payment-method-name"><?= $block->escapeHtml($paymentTitle) ?></div>
 <table class="data-table admin__table-secondary">
     <tr>
         <th><?= $block->escapeHtml(__('Purchase Order Number')) ?>:</th>

app/code/Magento/Payment/view/adminhtml/templates/info/default.phtml

@@ -9,8 +9,9 @@
  * @see \Magento\Payment\Block\Info
  */
 $specificInfo = $block->getSpecificInformation();
+$paymentTitle = $block->getMethod()->getConfigData('title', $block->getInfo()->getOrder()->getStoreId());
 ?>
-<?= $block->escapeHtml($block->getMethod()->getTitle()) ?>
+<?= $block->escapeHtml($paymentTitle) ?>
 
 <?php if ($specificInfo) : ?>
     <table class="data-table admin__table-secondary">

app/code/Magento/Payment/view/adminhtml/templates/info/pdf/default.phtml

@@ -8,8 +8,9 @@
  * @see \Magento\Payment\Block\Info
  * @var \Magento\Payment\Block\Info $block
  */
+$paymentTitle = $block->getMethod()->getConfigData('title', $block->getInfo()->getOrder()->getStoreId());
 ?>
-<?= $block->escapeHtml($block->getMethod()->getTitle()) ?>{{pdf_row_separator}}
+<?= $block->escapeHtml($paymentTitle) ?>{{pdf_row_separator}}
 
 <?php if ($specificInfo = $block->getSpecificInformation()) : ?>
     <?php foreach ($specificInfo as $label => $value) : ?>

dev/tests/integration/testsuite/Magento/Payment/Block/InfoTest.php

@@ -5,47 +5,57 @@
  */
 namespace Magento\Payment\Block;
 
+use Magento\Framework\View\Element\Text;
+use Magento\Framework\View\LayoutInterface;
+use Magento\OfflinePayments\Model\Banktransfer;
+use Magento\OfflinePayments\Model\Checkmo;
+use Magento\Payment\Block\Info as BlockInfo;
+use Magento\Payment\Block\Info\Instructions;
+use Magento\Payment\Model\Info;
+use Magento\Sales\Model\Order;
+use Magento\TestFramework\Helper\Bootstrap;
+
+/**
+ * Class InfoTest
+ */
 class InfoTest extends \PHPUnit\Framework\TestCase
 {
     /**
+     * Tests payment info block.
+     *
      * @magentoConfigFixture current_store payment/banktransfer/title Bank Method Title
      * @magentoConfigFixture current_store payment/checkmo/title Checkmo Title Of The Method
      * @magentoAppArea adminhtml
      */
     public function testGetChildPdfAsArray()
     {
         /** @var $layout \Magento\Framework\View\Layout */
-        $layout = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
-            \Magento\Framework\View\LayoutInterface::class
-        );
-        $block = $layout->createBlock(\Magento\Payment\Block\Info::class, 'block');
+        $layout = Bootstrap::getObjectManager()->get(LayoutInterface::class);
+        $block = $layout->createBlock(BlockInfo::class, 'block');
 
-        /** @var $paymentInfoBank \Magento\Payment\Model\Info  */
-        $paymentInfoBank = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-            \Magento\Payment\Model\Info::class
-        );
-        $paymentInfoBank->setMethodInstance(
-            \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-                \Magento\OfflinePayments\Model\Banktransfer::class
-            )
+        /** @var $paymentInfoBank Info  */
+        $paymentInfoBank = Bootstrap::getObjectManager()->create(
+            Info::class
         );
-        /** @var $childBank \Magento\Payment\Block\Info\Instructions */
-        $childBank = $layout->addBlock(\Magento\Payment\Block\Info\Instructions::class, 'child.one', 'block');
+        $order = Bootstrap::getObjectManager()->create(Order::class);
+        $banktransferPayment = Bootstrap::getObjectManager()->create(Banktransfer::class);
+        $paymentInfoBank->setMethodInstance($banktransferPayment);
+        $paymentInfoBank->setOrder($order);
+        /** @var $childBank Instructions */
+        $childBank = $layout->addBlock(Instructions::class, 'child.one', 'block');
         $childBank->setInfo($paymentInfoBank);
 
         $nonExpectedHtml = 'non-expected html';
-        $childHtml = $layout->addBlock(\Magento\Framework\View\Element\Text::class, 'child.html', 'block');
+        $childHtml = $layout->addBlock(Text::class, 'child.html', 'block');
         $childHtml->setText($nonExpectedHtml);
 
-        /** @var $paymentInfoCheckmo \Magento\Payment\Model\Info */
-        $paymentInfoCheckmo = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-            \Magento\Payment\Model\Info::class
-        );
-        $paymentInfoCheckmo->setMethodInstance(
-            \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-                \Magento\OfflinePayments\Model\Checkmo::class
-            )
+        /** @var $paymentInfoCheckmo Info */
+        $paymentInfoCheckmo = Bootstrap::getObjectManager()->create(
+            Info::class
         );
+        $checkmoPayment = Bootstrap::getObjectManager()->create(Checkmo::class);
+        $paymentInfoCheckmo->setMethodInstance($checkmoPayment);
+        $paymentInfoCheckmo->setOrder($order);
         /** @var $childCheckmo \Magento\OfflinePayments\Block\Info\Checkmo */
         $childCheckmo = $layout->addBlock(
             \Magento\OfflinePayments\Block\Info\Checkmo::class,