Merge pull request #527 from magento-mpi/MPI-BUGFIX-S69

[MPI] Bugfixes s69

Author: Pechenushko

app/code/Magento/Authorizenet/Block/Transparent/Iframe.php

@@ -17,21 +17,29 @@ class Iframe extends TransparentIframe
      */
     protected $dataFactory;
 
+    /**
+     * @var \Magento\Framework\Message\ManagerInterface
+     */
+    private $messageManager;
+
     /**
      * Constructor
      *
      * @param \Magento\Framework\View\Element\Template\Context $context
      * @param \Magento\Framework\Registry $registry
      * @param \Magento\Authorizenet\Helper\DataFactory $dataFactory
+     * @param \Magento\Framework\Message\ManagerInterface $messageManager
      * @param array $data
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
         \Magento\Framework\Registry $registry,
         \Magento\Authorizenet\Helper\DataFactory $dataFactory,
+        \Magento\Framework\Message\ManagerInterface $messageManager,
         array $data = []
     ) {
         $this->dataFactory = $dataFactory;
+        $this->messageManager = $messageManager;
         parent::__construct($context, $registry, $data);
     }
 
@@ -45,4 +53,26 @@ public function getHelper($area)
     {
         return $this->dataFactory->create($area);
     }
+
+    /**
+     * {inheritdoc}
+     */
+    protected function _beforeToHtml()
+    {
+        $this->addSuccessMessage();
+        return parent::_beforeToHtml();
+    }
+
+    /**
+     * Add success message
+     *
+     * @return void
+     */
+    private function addSuccessMessage()
+    {
+        $params = $this->getParams();
+        if (isset($params['redirect_parent'])) {
+            $this->messageManager->addSuccess(__('You created the order.'));
+        }
+    }
 }

app/code/Magento/Braintree/Block/PayPal/Shortcut.php

@@ -183,7 +183,6 @@ public function getContainerId()
     {
         if ($this->isInMiniCart()) {
             return 'braintree_paypal_container_minicart';
-
         } else {
             return 'braintree_paypal_container' . $this->mathRandom->getRandomString(5);
         }

app/code/Magento/Braintree/Model/Checkout.php

@@ -84,7 +84,7 @@ protected function populateQuoteAddress($quote, $details)
             $billingAddress->setFirstname($details['firstName']);
             $billingAddress->setLastname($details['lastName']);
             $billingAddress->setEmail($details['email']);
-        } elseif ($billingAddress->getEmail() == null) {
+        } elseif ($exportedShippingAddress) {
             $this->importAddressData($billingAddress, $exportedShippingAddress);
             $billingAddress->setFirstname($details['firstName']);
             $billingAddress->setLastname($details['lastName']);

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

@@ -49,13 +49,15 @@
                             <label>Merchant ID</label>
                             <config_path>payment/braintree/merchant_id</config_path>
                         </field>
-                        <field id="public_key" translate="label" sortOrder="100" showInDefault="1" showInWebsite="1" showInStore="0">
+                        <field id="public_key" translate="label" type="obscure" sortOrder="100" showInDefault="1" showInWebsite="1" showInStore="0">
                             <label>Public Key</label>
                             <config_path>payment/braintree/public_key</config_path>
+                            <backend_model>Magento\Config\Model\Config\Backend\Encrypted</backend_model>
                         </field>
-                        <field id="private_key" translate="label" sortOrder="110" showInDefault="1" showInWebsite="1" showInStore="0">
+                        <field id="private_key" translate="label" type="obscure" sortOrder="110" showInDefault="1" showInWebsite="1" showInStore="0">
                             <label>Private Key</label>
                             <config_path>payment/braintree/private_key</config_path>
+                            <backend_model>Magento\Config\Model\Config\Backend\Encrypted</backend_model>
                         </field>
                         <field id="sort_order" translate="label" type="text" sortOrder="230" showInDefault="1" showInWebsite="1" showInStore="0">
                             <label>Sort Order</label>

app/code/Magento/Braintree/etc/config.xml

@@ -22,6 +22,8 @@
                 <fraudprotection>0</fraudprotection>
                 <capture_action>invoice</capture_action>
                 <data_js><![CDATA[https://js.braintreegateway.com/v1/braintree-data.js]]></data_js>
+                <public_key backend_model="Magento\Config\Model\Config\Backend\Encrypted" />
+                <private_key backend_model="Magento\Config\Model\Config\Backend\Encrypted" />
                 <duplicate_card>0</duplicate_card>
                 <masked_fields>cvv,number</masked_fields>
                 <usecache>0</usecache>

app/code/Magento/Braintree/view/frontend/web/js/braintree-paypal-shortcut.js

@@ -29,7 +29,7 @@ define([
             var paymentDetailsId = this.options.paymentDetailsId;
             var submitFormId = this.options.submitFormId;
             var self = this;
-            $('#'.concat(this.container)).empty();
+            $('#'.concat(this.options.container)).empty();
             braintree.setup(clientToken, "paypal", {
                 container: this.options.container,
                 singleUse: true,
@@ -52,4 +52,4 @@ define([
     });
 
     return $.mage.braintreePayPalShortcut;
-});
+});

app/code/Magento/Payment/view/adminhtml/templates/transparent/iframe.phtml

@@ -17,7 +17,7 @@ $params = $block->getParams();
 <?php elseif (isset($params['redirect_parent'])): ?>
     window.top.location="<?php echo $block->escapeUrl($params['redirect_parent']) ?>";
 <?php elseif (isset($params['error_msg'])): ?>
-    window.top.alert(<?php echo $block->helper('Magento\Framework\Json\Helper\Data')->jsonEncode($params['error_msg']) ?>);
+    window.top.alert(<?php echo $this->helper('Magento\Framework\Json\Helper\Data')->jsonEncode($params['error_msg']) ?>);
 <?php elseif (isset($params['order_success'])): ?>
     window.top.location = "<?php echo $params['order_success'] ?>";
 <?php else: ?>

app/code/Magento/Paypal/etc/config.xml

@@ -89,6 +89,7 @@
                 <avs_zip>0</avs_zip>
                 <avs_international>0</avs_international>
                 <avs_security_code>1</avs_security_code>
+                <cc_year_length>2</cc_year_length>
             </payflowpro>
             <paypal_billing_agreement>
                 <active>1</active>