Skip to content

Commit

Permalink
Merge pull request #458 from njm506/develop
Browse files Browse the repository at this point in the history
Fix checkin/out button on Reservation page
  • Loading branch information
effgarces authored Dec 4, 2024
2 parents 35d0593 + cb91973 commit 651f449
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
6 changes: 3 additions & 3 deletions tpl/Reservation/edit.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -73,13 +73,13 @@
</div>


{if $CheckInRequired && (!checkinAdminOnly || $CanViewAdmin)}
{if $CheckInRequired && (!$checkinAdminOnly || $CanViewAdmin)}
<button type="button" class="btn btn-sm btn-warning btnCheckin"><i class="bi bi-box-arrow-in-right"></i>
{translate key=CheckIn}
<span class="autoReleaseButtonMessage" data-autorelease-minutes="{$AutoReleaseMinutes}"> -
{translate key=ReleasedIn} <span class="autoReleaseMinutes"></span> {translate key=minutes}</span></button>
{/if}
{if $CheckOutRequired && (!checkoutAdminOnly || $CanViewAdmin)}
{if $CheckOutRequired && (!$checkoutAdminOnly || $CanViewAdmin)}
<button type="button" class="btn btn-sm btn-warning btnCheckout"><i class="bi bi-box-arrow-in-right"></i>
{translate key=CheckOut}</button>
{/if}
Expand Down Expand Up @@ -220,4 +220,4 @@
</div>
</form>
</div>
{/block}
{/block}
6 changes: 3 additions & 3 deletions tpl/Reservation/view.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -281,14 +281,14 @@
{/block}

{block name="submitButtons"}
{if $CheckInRequired && (!checkinAdminOnly || $CanViewAdmin)}
{if $CheckInRequired && (!$checkinAdminOnly || $CanViewAdmin)}
<button type="button" class="btn btn-warning btnCheckin"><i
class="bi bi-box-arrow-in-right"></i>
{translate key=CheckIn}<span class="autoReleaseButtonMessage"
data-autorelease-minutes="{$AutoReleaseMinutes}"> - {translate key=ReleasedIn}
<span class="autoReleaseMinutes"></span> {translate key=minutes}</span></button>
{/if}
{if $CheckOutRequired && (!checkoutAdminOnly || $CanViewAdmin)}
{if $CheckOutRequired && (!$checkoutAdminOnly || $CanViewAdmin)}
<button type="button" class="btn btn-warning btnCheckout"><i
class="bi bi-box-arrow-in-left"></i>
{translate key=CheckOut}</button>
Expand Down Expand Up @@ -433,4 +433,4 @@
$.blockUI.defaults.css.left = '20%';
});
</script>
{include file='globalfooter.tpl'}
{include file='globalfooter.tpl'}

0 comments on commit 651f449

Please sign in to comment.