Merge remote-tracking branch 'origin/MAGETWO-59033' into MPI-PR-bugfixes

Dmytro Yushkin · Dmytro Yushkin · commit 5370951e7398 · 2016-10-03T14:27:30.000+03:00
diff --git a/app/code/Magento/Authorizenet/Model/Source/Cctype.php b/app/code/Magento/Authorizenet/Model/Source/Cctype.php
@@ -17,6 +17,6 @@ class Cctype extends PaymentCctype
      */
     public function getAllowedTypes()
     {
-        return ['VI', 'MC', 'AE', 'DI'];
+        return ['VI', 'MC', 'AE', 'DI', 'JCB', 'DN'];
     }
 }
diff --git a/app/code/Magento/Authorizenet/etc/config.xml b/app/code/Magento/Authorizenet/etc/config.xml
@@ -10,7 +10,7 @@
         <payment>
             <authorizenet_directpost>
                 <active>0</active>
-                <cctypes>AE,VI,MC,DI</cctypes>
+                <cctypes>AE,VI,MC,DI,JCB,DN</cctypes>
                 <debug>0</debug>
                 <email_customer>0</email_customer>
                 <login backend_model="Magento\Config\Model\Config\Backend\Encrypted" />

Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,6 @@ class Cctype extends PaymentCctype`
`17`	`17`	`*/`
`18`	`18`	`public function getAllowedTypes()`
`19`	`19`	`{`
`20`		`- return ['VI', 'MC', 'AE', 'DI'];`
	`20`	`+ return ['VI', 'MC', 'AE', 'DI', 'JCB', 'DN'];`
`21`	`21`	`}`
`22`	`22`	`}`