From cb919733aafe9b3d1615b879747d9f07e77c4a86 Mon Sep 17 00:00:00 2001
From: Lissa Moriarty <njm506@york.ac.uk>
Date: Mon, 18 Nov 2024 10:56:35 +0000
Subject: [PATCH] Fix checkin/out button on Reservation page

Missing `$` in template was causing the buttons to only show for
administrators.

Fixes #457
---
 tpl/Reservation/edit.tpl | 6 +++---
 tpl/Reservation/view.tpl | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/tpl/Reservation/edit.tpl b/tpl/Reservation/edit.tpl
index 7c37962e9..fb5476312 100644
--- a/tpl/Reservation/edit.tpl
+++ b/tpl/Reservation/edit.tpl
@@ -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}
@@ -220,4 +220,4 @@
                 </div>
             </form>
         </div>
-{/block}
\ No newline at end of file
+{/block}
diff --git a/tpl/Reservation/view.tpl b/tpl/Reservation/view.tpl
index 987c2d00a..3a4884f14 100644
--- a/tpl/Reservation/view.tpl
+++ b/tpl/Reservation/view.tpl
@@ -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>
@@ -433,4 +433,4 @@
         $.blockUI.defaults.css.left = '20%';
     });
 </script>
-{include file='globalfooter.tpl'}
\ No newline at end of file
+{include file='globalfooter.tpl'}