MAGETWO-57461: [Backport] - Exception occurs when tracking shipment with invalid FedEx tracking number - for 2.0.x

Author: viktym

app/code/Magento/Backend/Controller/Adminhtml/System/Account/Save.php

@@ -52,12 +52,19 @@ public function execute()
                 $user->setPassword($password);
                 $user->setPasswordConfirmation($passwordConfirmation);
             }
-            $user->save();
-            /** Send password reset email notification only when password was changed */
-            if ($password !== '') {
-                $user->sendPasswordResetNotificationEmail();
+            $errors = $user->validate();
+            if ($errors !== true && !empty($errors)) {
+                foreach ($errors as $error) {
+                    $this->messageManager->addError($error);
+                }
+            } else {
+                $user->save();
+                /** Send password reset email notification only when password was changed */
+                if ($password !== '') {
+                    $user->sendPasswordResetNotificationEmail();
+                }
+                $this->messageManager->addSuccess(__('You saved the account.'));
             }
-            $this->messageManager->addSuccess(__('You saved the account.'));
         } catch (ValidatorException $e) {
             $this->messageManager->addMessages($e->getMessages());
             if ($e->getMessage()) {

app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/System/Account/SaveTest.php

@@ -76,7 +76,10 @@ protected function setUp()
         $this->_userMock = $this->getMockBuilder('Magento\User\Model\User')
             ->disableOriginalConstructor()
             ->setMethods(
-                ['load', 'save', 'sendPasswordResetNotificationEmail', 'verifyIdentity', '__sleep', '__wakeup']
+                [
+                    'load', 'save', 'sendPasswordResetNotificationEmail',
+                    'verifyIdentity', 'validate', '__sleep', '__wakeup'
+                ]
             )
             ->getMock();
 
@@ -193,6 +196,7 @@ public function testSaveAction()
 
         $this->_userMock->expects($this->once())->method('save');
         $this->_userMock->expects($this->once())->method('verifyIdentity')->will($this->returnValue(true));
+        $this->_userMock->expects($this->once())->method('validate')->willReturn(true);
         $this->_userMock->expects($this->once())->method('sendPasswordResetNotificationEmail');
 
         $this->_requestMock->setParams($requestParams);

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

@@ -116,10 +116,25 @@ define(
 
             addressToEstimationAddress: function (address) {
                 var estimatedAddressData = {
-                    country_id: address.countryId,
-                    region: address.region,
-                    region_id: address.regionId,
-                    postcode: address.postcode
+                    'street': address.street,
+                    'city': address.city,
+                    'region_id': address.regionId,
+                    'region': address.region,
+                    'country_id': address.countryId,
+                    'postcode': address.postcode,
+                    'email': address.email,
+                    'customer_id': address.customerId,
+                    'firstname': address.firstname,
+                    'lastname': address.lastname,
+                    'middlename': address.middlename,
+                    'prefix': address.prefix,
+                    'suffix': address.suffix,
+                    'vat_id': address.vatId,
+                    'company': address.company,
+                    'telephone': address.telephone,
+                    'fax': address.fax,
+                    'custom_attributes': address.customAttributes
+
                 };
                return this.formAddressDataToQuoteAddress(estimatedAddressData);
             }

app/code/Magento/Checkout/view/frontend/web/js/model/shipping-rate-processor/new-address.js

@@ -25,10 +25,25 @@ define(
                     serviceUrl = resourceUrlManager.getUrlForEstimationShippingMethodsForNewAddress(quote),
                     payload = JSON.stringify({
                             address: {
-                                country_id: address.countryId,
-                                region_id: address.regionId,
-                                region: address.region,
-                                postcode: address.postcode
+                                'street': address.street,
+                                'city': address.city,
+                                'region_id': address.regionId,
+                                'region': address.region,
+                                'country_id': address.countryId,
+                                'postcode': address.postcode,
+                                'email': address.email,
+                                'customer_id': address.customerId,
+                                'firstname': address.firstname,
+                                'lastname': address.lastname,
+                                'middlename': address.middlename,
+                                'prefix': address.prefix,
+                                'suffix': address.suffix,
+                                'vat_id': address.vatId,
+                                'company': address.company,
+                                'telephone': address.telephone,
+                                'fax': address.fax,
+                                'custom_attributes': address.customAttributes,
+                                'save_in_address_book': address.saveInAddressBook
                             }
                         }
                     );

app/code/Magento/Dhl/view/frontend/web/js/model/shipping-rates-validation-rules.js

@@ -15,6 +15,9 @@ define(
                     },
                     'country_id': {
                         'required': true
+                    },
+                    'city': {
+                        'required': true
                     }
                 };
             }

app/code/Magento/Fedex/view/frontend/web/js/model/shipping-rates-validation-rules.js

@@ -15,6 +15,9 @@ define(
                     },
                     'country_id': {
                         'required': true
+                    },
+                    'city': {
+                        'required': true
                     }
                 };
             }

app/code/Magento/Quote/Api/GuestShipmentEstimationInterface.php

@@ -0,0 +1,15 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Quote\Api;
+
+/**
+ * Interface GuestShipmentEstimationInterface
+ * @api
+ */
+interface GuestShipmentEstimationInterface extends ShipmentEstimationInterface
+{
+
+}

app/code/Magento/Quote/Api/GuestShippingMethodManagementInterface.php

@@ -27,6 +27,7 @@ public function getList($cartId);
      * @param string $cartId The shopping cart ID.
      * @param \Magento\Quote\Api\Data\EstimateAddressInterface $address The estimate address
      * @return \Magento\Quote\Api\Data\ShippingMethodInterface[] An array of shipping methods.
+     * @deprecated
      */
     public function estimateByAddress($cartId, \Magento\Quote\Api\Data\EstimateAddressInterface $address);
 }

app/code/Magento/Quote/Api/ShipmentEstimationInterface.php

@@ -0,0 +1,23 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Quote\Api;
+
+use Magento\Quote\Api\Data\AddressInterface;
+
+/**
+ * Interface ShipmentManagementInterface
+ * @api
+ */
+interface ShipmentEstimationInterface
+{
+    /**
+     * Estimate shipping by address and return list of available shipping methods
+     * @param mixed $cartId
+     * @param AddressInterface $address
+     * @return \Magento\Quote\Api\Data\ShippingMethodInterface[] An array of shipping methods
+     */
+    public function estimateByExtendedAddress($cartId, AddressInterface $address);
+}

app/code/Magento/Quote/Api/ShippingMethodManagementInterface.php

@@ -17,6 +17,7 @@ interface ShippingMethodManagementInterface
      * @param int $cartId The shopping cart ID.
      * @param \Magento\Quote\Api\Data\EstimateAddressInterface $address The estimate address
      * @return \Magento\Quote\Api\Data\ShippingMethodInterface[] An array of shipping methods.
+     * @deprecated
      */
     public function estimateByAddress($cartId, \Magento\Quote\Api\Data\EstimateAddressInterface $address);