Skip to content

Commit 6c0af15

Browse files
committed
Merge branch 'bugfix' into bugs
2 parents f53753e + d8109fb commit 6c0af15

File tree

3 files changed

+5
-7
lines changed

3 files changed

+5
-7
lines changed

app/code/Magento/Checkout/view/frontend/web/template/cart/shipping-rates.html

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,7 @@
1717
<div data-bind="text: error_message"></div>
1818
<!-- /ko -->
1919
<!-- ko if: (available) -->
20-
<input name="estimate_method"
21-
type="radio"
20+
<input type="radio"
2221
class="radio"
2322
data-bind="
2423
click: $parents[1].selectShippingMethod,

app/code/Magento/Checkout/view/frontend/web/template/shipping.html

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,7 @@
8181
<td class="col col-method">
8282
<!-- ko ifnot: method.error_message -->
8383
<!-- ko if: $parent.rates().length == 1 -->
84-
<input name="shipping_method"
85-
class="radio"
84+
<input class="radio"
8685
type="radio"
8786
data-bind="attr: {
8887
checked: $parent.rates().length == 1,
@@ -92,7 +91,7 @@
9291
}" />
9392
<!-- /ko -->
9493
<!--ko ifnot: ($parent.rates().length == 1)-->
95-
<input name="shipping_method" type="radio"
94+
<input type="radio"
9695
data-bind="
9796
value: method.carrier_code + '_' + method.method_code,
9897
checked: $parent.isSelected,
@@ -125,7 +124,7 @@
125124
<div data-bind="text: method.error_message"></div>
126125
</div>
127126
<span class="no-display">
128-
<input name="shipping_method" type="radio" data-bind="attr: {'value' : method.method_code, 'id': 's_method_' + method.method_code}"/>
127+
<input type="radio" data-bind="attr: {'value' : method.method_code, 'id': 's_method_' + method.method_code}"/>
129128
</span>
130129
</td>
131130
</tr>

app/code/Magento/Tax/Model/Sales/Total/Quote/Tax.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -303,7 +303,7 @@ public function fetch(\Magento\Quote\Model\Quote $quote, \Magento\Quote\Model\Qu
303303
$applied = unserialize($applied);
304304
}
305305
$amount = $total->getTaxAmount();
306-
if ($amount == null) {
306+
if ($amount === null) {
307307
$this->enhanceTotalData($quote, $total);
308308
$amount = $total->getTaxAmount();
309309
}

0 commit comments

Comments
 (0)