Skip to content

Commit 40ede47

Browse files
committed
MAGETWO-37735: Magento Centinel Removal
- CR
1 parent 58bdb08 commit 40ede47

File tree

7 files changed

+3
-12
lines changed

7 files changed

+3
-12
lines changed

app/code/Magento/OfflinePayments/etc/payment.xml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,23 +15,18 @@
1515
<methods>
1616
<method name="banktransfer">
1717
<allow_multiple_address>1</allow_multiple_address>
18-
<allow_multiple_with_3dsecure>1</allow_multiple_with_3dsecure>
1918
</method>
2019
<method name="cashondelivery">
2120
<allow_multiple_address>1</allow_multiple_address>
22-
<allow_multiple_with_3dsecure>1</allow_multiple_with_3dsecure>
2321
</method>
2422
<method name="checkmo">
2523
<allow_multiple_address>1</allow_multiple_address>
26-
<allow_multiple_with_3dsecure>1</allow_multiple_with_3dsecure>
2724
</method>
2825
<method name="purchaseorder">
2926
<allow_multiple_address>1</allow_multiple_address>
30-
<allow_multiple_with_3dsecure>1</allow_multiple_with_3dsecure>
3127
</method>
3228
<method name="free">
3329
<allow_multiple_address>1</allow_multiple_address>
34-
<allow_multiple_with_3dsecure>1</allow_multiple_with_3dsecure>
3530
</method>
3631
</methods>
3732
</payment>

app/code/Magento/Payment/Test/Unit/Model/Config/ConverterTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public function testConvert()
3131
$expectedResult = [
3232
'credit_cards' => ['SO' => 'Solo', 'SM' => 'Switch/Maestro'],
3333
'groups' => ['any_payment' => 'Any Payment'],
34-
'methods' => ['checkmo' => ['allow_multiple_address' => 1, 'allow_multiple_with_3dsecure' => 1]],
34+
'methods' => ['checkmo' => ['allow_multiple_address' => 1]],
3535
];
3636
$this->assertEquals($expectedResult, $this->_model->convert($dom), '', 0, 20);
3737
}

app/code/Magento/Payment/Test/Unit/Model/Config/_files/payment.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
<methods>
2424
<method name="checkmo">
2525
<allow_multiple_address>1</allow_multiple_address>
26-
<allow_multiple_with_3dsecure>1</allow_multiple_with_3dsecure>
2726
</method>
2827
</methods>
2928
</payment>

app/code/Magento/Payment/etc/payment.xsd

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,6 @@
8989
</xs:annotation>
9090
<xs:all>
9191
<xs:element name="allow_multiple_address" type="xs:integer" minOccurs="0" />
92-
<xs:element name="allow_multiple_with_3dsecure" type="xs:integer" minOccurs="0" />
9392
</xs:all>
9493
<xs:attribute name="name" type="xs:ID" use="required" />
9594
</xs:complexType>

app/code/Magento/Payment/etc/payment_file.xsd

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,6 @@
8989
</xs:annotation>
9090
<xs:all>
9191
<xs:element name="allow_multiple_address" type="xs:integer" minOccurs="0" />
92-
<xs:element name="allow_multiple_with_3dsecure" type="xs:integer" minOccurs="0" />
9392
</xs:all>
9493
<xs:attribute name="name" type="xs:ID" use="required" />
9594
</xs:complexType>

dev/tests/integration/testsuite/Magento/Payment/Model/Config/ReaderTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public function testRead()
4040
$expected = [
4141
'credit_cards' => ['SO' => 'Solo', 'SM' => 'Switch/Maestro'],
4242
'groups' => ['any_payment' => 'Any Payment'],
43-
'methods' => ['checkmo' => ['allow_multiple_address' => 1, 'allow_multiple_with_3dsecure' => 1]],
43+
'methods' => ['checkmo' => ['allow_multiple_address' => 1]],
4444
];
4545
$this->assertEquals($expected, $result);
4646
}
@@ -58,7 +58,7 @@ public function testMergeCompleteAndPartial()
5858
'credit_cards' => ['AE' => 'American Express', 'SM' => 'Switch/Maestro', 'SO' => 'Solo'],
5959
'groups' => ['any_payment' => 'Any Payment Methods', 'offline' => 'Offline Payment Methods'],
6060
'methods' => [
61-
'checkmo' => ['allow_multiple_address' => 1, 'allow_multiple_with_3dsecure' => 1],
61+
'checkmo' => ['allow_multiple_address' => 1],
6262
'deny-method' => ['allow_multiple_address' => 0],
6363
],
6464
];

dev/tests/integration/testsuite/Magento/Payment/Model/_files/payment.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
<methods>
2424
<method name="checkmo">
2525
<allow_multiple_address>1</allow_multiple_address>
26-
<allow_multiple_with_3dsecure>1</allow_multiple_with_3dsecure>
2726
</method>
2827
</methods>
2928
</payment>

0 commit comments

Comments
 (0)