Merge remote-tracking branch 'origin/MAGETWO-65656' into 2.1.8-develop-pr24

# Conflicts:
#	dev/tests/functional/tests/app/Magento/Checkout/Test/TestStep/FillShippingAddressStep.php
#	dev/tests/functional/tests/app/Magento/Checkout/Test/etc/testcase.xml

Author: ameysar

app/code/Magento/Checkout/view/frontend/web/js/checkout-data.js

@@ -15,27 +15,32 @@ define([
 
     var cacheKey = 'checkout-data';
 
-    var getData = function () {
-        return storage.get(cacheKey)();
-    };
-
     var saveData = function (checkoutData) {
         storage.set(cacheKey, checkoutData);
-    };
+    },
+        
+    /**
+     * @return {*}
+     */
+    getData = function () {
+        var data = storage.get(cacheKey)();
+
+        if ($.isEmptyObject(data)) {
+            data = {
+                'selectedShippingAddress': null,
+                'shippingAddressFromData': null,
+                'newCustomerShippingAddress': null,
+                'selectedShippingRate': null,
+                'selectedPaymentMethod': null,
+                'selectedBillingAddress': null,
+                'billingAddressFormData': null,
+                'newCustomerBillingAddress': null
+            };
+            saveData(data);
+        }
 
-    if ($.isEmptyObject(getData())) {
-        var checkoutData = {
-            'selectedShippingAddress': null,
-            'shippingAddressFromData' : null,
-            'newCustomerShippingAddress' : null,
-            'selectedShippingRate' : null,
-            'selectedPaymentMethod' : null,
-            'selectedBillingAddress' : null,
-            'billingAddressFormData' : null,
-            'newCustomerBillingAddress' : null
-        };
-        saveData(checkoutData);
-    }
+        return data;
+    };
 
     return {
         setSelectedShippingAddress: function (data) {

app/code/Magento/Checkout/view/frontend/web/js/model/cart/cache.js

@@ -26,22 +26,28 @@ define([
         },
 
         /**
-         * Get data from local storage.
+         * Set data to local storage.
          *
-         * @param {String} [key]
-         * @returns {*}
+         * @param {Object} checkoutData
          */
-        getData = function (key) {
-            return key ? storage.get(cacheKey)()[key] : storage.get(cacheKey)();
+        setData = function (checkoutData) {
+            storage.set(cacheKey, checkoutData);
         },
 
         /**
-         * Set data to local storage.
+         * Get data from local storage.
          *
-         * @param {Object} checkoutData
+         * @param {String} [key]
+         * @returns {*}
          */
-        setData = function (checkoutData) {
-            storage.set(cacheKey, checkoutData);
+        getData = function (key) {
+            var data = key ? storage.get(cacheKey)()[key] : storage.get(cacheKey)();
+
+            if (_.isEmpty(storage.get(cacheKey)())) {
+                setData(utils.copy(cartData));
+            }
+
+            return data;
         },
 
         /**
@@ -59,10 +65,6 @@ define([
             return prefix + name.charAt(0).toUpperCase() + name.slice(1) + suffix;
         };
 
-    if (_.isEmpty(getData())) {
-        setData(utils.copy(cartData));
-    }
-
     /**
      * Provides get/set/isChanged/clear methods for work with cart data.
      * Can be customized via mixin functionality.

app/code/Magento/Checkout/view/frontend/web/js/model/new-customer-address.js

@@ -4,7 +4,11 @@
  */
 /*jshint browser:true jquery:true*/
 /*global alert*/
-define([], function () {
+define([
+    'underscore'
+], function (_) {
+    'use strict';
+
     /**
      * @param {Object} addressData
      * Returns new address object
@@ -26,7 +30,7 @@ define([], function () {
             regionCode: (addressData.region) ? addressData.region.region_code : null,
             region: (addressData.region) ? addressData.region.region : null,
             customerId: addressData.customer_id || addressData.customerId,
-            street: addressData.street,
+            street: addressData.street ? _.compact(addressData.street) : addressData.street,
             company: addressData.company,
             telephone: addressData.telephone,
             fax: addressData.fax,

app/code/Magento/Checkout/view/frontend/web/js/model/shipping-rates-validator.js

@@ -13,7 +13,8 @@ define(
         './postcode-validator',
         'mage/translate',
         'uiRegistry',
-        'Magento_Checkout/js/model/quote'
+        'Magento_Checkout/js/model/quote',
+        'Magento_Checkout/js/model/shipping-address/form-popup-state'
     ],
     function (
         $,
@@ -24,7 +25,8 @@ define(
         postcodeValidator,
         $t,
         uiRegistry,
-        quote
+        quote,
+        formPopUpState
     ) {
         'use strict';
 
@@ -127,12 +129,14 @@ define(
                     });
                 } else {
                     element.on('value', function () {
-                        clearTimeout(self.validateAddressTimeout);
-                        self.validateAddressTimeout = setTimeout(function () {
-                            if (self.postcodeValidation()) {
-                                self.validateFields();
-                            }
-                        }, delay);
+                        if (!formPopUpState.isVisible()) {
+                            clearTimeout(self.validateAddressTimeout);
+                            self.validateAddressTimeout = setTimeout(function () {
+                                if (self.postcodeValidation()) {
+                                    self.validateFields();
+                                }
+                            }, delay);
+                        }
                     });
                     observedElements.push(element);
                 }

app/code/Magento/Checkout/view/frontend/web/js/view/shipping.js

@@ -113,7 +113,7 @@ define(
                     if (shippingAddressData) {
                         checkoutProvider.set(
                             'shippingAddress',
-                            $.extend({}, checkoutProvider.get('shippingAddress'), shippingAddressData)
+                            $.extend(true, {}, checkoutProvider.get('shippingAddress'), shippingAddressData)
                         );
                     }
                     checkoutProvider.on('shippingAddress', function (shippingAddressData) {
@@ -150,20 +150,39 @@ define(
                         {
                             text: buttons.cancel.text ? buttons.cancel.text : $t('Cancel'),
                             class: buttons.cancel.class ? buttons.cancel.class : 'action secondary action-hide-popup',
-                            click: function () {
-                                this.closeModal();
-                            }
+
+                            /** @inheritdoc */
+                            click: this.onClosePopUp.bind(this)
                         }
                     ];
                     this.popUpForm.options.closed = function () {
                         self.isFormPopUpVisible(false);
                     };
+
+                    this.popUpForm.options.modalCloseBtnHandler = this.onClosePopUp.bind(this);
+                    this.popUpForm.options.keyEventHandlers = {
+                        escapeKey: this.onClosePopUp.bind(this)
+                    };
+
+                    /** @inheritdoc */
+                    this.popUpForm.options.opened = function () {
+                        // Store temporary address for revert action in case when user click cancel action
+                        self.temporaryAddress = $.extend(true, {}, checkoutData.getShippingAddressFromData());
+                    };
                     popUp = modal(this.popUpForm.options, $(this.popUpForm.element));
                 }
 
                 return popUp;
             },
 
+            /**
+             * Revert address and close modal.
+             */
+            onClosePopUp: function () {
+                checkoutData.setShippingAddressFromData($.extend(true, {}, this.temporaryAddress));
+                this.getPopUp().closeModal();
+            },
+
             /**
              * Show address form popup
              */
@@ -190,7 +209,7 @@ define(
                     newShippingAddress = createShippingAddress(addressData);
                     selectShippingAddress(newShippingAddress);
                     checkoutData.setSelectedShippingAddress(newShippingAddress.getKey());
-                    checkoutData.setNewCustomerShippingAddress(addressData);
+                    checkoutData.setNewCustomerShippingAddress($.extend(true, {}, addressData));
                     this.getPopUp().closeModal();
                     this.isNewAddressAdded(true);
                 }

dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Shipping.php

@@ -22,6 +22,13 @@ class Shipping extends Form
      */
     private $newAddressButton = '[data-bind*="isNewAddressAdded"]';
 
+    /**
+     * CSS Selector for "Edit" button.
+     *
+     * @var string
+     */
+    private $editAddressButton = '.edit-address-link';
+
     /**
      * Wait element.
      *
@@ -106,6 +113,23 @@ public function getSelectedAddress()
         return $this->_rootElement->find($this->selectedAddress)->getText();
     }
 
+    /**
+     * Get address block.
+     *
+     * @param String $address
+     * @return void
+     */
+    public function editAddress($address)
+    {
+        $addresses = $this->_rootElement->getElements($this->shippingAddressBlock);
+        foreach ($addresses as $addressBlock) {
+            if (strpos($addressBlock->getText(), $address) === 0) {
+                $addressBlock->find($this->editAddressButton)->click();
+                break;
+            }
+        }
+    }
+
     /**
      * Select address.
      *

dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Shipping/AddressModal.php

@@ -20,6 +20,13 @@ class AddressModal extends Form
      */
     private $saveButton = '.action-save-address';
 
+    /**
+     * CSS Selector for Cancel button.
+     *
+     * @var string
+     */
+    private $cancelButton = '.action-hide-popup';
+
     /**
      * Selector for field's error message.
      *
@@ -51,6 +58,16 @@ public function save()
         $this->_rootElement->find($this->saveButton)->click();
     }
 
+    /**
+     * Click on 'Cancel' button.
+     *
+     * @return void
+     */
+    public function cancel()
+    {
+        $this->_rootElement->find($this->cancelButton)->click();
+    }
+
     /**
      * Get Error messages for attributes.
      *

dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/EditShippingAddressOnePageCheckoutTest.php

@@ -0,0 +1,45 @@
+<?php
+/**
+ * Copyright © 2013-2017 Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Checkout\Test\TestCase;
+
+use Magento\Mtf\TestCase\Scenario;
+
+/**
+ * Preconditions:
+ *
+ * 1. Simple product is created.
+ * 2. Customer with default billing/shipping address is created.
+ *
+ * Steps:
+ * 1. Go to Frontend as Customer.
+ * 2. Add product in cart and proceed to checkout.
+ * 3. Click *New Address* button on 1st checkout step.
+ * 4. Fill in required fields and click *Save address* button.
+ * 5. Select Shipping Rate.
+ * 6. Click *Edit* button for the new address.
+ * 7. Remove values from required fields and click *Cancel* button.
+ * 8. Go to *Next*.
+ * 9. Select payment solution.
+ * 10. Refresh page.
+ * 11. Click Place order.
+ * 12. Perform all assertions.
+ *
+ * @group Checkout
+ * @ZephyrId MAGETWO-71053
+ */
+class EditShippingAddressOnePageCheckoutTest extends Scenario
+{
+    /**
+     * Edit Shipping Address on Checkout Page.
+     *
+     * @return void
+     */
+    public function test()
+    {
+        $this->executeScenario();
+    }
+}

dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/EditShippingAddressOnePageCheckoutTest.xml

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/**
+ * Copyright © 2013-2017 Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+ -->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
+    <testCase name="Magento\Checkout\Test\TestCase\EditShippingAddressOnePageCheckoutTest" summary="Customer can place order with new addresses that was edited during checkout with several conditions" ticketId="MAGETWO-71053">
+        <variation name="EditShippingAddressOnePageCheckoutTestVariation1">
+            <data name="tag" xsi:type="string">severity:S1</data>
+            <data name="customer/dataset" xsi:type="string">johndoe_with_addresses</data>
+            <data name="shippingAddress/dataset" xsi:type="string">UK_address_without_email</data>
+            <data name="editShippingAddress/dataset" xsi:type="string">empty_UK_address_without_email</data>
+            <data name="shipping/shipping_service" xsi:type="string">Flat Rate</data>
+            <data name="shipping/shipping_method" xsi:type="string">Fixed</data>
+            <data name="billingCheckboxState" xsi:type="string">Yes</data>
+            <data name="products" xsi:type="array">
+                <item name="0" xsi:type="string">catalogProductSimple::default</item>
+            </data>
+            <data name="payment/method" xsi:type="string">checkmo</data>
+            <data name="editBillingInformation" xsi:type="boolean">false</data>
+            <data name="editSave" xsi:type="boolean">false</data>
+            <data name="refresh" xsi:type="boolean">true</data>
+            <constraint name="Magento\Checkout\Test\Constraint\AssertOrderSuccessPlacedMessage" />
+            <constraint name="Magento\Customer\Test\Constraint\AssertAdditionalAddressCreatedFrontend" />
+            <constraint name="Magento\Sales\Test\Constraint\AssertOrderAddresses" />
+        </variation>
+    </testCase>
+</config>

dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/OnePageCheckoutTest.xml

@@ -105,11 +105,14 @@
             <data name="cart/data/shipping_amount" xsi:type="string">0.00</data>
             <data name="cart/data/grand_total" xsi:type="string">130.98</data>
             <data name="billingCheckboxState" xsi:type="string">Yes</data>
+            <data name="editBillingInformation" xsi:type="boolean">false</data>
+            <data name="refresh" xsi:type="boolean">true</data>
             <data name="payment/method" xsi:type="string">checkmo</data>
             <data name="configData" xsi:type="string">checkmo, freeshipping_minimum_order_amount_100</data>
             <constraint name="Magento\Checkout\Test\Constraint\AssertOrderSuccessPlacedMessage"/>
             <constraint name="Magento\Checkout\Test\Constraint\AssertMinicartEmpty" />
             <constraint name="Magento\Sales\Test\Constraint\AssertOrderGrandTotal"/>
+            <constraint name="Magento\Sales\Test\Constraint\AssertOrderAddresses" />
         </variation>
     </testCase>
 </config>