Skip to content

Commit 5ffafe2

Browse files
author
Oleksii Korshenko
authored
Merge pull request #590 from magento-tango/MAGETWO-60809
Fixed issues: - MAGETWO-59586 Excessive loaders for order with virtual product - MAGETWO-60461 Skip running compiler separately in production mode - 2.2
2 parents d403ec9 + 7dd69e7 commit 5ffafe2

File tree

2 files changed

+2
-4
lines changed
  • app/code/Magento/Sales/view/adminhtml/templates/order/create/billing/method
  • lib/internal/Magento/Framework/ObjectManager/Test/Unit/Config

2 files changed

+2
-4
lines changed

app/code/Magento/Sales/view/adminhtml/templates/order/create/billing/method/form.phtml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,7 @@
4040
</div>
4141
<script>
4242
require(["Magento_Sales/order/create/form"], function(){
43-
<?php if($_methodsCount == 1):?>
44-
order.switchPaymentMethod('<?php /* @escapeNotVerified */ echo $block->getSelectedMethodCode(); ?>');
45-
<?php else: ?>
43+
<?php if($_methodsCount != 1):?>
4644
order.setPaymentMethod('<?php /* @escapeNotVerified */ echo $block->getSelectedMethodCode(); ?>');
4745
<?php endif; ?>
4846
});

lib/internal/Magento/Framework/Test/Unit/ObjectManager/Config/CompiledTest.php renamed to lib/internal/Magento/Framework/ObjectManager/Test/Unit/Config/CompiledTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* Copyright © 2016 Magento. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6-
namespace Magento\Framework\Test\Unit\ObjectManager\Config;
6+
namespace Magento\Framework\ObjectManager\Test\Unit\Config;
77

88
use Magento\Framework\ObjectManager\Config\Compiled as CompiledConfig;
99
use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;

0 commit comments

Comments
 (0)