diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/billing/method/form.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/billing/method/form.phtml index 6d09c4d7601890d4948c5d40fb801b51371bd57f..4a9af33449b61c80b709998cf663b5601df26447 100644 --- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/billing/method/form.phtml +++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/billing/method/form.phtml @@ -40,9 +40,7 @@ </div> <script> require(["Magento_Sales/order/create/form"], function(){ - <?php if($_methodsCount == 1):?> - order.switchPaymentMethod('<?php /* @escapeNotVerified */ echo $block->getSelectedMethodCode(); ?>'); - <?php else: ?> + <?php if($_methodsCount != 1):?> order.setPaymentMethod('<?php /* @escapeNotVerified */ echo $block->getSelectedMethodCode(); ?>'); <?php endif; ?> }); diff --git a/lib/internal/Magento/Framework/Test/Unit/ObjectManager/Config/CompiledTest.php b/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Config/CompiledTest.php similarity index 98% rename from lib/internal/Magento/Framework/Test/Unit/ObjectManager/Config/CompiledTest.php rename to lib/internal/Magento/Framework/ObjectManager/Test/Unit/Config/CompiledTest.php index 3dd9f5065a1421ec822d4a81377ea81a5c3f8f52..1fcf3176540db6279e3fec6754fb3a7a22b3cc59 100644 --- a/lib/internal/Magento/Framework/Test/Unit/ObjectManager/Config/CompiledTest.php +++ b/lib/internal/Magento/Framework/ObjectManager/Test/Unit/Config/CompiledTest.php @@ -3,7 +3,7 @@ * Copyright © 2016 Magento. All rights reserved. * See COPYING.txt for license details. */ -namespace Magento\Framework\Test\Unit\ObjectManager\Config; +namespace Magento\Framework\ObjectManager\Test\Unit\Config; use Magento\Framework\ObjectManager\Config\Compiled as CompiledConfig; use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;