Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 12 additions & 3 deletions app/code/Magento/Checkout/Block/Cart/Shipping.php
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,11 @@ class Shipping extends \Magento\Checkout\Block\Cart\AbstractCart
* @var \Magento\Framework\Serialize\Serializer\Json
*/
private $serializer;

/**
* @var \Magento\Checkout\Model\Cart\ConfigProvider
*/
private $cartConfig;

/**
* @param \Magento\Framework\View\Element\Template\Context $context
Expand All @@ -34,6 +39,7 @@ class Shipping extends \Magento\Checkout\Block\Cart\AbstractCart
* @param array $layoutProcessors
* @param array $data
* @param \Magento\Framework\Serialize\Serializer\Json|null $serializer
* @param \Magento\Checkout\Model\Cart\ConfigProvider|null $cartConfig
* @throws \RuntimeException
*/
public function __construct(
Expand All @@ -43,14 +49,17 @@ public function __construct(
\Magento\Checkout\Model\CompositeConfigProvider $configProvider,
array $layoutProcessors = [],
array $data = [],
\Magento\Framework\Serialize\Serializer\Json $serializer = null
\Magento\Framework\Serialize\Serializer\Json $serializer = null,
\Magento\Checkout\Model\Cart\ConfigProvider $cartConfig = null
) {
$this->configProvider = $configProvider;
$this->layoutProcessors = $layoutProcessors;
parent::__construct($context, $customerSession, $checkoutSession, $data);
$this->_isScopePrivate = true;
$this->serializer = $serializer ?: \Magento\Framework\App\ObjectManager::getInstance()
->get(\Magento\Framework\Serialize\Serializer\Json::class);
$this->cartConfig = $cartConfig ?: \Magento\Framework\App\ObjectManager::getInstance()
->get(\Magento\Checkout\Model\Cart\ConfigProvider::class);
}

/**
Expand All @@ -61,7 +70,7 @@ public function __construct(
*/
public function getCheckoutConfig()
{
return $this->configProvider->getConfig();
return $this->cartConfig->getCheckoutConfig();
}

/**
Expand Down Expand Up @@ -95,6 +104,6 @@ public function getBaseUrl()
*/
public function getSerializedCheckoutConfig()
{
return json_encode($this->getCheckoutConfig(), JSON_HEX_TAG);
return $this->cartConfig->getSerializedCheckoutConfig();
}
}
30 changes: 28 additions & 2 deletions app/code/Magento/Checkout/Block/Cart/Totals.php
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,16 @@ class Totals extends \Magento\Checkout\Block\Cart\AbstractCart
* @var LayoutProcessorInterface[]
*/
protected $layoutProcessors;

/**
* @var \Magento\Checkout\Model\Cart\ConfigProvider
*/
private $cartConfig;

/**
* @var \Magento\Framework\Serialize\SerializerInterface
*/
private $serializer;

/**
* @param \Magento\Framework\View\Element\Template\Context $context
Expand All @@ -45,6 +55,8 @@ class Totals extends \Magento\Checkout\Block\Cart\AbstractCart
* @param \Magento\Sales\Model\Config $salesConfig
* @param array $layoutProcessors
* @param array $data
* @param \Magento\Checkout\Model\Cart\ConfigProvider $cartConfig
* @param \Magento\Framework\Serialize\SerializerInterface $serializer
* @codeCoverageIgnore
*/
public function __construct(
Expand All @@ -53,12 +65,18 @@ public function __construct(
\Magento\Checkout\Model\Session $checkoutSession,
\Magento\Sales\Model\Config $salesConfig,
array $layoutProcessors = [],
array $data = []
array $data = [],
\Magento\Checkout\Model\Cart\ConfigProvider $cartConfig = null,
\Magento\Framework\Serialize\SerializerInterface $serializer = null
) {
$this->_salesConfig = $salesConfig;
parent::__construct($context, $customerSession, $checkoutSession, $data);
$this->_isScopePrivate = true;
$this->layoutProcessors = $layoutProcessors;
$this->cartConfig = $cartConfig ?: \Magento\Framework\App\ObjectManager::getInstance()
->get(\Magento\Checkout\Model\Cart\ConfigProvider::class);
$this->serializer = $serializer ?: \Magento\Framework\App\ObjectManager::getInstance()
->get(\Magento\Framework\Serialize\SerializerInterface::class);
}

/**
Expand All @@ -70,7 +88,7 @@ public function getJsLayout()
$this->jsLayout = $processor->process($this->jsLayout);
}

return json_encode($this->jsLayout, JSON_HEX_TAG);
return $this->serializer->serialize($this->jsLayout);
}

/**
Expand Down Expand Up @@ -207,4 +225,12 @@ public function getQuote()
}
return $this->_quote;
}

/**
* @return bool|string
*/
public function getSerializedCheckoutConfig()
{
return $this->cartConfig->getSerializedCheckoutConfig();
}
}
59 changes: 59 additions & 0 deletions app/code/Magento/Checkout/Model/Cart/ConfigProvider.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
<?php
/**
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
declare(strict_types=1);

namespace Magento\Checkout\Model\Cart;

/**
* Provides the checkout configuration.
*
* @api
*/
class ConfigProvider
{
/**
* @var \Magento\Checkout\Model\CompositeConfigProvider
*/
private $configProvider;

/** @var \Magento\Framework\Serialize\SerializerInterface */
private $serializer;

/**
* Config constructor.
*
* @param \Magento\Checkout\Model\CompositeConfigProvider $configProvider
* @param \Magento\Framework\Serialize\SerializerInterface $serializer
*/
public function __construct(
\Magento\Checkout\Model\CompositeConfigProvider $configProvider,
\Magento\Framework\Serialize\SerializerInterface $serializer
) {
$this->configProvider = $configProvider;
$this->serializer = $serializer;
}

/**
* Retrieve checkout configuration
*
* @return array
* @codeCoverageIgnore
*/
public function getCheckoutConfig()
{
return $this->configProvider->getConfig();
}

/**
* Retrieve checkout serialized configuration
*
* @return bool|string
*/
public function getSerializedCheckoutConfig()
{
return $this->serializer->serialize($this->getCheckoutConfig());
}
}
16 changes: 13 additions & 3 deletions app/code/Magento/Checkout/Test/Unit/Block/Cart/ShippingTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,11 @@ class ShippingTest extends \PHPUnit\Framework\TestCase
* @var \PHPUnit_Framework_MockObject_MockObject
*/
private $serializer;

/**
* @var \PHPUnit_Framework_MockObject_MockObject
*/
private $cartConfig;

protected function setUp()
{
Expand All @@ -69,6 +74,7 @@ protected function setUp()
$this->storeManager = $this->createMock(\Magento\Store\Model\StoreManagerInterface::class);
$this->context->expects($this->once())->method('getStoreManager')->willReturn($this->storeManager);
$this->serializer = $this->createMock(\Magento\Framework\Serialize\Serializer\Json::class);
$this->cartConfig = $this->createMock(\Magento\Checkout\Model\Cart\ConfigProvider::class);

$this->model = new \Magento\Checkout\Block\Cart\Shipping(
$this->context,
Expand All @@ -77,14 +83,15 @@ protected function setUp()
$this->configProvider,
[$this->layoutProcessor],
['jsLayout' => $this->layout],
$this->serializer
$this->serializer,
$this->cartConfig
);
}

public function testGetCheckoutConfig()
{
$config = ['param' => 'value'];
$this->configProvider->expects($this->once())->method('getConfig')->willReturn($config);
$this->cartConfig->expects($this->once())->method('getCheckoutConfig')->willReturn($config);
$this->assertEquals($config, $this->model->getCheckoutConfig());
}

Expand Down Expand Up @@ -117,7 +124,10 @@ public function testGetBaseUrl()
public function testGetSerializedCheckoutConfig()
{
$checkoutConfig = ['checkout', 'config'];
$this->configProvider->expects($this->once())->method('getConfig')->willReturn($checkoutConfig);
$this->cartConfig
->expects($this->once())
->method('getSerializedCheckoutConfig')
->willReturn(json_encode($checkoutConfig));

$this->assertEquals(json_encode($checkoutConfig), $this->model->getSerializedCheckoutConfig());
}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
<?php
/**
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
namespace Magento\Checkout\Test\Unit\Model\Cart;

class ConfigProviderTest extends \PHPUnit\Framework\TestCase
{
/**
* @var \Magento\Checkout\Model\Cart\ConfigProvider
*/
private $model;

/**
* @var \PHPUnit_Framework_MockObject_MockObject
*/
private $cartConfigProvider;

/**
* @var \PHPUnit_Framework_MockObject_MockObject
*/
private $compositeConfigProvider;

/**
* @var \PHPUnit_Framework_MockObject_MockObject
*/
private $serializer;

protected function setUp()
{
$this->cartConfigProvider = $this->createMock(\Magento\Checkout\Model\Cart\ConfigProvider::class);
$this->compositeConfigProvider = $this->createMock(\Magento\Checkout\Model\CompositeConfigProvider::class);
$this->serializer = $this->createMock(\Magento\Framework\Serialize\SerializerInterface::class);

$this->model = new \Magento\Checkout\Model\Cart\ConfigProvider(
$this->compositeConfigProvider,
$this->serializer
);
}

public function testGetCheckoutConfig()
{
$config = ['param' => 'value'];
$this->compositeConfigProvider
->expects($this->once())
->method('getConfig')
->willReturn($config);

$this->assertEquals($config, $this->model->getCheckoutConfig());
}

public function testGetSerializedCheckoutConfig()
{
$config = '{"param":"value"}';

$this->serializer
->expects($this->once())
->method('serialize')
->willReturn($config);

$this->assertEquals($config, $this->model->getSerializedCheckoutConfig());
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,12 @@
<script type="text/x-magento-init">
{
"#cart-totals": {
"Magento_Ui/js/core/app": <?= /* @escapeNotVerified */ $block->getJsLayout() ?>
"Magento_Ui/js/core/app": <?= /* @escapeNotVerified */ $block->getJsLayout() ?>,
"Magento_Checkout/js/totals": {
"checkoutConfig":<?= /* @escapeNotVerified */ $block->getSerializedCheckoutConfig() ?>,
"loaderFile":"<?= /* @escapeNotVerified */ $block->getViewFileUrl('images/loader-1.gif') ?>",
"baseUrl":"<?= /* @escapeNotVerified */ $block->getBaseUrl() ?>"
}
}
}
</script>
Expand Down
20 changes: 20 additions & 0 deletions app/code/Magento/Checkout/view/frontend/web/js/totals.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
/**
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/

define([
'mage/url',
'Magento_Ui/js/block-loader'
], function (url, blockLoader) {
'use strict';

return function (config) {
window.checkoutConfig = config.checkoutConfig;
window.customerData = window.checkoutConfig.customerData;
window.isCustomerLoggedIn = window.checkoutConfig.isCustomerLoggedIn;

blockLoader(config.loaderFile);
url.setBaseUrl(config.baseUrl);
};
});