Skip to content

Commit b42cd08

Browse files
committed
MAGETWO-49485: Incorrect field in carriers
1 parent a89acbb commit b42cd08

File tree

8 files changed

+0
-20
lines changed

8 files changed

+0
-20
lines changed

app/code/Magento/Dhl/etc/adminhtml/system.xml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,6 @@
1414
<label>Enabled for Checkout</label>
1515
<source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
1616
</field>
17-
<field id="active_rma" translate="label" type="select" sortOrder="15" showInDefault="1" showInWebsite="1" showInStore="0">
18-
<label>Enabled for RMA</label>
19-
<source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
20-
</field>
2117
<field id="gateway_url" translate="label" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="0">
2218
<label>Gateway URL</label>
2319
</field>

app/code/Magento/Dhl/i18n/en_US.csv

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@ None,None
5757
"Field ","Field "
5858
" is required."," is required."
5959
"Enabled for Checkout","Enabled for Checkout"
60-
"Enabled for RMA","Enabled for RMA"
6160
"Gateway URL","Gateway URL"
6261
Title,Title
6362
"Access ID","Access ID"

app/code/Magento/Fedex/etc/adminhtml/system.xml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,6 @@
1414
<label>Enabled for Checkout</label>
1515
<source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
1616
</field>
17-
<field id="active_rma" translate="label" type="select" sortOrder="15" showInDefault="1" showInWebsite="1" showInStore="0">
18-
<label>Enabled for RMA</label>
19-
<source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
20-
</field>
2117
<field id="title" translate="label" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
2218
<label>Title</label>
2319
</field>

app/code/Magento/Fedex/i18n/en_US.csv

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ None,None
4545
" is required."," is required."
4646
FedEx,FedEx
4747
"Enabled for Checkout","Enabled for Checkout"
48-
"Enabled for RMA","Enabled for RMA"
4948
Title,Title
5049
"Account ID","Account ID"
5150
"Please make sure to use only digits here. No dashes are allowed.","Please make sure to use only digits here. No dashes are allowed."

app/code/Magento/Ups/etc/adminhtml/system.xml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,6 @@
1818
<label>Enabled for Checkout</label>
1919
<source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
2020
</field>
21-
<field id="active_rma" translate="label" type="select" sortOrder="15" showInDefault="1" showInWebsite="1" showInStore="0">
22-
<label>Enabled for RMA</label>
23-
<source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
24-
</field>
2521
<field id="allowed_methods" translate="label" type="multiselect" sortOrder="170" showInDefault="1" showInWebsite="1" showInStore="0">
2622
<label>Allowed Methods</label>
2723
<source_model>Magento\Ups\Model\Config\Source\Method</source_model>

app/code/Magento/Ups/i18n/en_US.csv

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,6 @@ label,label
7878
UPS,UPS
7979
"Access License Number","Access License Number"
8080
"Enabled for Checkout","Enabled for Checkout"
81-
"Enabled for RMA","Enabled for RMA"
8281
"Allowed Methods","Allowed Methods"
8382
"Packages Request Type","Packages Request Type"
8483
Container,Container

app/code/Magento/Usps/etc/adminhtml/system.xml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,6 @@
1414
<label>Enabled for Checkout</label>
1515
<source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
1616
</field>
17-
<field id="active_rma" translate="label" type="select" sortOrder="15" showInDefault="1" showInWebsite="1" showInStore="0">
18-
<label>Enabled for RMA</label>
19-
<source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
20-
</field>
2117
<field id="gateway_url" translate="label" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="0">
2218
<label>Gateway URL</label>
2319
</field>

app/code/Magento/Usps/i18n/en_US.csv

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,6 @@ None,None
102102
" is required."," is required."
103103
USPS,USPS
104104
"Enabled for Checkout","Enabled for Checkout"
105-
"Enabled for RMA","Enabled for RMA"
106105
"Gateway URL","Gateway URL"
107106
"Secure Gateway URL","Secure Gateway URL"
108107
Title,Title

0 commit comments

Comments
 (0)