MAGETWO-53238: Vault Provider field contains Payflow Pro option in countries which don't have such solution

- reverted code back, fixed several minor defects

Author: dkvashninbay

app/code/Magento/Paypal/etc/adminhtml/system/paypal_payflowpro.xml

@@ -85,7 +85,7 @@
                 <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                 <config_path>payment/payflowpro_cc_vault/active</config_path>
                 <requires>
-                    <group id="paypal_payflow_required"/>
+                    <group id="paypal_payflow_api_settings"/>
                 </requires>
             </field>
         </group>

app/code/Magento/Paypal/view/frontend/web/template/payment/payflowpro-form.html

@@ -53,7 +53,7 @@
                        class="checkbox-inline"
                        data-bind="attr: {'id': getCode() + '_vault_enabler'}, checked: vaultEnabler.isActivePaymentTokenEnabler"/>
                 <label class="label" data-bind="attr: {'for': getCode() + '_vault_enabler'}">
-                    <span><!-- ko i18n: 'Save credit card info for future use.'--><!-- /ko --></span>
+                    <span><!-- ko i18n: 'Save credit card information for future use.'--><!-- /ko --></span>
                 </label>
             </div>
             <!-- /ko -->

app/code/Magento/Vault/Observer/VaultEnableAssigner.php

@@ -26,9 +26,12 @@ public function execute(\Magento\Framework\Event\Observer $observer)
             return;
         }
 
-        $payment = $this->readPaymentModelArgument($observer);
-        $enableVault = isset($additionalData[VaultConfigProvider::IS_ACTIVE_CODE]) ?
-            filter_var($additionalData[VaultConfigProvider::IS_ACTIVE_CODE], FILTER_VALIDATE_BOOLEAN) : false;
-        $payment->setAdditionalInformation(VaultConfigProvider::IS_ACTIVE_CODE, $enableVault);
+        if (isset($additionalData[VaultConfigProvider::IS_ACTIVE_CODE])) {
+            $payment = $this->readPaymentModelArgument($observer);
+            $payment->setAdditionalInformation(
+                VaultConfigProvider::IS_ACTIVE_CODE,
+                filter_var($additionalData[VaultConfigProvider::IS_ACTIVE_CODE], FILTER_VALIDATE_BOOLEAN)
+            );
+        }
     }
 }

app/code/Magento/Vault/Test/Unit/Observer/VaultEnableAssignerTest.php

@@ -81,6 +81,30 @@ public function booleanDataProvider()
         ];
     }
 
+    public function testExecuteNever()
+    {
+        $dataObject = new DataObject(
+            [
+                PaymentInterface::KEY_ADDITIONAL_DATA => []
+            ]
+        );
+        $paymentModel = $this->getMock(InfoInterface::class);
+
+        $paymentModel->expects(static::never())
+            ->method('setAdditionalInformation');
+
+        $observer = $this->getPreparedObserverWithMap(
+            [
+                [AbstractDataAssignObserver::DATA_CODE, $dataObject],
+                [AbstractDataAssignObserver::MODEL_CODE, $paymentModel]
+            ]
+        );
+
+        $vaultEnableAssigner = new VaultEnableAssigner();
+
+        $vaultEnableAssigner->execute($observer);
+    }
+
     /**
      * @param array $returnMap
      * @return \PHPUnit_Framework_MockObject_MockObject|Observer