Merge pull request #865 from magento-mpi/PR-bugfixes

Alexander Akimov · web-flow · commit f59e74c72474 · 2017-02-24T15:34:22.000+02:00
[MPI] Bugfixes
diff --git a/app/code/Magento/Bundle/view/adminhtml/layout/adminhtml_order_shipment_view.xml b/app/code/Magento/Bundle/view/adminhtml/layout/adminhtml_order_shipment_view.xml
@@ -8,7 +8,7 @@
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
     <body>
         <referenceBlock name="shipment_items">
-            <block class="Magento\Bundle\Block\Adminhtml\Sales\Order\Items\Renderer" name="shipment_item_bundle" as="shipment_item_bundle" template="sales/shipment/view/items/renderer.phtml"/>
+            <block class="Magento\Bundle\Block\Adminhtml\Sales\Order\Items\Renderer" name="bundle" as="bundle" template="sales/shipment/view/items/renderer.phtml"/>
         </referenceBlock>
     </body>
 </page>
diff --git a/app/code/Magento/Paypal/Helper/Data.php b/app/code/Magento/Paypal/Helper/Data.php
@@ -15,7 +15,7 @@
 class Data extends \Magento\Framework\App\Helper\AbstractHelper
 {
     const HTML_TRANSACTION_ID =
-        '<a target="_blank" href="https://www.%1$s.paypal.com/cgi-bin/webscr?cmd=_view-a-trans&id=%2$s">%2$s</a>';
+        '<a target="_blank" href="https://www%1$s.paypal.com/cgi-bin/webscr?cmd=_view-a-trans&id=%2$s">%2$s</a>';
 
     /**
      * Cache for shouldAskToCreateBillingAgreement()
@@ -133,7 +133,7 @@ public function getHtmlTransactionId($methodCode, $txnId)
         if (in_array($methodCode, $this->methodCodes)) {
             /** @var \Magento\Paypal\Model\Config $config */
             $config = $this->configFactory->create()->setMethod($methodCode);
-            $sandboxFlag = ($config->getValue('sandboxFlag') ? 'sandbox' : '');
+            $sandboxFlag = ($config->getValue('sandboxFlag') ? '.sandbox' : '');
             return sprintf(self::HTML_TRANSACTION_ID, $sandboxFlag, $txnId);
         }
         return $txnId;
diff --git a/app/code/Magento/Paypal/Model/Express/Checkout.php b/app/code/Magento/Paypal/Model/Express/Checkout.php
@@ -387,10 +387,9 @@ public function getCheckoutShortcutImageUrl()
                 $pal = null;
             } elseif (!$pal) {
                 $pal = null;
-                $this->_getApi();
                 try {
-                    $this->_api->callGetPalDetails();
-                    $pal = $this->_api->getPal();
+                    $this->_getApi()->callGetPalDetails();
+                    $pal = $this->_getApi()->getPal();
                     $this->_configCacheType->save($pal, $cacheId);
                 } catch (\Exception $e) {
                     $this->_configCacheType->save(self::PAL_CACHE_ID, $cacheId);
@@ -503,11 +502,10 @@ public function start($returnUrl, $cancelUrl, $button = null)
         $this->_quote->reserveOrderId();
         $this->quoteRepository->save($this->_quote);
         // prepare API
-        $this->_getApi();
         $solutionType = $this->_config->getMerchantCountry() == 'DE'
             ? \Magento\Paypal\Model\Config::EC_SOLUTION_TYPE_MARK
             : $this->_config->getValue('solutionType');
-        $this->_api->setAmount($this->_quote->getBaseGrandTotal())
+        $this->_getApi()->setAmount($this->_quote->getBaseGrandTotal())
             ->setCurrencyCode($this->_quote->getBaseCurrencyCode())
             ->setInvNum($this->_quote->getReservedOrderId())
             ->setReturnUrl($returnUrl)
@@ -516,7 +514,7 @@ public function start($returnUrl, $cancelUrl, $button = null)
             ->setPaymentAction($this->_config->getValue('paymentAction'));
         if ($this->_giropayUrls) {
             list($successUrl, $cancelUrl, $pendingUrl) = $this->_giropayUrls;
-            $this->_api->addData(
+            $this->_getApi()->addData(
                 [
                     'giropay_cancel_url' => $cancelUrl,
                     'giropay_success_url' => $successUrl,
@@ -526,13 +524,13 @@ public function start($returnUrl, $cancelUrl, $button = null)
         }
 
         if ($this->_isBml) {
-            $this->_api->setFundingSource('BML');
+            $this->_getApi()->setFundingSource('BML');
         }
 
         $this->_setBillingAgreementRequest();
 
         if ($this->_config->getValue('requireBillingAddress') == PaypalConfig::REQUIRE_BILLING_ADDRESS_ALL) {
-            $this->_api->setRequireBillingAddress(1);
+            $this->_getApi()->setRequireBillingAddress(1);
         }
 
         // suppress or export shipping address
@@ -541,15 +539,18 @@ public function start($returnUrl, $cancelUrl, $button = null)
             if ($this->_config->getValue('requireBillingAddress')
                 == PaypalConfig::REQUIRE_BILLING_ADDRESS_VIRTUAL
             ) {
-                $this->_api->setRequireBillingAddress(1);
+                $this->_getApi()->setRequireBillingAddress(1);
             }
-            $this->_api->setSuppressShipping(true);
+            $this->_getApi()->setSuppressShipping(true);
         } else {
+
+            $this->_getApi()->setBillingAddress($this->_quote->getBillingAddress());
+
             $address = $this->_quote->getShippingAddress();
             $isOverridden = 0;
             if (true === $address->validate()) {
                 $isOverridden = 1;
-                $this->_api->setAddress($address);
+                $this->_getApi()->setAddress($address);
             }
             $this->_quote->getPayment()->setAdditionalInformation(
                 self::PAYMENT_INFO_TRANSPORT_SHIPPING_OVERRIDDEN,
@@ -561,19 +562,19 @@ public function start($returnUrl, $cancelUrl, $button = null)
         /** @var $cart \Magento\Payment\Model\Cart */
         $cart = $this->_cartFactory->create(['salesModel' => $this->_quote]);
 
-        $this->_api->setPaypalCart($cart);
+        $this->_getApi()->setPaypalCart($cart);
 
         if (!$this->_taxData->getConfig()->priceIncludesTax()) {
             $this->setShippingOptions($cart, $address);
         }
 
-        $this->_config->exportExpressCheckoutStyleSettings($this->_api);
+        $this->_config->exportExpressCheckoutStyleSettings($this->_getApi());
 
         /* Temporary solution. @TODO: do not pass quote into Nvp model */
-        $this->_api->setQuote($this->_quote);
-        $this->_api->callSetExpressCheckout();
+        $this->_getApi()->setQuote($this->_quote);
+        $this->_getApi()->callSetExpressCheckout();
 
-        $token = $this->_api->getToken();
+        $token = $this->_getApi()->getToken();
 
         $this->_setRedirectUrl($button, $token);
 
@@ -613,15 +614,15 @@ public function canSkipOrderReviewStep()
      */
     public function returnFromPaypal($token)
     {
-        $this->_getApi();
-        $this->_api->setToken($token)
+        $this->_getApi()
+            ->setToken($token)
             ->callGetExpressCheckoutDetails();
         $quote = $this->_quote;
 
         $this->ignoreAddressValidation();
 
         // import shipping address
-        $exportedShippingAddress = $this->_api->getExportedShippingAddress();
+        $exportedShippingAddress = $this->_getApi()->getExportedShippingAddress();
         if (!$quote->getIsVirtual()) {
             $shippingAddress = $quote->getShippingAddress();
             if ($shippingAddress) {
@@ -640,8 +641,8 @@ public function returnFromPaypal($token)
 
                 // import shipping method
                 $code = '';
-                if ($this->_api->getShippingRateCode()) {
-                    $code = $this->_matchShippingMethodCode($shippingAddress, $this->_api->getShippingRateCode());
+                if ($this->_getApi()->getShippingRateCode()) {
+                    $code = $this->_matchShippingMethodCode($shippingAddress, $this->_getApi()->getShippingRateCode());
                     if ($code) {
                         // possible bug of double collecting rates :-/
                         $shippingAddress->setShippingMethod($code)->setCollectShippingRates(true);
@@ -670,17 +671,18 @@ public function returnFromPaypal($token)
         } else {
             $billingAddress = $quote->getBillingAddress();
         }
-        $exportedBillingAddress = $this->_api->getExportedBillingAddress();
+        $exportedBillingAddress = $this->_getApi()->getExportedBillingAddress();
 
         $this->_setExportedAddressData($billingAddress, $exportedBillingAddress);
         $billingAddress->setCustomerNote($exportedBillingAddress->getData('note'));
         $quote->setBillingAddress($billingAddress);
+        $quote->setCheckoutMethod($this->getCheckoutMethod());
 
         // import payment info
         $payment = $quote->getPayment();
         $payment->setMethod($this->_methodType);
-        $this->_paypalInfo->importToPayment($this->_api, $payment);
-        $payment->setAdditionalInformation(self::PAYMENT_INFO_TRANSPORT_PAYER_ID, $this->_api->getPayerId())
+        $this->_paypalInfo->importToPayment($this->_getApi(), $payment);
+        $payment->setAdditionalInformation(self::PAYMENT_INFO_TRANSPORT_PAYER_ID, $this->_getApi()->getPayerId())
             ->setAdditionalInformation(self::PAYMENT_INFO_TRANSPORT_TOKEN, $token);
         $quote->collectTotals();
         $this->quoteRepository->save($quote);
@@ -724,8 +726,7 @@ public function getShippingOptionsCallbackResponse(array $request)
 
         try {
             // obtain addresses
-            $this->_getApi();
-            $address = $this->_api->prepareShippingOptionsCallbackAddress($request);
+            $address = $this->_getApi()->prepareShippingOptionsCallbackAddress($request);
             $quoteAddress = $this->_quote->getShippingAddress();
 
             // compare addresses, calculate shipping rates and prepare response
@@ -738,7 +739,7 @@ public function getShippingOptionsCallbackResponse(array $request)
                 $this->totalsCollector->collectAddressTotals($this->_quote, $quoteAddress);
                 $options = $this->_prepareShippingOptions($quoteAddress, false, true);
             }
-            $response = $this->_api->setShippingOptions($options)->formatShippingOptionsCallback();
+            $response = $this->_getApi()->setShippingOptions($options)->formatShippingOptionsCallback();
 
             // log request and response
             $debugData['response'] = $response;
@@ -956,7 +957,7 @@ protected function _setBillingAgreementRequest()
         if (!$this->_agreementFactory->create()->needToCreateForCustomer($this->_customerId)) {
             return $this;
         }
-        $this->_api->setBillingType($this->_api->getBillingAgreementType());
+        $this->_getApi()->setBillingType($this->_getApi()->getBillingAgreementType());
         return $this;
     }
 
@@ -1129,7 +1130,7 @@ public function getCustomerSession()
     private function setShippingOptions(PaypalCart $cart, Address $address = null)
     {
         // for included tax always disable line items (related to paypal amount rounding problem)
-        $this->_api->setIsLineItemsEnabled($this->_config->getValue(PaypalConfig::TRANSFER_CART_LINE_ITEMS));
+        $this->_getApi()->setIsLineItemsEnabled($this->_config->getValue(PaypalConfig::TRANSFER_CART_LINE_ITEMS));
 
         // add shipping options if needed and line items are available
         $cartItems = $cart->getAllItems();
@@ -1140,7 +1141,7 @@ private function setShippingOptions(PaypalCart $cart, Address $address = null)
             if (!$this->_quote->getIsVirtual()) {
                 $options = $this->_prepareShippingOptions($address, true);
                 if ($options) {
-                    $this->_api->setShippingOptionsCallbackUrl(
+                    $this->_getApi()->setShippingOptionsCallbackUrl(
                         $this->_coreUrl->getUrl(
                             '*/*/shippingOptionsCallback',
                             ['quote_id' => $this->_quote->getId()]
diff --git a/app/code/Magento/Paypal/Test/Unit/Helper/DataTest.php b/app/code/Magento/Paypal/Test/Unit/Helper/DataTest.php
@@ -7,6 +7,17 @@
 
 class DataTest extends \PHPUnit_Framework_TestCase
 {
+    /**
+     * @var string
+     */
+    private static $htmlTransactionId =
+        '<a target="_blank" href="https://www%1$s.paypal.com/cgi-bin/webscr?cmd=_view-a-trans&id=%2$s">%2$s</a>';
+
+    /**
+     * @var string
+     */
+    private static $txnId = 'XXX123123XXX';
+
     /**
      * @var \Magento\Payment\Api\PaymentMethodListInterface|\PHPUnit_Framework_MockObject_MockObject
      */
@@ -37,13 +48,10 @@ protected function setUp()
             \Magento\Payment\Model\Method\InstanceFactory::class
         )->disableOriginalConstructor()->getMock();
 
-        $this->configMock = $this->getMock(
-            \Magento\Paypal\Model\Config::class,
-            [],
-            [],
-            '',
-            false
-        );
+        $this->configMock = $this->getMockBuilder(\Magento\Paypal\Model\Config::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
         $configMockFactory = $this->getMockBuilder(\Magento\Paypal\Model\ConfigFactory::class)
             ->disableOriginalConstructor()
             ->setMethods(['create'])
@@ -138,34 +146,68 @@ public function getBillingAgreementMethodsDataProvider()
     }
 
     /**
+     * Sandbox mode
+     * Expected link <a target="_blank" href="https://www.sandbox.paypal.com/...</a>
+     *
      * @param string $methodCode
-     * @param string $htmlTransactionId
      * @dataProvider testGetHtmlTransactionIdProvider
      */
-    public function testGetHtmlTransactionId($methodCode, $htmlTransactionId)
+    public function testGetHtmlTransactionSandboxLink($methodCode)
     {
-        $txnId = 'XXX123123XXX';
-        $htmlTransactionId = sprintf($htmlTransactionId, 'sandbox', $txnId);
+        $expectedLink = sprintf(self::$htmlTransactionId, '.sandbox', self::$txnId);
 
-        $this->configMock->expects($this->any())
+        $this->configMock->expects($this->once())
             ->method('getValue')
-            ->with($this->stringContains('sandboxFlag'))
+            ->with('sandboxFlag')
             ->willReturn(true);
 
-        $this->assertEquals($htmlTransactionId, $this->_helper->getHtmlTransactionId($methodCode, $txnId));
+        $this->assertEquals(
+            $expectedLink,
+            $this->_helper->getHtmlTransactionId($methodCode, self::$txnId)
+        );
+    }
+
+    /**
+     * Real mode
+     * Expected link <a target="_blank" href="https://www.paypal.com/...  </a>
+     *
+     * @param string $methodCode
+     * @dataProvider testGetHtmlTransactionIdProvider
+     */
+    public function testGetHtmlTransactionRealLink($methodCode)
+    {
+        $expectedLink = sprintf(self::$htmlTransactionId, '', self::$txnId);
+
+        $this->configMock->expects($this->once())
+            ->method('getValue')
+            ->with('sandboxFlag')
+            ->willReturn(false);
+
+        $this->assertEquals(
+            $expectedLink,
+            $this->_helper->getHtmlTransactionId($methodCode, self::$txnId)
+        );
     }
 
     /**
      * @return array
      */
     public function testGetHtmlTransactionIdProvider()
     {
-        $htmlTransactionId =
-            '<a target="_blank" href="https://www.%1$s.paypal.com/cgi-bin/webscr?cmd=_view-a-trans&id=%2$s">%2$s</a>';
         return [
-            ['paypal_express', $htmlTransactionId],
-            ['payflow_express', 'XXX123123XXX'],
-            ['hosted_pro', $htmlTransactionId]
+            ['paypal_express'],
+            ['hosted_pro']
         ];
     }
+
+    /**
+     * Invokes with method not in payment list
+     * Expected result just returned txtId: "XXX123123XXX"
+     */
+    public function testGetHtmlTransactionMethodNotInPaymentList()
+    {
+        $methodCode = 'payflow_express';
+
+        $this->assertEquals(self::$txnId, $this->_helper->getHtmlTransactionId($methodCode, self::$txnId));
+    }
 }
diff --git a/app/code/Magento/Shipping/view/adminhtml/layout/adminhtml_order_shipment_new.xml b/app/code/Magento/Shipping/view/adminhtml/layout/adminhtml_order_shipment_new.xml
@@ -14,7 +14,7 @@
                     <block class="Magento\Sales\Block\Adminhtml\Order\View\Info" name="order_info" template="Magento_Sales::order/view/info.phtml"/>
                     <block class="Magento\Sales\Block\Adminhtml\Order\Payment" name="order_payment"/>
                     <block class="Magento\Shipping\Block\Adminhtml\Create\Items" name="order_items" template="create/items.phtml">
-                        <block class="Magento\Sales\Block\Adminhtml\Items\Renderer\DefaultRenderer" name="shipment_item_default" as="shipment_item_default" template="Magento_Shipping::create/items/renderer/default.phtml"/>
+                        <block class="Magento\Sales\Block\Adminhtml\Items\Renderer\DefaultRenderer" name="default" as="default" template="Magento_Shipping::create/items/renderer/default.phtml"/>
                         <block class="Magento\Sales\Block\Adminhtml\Items\Column\Qty" name="column_qty" template="Magento_Sales::items/column/qty.phtml" group="column"/>
                         <block class="Magento\Sales\Block\Adminhtml\Items\Column\Name" name="column_name" template="Magento_Sales::items/column/name.phtml" group="column"/>
                         <block class="Magento\Framework\View\Element\Text\ListText" name="order_item_extra_info"/>
diff --git a/app/code/Magento/Shipping/view/adminhtml/layout/adminhtml_order_shipment_view.xml b/app/code/Magento/Shipping/view/adminhtml/layout/adminhtml_order_shipment_view.xml
@@ -14,7 +14,7 @@
                     <block class="Magento\Sales\Block\Adminhtml\Order\View\Info" name="order_info" template="Magento_Sales::order/view/info.phtml"/>
                     <block class="Magento\Sales\Block\Adminhtml\Order\Payment" name="order_payment"/>
                     <block class="Magento\Shipping\Block\Adminhtml\View\Items" name="shipment_items" template="view/items.phtml">
-                        <block class="Magento\Sales\Block\Adminhtml\Items\Renderer\DefaultRenderer" name="shipment_item_default" as="shipment_item_default" template="Magento_Shipping::view/items/renderer/default.phtml"/>
+                        <block class="Magento\Sales\Block\Adminhtml\Items\Renderer\DefaultRenderer" name="default" as="default" template="Magento_Shipping::view/items/renderer/default.phtml"/>
                         <block class="Magento\Sales\Block\Adminhtml\Items\Column\Qty" name="column_qty" template="Magento_Sales::items/column/qty.phtml" group="column"/>
                         <block class="Magento\Sales\Block\Adminhtml\Items\Column\Name" name="column_name" template="Magento_Sales::items/column/name.phtml" group="column"/>
                         <block class="Magento\Framework\View\Element\Text\ListText" name="order_item_extra_info"/>
diff --git a/dev/tests/integration/testsuite/Magento/Paypal/Model/Express/CheckoutTest.php b/dev/tests/integration/testsuite/Magento/Paypal/Model/Express/CheckoutTest.php
