MAGETWO-45339: Cart price rule not applied for Payment method conditions

 - remove payment_method condition for cart rules

Author: Robert He

app/code/Magento/SalesRule/Model/Rule/Condition/Address.php

@@ -99,6 +99,7 @@ public function getInputType()
                 return 'numeric';
 
             case 'shipping_method':
+            case 'payment_method':
             case 'country_id':
             case 'region_id':
                 return 'select';
@@ -115,6 +116,7 @@ public function getValueElementType()
     {
         switch ($this->getAttribute()) {
             case 'shipping_method':
+            case 'payment_method':
             case 'country_id':
             case 'region_id':
                 return 'select';
@@ -143,6 +145,10 @@ public function getValueSelectOptions()
                     $options = $this->_shippingAllmethods->toOptionArray();
                     break;
 
+                case 'payment_method':
+                    $options = $this->_paymentAllmethods->toOptionArray();
+                    break;
+
                 default:
                     $options = [];
             }
@@ -168,6 +174,10 @@ public function validate(\Magento\Framework\Model\AbstractModel $model)
             }
         }
 
+        if ('payment_method' == $this->getAttribute() && !$address->hasPaymentMethod()) {
+            $address->setPaymentMethod($model->getQuote()->getPayment()->getMethod());
+        }
+
         return parent::validate($address);
     }
 }