ACP2E-1120: extend new statuses that can apply for new placed order with free payment

Author: alzota

app/code/Magento/Payment/Model/Method/Free.php

@@ -5,7 +5,18 @@
  */
 namespace Magento\Payment\Model\Method;
 
+use Magento\Framework\Api\AttributeValueFactory;
+use Magento\Framework\Api\ExtensionAttributesFactory;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Data\Collection\AbstractDb;
+use Magento\Framework\Model\Context;
+use Magento\Framework\Model\ResourceModel\AbstractResource;
 use Magento\Framework\Pricing\PriceCurrencyInterface;
+use Magento\Framework\Registry;
+use Magento\Payment\Helper\Data;
+use Magento\Sales\Model\Order\Config;
+use Magento\Sales\Model\Order\Status;
 
 /**
  * Free payment method
@@ -50,6 +61,11 @@ class Free extends \Magento\Payment\Model\Method\AbstractMethod
      */
     protected $priceCurrency;
 
+    /**
+     * @var Config|null
+     */
+    private $config;
+
     /**
      * @param \Magento\Framework\Model\Context $context
      * @param \Magento\Framework\Registry $registry
@@ -62,6 +78,7 @@ class Free extends \Magento\Payment\Model\Method\AbstractMethod
      * @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
+     * @param Config|null $config
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -75,7 +92,8 @@ public function __construct(
         PriceCurrencyInterface $priceCurrency,
         \Magento\Framework\Model\ResourceModel\AbstractResource $resource = null,
         \Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
-        array $data = []
+        array $data = [],
+        Config $config = null
     ) {
         parent::__construct(
             $context,
@@ -90,6 +108,7 @@ public function __construct(
             $data
         );
         $this->priceCurrency = $priceCurrency;
+        $this->config = $config ?: ObjectManager::getInstance()->create(Config::class);
     }
 
     /**
@@ -119,12 +138,14 @@ public function isAvailableInConfig($quote = null)
     }
 
     /**
-     * Get config payment action, do nothing if status is pending
+     * Get config payment action, do nothing if status is pending or status is assigned to new[Pending] state
      *
      * @return string|null
      */
     public function getConfigPaymentAction()
     {
-        return $this->getConfigData('order_status') == 'pending' ? null : parent::getConfigPaymentAction();
+        $newStateStatuses = $this->config->getStateStatuses('new');
+        $configNewOrderStatus = $this->getConfigData('order_status');
+        return $configNewOrderStatus == 'pending' || array_key_exists($configNewOrderStatus, $newStateStatuses) ? null : parent::getConfigPaymentAction();
     }
 }