View | Details | Raw Unified | Return to bug 2093
Collapse All | Expand All

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt (-6 / +6 lines)
Lines 135-158 Link Here
135
                            </div> <!-- /#login -->
135
                            </div> <!-- /#login -->
136
                        [% END # /casAuthentication %]
136
                        [% END # /casAuthentication %]
137
                    [% ELSE %]
137
                    [% ELSE %]
138
                        [% IF Koha.Preference('OPACUserSummary') %]
138
                        [% IF Koha.Preference('OPACUserSummary') && dashboard_info %]
139
                            <div id="user_summary">
139
                            <div id="user_summary">
140
                                <h3>Welcome, <a href="/cgi-bin/koha/opac-user.pl"><span class="loggedinusername">[% USER_INFO.title %] [% USER_INFO.firstname %] [% USER_INFO.surname %]</span></a></h3>
140
                                <h3>Welcome, <a href="/cgi-bin/koha/opac-user.pl"><span class="loggedinusername">[% USER_INFO.title %] [% USER_INFO.firstname %] [% USER_INFO.surname %]</span></a></h3>
141
                                <ul id="user_summary_shortcuts">
141
                                <ul id="user_summary_shortcuts">
142
                                    [% IF checkouts && checkouts > 0 %]
142
                                    [% IF checkouts && checkouts > 0 %]
143
                                        <li><a href="/cgi-bin/koha/opac-user.pl#opac-user-checkouts"><span class="user_checkouts_count count_label">[% checkouts %]</span> Checkout(s)</a></li>
143
                                        <li><a href="/cgi-bin/koha/opac-user.pl#opac-user-checkouts"><span class="user_checkouts_count count_label">[% checkouts %]</span> checkout(s)</a></li>
144
                                    [% END %]
144
                                    [% END %]
145
                                    [% IF overdues && overdues > 0 %]
145
                                    [% IF overdues && overdues > 0 %]
146
                                        <li><a href="/cgi-bin/koha/opac-user.pl#opac-user-overdues"><span class="user_overdues_count count_label">[% overdues %]</span> Overdue(s)</a></li>
146
                                        <li><a href="/cgi-bin/koha/opac-user.pl#opac-user-overdues"><span class="user_overdues_count count_label">[% overdues %]</span> overdue(s)</a></li>
147
                                    [% END %]
147
                                    [% END %]
148
                                    [% IF holds_pending && holds_pending > 0 %]
148
                                    [% IF holds_pending && holds_pending > 0 %]
149
                                        <li><a href="/cgi-bin/koha/opac-user.pl#opac-user-holds"><span class="user_holds_pending_count count_label">[% holds_pending %]</span> Hold(s) pending</a></li>
149
                                        <li><a href="/cgi-bin/koha/opac-user.pl#opac-user-holds"><span class="user_holds_pending_count count_label">[% holds_pending %]</span> hold(s) pending</a></li>
150
                                    [% END %]
150
                                    [% END %]
151
                                    [% IF holds_waiting && holds_waiting > 0 %]
151
                                    [% IF holds_waiting && holds_waiting > 0 %]
152
                                        <li><a href="/cgi-bin/koha/opac-user.pl#opac-user-holds"><span class="user_holds_waiting_count count_label">[% holds_waiting %]</span> Hold(s) waiting</a></li>
152
                                        <li><a href="/cgi-bin/koha/opac-user.pl#opac-user-holds"><span class="user_holds_waiting_count count_label">[% holds_waiting %]</span> hold(s) waiting</a></li>
153
                                    [% END %]
153
                                    [% END %]
154
                                    [% IF total_owing && total_owing > 0 %]
154
                                    [% IF total_owing && total_owing > 0 %]
155
                                        <li><a href="/cgi-bin/koha/opac-account.pl"><span class="user_fines_count count_label">[% total_owing | $Price with_symbol => 1 %]</span> Due</a></li>
155
                                        <li><a href="/cgi-bin/koha/opac-account.pl"><span class="user_fines_count count_label">[% total_owing | $Price with_symbol => 1 %]</span> due in fines and charges</a></li>
156
                                    [% END %]
156
                                    [% END %]
157
                                </ul>
157
                                </ul>
158
                            </div>
158
                            </div>
(-)a/opac/opac-main.pl (-11 / +9 lines)
Lines 27-34 use C4::Languages qw(getTranslatedLanguages accept_language); Link Here
27
use C4::Koha qw( GetDailyQuote );
27
use C4::Koha qw( GetDailyQuote );
28
use C4::Members;
28
use C4::Members;
29
use C4::Overdues;
29
use C4::Overdues;
30
use C4::Reserves;
31
use Koha::Checkouts;
30
use Koha::Checkouts;
31
use Koha::Holds;
32
32
33
my $input = new CGI;
33
my $input = new CGI;
34
my $dbh   = C4::Context->dbh;
34
my $dbh   = C4::Context->dbh;
Lines 66-88 my $koha_news_count = scalar @$all_koha_news; Link Here
66
66
67
my $quote = GetDailyQuote();   # other options are to pass in an exact quote id or select a random quote each pass... see perldoc C4::Koha
67
my $quote = GetDailyQuote();   # other options are to pass in an exact quote id or select a random quote each pass... see perldoc C4::Koha
68
68
69
# For dashboard
69
my $checkouts = Koha::Checkouts->search({ borrowernumber => $borrowernumber })->count;
70
my $checkouts = Koha::Checkouts->search({ borrowernumber => $borrowernumber })->count;
70
my ( $overdues_count, $overdues ) = checkoverdues($borrowernumber);
71
my ( $overdues_count, $overdues ) = checkoverdues($borrowernumber);
71
my @holds = GetReservesFromBorrowernumber($borrowernumber);
72
my $holds_pending = Koha::Holds->search({ borrowernumber => $borrowernumber, found => undef })->count;
72
my $holds_pending = 0;
73
my $holds_waiting = Koha::Holds->search({ borrowernumber => $borrowernumber })->waiting->count;
73
foreach my $hold (@holds) {
74
    if (not defined($hold->{found})){
75
        $holds_pending++;
76
    }
77
}
78
my @holds_waiting = GetReservesFromBorrowernumber($borrowernumber, 'W');
79
my ( $total , $accts, $numaccts) = GetMemberAccountRecords( $borrowernumber );
74
my ( $total , $accts, $numaccts) = GetMemberAccountRecords( $borrowernumber );
80
75
76
if  ( $checkouts > 0 || $overdues_count > 0 || $holds_pending > 0 || $holds_waiting > 0 || $total > 0 ) {
77
    $template->param( dashboard_info => 1 );
78
}
79
81
$template->param(
80
$template->param(
82
    checkouts           => $checkouts,
81
    checkouts           => $checkouts,
83
    overdues            => $overdues_count,
82
    overdues            => $overdues_count,
84
    holds_pending       => $holds_pending,
83
    holds_pending       => $holds_pending,
85
    holds_waiting       => scalar @holds_waiting,
84
    holds_waiting       => $holds_waiting,
86
    total_owing         => $total,
85
    total_owing         => $total,
87
    koha_news           => $all_koha_news,
86
    koha_news           => $all_koha_news,
88
    koha_news_count     => $koha_news_count,
87
    koha_news_count     => $koha_news_count,
89
- 

Return to bug 2093