Merge branch 'develop' of github.corp.magento.com:magento2/magento2ce into MAGETWO-43102

slopukhov · slopukhov · commit fc47f03739e7 · 2016-02-19T17:05:14.000+02:00
diff --git a/app/code/Magento/BraintreeTwo/Test/Unit/Gateway/Http/Client/TransactionSubmitForSettlementTest.php b/app/code/Magento/BraintreeTwo/Test/Unit/Gateway/Http/Client/TransactionSubmitForSettlementTest.php
@@ -69,7 +69,7 @@ public function testPlaceRequestWithException()
     }
 
     /**
-     * @covers \Magento\BraintreeTwo\Gateway\Http\Client\TransactionSubmitForSettlement::placeRequest
+     * @covers \Magento\BraintreeTwo\Gateway\Http\Client\TransactionSubmitForSettlement::process
      */
     public function testPlaceRequest()
     {
diff --git a/app/code/Magento/BraintreeTwo/view/adminhtml/layout/braintreetwo_report_index.xml b/app/code/Magento/BraintreeTwo/view/adminhtml/layout/braintreetwo_report_index.xml
@@ -7,6 +7,13 @@
 -->
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
     <body>
+        <referenceContainer name="page.main.actions">
+            <block class="Magento\Backend\Block\Template" name="adminhtml.report.grid.braintreetwo.tooltip" template="Magento_BraintreeTwo::grid/tooltip.phtml">
+                <arguments>
+                    <argument name="tooltip_content" xsi:type="string" translate="true">Apply filters in order to get results. Only first 100 records will be displayed in the grid, you will be able to download full version of the report in .csv format.</argument>
+                </arguments>
+            </block>
+        </referenceContainer>
         <referenceContainer name="content">
             <uiComponent name="braintreetwo_report"/>
         </referenceContainer>
diff --git a/app/code/Magento/BraintreeTwo/view/adminhtml/templates/form/vault.phtml b/app/code/Magento/BraintreeTwo/view/adminhtml/templates/form/vault.phtml
@@ -23,7 +23,7 @@ $id = $block->escapeHtml($block->getData('id'));
         <img src="<?php echo $block->escapeUrl($icon['url']); ?>"
              width="<?php echo $block->escapeHtml($icon['width']); ?>"
              height="<?php echo $block->escapeHtml($icon['height']); ?>"
-            >
+             class="payment-icon" >
         <span><?php echo $block->escapeHtml(__('ending'));?></span>
         <span><?php echo $block->escapeHtml($details['maskedCC']); ?></span>
         (<span><?php echo $block->escapeHtml(__('expires'));?></span>:
diff --git a/app/code/Magento/BraintreeTwo/view/adminhtml/templates/grid/tooltip.phtml b/app/code/Magento/BraintreeTwo/view/adminhtml/templates/grid/tooltip.phtml
@@ -0,0 +1,10 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/**
+ * @var \Magento\Backend\Block\Template $block
+ */
+echo $block->escapeHtml($block->getData('tooltip_content'));
diff --git a/app/code/Magento/BraintreeTwo/view/frontend/web/js/view/payment/method-renderer/hosted-fields.js b/app/code/Magento/BraintreeTwo/view/frontend/web/js/view/payment/method-renderer/hosted-fields.js
@@ -112,11 +112,12 @@ define([
                     self.selectedCardType(null);
                 }
 
-                if (!event.isValid) {
-                    return false;
-                }
-
-                if (event.card) {
+                if (event.target.fieldKey === 'number' && event.card) {
+                    if (event.isValid) {
+                        self.cardNumber = event.card;
+                    } else {
+                        self.cardNumber = null;
+                    }
                     self.selectedCardType(
                         validator.getMageCardType(event.card.type, self.getCcAvailableTypes())
                     );
diff --git a/app/code/Magento/BraintreeTwo/view/frontend/web/js/view/payment/method-renderer/paypal.js b/app/code/Magento/BraintreeTwo/view/frontend/web/js/view/payment/method-renderer/paypal.js
@@ -9,8 +9,9 @@ define([
     'underscore',
     'Magento_Checkout/js/view/payment/default',
     'Magento_BraintreeTwo/js/view/payment/adapter',
-    'Magento_Checkout/js/model/quote'
-], function ($, _, Component, Braintree, quote) {
+    'Magento_Checkout/js/model/quote',
+    'Magento_Checkout/js/model/full-screen-loader'
+], function ($, _, Component, Braintree, quote, fullScreenLoader) {
     'use strict';
 
     var checkout;
@@ -35,6 +36,7 @@ define([
                  */
                 onReady: function (integration) {
                     checkout = integration;
+                    this.enableButton();
                 },
 
                 /**
@@ -160,6 +162,7 @@ define([
             checkout.teardown(function () {
                 checkout = null;
             });
+            this.disableButton();
             this.clientConfig.paypal.amount = this.grandTotalAmount;
 
             Braintree.setConfig(this.clientConfig);
@@ -267,6 +270,22 @@ define([
         getPaymentAcceptanceMarkSrc: function () {
 
             return window.checkoutConfig.payment[this.getCode()].paymentAcceptanceMarkSrc;
+        },
+
+        /**
+         * Disable submit button
+         */
+        disableButton: function () {
+            fullScreenLoader.startLoader();
+            $('[data-button="place"]').attr('disabled', 'disabled');
+        },
+
+        /**
+         * Enable submit button
+         */
+        enableButton: function () {
+            $('[data-button="place"]').removeAttr('disabled');
+            fullScreenLoader.stopLoader();
         }
     });
 });
diff --git a/app/code/Magento/BraintreeTwo/view/frontend/web/template/payment/paypal.html b/app/code/Magento/BraintreeTwo/view/frontend/web/template/payment/paypal.html
@@ -29,7 +29,7 @@
         </div>
         <div class="actions-toolbar">
             <div class="primary">
-                <button data-role="review-save"
+                <button data-button="place" data-role="review-save"
                         type="submit"
                         data-bind="attr: {title: $t('Continue to PayPal')}, enable: (isActive()), click: payWithPayPal"
                         class="action primary checkout"
diff --git a/app/code/Magento/Paypal/view/adminhtml/templates/payflowpro/vault.phtml b/app/code/Magento/Paypal/view/adminhtml/templates/payflowpro/vault.phtml
@@ -24,7 +24,7 @@ $id = $block->escapeHtml($block->getData('id'));
         <img src="<?php echo $block->escapeUrl($icon['url']); ?>"
              width="<?php echo $block->escapeHtml($icon['width']); ?>"
              height="<?php echo $block->escapeHtml($icon['height']); ?>"
-            >
+             class="payment-icon" >
         <span><?php echo $block->escapeHtml(__('ending'));?></span>
         <span><?php echo $block->escapeHtml($details['cc_last_4']); ?></span>
         (<span><?php echo $block->escapeHtml(__('expires'));?></span>:
diff --git a/app/code/Magento/Paypal/view/frontend/web/js/action/set-payment-method.js b/app/code/Magento/Paypal/view/frontend/web/js/action/set-payment-method.js
@@ -18,19 +18,22 @@ define(
         return function (messageContainer) {
             var serviceUrl,
                 payload,
+                method = 'put',
                 paymentData = quote.paymentMethod();
 
             /**
              * Checkout for guest and registered customer.
              */
             if (!customer.isLoggedIn()) {
-                serviceUrl = urlBuilder.createUrl('/guest-carts/:cartId/selected-payment-method', {
+                serviceUrl = urlBuilder.createUrl('/guest-carts/:cartId/set-payment-information', {
                     cartId: quote.getQuoteId()
                 });
                 payload = {
                     cartId: quote.getQuoteId(),
-                    method: paymentData
+                    email: quote.guestEmail,
+                    paymentMethod: paymentData
                 };
+                method = 'post';
             } else {
                 serviceUrl = urlBuilder.createUrl('/carts/mine/selected-payment-method', {});
                 payload = {
@@ -40,7 +43,7 @@ define(
             }
             fullScreenLoader.startLoader();
 
-            return storage.put(
+            return storage[method](
                 serviceUrl, JSON.stringify(payload)
             ).fail(
                 function (response) {
diff --git a/app/code/Magento/Usps/Model/Carrier.php b/app/code/Magento/Usps/Model/Carrier.php
@@ -550,6 +550,9 @@ protected function _parseXmlResponse($response)
                                 $serviceName = $this->_filterServiceName((string)$service->SvcDescription);
                                 $serviceCode = 'INT_' . (string)$service->attributes()->ID;
                                 $serviceCodeToActualNameMap[$serviceCode] = $serviceName;
+                                if (!$this->isServiceAvailable($service)) {
+                                    continue;
+                                }
                                 if (in_array($serviceCode, $allowedMethods)) {
                                     $costArr[$serviceCode] = (string)$service->Postage;
                                     $priceArr[$serviceCode] = $this->getMethodPrice(
@@ -2021,4 +2024,20 @@ protected function _parseZip($zipString, $returnFull = false)
 
         return [$zip5, $zip4];
     }
+
+    /**
+     * Check availability of post service
+     *
+     * @param \SimpleXMLElement $service
+     * @return boolean
+     */
+    private function isServiceAvailable(\SimpleXMLElement $service)
+    {
+        foreach ($service->ExtraServices->children() as $child) {
+            if (filter_var($child->Available, FILTER_VALIDATE_BOOLEAN)) {
+                return true;
+            }
+        }
+        return false;
+    }
 }
diff --git a/app/code/Magento/Usps/Test/Unit/Model/CarrierTest.php b/app/code/Magento/Usps/Test/Unit/Model/CarrierTest.php
@@ -6,7 +6,6 @@
 namespace Magento\Usps\Test\Unit\Model;
 
 use Magento\Quote\Model\Quote\Address\RateRequest;
-use Magento\Store\Model\StoreManager;
 
 class CarrierTest extends \PHPUnit_Framework_TestCase
 {
@@ -179,14 +178,33 @@ public function testCollectRates()
             $this->returnValue(file_get_contents(__DIR__ . '/_files/success_usps_response_rates.xml'))
         );
         // for setRequest
+        $data = require __DIR__ . '/_files/rates_request_data.php';
         $request = $this->helper->getObject(
             'Magento\Quote\Model\Quote\Address\RateRequest',
-            require __DIR__ . '/_files/rates_request_data.php'
+            ['data' => $data[0]]
         );
 
         $this->assertNotEmpty($this->carrier->collectRates($request)->getAllRates());
     }
 
+    public function testCollectRatesWithUnavailableService()
+    {
+        $expectedCount = 5;
+
+        $this->scope->expects(static::once())
+            ->method('isSetFlag')
+            ->willReturn(true);
+
+        $this->httpResponse->expects(static::once())
+            ->method('getBody')
+            ->willReturn(file_get_contents(__DIR__ . '/_files/response_rates.xml'));
+
+        $data = require __DIR__ . '/_files/rates_request_data.php';
+        $request = $this->helper->getObject(RateRequest::class, ['data' => $data[1]]);
+        $rates = $this->carrier->collectRates($request)->getAllRates();
+        static::assertEquals($expectedCount, count($rates));
+    }
+
     public function testReturnOfShipment()
     {
         $this->httpResponse->expects(
diff --git a/app/code/Magento/Usps/Test/Unit/Model/_files/rates_request_data.php b/app/code/Magento/Usps/Test/Unit/Model/_files/rates_request_data.php
@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 return [
-    'data' => [
+    [
         'dest_country_id' => 'US',
         'dest_region_id' => '12',
         'dest_region_code' => 'CA',
@@ -34,5 +34,32 @@
         'height' => null,
         'length' => null,
         'width' => null,
+    ], [
+        'dest_country_id' => 'CA',
+        'dest_postcode' => 'M5V 3G5',
+        'dest_country_name' => 'Canada',
+        'package_value' => '5',
+        'package_value_with_discount' => '5',
+        'package_weight' => '5',
+        'package_qty' => '1',
+        'package_physical_value' => '5',
+        'free_method_weight' => '5',
+        'store_id' => '1',
+        'website_id' => '1',
+        'free_shipping' => '0',
+        'limit_carrier' => 'null',
+        'base_subtotal_incl_tax' => '5',
+        'orig_country_id' => 'US',
+        'country_id' => 'US',
+        'region_id' => '12',
+        'city' => 'Culver City',
+        'postcode' => '90034',
+        'usps_userid' => '213MAGEN6752',
+        'usps_container' => 'VARIABLE',
+        'usps_size' => 'REGULAR',
+        'girth' => null,
+        'height' => null,
+        'length' => null,
+        'width' => null,
     ]
 ];
diff --git a/app/code/Magento/Usps/Test/Unit/Model/_files/response_rates.xml b/app/code/Magento/Usps/Test/Unit/Model/_files/response_rates.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<IntlRateV2Response>
+    <Package>
+        <Service ID="12">
+            <Pounds>3</Pounds>
+            <Ounces>0</Ounces>
+            <Postage>80.45</Postage>
+            <ExtraServices>
+                <ExtraService>
+                    <Available>True</Available>
+                </ExtraService>
+            </ExtraServices>
+            <SvcDescription>USPS GXG&amp;lt;sup&amp;gt;&amp;#8482;&amp;lt;/sup&amp;gt; Envelopes</SvcDescription>
+        </Service>
+        <Service ID="1">
+            <Pounds>3</Pounds>
+            <Ounces>0</Ounces>
+            <Postage>54.25</Postage>
+            <ExtraServices>
+                <ExtraService>
+                    <Available>True</Available>
+                </ExtraService>
+            </ExtraServices>
+            <SvcDescription>Priority Mail Express International&amp;lt;sup&amp;gt;&amp;#8482;&amp;lt;/sup&amp;gt;</SvcDescription>
+        </Service>
+        <Service ID="10">
+            <Pounds>3</Pounds>
+            <Ounces>0</Ounces>
+            <Postage>41.50</Postage>
+            <ExtraServices>
+                <ExtraService>
+                    <ServiceID>1</ServiceID>
+                    <Available>True</Available>
+                </ExtraService>
+            </ExtraServices>
+            <SvcDescription>Priority Mail Express International&amp;lt;sup&amp;gt;&amp;#8482;&amp;lt;/sup&amp;gt; Flat Rate Envelope</SvcDescription>
+        </Service>
+        <Service ID="11">
+            <Pounds>3</Pounds>
+            <Ounces>0</Ounces>
+            <Postage>59.95</Postage>
+            <ExtraServices>
+                <ExtraService>
+                    <Available>True</Available>
+                </ExtraService>
+                <ExtraService>
+                    <Available>True</Available>
+                </ExtraService>
+            </ExtraServices>
+            <SvcDescription>Priority Mail International&amp;lt;sup&amp;gt;&amp;#174;&amp;lt;/sup&amp;gt; Large Flat Rate Box</SvcDescription>
+        </Service>
+        <Service ID="15">
+            <Pounds>3</Pounds>
+            <Ounces>0</Ounces>
+            <Postage>24.50</Postage>
+            <ExtraServices>
+                <ExtraService>
+                    <Available>False</Available>
+                </ExtraService>
+                <ExtraService>
+                    <Available>True</Available>
+                </ExtraService>
+            </ExtraServices>
+            <SvcDescription>First-Class Package International Service&amp;lt;sup&amp;gt;&amp;#8482;&amp;lt;/sup&amp;gt;</SvcDescription>
+        </Service>
+        <Service ID="2">
+            <Pounds>3</Pounds>
+            <Ounces>0</Ounces>
+            <Postage>0.00</Postage>
+            <ExtraServices>
+                <ExtraService>
+                    <Available>False</Available>
+                </ExtraService>
+            </ExtraServices>
+        </Service>
+    </Package>
+</IntlRateV2Response>
diff --git a/app/code/Magento/Vault/view/frontend/web/template/payment/form.html b/app/code/Magento/Vault/view/frontend/web/template/payment/form.html
@@ -20,7 +20,7 @@
             'src': getIcons(getCardType()).url,
             'width': getIcons(getCardType()).width,
             'height': getIcons(getCardType()).height
-            }">
+            }" class="payment-icon">
             <span translate="'ending'"></span>
             <span text="getMaskedCard()"></span>
             (
diff --git a/app/design/adminhtml/Magento/backend/Magento_Vault/web/css/source/_module.less b/app/design/adminhtml/Magento/backend/Magento_Vault/web/css/source/_module.less
@@ -0,0 +1,16 @@
+// /**
+//  * Copyright © 2016 Magento. All rights reserved.
+//  * See COPYING.txt for license details.
+//  */
+
+//
+//  Vault General Styles
+//  ---------------------------------------------
+
+.order-billing-method {
+    .payment-icon {
+        display: inline-block;
+        margin-right: @indent__xs;
+        vertical-align: middle;
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ public function testPlaceRequestWithException()`
`69`	`69`	`}`
`70`	`70`
`71`	`71`	`/**`
`72`		`- * @covers \Magento\BraintreeTwo\Gateway\Http\Client\TransactionSubmitForSettlement::placeRequest`
	`72`	`+ * @covers \Magento\BraintreeTwo\Gateway\Http\Client\TransactionSubmitForSettlement::process`
`73`	`73`	`*/`
`74`	`74`	`public function testPlaceRequest()`
`75`	`75`	`{`