MAGETWO-50288: Pull request support

irenelagno · irenelagno · commit 595ddd77bc9b · 2016-03-10T09:21:36.000+02:00
diff --git a/app/code/Magento/Paypal/view/frontend/web/js/in-context/express-checkout.js b/app/code/Magento/Paypal/view/frontend/web/js/in-context/express-checkout.js
@@ -42,6 +42,7 @@ define(
                             function (response) {
                                 if (response && response.token) {
                                     paypalExpressCheckout.checkout.startFlow(response.token);
+
                                     return;
                                 }
 
diff --git a/app/code/Magento/Quote/Model/Quote/Address.php b/app/code/Magento/Quote/Model/Quote/Address.php
@@ -1009,7 +1009,7 @@ public function requestShippingRates(\Magento\Quote\Model\Quote\Item\AbstractIte
                     if ($item) {
                         $item->setBaseShippingAmount($rate->getPrice());
                     } else {
-                        /**
+
                         /** @var \Magento\Quote\Model\Quote $quote */
                         $quote = $this->getQuote();
                         $amountPrice = $quote->getStore()
@@ -1028,6 +1028,7 @@ public function requestShippingRates(\Magento\Quote\Model\Quote\Item\AbstractIte
     }
 
     /******************************* Total Collector Interface *******************************************/
+
     /**
      * Get address totals as array
      *
@@ -1302,6 +1303,7 @@ public function getSubtotalWithDiscount()
     }
 
     //@codeCoverageIgnoreStart
+
     /**
      * Get all total amount values
      *

Original file line number	Diff line number	Diff line change
`@@ -42,6 +42,7 @@ define(`
`42`	`42`	`function (response) {`
`43`	`43`	`if (response && response.token) {`
`44`	`44`	`paypalExpressCheckout.checkout.startFlow(response.token);`
	`45`	`+`
`45`	`46`	`return;`
`46`	`47`	`}`
`47`	`48`
Original file line number	Diff line number	Diff line change
`@@ -1009,7 +1009,7 @@ public function requestShippingRates(\Magento\Quote\Model\Quote\Item\AbstractIte`
`1009`	`1009`	`if ($item) {`
`1010`	`1010`	`$item->setBaseShippingAmount($rate->getPrice());`
`1011`	`1011`	`} else {`
`1012`		`- /**`
	`1012`	`+`
`1013`	`1013`	`/** @var \Magento\Quote\Model\Quote $quote */`
`1014`	`1014`	`$quote = $this->getQuote();`
`1015`	`1015`	`$amountPrice = $quote->getStore()`
`@@ -1028,6 +1028,7 @@ public function requestShippingRates(\Magento\Quote\Model\Quote\Item\AbstractIte`
`1028`	`1028`	`}`
`1029`	`1029`
`1030`	`1030`	`/***************************** Total Collector Interface *****************************************/`
	`1031`	`+`
`1031`	`1032`	`/**`
`1032`	`1033`	`* Get address totals as array`
`1033`	`1034`	`*`
`@@ -1302,6 +1303,7 @@ public function getSubtotalWithDiscount()`
`1302`	`1303`	`}`
`1303`	`1304`
`1304`	`1305`	`//@codeCoverageIgnoreStart`
	`1306`	`+`
`1305`	`1307`	`/**`
`1306`	`1308`	`* Get all total amount values`
`1307`	`1309`	`*`