@@ -61,7 +61,6 @@ public function loadAttributeOptions()
61
61
'base_subtotal ' => __ ('Subtotal ' ),
62
62
'total_qty ' => __ ('Total Items Quantity ' ),
63
63
'weight ' => __ ('Total Weight ' ),
64
- 'payment_method ' => __ ('Payment Method ' ),
65
64
'shipping_method ' => __ ('Shipping Method ' ),
66
65
'postcode ' => __ ('Shipping Postcode ' ),
67
66
'region ' => __ ('Shipping Region ' ),
@@ -100,7 +99,6 @@ public function getInputType()
100
99
return 'numeric ' ;
101
100
102
101
case 'shipping_method ' :
103
- case 'payment_method ' :
104
102
case 'country_id ' :
105
103
case 'region_id ' :
106
104
return 'select ' ;
@@ -117,7 +115,6 @@ public function getValueElementType()
117
115
{
118
116
switch ($ this ->getAttribute ()) {
119
117
case 'shipping_method ' :
120
- case 'payment_method ' :
121
118
case 'country_id ' :
122
119
case 'region_id ' :
123
120
return 'select ' ;
@@ -146,10 +143,6 @@ public function getValueSelectOptions()
146
143
$ options = $ this ->_shippingAllmethods ->toOptionArray ();
147
144
break ;
148
145
149
- case 'payment_method ' :
150
- $ options = $ this ->_paymentAllmethods ->toOptionArray ();
151
- break ;
152
-
153
146
default :
154
147
$ options = [];
155
148
}
@@ -175,10 +168,6 @@ public function validate(\Magento\Framework\Model\AbstractModel $model)
175
168
}
176
169
}
177
170
178
- if ('payment_method ' == $ this ->getAttribute () && !$ address ->hasPaymentMethod ()) {
179
- $ address ->setPaymentMethod ($ model ->getQuote ()->getPayment ()->getMethod ());
180
- }
181
-
182
171
return parent ::validate ($ address );
183
172
}
184
173
}
0 commit comments