Skip to content

Commit

Permalink
Change logical operators to comply with coding guidelines
Browse files Browse the repository at this point in the history
Signed-off-by: Sam Poyigi <[email protected]>
  • Loading branch information
sampoyigi committed Nov 11, 2021
1 parent 3c211ea commit 67b8e57
Show file tree
Hide file tree
Showing 6 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion components/cartbox/buttons.blade.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@php $locationIsClosed = ($__SELF__->locationIsClosed() OR $__SELF__->hasMinimumOrder()); @endphp
@php $locationIsClosed = ($__SELF__->locationIsClosed() || $__SELF__->hasMinimumOrder()); @endphp
<button
class="checkout-btn btn btn-primary {{ $locationIsClosed ? 'disabled' : '' }} btn-block btn-lg"
data-attach-loading="disabled"
Expand Down
2 changes: 1 addition & 1 deletion components/cartbox/item_option_checkbox.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ class="custom-control-input"
name="menu_options[{{ $index }}][option_values][]"
value="{{ $optionValue->menu_option_value_id }}"
data-option-price="{{ $optionValue->price }}"
@if (($cartItem && $cartItem->hasOptionValue($menuOptionValueId)) OR $optionValue->isDefault())
@if (($cartItem && $cartItem->hasOptionValue($menuOptionValueId)) || $optionValue->isDefault())
checked="checked"
@endif
>
Expand Down
2 changes: 1 addition & 1 deletion components/cartbox/item_option_radio.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ class="custom-control-input"
name="menu_options[{{ $index }}][option_values][]"
value="{{ $optionValue->menu_option_value_id }}"
data-option-price="{{ $optionValue->price }}"
@if (($cartItem && $cartItem->hasOptionValue($menuOptionValueId)) OR $optionValue->isDefault())
@if (($cartItem && $cartItem->hasOptionValue($menuOptionValueId)) || $optionValue->isDefault())
checked="checked"
@endif
>
Expand Down
2 changes: 1 addition & 1 deletion components/cartbox/item_option_select.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ class="form-control my-2"
@php $isSelected = ($cartItem && $cartItem->hasOptionValue($optionValue->menu_option_value_id)); @endphp
<option
value="{{ $optionValue->menu_option_value_id }}"
@if (($cartItem && $cartItem->hasOptionValue($optionValue->menu_option_value_id)) OR $optionValue->isDefault())
@if (($cartItem && $cartItem->hasOptionValue($optionValue->menu_option_value_id)) || $optionValue->isDefault())
selected="selected"
@endif
data-option-price="{{ $optionValue->price }}"
Expand Down
2 changes: 1 addition & 1 deletion components/cartbox/item_options.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
class="small pull-right text-muted">@lang('igniter.cart::default.text_required')</span>
@endif
</h5>
@if ($menuOption->min_selected > 0 OR $menuOption->max_selected > 0)
@if ($menuOption->min_selected > 0 || $menuOption->max_selected > 0)
<p class="mb-0">{!! sprintf(lang('igniter.cart::default.text_option_summary'), $menuOption->min_selected, $menuOption->max_selected) !!}</p>
@endif
</div>
Expand Down
4 changes: 2 additions & 2 deletions components/order/items.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,9 @@
<td class="border-top p-0" colspan="99999"></td>
</tr>
@foreach ($order->getOrderTotals() as $orderTotal)
@continue(!$orderTotal->is_summable)
@continue($order->isCollectionType() && $orderTotal->code == 'delivery')
@php($thickLine = ($orderTotal->code == 'order_total' OR $orderTotal->code == 'total'))
@php($thickLine = ($orderTotal->code == 'order_total' || $orderTotal->code == 'total'))
@continue(!$thickLine && !$orderTotal->is_summable)
<tr>
<td class="px-0 {{ $thickLine ? 'border-top lead font-weight-bold' : 'text-muted border-0' }}">
{{ $orderTotal->title }}
Expand Down

0 comments on commit 67b8e57

Please sign in to comment.