Merge remote-tracking branch 'remotes/github/MAGETWO-96432' into EPAM-PR-32

Author: Mac

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

@@ -84,6 +84,8 @@ public function __construct(
     }
 
     /**
+     * Get config name of method model
+     *
      * @param string $code
      * @return string
      */

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

@@ -5,6 +5,9 @@
  */
 namespace Magento\Payment\Ui\Component\Listing\Column\Method;
 
+use Magento\Payment\Api\PaymentMethodListInterface;
+use Magento\Store\Model\StoreManagerInterface;
+
 /**
  * Class Options
  */
@@ -20,14 +23,29 @@ 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)
-    {
+    public function __construct(
+        \Magento\Payment\Helper\Data $paymentHelper,
+        \Magento\Payment\Api\PaymentMethodListInterface $paymentMethodList,
+        \Magento\Store\Model\StoreManagerInterface $storeManager
+    ) {
         $this->paymentHelper = $paymentHelper;
+        $this->paymentMethodList = $paymentMethodList;
+        $this->storeManager = $storeManager;
     }
 
     /**
@@ -38,8 +56,23 @@ public function __construct(\Magento\Payment\Helper\Data $paymentHelper)
     public function toOptionArray()
     {
         if ($this->options === null) {
-            $this->options = $this->paymentHelper->getPaymentMethodList(true, true);
+            $this->options = $this->getPaymentOptions();
+//            $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;
+    }
 }