MAGETWO-45180: [Refactoring] Accept Credit Card Payments using Braintree for StoreFront and Backend

 - Updated card type validation for Braintree
 - Updated tips for config section

Author: Ievgen Sentiabov

app/code/Magento/BraintreeTwo/Model/Adminhtml/Source/CcType.php

@@ -26,7 +26,7 @@ class CcType extends \Magento\Payment\Model\Source\Cctype
      */
     public function getAllowedTypes()
     {
-        return ['VI', 'MC', 'AE', 'DI', 'JCB', 'MI', 'DN', 'CUP', 'OT'];
+        return ['VI', 'MC', 'AE', 'DI', 'JCB', 'MI', 'DN', 'CUP'];
     }
 
     /**

app/code/Magento/BraintreeTwo/Test/Unit/Block/FormTest.php

@@ -26,7 +26,6 @@ class FormTest extends \PHPUnit_Framework_TestCase
         'JBC' => 'JBC',
         'CUP' => 'China Union Pay',
         'MI' => 'Maestro',
-        'OT' => 'Other'
     ];
 
     public static $configCardTypes = [

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

@@ -65,7 +65,7 @@
                         <frontend_model>Magento\Config\Block\System\Config\Form\Fieldset</frontend_model>
                         <field id="merchant_account_id" translate="label" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="0">
                             <label>Merchant Account ID</label>
-                            <comment>If you don't specify the merchant account to use to process a transaction, Braintree will process it using your default merchant account</comment>
+                            <comment>If you don't specify the merchant account to use to process a transaction, Braintree will process it using your default merchant account.</comment>
                             <config_path>payment/braintreetwo/merchant_account_id</config_path>
                         </field>
                         <field id="debug" translate="label" type="select" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="0">
@@ -76,7 +76,7 @@
                         <field id="useccv" translate="label" type="select" sortOrder="150" showInDefault="1" showInWebsite="1" showInStore="0">
                             <label>CVV Verification</label>
                             <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                            <comment>Be sure to Enable AVS and/or CVV in Your Braintree Account in Settings/Processing Section</comment>
+                            <comment>Be sure to Enable AVS and/or CVV in Your Braintree Account in Settings/Processing Section.</comment>
                             <config_path>payment/braintreetwo/useccv</config_path>
                         </field>
                         <field id="cctypes" translate="label" type="multiselect" sortOrder="160" showInDefault="1" showInWebsite="1" showInStore="0">

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

@@ -1,8 +1,8 @@
 "cc_type","Credit Card Type"
 "cc_number","Credit Card Number"
 "avsPostalCodeResponseCode","AVS Postal Code Response Code"
-"avsStreetAddressResponseCode","Avs Street Address Response Code"
-"cvvResponseCode","Cvv Response Code"
+"avsStreetAddressResponseCode","AVS Street Address Response Code"
+"cvvResponseCode","CVV Response Code"
 "processorAuthorizationCode","Processor Authorization Code"
 "processorResponseCode","Processor Response Code"
 "processorResponseText","Processor Response Text"

app/code/Magento/BraintreeTwo/view/frontend/web/js/view/payment/method-renderer/braintree.js

@@ -129,7 +129,7 @@ define(
                         },
                         expirationYear: {
                             selector: self.getSelector('expirationYear'),
-                            placeholder: $t('YYYY')
+                            placeholder: $t('YY')
                         },
 
                         /**
@@ -195,8 +195,13 @@ define(
              * @returns {Boolean}
              */
             validateCardType: function () {
+                var $selector = $(this.getSelector('cc_number')),
+                    invalidClass = 'braintree-hosted-fields-invalid';
+
+                $selector.removeClass(invalidClass);
+
                 if (this.selectedCardType() === null) {
-                    $(this.getSelector('cc_number')).attr('class', 'braintree-hosted-fields-invalid');
+                    $(this.getSelector('cc_number')).addClass('class', invalidClass);
 
                     return false;
                 }