Skip to content
Snippets Groups Projects
Commit ca502724 authored by Ievgen Shakhsuvarov's avatar Ievgen Shakhsuvarov
Browse files

MAGETWO-39372: Build stabilization

 - Static
parent 152f2c36
Branches
No related merge requests found
......@@ -6,7 +6,6 @@
"magento/module-store": "0.74.0-beta14",
"magento/module-customer": "0.74.0-beta14",
"magento/module-checkout": "0.74.0-beta14",
"magento/module-quote": "0.74.0-beta14",
"magento/module-backend": "0.74.0-beta14",
"magento/framework": "0.74.0-beta14",
"magento/magento-composer-installer": "*"
......
......@@ -65,8 +65,9 @@ class LayoutProcessor implements \Magento\Checkout\Block\Checkout\LayoutProcesso
)) {
$jsLayout['components']['checkout']['children']['steps']['children']['billing-step']['children']
['payment']['children']['payments-list']['children'] =
array_merge_recursive($jsLayout['components']['checkout']['children']['steps']['children']
['billing-step']['children']['payment']['children']['payments-list']['children'],
array_merge_recursive(
$jsLayout['components']['checkout']['children']['steps']['children']['billing-step']['children']
['payment']['children']['payments-list']['children'],
$this->processPaymentConfiguration(
$jsLayout['components']['checkout']['children']['steps']['children']['billing-step']['children']
['payment']['children']['renders']['children'],
......
......@@ -33,7 +33,6 @@ class GuestPaymentInformationManagement implements \Magento\Checkout\Api\GuestPa
\Magento\Quote\Api\GuestBillingAddressManagementInterface $billingAddressManagement,
\Magento\Quote\Api\GuestPaymentMethodManagementInterface $paymentMethodManagement,
\Magento\Quote\Api\GuestCartManagementInterface $cartManagement
) {
$this->billingAddressManagement = $billingAddressManagement;
$this->paymentMethodManagement = $paymentMethodManagement;
......@@ -63,7 +62,7 @@ class GuestPaymentInformationManagement implements \Magento\Checkout\Api\GuestPa
\Magento\Quote\Api\Data\AddressInterface $billingAddress
) {
$billingAddress->setEmail($email);
$this->billingAddressManagement->assign($cartId, $billingAddress);
$this->billingAddressManagement->assign($cartId, $billingAddress);
$this->paymentMethodManagement->set($cartId, $paymentMethod);
return true;
}
......
......@@ -33,7 +33,6 @@ class PaymentInformationManagement implements \Magento\Checkout\Api\PaymentInfor
\Magento\Quote\Api\BillingAddressManagementInterface $billingAddressManagement,
\Magento\Quote\Api\PaymentMethodManagementInterface $paymentMethodManagement,
\Magento\Quote\Api\CartManagementInterface $cartManagement
) {
$this->billingAddressManagement = $billingAddressManagement;
$this->paymentMethodManagement = $paymentMethodManagement;
......
......@@ -12,16 +12,7 @@ use Psr\Log\LoggerInterface as Logger;
use \Magento\Quote\Model\QuoteAddressValidator;
class ShippingInformationManagement implements \Magento\Checkout\Api\ShippingInformationManagementInterface
{/**
* @var \Magento\Quote\Api\GuestShippingAddressManagementInterface
*/
protected $shippingAddressManagement;
/**
* @var \Magento\Quote\Api\GuestShippingMethodManagementInterface
*/
protected $shippingMethodManagement;
{
/**
* @var \Magento\Quote\Api\PaymentMethodManagementInterface
*/
......@@ -69,15 +60,16 @@ class ShippingInformationManagement implements \Magento\Checkout\Api\ShippingInf
protected $scopeConfig;
/**
* @param \Magento\Quote\Api\ShippingAddressManagementInterface $shippingAddressManagement
* @param \Magento\Quote\Api\ShippingMethodManagementInterface $shippingMethodManagement
* @param \Magento\Quote\Api\PaymentMethodManagementInterface $paymentMethodManagement
* @param PaymentDetailsFactory $paymentDetailsFactory
* @param \Magento\Checkout\Model\PaymentDetailsFactory $paymentDetailsFactory
* @param \Magento\Quote\Api\CartTotalRepositoryInterface $cartTotalsRepository
* @param \Magento\Quote\Model\QuoteRepository $quoteRepository
* @param \Magento\Quote\Model\QuoteAddressValidator $addressValidator
* @param Logger $logger
* @param \Magento\Customer\Api\AddressRepositoryInterface $addressRepository
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
*/
public function __construct(
\Magento\Quote\Api\ShippingAddressManagementInterface $shippingAddressManagement,
\Magento\Quote\Api\ShippingMethodManagementInterface $shippingMethodManagement,
\Magento\Quote\Api\PaymentMethodManagementInterface $paymentMethodManagement,
\Magento\Checkout\Model\PaymentDetailsFactory $paymentDetailsFactory,
\Magento\Quote\Api\CartTotalRepositoryInterface $cartTotalsRepository,
......@@ -87,8 +79,6 @@ class ShippingInformationManagement implements \Magento\Checkout\Api\ShippingInf
\Magento\Customer\Api\AddressRepositoryInterface $addressRepository,
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
) {
$this->shippingAddressManagement = $shippingAddressManagement;
$this->shippingMethodManagement = $shippingMethodManagement;
$this->paymentMethodManagement = $paymentMethodManagement;
$this->paymentDetailsFactory = $paymentDetailsFactory;
$this->cartTotalsRepository = $cartTotalsRepository;
......
......@@ -27,7 +27,7 @@ class ImageProviderTest extends \PHPUnit_Framework_TestCase
{
$this->itemRepositoryMock = $this->getMock('Magento\Quote\Api\CartItemRepositoryInterface', [], [], '', false);
$this->itemPoolMock = $this->getMock('Magento\Checkout\CustomerData\ItemPoolInterface', [], [], '', false);
$this->model = new \Magento\Checkout\Model\Cart\ImageProvider (
$this->model = new \Magento\Checkout\Model\Cart\ImageProvider(
$this->itemRepositoryMock,
$this->itemPoolMock
);
......
......@@ -6,7 +6,6 @@
"magento/module-checkout": "0.74.0-beta14",
"magento/module-store": "0.74.0-beta14",
"magento/module-backend": "0.74.0-beta14",
"magento/module-ui": "0.74.0-beta14",
"magento/framework": "0.74.0-beta14",
"magento/magento-composer-installer": "*"
},
......
......@@ -8,7 +8,6 @@ namespace Magento\Tax\Model\Quote;
use Magento\Quote\Model\Cart\CartTotalRepository;
use Magento\Quote\Api\Data\TotalsExtensionFactory;
class GrandTotalDetailsPlugin
{
/**
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment