projects / srvgit / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Bug 30407: Add ability to syspref UpdateNotForLoanStatusOnCheckin to show only the...
[srvgit] / koha-tmpl / intranet-tmpl / prog / en / modules / circ / returns.tt
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
index 074ca2f..8187f30 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
@@ -36,9 +36,11 @@
 <body id="circ_returns" class="circ">
     <span class="audio-alert-success"></span>
 
-    [% INCLUDE 'header.inc' %]
-    [% INCLUDE 'checkin-search.inc' %]
+    [% WRAPPER 'header.inc' %]
+        [% INCLUDE 'checkin-search.inc' %]
+    [% END %]
 
+    [% WRAPPER 'sub-header.inc' %]
     <nav id="breadcrumbs" aria-label="Breadcrumb" class="breadcrumb">
         <ol>
             <li>
@@ -54,6 +56,7 @@
             </li>
         </ol>
     </nav>
+    [% END %]
 
     <div class="main container-fluid">
         <div class="row">
@@ -261,6 +264,9 @@
                                     [% FOREACH errmsgloo IN errmsgloop %]
                                         [% IF ( errmsgloo.NotForLoanStatusUpdated ) %]
                                             <p class="problem ret_nflupdate">
+                                            [% IF errmsgloo.NotForLoanStatusUpdated.to == 'ONLYMESSAGE' %]
+                                                [% AuthorisedValues.GetByCode( 'NOT_LOAN', errmsgloo.NotForLoanStatusUpdated.from ) %]
+                                            [% ELSE %]
                                                 Not for loan status updated.
                                                 <br />Old value:
                                                 [% IF errmsgloo.NotForLoanStatusUpdated.from %]
@@ -278,6 +284,7 @@
                                                 [% ELSE %]
                                                     Available for loan.
                                                 [% END %]
+                                            [% END %]
                                             </p>
                                         [% END %]
                                         [% IF ( errmsgloo.ItemLocationUpdated ) %]
@@ -333,7 +340,7 @@
                                                 <p class="problem ret_checkedin">Item was lost, now found.</p>
                                             [% END %]
                                             [% IF LostItemFeeRefunded and not Koha.Preference('BlockReturnOfLostItems') %]
-                                                <p class="problem ret_refund">A refund has been applied to the borrowing patron's account.</p>
+                                                <p class="problem ret_refund">A refund for the lost item charge has been applied to the borrowing patron's account.</p>
                                             [% ELSIF LostItemFeeCharged and not Koha.Preference('BlockReturnOfLostItems') %]
                                                 <p class="problem ret_charged">A refund for the lost item charge has been applied to the borrowing patron's account, and new overdue charge has been calculated and applied.</p>
                                             [% ELSIF LostItemFeeRestored and not Koha.Preference('BlockReturnOfLostItems') %]
@@ -344,6 +351,11 @@
                                             [% ELSE %]
                                                 <p class="problem ret_feeremains">Any lost item fees for this item will remain on the patron's account.</p>
                                             [% END %]
+                                            [% IF ProcessingFeeRefunded and not Koha.Preference('BlockReturnOfLostItems') %]
+                                                <p class="problem ret_refund">A refund for the lost item processing charge has been applied to the borrowing patron's account.</p>
+                                            [% ELSE %]
+                                                <p class="problem ret_feeremains">Any processing fees for this item will remain on the patron's account.</p>
+                                            [% END %]
                                         [% END %]
                                         [% IF ( errmsgloo.withdrawn ) %]
                                             [% IF Koha.Preference('BlockReturnOfWithdrawnItems') %]
@@ -1073,25 +1085,26 @@
                                 <h1>Check in</h1>
                                 <div class="row">
                                     <div class="col-sm-6">
-                                        <div class="hint">Enter item barcode:</div>
                                             <div class="form-control-group">
                                                 [% IF ( exemptfine ) %]
-                                                    <input name="barcode" id="barcode" size="14" class="focus input-warning" type="text" />
+                                                    <input name="barcode" id="barcode" size="14" placeholder="Enter item barcode" class="focus input-warning" type="text" />
                                                 [% ELSIF ( dropboxmode ) %]
-                                                    <input name="barcode" id="barcode" size="14" class="barcode focus input-warning" />
+                                                    <input name="barcode" id="barcode" size="14" placeholder="Enter item barcode" class="barcode focus input-warning" />
                                                 [% ELSE %]
-                                                    <input name="barcode" id="barcode" size="14" class="barcode focus" />
+                                                    <input name="barcode" id="barcode" size="14" placeholder="Enter item barcode" class="barcode focus" />
                                                 [% END %]
-                                                <button type="submit" class="btn btn-default">Check in</button>
+
+                                                <div id="show-circ-settings">
+                                                    <a href="#" title="Checkin settings"><i class="fa fa-sliders"></i></a>
+                                                </div>
+
+                                                <button type="submit" class="btn btn-primary">Check in</button>
                                                 [% FOREACH inputloo IN inputloop %]
                                                     <input type="hidden" name="ri-[% inputloo.counter | html %]" value="[% inputloo.barcode | html %]" />
                                                     <input type="hidden" name="dd-[% inputloo.counter | html %]" value="[% inputloo.duedate | html %]" />
                                                     <input type="hidden" name="bn-[% inputloo.counter | html %]" value="[% inputloo.borrowernumber | html %]" />
                                                 [% END %]
                                             </div>
-                                        <div id="show-circ-settings">
-                                            <a href="#"><i class="fa circ-settings-icon fa-caret-down"></i> Checkin settings</a>
-                                        </div>
                                     </div>
                                     <div class="col-sm-6">
                                         [% IF ( exemptfine ) %]
@@ -1413,7 +1426,7 @@
                     "bPaginate":false,
                     "bInfo":false,
                     "bSort":false,
-                    "dom": 'B<"clearfix">t',
+                    "dom": '<"table_controls"B>rt',
                     }, table_settings);
 
             $("#exemptcheck").change(function () {
KOHA@FFZG based on git://git.koha.org/pub/scm/koha.git