Bug 24786: Allow setting a register for the session

[srvgit] / koha-tmpl / intranet-tmpl / prog / en / includes / header.inc

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc
index f65cd87..09f66e9 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc
@@ -1,6 +1,7 @@
 [% USE raw %]
 [% USE Branches %]
 [% USE Desks %]
+[% USE Registers %]
 [% USE Koha %]
 <nav class="navbar">
     <div class="navbar-header">
@@ -86,17 +87,24 @@
                                 <span class="logged-in-branch-code content_hidden">[% Branches.GetLoggedInBranchcode | html %]</span>
                             </strong>
                         [% END %]
-                        [% IF (Desks.defined) %]
+                        [% IF Koha.Preference('UseCirculationDesks') && Desks.ListForLibrary.count %]
                             <span class="separator">|</span>
                             <strong>
-                                [% IF ( LoginDeskname == '') %]
+                                [% IF ( Desks.GetLoggedInDeskName == '' ) %]
                                    <span class="logged-in-desk-name">NO DESK SET</span>
                                 [% ELSE %]
-                                    <span class="logged-in-desk-name">[% LoginDeskname | html %]</span>
+                                    <span class="logged-in-desk-name">[% Desks.GetLoggedInDeskName | html %]</span>
                                     <span class="logged-in-desk-id content_hidden">[% Desks.GetLoggedInDeskId | html %]</span>
                                 [% END %]
                             </strong>
-                         [% END %]
+                        [% END %]
+                        [% IF Koha.Preference('UseCashRegisters') && !(Registers.session_register_name == '') %]
+                            <span class="separator">|</span>
+                            <strong>
+                                <span class="logged-in-register-name">[% Registers.session_register_name | html %]</span>
+                                <span class="logged-in-register-id content_hidden">[% Registers.session_register_id | html %]</span>
+                            </strong>
+                        [% END %]
                     </span>
                     <b class="caret"></b>
                 </a>
@@ -117,31 +125,46 @@
                             <span class="logged-in-branch-code content_hidden">[% Branches.GetLoggedInBranchcode | html %]</span>
                         [% END %]
                     </li>
+
+                    [% IF Koha.Preference('UseCirculationDesks') && Desks.ListForLibrary.count %]
                     <li class="loggedin-menu-label">
                         Desk: <br />
-                        [% IF ( LoginDeskname == '' AND Desks.defined ) %]
+                        [% IF ( Desks.GetLoggedInDeskName == '' ) %]
                            <span class="logged-in-desk-name">NO DESK SET</span>
-                        [% ELSIF ( LoginDeskname != '' ) %]
-                            <span class="logged-in-desk-name">[% LoginDeskname | html %]</span>
+                        [% ELSE %]
+                            <span class="logged-in-desk-name">[% Desks.GetLoggedInDeskName | html %]</span>
                             <span class="logged-in-desk-id content_hidden">[% Desks.GetLoggedInDeskId | html %]</span>
                         [% END %]
                     </li>
+                    [% END %]
 
+                    [% IF !( Koha.Preference('IndependentBranches') && !CAN_user_superlibrarian && !CAN_user_editcatalogue_edit_catalogue ) %]
                     <li role="separator" class="loggedin-menu-label divider"></li>
-                    [% IF ( IndependentBranches ) %]
-                        [% IF ( CAN_user_editcatalogue_edit_catalogue ) %]
                     <li>
+                        [% IF Koha.Preference('UseCirculationDesks') && Koha.Preference('UseCashRegisters') %]
+                        <a class="toplinks" href="/cgi-bin/koha/circ/set-library.pl">Set library, desk and register</a>
+                        [% ELSIF Koha.Preference('UseCirculationDesks') %]
+                        <a class="toplinks" href="/cgi-bin/koha/circ/set-library.pl">Set library and desk</a>
+                        [% ELSIF Koha.Preference('UseCashRegisters') %]
+                        <a class="toplinks" href="/cgi-bin/koha/circ/set-library.pl">Set library and cash register</a>
+                        [% ELSE %]
                         <a class="toplinks" href="/cgi-bin/koha/circ/set-library.pl">Set library</a>
-                    </li>
                         [% END %]
-                    [% ELSE %]
+                    </li>
+                    [% ELSIF Koha.Preference('UseCirculationDesks') && Koha.Preference('UseCashRegisters') %]
+                    <li role="separator" class="loggedin-menu-label divider"></li>
                     <li>
-                        <a class="toplinks" href="/cgi-bin/koha/circ/set-library.pl">Set library</a>
+                        <a class="toplinks" href="/cgi-bin/koha/circ/set-library.pl">Set desk and cash register</a>
                     </li>
-                    [% END %]
-                    [% IF Desks.defined %]
+                    [% ELSIF Koha.Preference('UseCirculationDesks') %]
+                    <li role="separator" class="loggedin-menu-label divider"></li>
                     <li>
-                        <a class="toplinks" href="/cgi-bin/koha/circ/selectdesk.pl">Set desk</a>
+                        <a class="toplinks" href="/cgi-bin/koha/circ/set-library.pl">Set desk</a>
+                    </li>
+                    [% ELSIF Koha.Preference('UseCashRegisters') %]
+                    <li role="separator" class="loggedin-menu-label divider"></li>
+                    <li>
+                        <a class="toplinks" href="/cgi-bin/koha/circ/set-library.pl">Set cash register</a>
                     </li>
                     [% END %]
                     [% IF EnableSearchHistory %]
@@ -149,6 +172,7 @@
                         <a class="toplinks" href="/cgi-bin/koha/catalogue/search-history.pl">Search history</a>
                     </li>
                     [% END %]
+
                     [% IF loggedinusernumber %]
                         <li class ="toplinks-myaccount">
                             <a class="toplinks" href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% loggedinusernumber | html %]">My account</a>