Merge remote-tracking branch 'origin/MAGETWO-99112' into 2.3-develop-pr25

Author: serhii-balko

app/code/Magento/Payment/Helper/Data.php

@@ -149,7 +149,7 @@ public function getStoreMethods($store = null, $quote = null)
             }
             $res[] = $methodInstance;
         }
-
+        // phpcs:ignore Generic.PHP.NoSilencedErrors
         @uasort(
             $res,
             function (MethodInterface $a, MethodInterface $b) {
@@ -261,14 +261,12 @@ public function getPaymentMethodList($sorted = true, $asLabelValue = false, $wit
         $groupRelations = [];
 
         foreach ($this->getPaymentMethods() as $code => $data) {
-            if (!empty($data['active'])) {
-                $storedTitle = $this->getMethodInstance($code)->getConfigData('title', $store);
-                if (isset($storedTitle)) {
-                    $methods[$code] = $storedTitle;
-                } elseif (isset($data['title'])) {
-                    $methods[$code] = $data['title'];
-                }
+            $storeId = $store ? (int)$store->getId() : null;
+            $storedTitle = $this->getMethodStoreTitle($code, $storeId);
+            if (!empty($storedTitle)) {
+                $methods[$code] = $storedTitle;
             }
+
             if ($asLabelValue && $withGroups && isset($data['group'])) {
                 $groupRelations[$code] = $data['group'];
             }
@@ -350,4 +348,21 @@ public function getZeroSubTotalPaymentAutomaticInvoice($store = null)
             $store
         );
     }
+
+    /**
+     * Get config title of payment method
+     *
+     * @param string $code
+     * @param int|null $storeId
+     * @return string
+     */
+    private function getMethodStoreTitle(string $code, ?int $storeId = null): string
+    {
+        $configPath = sprintf('%s/%s/title', self::XML_PATH_PAYMENT_METHODS, $code);
+        return (string) $this->scopeConfig->getValue(
+            $configPath,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+            $storeId
+        );
+    }
 }

dev/tests/integration/testsuite/Magento/Payment/Helper/DataTest.php

@@ -3,22 +3,59 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+namespace Magento\Payment\Helper;
+
+use PHPUnit\Framework\TestCase;
+use Magento\OfflinePayments\Block\Info\Checkmo;
+use Magento\Payment\Model\Info;
+use Magento\TestFramework\Helper\Bootstrap;
 
 /**
  * Test class for \Magento\Payment\Helper\Data
  */
-namespace Magento\Payment\Helper;
-
-class DataTest extends \PHPUnit\Framework\TestCase
+class DataTest extends TestCase
 {
+    /**
+     * @var Data
+     */
+    private $helper;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        parent::setUp();
+
+        $this->helper = Bootstrap::getObjectManager()->get(Data::class);
+    }
+
+    /**
+     * @return void
+     */
     public function testGetInfoBlock()
     {
-        $helper = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(\Magento\Payment\Helper\Data::class);
-        $paymentInfo = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-            \Magento\Payment\Model\Info::class
+        $paymentInfo = Bootstrap::getObjectManager()->create(
+            Info::class
         );
         $paymentInfo->setMethod('checkmo');
-        $result = $helper->getInfoBlock($paymentInfo);
-        $this->assertInstanceOf(\Magento\OfflinePayments\Block\Info\Checkmo::class, $result);
+        $result = $this->helper->getInfoBlock($paymentInfo);
+        $this->assertInstanceOf(Checkmo::class, $result);
+    }
+
+    /**
+     * Test to load Payment method title from store config
+     *
+     * @magentoConfigFixture current_store payment/cashondelivery/title Cash On Delivery Title Of The Method
+     */
+    public function testPaymentMethodLabelByStore()
+    {
+        $result = $this->helper->getPaymentMethodList(true, true);
+        $this->assertArrayHasKey('cashondelivery', $result, 'Payment info does not exist');
+        $this->assertEquals(
+            'Cash On Delivery Title Of The Method',
+            $result['cashondelivery']['label'],
+            'Payment method title is not loaded from store config'
+        );
     }
 }