Merge pull request #849 from magento-tango/MAGETWO-64483

Bug fixes:
* MAGETWO-56014: [GitHub] Dashboard Most Viewed Products Tab in admin - prices issue #5660
* MAGETWO-62044: Not possible to update or delete products in cart or checkout after deleting address

app/code/Magento/Backend/Block/Dashboard/Tab/Products/Viewed.php

@@ -5,6 +5,9 @@
  */
 namespace Magento\Backend\Block\Dashboard\Tab\Products;
 
+use Magento\Catalog\Model\Product;
+use Magento\Catalog\Pricing\Price\FinalPrice;
+
 /**
  * Adminhtml dashboard most viewed products grid
  *
@@ -66,8 +69,14 @@ protected function _prepareCollection()
         );
 
         $this->setCollection($collection);
+        parent::_prepareCollection();
+
+        /** @var Product $product */
+        foreach ($collection as $product) {
+            $product->setPrice($product->getPriceInfo()->getPrice(FinalPrice::PRICE_CODE)->getValue());
+        }
 
-        return parent::_prepareCollection();
+        return $this;
     }
 
     /**

app/code/Magento/Quote/Api/Data/AddressInterface.php

@@ -370,7 +370,7 @@ public function getCustomerAddressId();
     /**
      * Set customer address id
      *
-     * @param int $customerAddressId
+     * @param int|null $customerAddressId
      * @return $this
      */
     public function setCustomerAddressId($customerAddressId);

app/code/Magento/Quote/Model/Quote/ShippingAssignment/ShippingAssignmentProcessor.php

@@ -5,11 +5,15 @@
  */
 namespace Magento\Quote\Model\Quote\ShippingAssignment;
 
+use Magento\Framework\Exception\LocalizedException;
 use Magento\Quote\Api\Data\CartInterface;
 use Magento\Quote\Api\Data\ShippingAssignmentInterface;
 use Magento\Framework\Exception\InputException;
 use Magento\Quote\Model\ShippingAssignmentFactory;
 use Magento\Quote\Model\Quote\Item\CartItemPersister;
+use Magento\Customer\Api\AddressRepositoryInterface;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Exception\NoSuchEntityException;
 
 class ShippingAssignmentProcessor
 {
@@ -28,41 +32,56 @@ class ShippingAssignmentProcessor
      */
     protected $cartItemPersister;
 
+    /**
+     * @var AddressRepositoryInterface
+     */
+    private $addressRepository;
+
     /**
      * @param ShippingAssignmentFactory $shippingAssignmentFactory
      * @param ShippingProcessor $shippingProcessor
      * @param CartItemPersister $cartItemPersister
+     * @param AddressRepositoryInterface $addressRepository
      */
     public function __construct(
         ShippingAssignmentFactory $shippingAssignmentFactory,
         ShippingProcessor $shippingProcessor,
-        CartItemPersister $cartItemPersister
+        CartItemPersister $cartItemPersister,
+        AddressRepositoryInterface $addressRepository = null
     ) {
         $this->shippingAssignmentFactory = $shippingAssignmentFactory;
         $this->shippingProcessor = $shippingProcessor;
         $this->cartItemPersister = $cartItemPersister;
+        $this->addressRepository = $addressRepository
+            ?: ObjectManager::getInstance()->get(AddressRepositoryInterface::class);
     }
 
     /**
+     * Create shipping assignment
+     *
      * @param CartInterface $quote
      * @return \Magento\Quote\Api\Data\ShippingAssignmentInterface
      */
     public function create(CartInterface $quote)
     {
         /** @var \Magento\Quote\Model\Quote $quote */
         $shippingAddress = $quote->getShippingAddress();
+
         /** @var \Magento\Quote\Api\Data\ShippingAssignmentInterface $shippingAssignment */
         $shippingAssignment = $this->shippingAssignmentFactory->create();
         $shippingAssignment->setItems($quote->getItems());
         $shippingAssignment->setShipping($this->shippingProcessor->create($shippingAddress));
+
         return $shippingAssignment;
     }
 
     /**
+     * Save shipping assignment
+     *
      * @param ShippingAssignmentInterface $shippingAssignment
      * @param CartInterface $quote
      * @return void
-     * @throws InputException
+     * @throws InputException|LocalizedException
      */
     public function save(CartInterface $quote, ShippingAssignmentInterface $shippingAssignment)
     {
@@ -73,6 +92,17 @@ public function save(CartInterface $quote, ShippingAssignmentInterface $shipping
                 $this->cartItemPersister->save($quote, $item);
             }
         }
+
+        $shippingAddress = $shippingAssignment->getShipping()->getAddress();
+
+        if ($shippingAddress->getCustomerAddressId()) {
+            try {
+                $this->addressRepository->getById($shippingAddress->getCustomerAddressId());
+            } catch (NoSuchEntityException $e) {
+                $shippingAddress->setCustomerAddressId(null);
+            }
+        }
+
         $this->shippingProcessor->save($shippingAssignment->getShipping(), $quote);
     }
 }

app/code/Magento/Quote/Model/QuoteRepository/SaveHandler.php

@@ -6,6 +6,9 @@
 namespace Magento\Quote\Model\QuoteRepository;
 
 use Magento\Quote\Api\Data\CartInterface;
+use Magento\Customer\Api\AddressRepositoryInterface;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\Exception\InputException;
 
 class SaveHandler
@@ -30,38 +33,48 @@ class SaveHandler
      */
     private $shippingAssignmentPersister;
 
+    /**
+     * @var AddressRepositoryInterface
+     */
+    private $addressRepository;
+
     /**
      * @param \Magento\Quote\Model\ResourceModel\Quote $quoteResource
      * @param \Magento\Quote\Model\Quote\Item\CartItemPersister $cartItemPersister
      * @param \Magento\Quote\Model\Quote\Address\BillingAddressPersister $billingAddressPersister
      * @param \Magento\Quote\Model\Quote\ShippingAssignment\ShippingAssignmentPersister $shippingAssignmentPersister
+     * @param AddressRepositoryInterface $addressRepository
      */
     public function __construct(
         \Magento\Quote\Model\ResourceModel\Quote $quoteResource,
         \Magento\Quote\Model\Quote\Item\CartItemPersister $cartItemPersister,
         \Magento\Quote\Model\Quote\Address\BillingAddressPersister $billingAddressPersister,
-        \Magento\Quote\Model\Quote\ShippingAssignment\ShippingAssignmentPersister $shippingAssignmentPersister
+        \Magento\Quote\Model\Quote\ShippingAssignment\ShippingAssignmentPersister $shippingAssignmentPersister,
+        AddressRepositoryInterface $addressRepository = null
     ) {
         $this->quoteResourceModel = $quoteResource;
         $this->cartItemPersister = $cartItemPersister;
         $this->billingAddressPersister = $billingAddressPersister;
         $this->shippingAssignmentPersister = $shippingAssignmentPersister;
+        $this->addressRepository = $addressRepository
+            ?: ObjectManager::getInstance()->get(AddressRepositoryInterface::class);
     }
 
     /**
+     * Process and save quote data
+     *
      * @param CartInterface $quote
      * @return CartInterface
-     *
      * @throws InputException
      * @throws \Magento\Framework\Exception\CouldNotSaveException
      * @throws \Magento\Framework\Exception\LocalizedException
-     * @throws \Magento\Framework\Exception\NoSuchEntityException
      */
     public function save(CartInterface $quote)
     {
         /** @var \Magento\Quote\Model\Quote $quote */
         // Quote Item processing
         $items = $quote->getItems();
+
         if ($items) {
             foreach ($items as $item) {
                 /** @var \Magento\Quote\Model\Quote\Item $item */
@@ -73,17 +86,28 @@ public function save(CartInterface $quote)
 
         // Billing Address processing
         $billingAddress = $quote->getBillingAddress();
+
         if ($billingAddress) {
+            if ($billingAddress->getCustomerAddressId()) {
+                try {
+                    $this->addressRepository->getById($billingAddress->getCustomerAddressId());
+                } catch (NoSuchEntityException $e) {
+                    $billingAddress->setCustomerAddressId(null);
+                }
+            }
+
             $this->billingAddressPersister->save($quote, $billingAddress);
         }
 
         $this->processShippingAssignment($quote);
-
         $this->quoteResourceModel->save($quote->collectTotals());
+
         return $quote;
     }
 
     /**
+     * Process shipping assignment
+     *
      * @param \Magento\Quote\Model\Quote $quote
      * @return void
      * @throws InputException
@@ -92,11 +116,14 @@ private function processShippingAssignment($quote)
     {
         // Shipping Assignments processing
         $extensionAttributes = $quote->getExtensionAttributes();
+
         if (!$quote->isVirtual() && $extensionAttributes && $extensionAttributes->getShippingAssignments()) {
             $shippingAssignments = $extensionAttributes->getShippingAssignments();
+
             if (count($shippingAssignments) > 1) {
-                throw new InputException(__("Only 1 shipping assignment can be set"));
+                throw new InputException(__('Only 1 shipping assignment can be set'));
             }
+
             $this->shippingAssignmentPersister->save($quote, $shippingAssignments[0]);
         }
     }