MAGETWO-64544: When logged in customer edits a new shipping address during checkout they are unable to place the order #6488

Author: omiroshnichenko

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

@@ -15,35 +15,36 @@ define([
     'use strict';
 
     var cacheKey = 'checkout-data',
-        checkoutData,
-
-        /**
-         * @return {*}
-         */
-        getData = function () {
-            return storage.get(cacheKey)();
-        },
 
         /**
          * @param {Object} data
          */
         saveData = function (data) {
             storage.set(cacheKey, data);
-        };
+        },
 
-    if ($.isEmptyObject(getData())) {
-        checkoutData = {
-            'selectedShippingAddress': null,
-            'shippingAddressFromData': null,
-            'newCustomerShippingAddress': null,
-            'selectedShippingRate': null,
-            'selectedPaymentMethod': null,
-            'selectedBillingAddress': null,
-            'billingAddressFormData': null,
-            'newCustomerBillingAddress': null
+        /**
+         * @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);
+            }
+
+            return data;
         };
-        saveData(checkoutData);
-    }
 
     return {
         /**

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

@@ -5,7 +5,9 @@
 /**
  * @api
  */
-define([], function () {
+define([
+    'underscore'
+], function (_) {
     'use strict';
 
     /**
@@ -29,7 +31,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,

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.
      *
@@ -170,6 +177,22 @@ public function getSelectedAddress()
         return $this->_rootElement->find($this->selectedAddress, Locator::SELECTOR_CSS)->getText();
     }
 
+    /**
+     * Get address block.
+     *
+     * @param String $address
+     */
+    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 © 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-67837
+ */
+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 © 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-67837">
+        <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

@@ -146,11 +146,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>
         <variation name="OnePageCheckoutTestVariation6" summary="Checkout as UK guest with virtual product using coupon for not logged in customers with Zero Subtotal Checkout payment method">
             <data name="issue" xsi:type="string">MAGETWO-64874: Eternal loader in shipping and tax block</data>

dev/tests/functional/tests/app/Magento/Checkout/Test/TestStep/AddNewShippingAddressStep.php

@@ -11,7 +11,7 @@
 use Magento\Mtf\TestStep\TestStepInterface;
 
 /**
- * Create customer custom attribute step.
+ * Add new shipping address on checkout step.
  */
 class AddNewShippingAddressStep implements TestStepInterface
 {
@@ -29,21 +29,30 @@ class AddNewShippingAddressStep implements TestStepInterface
      */
     private $address;
 
+    /**
+     * Save Shipping Address.
+     *
+     * @var boolean
+     */
+    private $save;
+
     /**
      * @constructor
      * @param CheckoutOnepage $checkoutOnepage
-     * @param Address|null $address [optional]
+     * @param Address|null $shippingAddress [optional]
+     * @param boolean $save [optional]
      */
-    public function __construct(CheckoutOnepage $checkoutOnepage, Address $address = null)
+    public function __construct(CheckoutOnepage $checkoutOnepage, Address $shippingAddress = null, $save = true)
     {
         $this->checkoutOnepage = $checkoutOnepage;
-        $this->address = $address;
+        $this->address = $shippingAddress;
+        $this->save = $save;
     }
 
     /**
-     * Create customer account.
+     * Add new shipping address.
      *
-     * @return void
+     * @return array
      */
     public function run()
     {
@@ -52,6 +61,12 @@ public function run()
         if ($this->address) {
             $shippingBlock->getAddressModalBlock()->fill($this->address);
         }
-        $shippingBlock->getAddressModalBlock()->save();
+        if ($this->save) {
+            $shippingBlock->getAddressModalBlock()->save();
+        } else {
+            $shippingBlock->getAddressModalBlock()->cancel();
+        }
+
+        return ['shippingAddress' => $this->address];
     }
 }