refactor location options

Signed-off-by: Sam Poyigi <[email protected]>
tastyigniter · May 5, 2022 · b5db7a4 · b5db7a4
1 parent 60197de
commit b5db7a4
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 29 deletions.
diff --git a/components/cartbox/item_modal.blade.php b/components/cartbox/item_modal.blade.php
@@ -6,6 +6,14 @@ class="modal-dialog "
 >
  <form method="POST" data-request="{{ $formHandler }}">
  <div class="modal-content">
+ <div class="modal-header">
+ <h4 class="modal-title">{{ $menuItem->getBuyableName() }}</h4>
+ <button
+ type="button"
+ class="btn-close px-2"
+ data-bs-dismiss="modal"
+ ></button>
+ </div>
  @if ($showCartItemThumb && $menuItem->hasMedia('thumb'))
  <div class="modal-top">
  <img
@@ -20,12 +28,6 @@ class="img-fluid"
  @endif
 
  <div class="modal-body">
- <button
- type="button"
- class="close px-2"
- data-bs-dismiss="modal"
- ><span aria-hidden="true">&times;</span></button>
- <h4>{{ $menuItem->getBuyableName() }}</h4>
  @if (strlen($menuItem->menu_description))
  <p class="text-muted">{!! nl2br($menuItem->menu_description) !!}</p>
  @endif
@@ -54,7 +56,7 @@ class="form-control"
  <div class="modal-footer">
  <div class="row g-0 w-100">
  <div class="col-sm-5 pb-3 pb-sm-0">
- <div class="input-group" data-toggle="quantity">
+ <div class="input-group input-group-lg" data-toggle="quantity">
  <button
  class="btn btn-light"
  data-operator="minus"
@@ -75,7 +77,7 @@ class="btn btn-light"
  ><i class="fa fa-plus fa-fw"></i></button>
  </div>
  </div>
- <div class="col-sm-7 pe-sm-2">
+ <div class="col-sm-7 ps-sm-3">
  <button type="submit" class="btn btn-primary btn-lg text-white w-100" data-attach-loading>
  <div class="d-flex align-items-center">
  <div class="col"></div>

diff --git a/components/cartbox/tip_form.blade.php b/components/cartbox/tip_form.blade.php
@@ -37,26 +37,26 @@ class="btn btn-light{{ $tipAmountType == 'custom' ? ' active' : '' }}"
  </div>
  @endif
  <input type="hidden" name="amount_type" value="{{ $tipAmountType }}">
-  <div
-  class="input-group{{ $tipAmounts ? ' mt-2' : '' }}"
-  data-tip-custom
-  {!! ($tipAmounts && $tipAmountType != 'custom') ? 'style="display: none;"' : '' !!}
- >
-  <input
-  type="number"
-  name="amount"
-  class="form-control"
-  value="{{ $currentAmount }}"
-  placeholder="@lang('igniter.cart::default.text_apply_tip')"
-  step="{{ 1 / (10 ** app('currency')->getDefault()->decimal_position) }}"
- />
-  <button
-  type="submit"
-  class="btn btn-light"
-  data-replace-loading="fa fa-spinner fa-spin"
-  title="@lang('igniter.cart::default.button_apply_tip')"
- ><i class="fa fa-check"></i></button>
- </div>
+ </div>
+ <div
+ class="input-group{{ $tipAmounts ? ' mt-2' : '' }}"
+ data-tip-custom
+ {!! ($tipAmounts && $tipAmountType != 'custom') ? 'style="display: none;"' : '' !!}
+ >
+ <input
+ type="number"
+ name="amount"
+ class="form-control"
+ value="{{ $currentAmount }}"
+ placeholder="@lang('igniter.cart::default.text_apply_tip')"
+ step="{{ 1 / (10 ** app('currency')->getDefault()->decimal_position) }}"
+ />
+ <button
+ type="submit"
+ class="btn btn-light"
+ data-replace-loading="fa fa-spinner fa-spin"
+ title="@lang('igniter.cart::default.button_apply_tip')"
+ ><i class="fa fa-check"></i></button>
  </div>
  </div>
  </form>

diff --git a/components/order/status.blade.php b/components/order/status.blade.php
@@ -1,4 +1,4 @@
-<div class="label label-light mb-3">
+<div class="label label-secondary mb-3">
  <span class="h6">
  <i class="fa fa-clock"></i>&nbsp;
  {{ $order->order_datetime->isoFormat($orderDateTimeFormat) }}