Merge branch 'MAGETWO-96432' into EPAM-PR-32

Author: Nikita Chubukov

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

@@ -261,10 +261,13 @@ public function getPaymentMethodList($sorted = true, $asLabelValue = false, $wit
         $groupRelations = [];
 
         foreach ($this->getPaymentMethods() as $code => $data) {
-            if (isset($data['title'])) {
-                $methods[$code] = $data['title'];
-            } else {
-                $methods[$code] = $this->getMethodInstance($code)->getConfigData('title', $store);
+            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'];
+                }
             }
             if ($asLabelValue && $withGroups && isset($data['group'])) {
                 $groupRelations[$code] = $data['group'];

app/code/Magento/Payment/Ui/Component/Listing/Column/Method/Options.php

@@ -5,9 +5,6 @@
  */
 namespace Magento\Payment\Ui\Component\Listing\Column\Method;
 
-use Magento\Payment\Api\PaymentMethodListInterface;
-use Magento\Store\Model\StoreManagerInterface;
-
 /**
  * Class Options
  */
@@ -23,29 +20,15 @@ class Options implements \Magento\Framework\Data\OptionSourceInterface
      */
     protected $paymentHelper;
 
-    /**
-     * @var PaymentMethodListInterface
-     */
-    private $paymentMethodList;
-
-    /**
-     * @var StoreManagerInterface
-     */
-    private $storeManager;
-
     /**
      * Constructor
      *
      * @param \Magento\Payment\Helper\Data $paymentHelper
      */
     public function __construct(
-        \Magento\Payment\Helper\Data $paymentHelper,
-        \Magento\Payment\Api\PaymentMethodListInterface $paymentMethodList,
-        \Magento\Store\Model\StoreManagerInterface $storeManager
+        \Magento\Payment\Helper\Data $paymentHelper
     ) {
         $this->paymentHelper = $paymentHelper;
-        $this->paymentMethodList = $paymentMethodList;
-        $this->storeManager = $storeManager;
     }
 
     /**
@@ -56,23 +39,8 @@ public function __construct(
     public function toOptionArray()
     {
         if ($this->options === null) {
-            $this->options = $this->getPaymentOptions();
-//            $this->options = $this->paymentHelper->getPaymentMethodList(true, true);
+            $this->options = $this->paymentHelper->getPaymentMethodList(true, true);
         }
         return $this->options;
     }
-
-    /**
-     * @return array
-     * @throws \Magento\Framework\Exception\NoSuchEntityException
-     */
-    private function getPaymentOptions()
-    {
-        $options = [];
-        foreach ($this->paymentMethodList->getList($this->storeManager->getStore()->getId()) as $option) {
-            $options[$option->getCode()] = ['value' => $option->getCode(), 'label' => $option->getTitle()];
-        }
-        asort($options);
-        return $options;
-    }
 }