Merge pull request #492 from magento-mpi/MAGETWO-47544

[MPI] Bug Fixes

Author: mslabko

app/code/Magento/Braintree/view/frontend/web/js/view/payment/method-renderer/paypal.js

@@ -205,7 +205,7 @@ define([
                 container: 'paypal-container',
                 singleUse: true,
                 headless: true,
-                amount: this.amount,
+                amount: this.grandTotalAmount,
                 currency: totals['base_currency_code'],
                 locale: this.getLocale(),
                 enableShippingAddress: true,

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

@@ -12,7 +12,7 @@
         <fieldset_css>pp-method-payflow</fieldset_css>
         <comment>Connect your merchant account with a fully customizable gateway that lets customers pay without leaving your site.</comment>
         <attribute type="activity_path">payment/payflowpro/active</attribute>
-        <more_url>https://www.paypal.com/webapps/mpp/referral/paypal-payflow-pro?partner_id=NB9WWHYEMVUMS</more_url>
+        <more_url>https://www.paypal.com/webapps/mpp/payflow-payment-gateway?partner_id=NB9WWHYEMVUMS</more_url>
         <attribute type="paypal_ec_separate">1</attribute>
         <group id="paypal_payflow_required" translate="label" showInDefault="1" showInWebsite="1" sortOrder="10">
             <label>Required PayPal Settings</label>

app/code/Magento/Vault/view/frontend/templates/customer_account/credit_card.phtml

@@ -9,11 +9,11 @@ use Magento\Vault\Block\CardRendererInterface;
 
 /** @var CardRendererInterface|Template $block */
 
-$ccNumberView = 'xxxx-xxxx-xxxx-' . $block->escapeHtml($block->getNumberLast4Digits());
+$ccNumberView = $block->escapeHtml($block->getNumberLast4Digits());
 ?>
 <tr>
     <td data-th="<?php echo $block->escapeHtml(__('Card Number')) ?>" class="col card-number">
-        <?php /* @noEscape */ echo $ccNumberView ?>
+        <span><?php echo $block->escapeHtml(__('ending')); ?></span> <?php /* @noEscape */ echo $ccNumberView ?>
     </td>
     <td data-th="<?php echo $block->escapeHtml(__('Expiration Date')) ?>" class="col card-expire">
         <?php echo $block->escapeHtml($block->getExpDate()); ?>
@@ -27,7 +27,7 @@ $ccNumberView = 'xxxx-xxxx-xxxx-' . $block->escapeHtml($block->getNumberLast4Dig
     <td data-th="<?php echo $block->escapeHtml(__('Actions')) ?>" class="col actions">
         <form
             class="form"
-            action="<?php /* @escapeNotVerified */ echo $block->getUrl('vault/cards/deleteaction') ?>"
+            action="<?php echo $block->escapeUrl($block->getUrl('vault/cards/deleteaction')); ?>"
             method="post"
             >
             <?php echo $block->getBlockHtml('formkey')?>
@@ -50,5 +50,6 @@ $ccNumberView = 'xxxx-xxxx-xxxx-' . $block->escapeHtml($block->getNumberLast4Dig
                                 }'>
                 <span><?php echo $block->escapeHtml(__('Delete')) ?></span>
             </button>
+        </form>
     </td>
 </tr>

dev/tests/integration/testsuite/Magento/Paypal/Model/Config/Structure/Reader/_files/expected/config.xml

@@ -32,7 +32,7 @@
                 <fieldset_css>pp-method-payflow</fieldset_css>
                 <comment>Connect your merchant account with a fully customizable gateway that lets customers pay without leaving your site.</comment>
                 <attribute type="activity_path">payment/payflowpro/active</attribute>
-                <more_url>https://www.paypal.com/webapps/mpp/referral/paypal-payflow-pro?partner_id=NB9WWHYEMVUMS</more_url>
+                <more_url>https://www.paypal.com/webapps/mpp/payflow-payment-gateway?partner_id=NB9WWHYEMVUMS</more_url>
                 <attribute type="paypal_ec_separate">1</attribute>
                 <group id="paypal_payflow_required" translate="label" showInDefault="1" showInWebsite="1" sortOrder="10">
                     <label>Required PayPal Settings</label>