File tree Expand file tree Collapse file tree 6 files changed +8
-8
lines changed
Multishipping/view/frontend/templates/checkout
Sales/view/adminhtml/templates/order/create/billing/method
dev/tests/integration/testsuite/Magento/SalesRule/_files
setup/src/Magento/Setup/Test/Unit/Module/Di/Code/Scanner Expand file tree Collapse file tree 6 files changed +8
-8
lines changed Original file line number Diff line number Diff line change 79
79
if (isset ($ methodsForms [$ code ])) {
80
80
$ block ->setMethodFormTemplate ($ code , $ methodsForms [$ code ]);
81
81
}
82
- ?>
82
+ ?>
83
83
<dt class="item-title">
84
84
<?php if ($ methodsCount > 1 ) : ?>
85
85
<input type="radio"
Original file line number Diff line number Diff line change @@ -11,7 +11,7 @@ $orderIds = $block->getOrderIds();
11
11
<div class="multicheckout results">
12
12
<p class="block-content">
13
13
<?php if (!empty ($ orderIds )) : ?>
14
- <?= $ block ->escapeHtml (__ ('Not all items were included. ' )); ?>
14
+ <?= $ block ->escapeHtml (__ ('Not all items were included. ' )); ?>
15
15
<?php endif ; ?>
16
16
<?= $ block ->escapeHtml (__ ('For details, see ' )); ?>
17
17
<a href="#failed"><?= $ block ->escapeHtml (__ ('Failed to Order ' )); ?> </a>
Original file line number Diff line number Diff line change 24
24
<?php if ($ shippingAddress ) : ?>
25
25
<span class="shipping-label"><?= $ block ->escapeHtml (__ ('Ship to: ' )); ?> </span>
26
26
<span class="shipping-address">
27
- <?= $ block ->escapeHtml (
28
- $ block ->getCheckoutData ()->formatOrderShippingAddress ($ shippingAddress )
29
- ); ?>
27
+ <?= $ block ->escapeHtml (
28
+ $ block ->getCheckoutData ()->formatOrderShippingAddress ($ shippingAddress )
29
+ ); ?>
30
30
</span>
31
31
<?php else : ?>
32
32
<span class="shipping-address">
Original file line number Diff line number Diff line change 17
17
<?php foreach ($ _methods as $ _method ) :
18
18
$ _code = $ _method ->getCode ();
19
19
$ _counter ++;
20
- ?>
20
+ ?>
21
21
<dt class="admin__field-option">
22
22
<?php if ($ _methodsCount > 1 ) : ?>
23
23
<input id="p_method_<?= $ block ->escapeHtml ($ _code ); ?> "
Original file line number Diff line number Diff line change 21
21
$ coupon = \Magento \TestFramework \Helper \Bootstrap::getObjectManager ()->create (\Magento \SalesRule \Model \Coupon::class);
22
22
$ coupon ->setRuleId ($ items [1 ]->getId ())->setCode ('autogenerated_2_2 ' )->setType (1 )->save ();
23
23
24
- // type SPECIFIC with generated coupons
24
+ // type SPECIFIC with generated coupons
25
25
$ coupon = \Magento \TestFramework \Helper \Bootstrap::getObjectManager ()->create (\Magento \SalesRule \Model \Coupon::class);
26
26
$ coupon ->setRuleId ($ items [2 ]->getId ())->setCode ('autogenerated_3_1 ' )->setType (1 )->save ();
27
27
$ coupon = \Magento \TestFramework \Helper \Bootstrap::getObjectManager ()->create (\Magento \SalesRule \Model \Coupon::class);
Original file line number Diff line number Diff line change @@ -69,7 +69,7 @@ public function testCollectEntities()
69
69
);
70
70
71
71
$ this ->assertEquals (
72
- [' \Magento\Eav\Api\Data\AttributeExtensionInterface ' ],
72
+ [\Magento \Eav \Api \Data \AttributeExtensionInterface::class ],
73
73
$ this ->_model ->collectEntities ($ this ->_testFiles )
74
74
);
75
75
}
You can’t perform that action at this time.
0 commit comments