Merge pull request #466 from magento-firedrakes/last_bugs

[Firedrakes] Bugfixes

Author: sivaschenko

app/code/Magento/Checkout/Block/Cart/Shipping.php

@@ -76,6 +76,11 @@ class Shipping extends \Magento\Checkout\Block\Cart\AbstractCart
      */
     protected $quoteRepository;
 
+    /**
+     * @var \Magento\Checkout\Model\Cart\CollectQuote
+     */
+    protected $collectQuote;
+
     /**
      * @param \Magento\Framework\View\Element\Template\Context $context
      * @param \Magento\Customer\Model\Session $customerSession
@@ -88,6 +93,7 @@ class Shipping extends \Magento\Checkout\Block\Cart\AbstractCart
      * @param AddressRepositoryInterface $addressRepository
      * @param CustomerRepositoryInterface $customerRepository
      * @param QuoteRepository $quoteRepository
+     * @param \Magento\Checkout\Model\Cart\CollectQuote $collectQuote
      * @param array $data
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
@@ -103,6 +109,7 @@ public function __construct(
         AddressRepositoryInterface $addressRepository,
         CustomerRepositoryInterface $customerRepository,
         QuoteRepository $quoteRepository,
+        \Magento\Checkout\Model\Cart\CollectQuote $collectQuote,
         array $data = []
     ) {
         $this->priceCurrency = $priceCurrency;
@@ -113,12 +120,12 @@ public function __construct(
         $this->addressRepository = $addressRepository;
         $this->customerRepository = $customerRepository;
         $this->quoteRepository = $quoteRepository;
+        $this->collectQuote = $collectQuote;
         parent::__construct($context, $customerSession, $checkoutSession, $data);
         $this->_isScopePrivate = true;
     }
 
-    /**
-     * Get config
+    /** Get config
      *
      * @param string $path
      * @return string|null
@@ -364,22 +371,7 @@ public function getShippingPriceHtml(\Magento\Quote\Model\Quote\Address\Rate $sh
      */
     protected function _beforeToHtml()
     {
-        if ($this->_customerSession->isLoggedIn()) {
-            $customer = $this->customerRepository->getById($this->_customerSession->getCustomerId());
-            if ($defaultShipping = $customer->getDefaultShipping()) {
-                $address = $this->addressRepository->getById($defaultShipping);
-                if ($address) {
-                    /** @var \Magento\Quote\Api\Data\EstimateAddressInterface $estimatedAddress */
-                    $estimatedAddress = $this->estimatedAddressFactory->create();
-                    $estimatedAddress->setCountryId($address->getCountryId());
-                    $estimatedAddress->setPostcode($address->getPostcode());
-                    $estimatedAddress->setRegion((string)$address->getRegion()->getRegion());
-                    $estimatedAddress->setRegionId($address->getRegionId());
-                    $this->shippingMethodManager->estimateByAddress($this->getQuote()->getId(), $estimatedAddress);
-                    $this->quoteRepository->save($this->getQuote());
-                }
-            }
-        }
+        $this->collectQuote->collect($this->getQuote());
         return parent::_beforeToHtml();
     }
 

app/code/Magento/Checkout/Model/Cart/CollectQuote.php

@@ -0,0 +1,87 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Checkout\Model\Cart;
+
+class CollectQuote
+{
+    /**
+     * @var \Magento\Customer\Model\Session
+     */
+    protected $customerSession;
+
+    /**
+     * @var \Magento\Customer\Api\CustomerRepositoryInterface
+     */
+    protected $customerRepository;
+
+    /**
+     * @var \Magento\Customer\Api\AddressRepositoryInterface
+     */
+    protected $addressRepository;
+
+    /**
+     * @var \Magento\Quote\Api\Data\EstimateAddressInterfaceFactory
+     */
+    protected $estimatedAddressFactory;
+
+    /**
+     * @var \Magento\Quote\Api\ShippingMethodManagementInterface
+     */
+    protected $shippingMethodManager;
+
+    /**
+     * @var \Magento\Quote\Model\QuoteRepository
+     */
+    protected $quoteRepository;
+
+    /**
+     * @param \Magento\Customer\Model\Session $customerSession
+     * @param \Magento\Customer\Api\CustomerRepositoryInterface $customerRepository
+     * @param \Magento\Customer\Api\AddressRepositoryInterface $addressRepository
+     * @param \Magento\Quote\Api\Data\EstimateAddressInterfaceFactory $estimatedAddressFactory
+     * @param \Magento\Quote\Api\ShippingMethodManagementInterface $shippingMethodManager
+     * @param \Magento\Quote\Model\QuoteRepository $quoteRepository
+     */
+    public function __construct(
+        \Magento\Customer\Model\Session $customerSession,
+        \Magento\Customer\Api\CustomerRepositoryInterface $customerRepository,
+        \Magento\Customer\Api\AddressRepositoryInterface $addressRepository,
+        \Magento\Quote\Api\Data\EstimateAddressInterfaceFactory $estimatedAddressFactory,
+        \Magento\Quote\Api\ShippingMethodManagementInterface $shippingMethodManager,
+        \Magento\Quote\Model\QuoteRepository $quoteRepository
+    ) {
+        $this->customerSession = $customerSession;
+        $this->customerRepository = $customerRepository;
+        $this->addressRepository = $addressRepository;
+        $this->estimatedAddressFactory = $estimatedAddressFactory;
+        $this->shippingMethodManager = $shippingMethodManager;
+        $this->quoteRepository = $quoteRepository;
+    }
+
+    /**
+     * @param \Magento\Quote\Model\Quote $quote
+     * @return void
+     */
+    public function collect(\Magento\Quote\Model\Quote $quote)
+    {
+        if ($this->customerSession->isLoggedIn()) {
+            $customer = $this->customerRepository->getById($this->customerSession->getCustomerId());
+            if ($defaultShipping = $customer->getDefaultShipping()) {
+                $address = $this->addressRepository->getById($defaultShipping);
+                if ($address) {
+                    /** @var \Magento\Quote\Api\Data\EstimateAddressInterface $estimatedAddress */
+                    $estimatedAddress = $this->estimatedAddressFactory->create();
+                    $estimatedAddress->setCountryId($address->getCountryId());
+                    $estimatedAddress->setPostcode($address->getPostcode());
+                    $estimatedAddress->setRegion((string)$address->getRegion()->getRegion());
+                    $estimatedAddress->setRegionId($address->getRegionId());
+                    $this->shippingMethodManager->estimateByAddress($quote->getId(), $estimatedAddress);
+                    $this->quoteRepository->save($quote);
+                }
+            }
+        }
+    }
+}

app/code/Magento/Checkout/Test/Unit/Block/Cart/ShippingTest.php

@@ -85,6 +85,9 @@ class ShippingTest extends \PHPUnit_Framework_TestCase
     /** @var  Quote |\PHPUnit_Framework_MockObject_MockObject */
     protected $quote;
 
+    /** @var \PHPUnit_Framework_MockObject_MockObject */
+    protected $collectQuote;
+
     protected function setUp()
     {
         $this->prepareContext();
@@ -117,8 +120,13 @@ protected function setUp()
         $this->customerRepository = $this->getMockBuilder('Magento\Customer\Api\CustomerRepositoryInterface')
             ->getMockForAbstractClass();
 
+        $this->collectQuote = $this->getMockBuilder('Magento\Checkout\Model\Cart\CollectQuote')
+            ->disableOriginalConstructor()
+            ->getMock();
+
         $this->prepareQuoteRepository();
 
+
         $this->model = new Shipping(
             $this->context,
             $this->customerSession,
@@ -130,7 +138,8 @@ protected function setUp()
             $this->shippingMethodManager,
             $this->addressReporitory,
             $this->customerRepository,
-            $this->quoteRepository
+            $this->quoteRepository,
+            $this->collectQuote
         );
     }
 
@@ -259,182 +268,19 @@ public function testBeforeToHtmlCustomerNotLoggedIn()
             ->with('advanced/modules_disable_output/Magento_Checkout', ScopeInterface::SCOPE_STORE)
             ->willReturn(false);
 
-        $this->customerSession->expects($this->once())
-            ->method('isLoggedIn')
-            ->willReturn(false);
-
-        $this->assertEquals('', $this->model->toHtml());
-    }
-
-    public function testBeforeToHtmlNoDefaultShippingAddress()
-    {
-        $customerId = 1;
-        $defaultShipping = 0;
-
-        $this->eventManager->expects($this->once())
-            ->method('dispatch')
-            ->with('view_block_abstract_to_html_before', ['block' => $this->model])
-            ->willReturnSelf();
-
-        $this->scopeConfig->expects($this->once())
-            ->method('getValue')
-            ->with('advanced/modules_disable_output/Magento_Checkout', ScopeInterface::SCOPE_STORE)
-            ->willReturn(false);
-
-        $this->customerSession->expects($this->once())
-            ->method('isLoggedIn')
-            ->willReturn(true);
-        $this->customerSession->expects($this->once())
-            ->method('getCustomerId')
-            ->willReturn($customerId);
-
-        $customerData = $this->getMockBuilder('Magento\Customer\Api\Data\CustomerInterface')
-            ->setMethods([
-                'getDefaultShipping',
-            ])
-            ->getMockForAbstractClass();
-        $customerData->expects($this->once())
-            ->method('getDefaultShipping')
-            ->willReturn($defaultShipping);
-
-        $this->customerRepository->expects($this->once())
-            ->method('getById')
-            ->with($customerId)
-            ->willReturn($customerData);
-
-        $this->assertEquals('', $this->model->toHtml());
-    }
-
-    /**
-     * @param int $customerId
-     * @param int $defaultShipping
-     * @param int $countryId
-     * @param string $postcode
-     * @param string $region
-     * @param int $regionId
-     * @param int $quoteId
-     * @dataProvider dataProviderBeforeToHtml
-     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
-     */
-    public function testBeforeToHtml(
-        $customerId,
-        $defaultShipping,
-        $countryId,
-        $postcode,
-        $region,
-        $regionId,
-        $quoteId
-    ) {
-        $this->eventManager->expects($this->once())
-            ->method('dispatch')
-            ->with('view_block_abstract_to_html_before', ['block' => $this->model])
-            ->willReturnSelf();
-
-        $this->scopeConfig->expects($this->once())
-            ->method('getValue')
-            ->with('advanced/modules_disable_output/Magento_Checkout', ScopeInterface::SCOPE_STORE)
-            ->willReturn(false);
-
-        $this->customerSession->expects($this->once())
-            ->method('isLoggedIn')
-            ->willReturn(true);
-        $this->customerSession->expects($this->once())
-            ->method('getCustomerId')
-            ->willReturn($customerId);
-
-        $customerDataMock = $this->getMockBuilder('Magento\Customer\Api\Data\CustomerInterface')
-            ->setMethods([
-                'getDefaultShipping',
-            ])
-            ->getMockForAbstractClass();
-        $customerDataMock->expects($this->once())
-            ->method('getDefaultShipping')
-            ->willReturn($defaultShipping);
-
-        $this->customerRepository->expects($this->once())
-            ->method('getById')
-            ->with($customerId)
-            ->willReturn($customerDataMock);
-
-        $this->addressReporitory->expects($this->once())
-            ->method('getById')
-            ->with($defaultShipping)
-            ->willReturn($this->address);
-
-        $regionMock = $this->getMockBuilder('Magento\Customer\Api\Data\RegionInterface')
-            ->setMethods([
-                'getRegion',
-            ])
-            ->getMockForAbstractClass();
-        $regionMock->expects($this->once())
-            ->method('getRegion')
-            ->willReturn($region);
-
-        $this->address->expects($this->once())
-            ->method('getCountryId')
-            ->willReturn($countryId);
-        $this->address->expects($this->once())
-            ->method('getPostcode')
-            ->willReturn($postcode);
-        $this->address->expects($this->once())
-            ->method('getRegion')
-            ->willReturn($regionMock);
-        $this->address->expects($this->once())
-            ->method('getRegionId')
-            ->willReturn($regionId);
-
-        $this->estimatedAddress->expects($this->once())
-            ->method('setCountryId')
-            ->with($countryId)
-            ->willReturnSelf();
-        $this->estimatedAddress->expects($this->once())
-            ->method('setPostcode')
-            ->with($postcode)
-            ->willReturnSelf();
-        $this->estimatedAddress->expects($this->once())
-            ->method('setRegion')
-            ->with($region)
-            ->willReturnSelf();
-        $this->estimatedAddress->expects($this->once())
-            ->method('setRegionId')
-            ->with($regionId)
-            ->willReturnSelf();
-
-        $this->checkoutSession->expects($this->once())
+        $quote = $this->getMockBuilder('Magento\Quote\Model\Quote')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->checkoutSession->expects($this->any())
             ->method('getQuote')
-            ->willReturn($this->quote);
-
-        $this->quote->expects($this->once())
-            ->method('getId')
-            ->willReturn($quoteId);
-
-        $this->shippingMethodManager->expects($this->once())
-            ->method('estimateByAddress')
-            ->with($quoteId, $this->estimatedAddress)
-            ->willReturnSelf();
-
-        $this->quoteRepository->expects($this->once())
-            ->method('save')
-            ->with($this->quote)
-            ->willReturnSelf();
+            ->willReturn($quote);
+        $this->collectQuote->expects($this->once())
+            ->method('collect')
+            ->with($quote);
 
         $this->assertEquals('', $this->model->toHtml());
     }
 
-    /**
-     * @return array
-     */
-    public function dataProviderBeforeToHtml()
-    {
-        return [
-            [1, 1, 1, '12345', '', 1, 1],
-            [1, 1, 1, '12345', '', 0, 1],
-            [1, 1, 1, '', '', 0, 1],
-            [1, 1, 1, '12345', 'California', 0, 1],
-            [1, 1, 1, '12345', 'California', 1, 1],
-        ];
-    }
-
     /**
      * @param int $count
      * @param bool $expectedResult

app/code/Magento/ConfigurableProduct/Block/Product/View/Type/Configurable.php

@@ -187,8 +187,9 @@ public function getJsonConfig()
                     'amount' => $this->_registerJsPrice($this->_convertPrice($regularPrice->getAmount()->getValue())),
                 ],
                 'basePrice' => [
-                    'amount' =>
-                        $this->_registerJsPrice($this->_convertPrice($finalPrice->getAmount()->getBaseAmount())),
+                    'amount' => $this->_registerJsPrice(
+                        $this->_convertPrice($finalPrice->getAmount()->getBaseAmount())
+                    ),
                 ],
                 'finalPrice' => [
                     'amount' => $this->_registerJsPrice($this->_convertPrice($finalPrice->getAmount()->getValue())),
@@ -197,7 +198,6 @@ public function getJsonConfig()
             'productId' => $currentProduct->getId(),
             'chooseText' => __('Choose an Option...'),
             'images' => isset($options['images']) ? $options['images'] : [],
-            'baseImage' => $options['baseImage'],
         ];
 
         if ($currentProduct->hasPreconfiguredValues() && !empty($attributesData['defaultValues'])) {