Bug 7534: (QA follow-up) Use Koha.Preference template plugin to fetch the pref's...

[koha.git] / opac / opac-main.pl

diff --git a/opac/opac-main.pl b/opac/opac-main.pl
index b007b81..2398b6a 100755 (executable)
--- a/opac/opac-main.pl
+++ b/opac/opac-main.pl
@@ -67,24 +67,26 @@ my $koha_news_count = scalar @$all_koha_news;
 my $quote = GetDailyQuote();   # other options are to pass in an exact quote id or select a random quote each pass... see perldoc C4::Koha
 
 # For dashboard
-if ( defined $borrowernumber ){
+my $patron = Koha::Patrons->find( $borrowernumber );
+
+if ( $patron ) {
     my $checkouts = Koha::Checkouts->search({ borrowernumber => $borrowernumber })->count;
     my ( $overdues_count, $overdues ) = checkoverdues($borrowernumber);
     my $holds_pending = Koha::Holds->search({ borrowernumber => $borrowernumber, found => undef })->count;
     my $holds_waiting = Koha::Holds->search({ borrowernumber => $borrowernumber })->waiting->count;
-    my ( $total , $accts, $numaccts) = GetMemberAccountRecords( $borrowernumber );
+
+    my $total = $patron->account->balance;
 
     if  ( $checkouts > 0 || $overdues_count > 0 || $holds_pending > 0 || $holds_waiting > 0 || $total > 0 ) {
-        $template->param( dashboard_info => 1 );
+        $template->param(
+            dashboard_info => 1,
+            checkouts           => $checkouts,
+            overdues            => $overdues_count,
+            holds_pending       => $holds_pending,
+            holds_waiting       => $holds_waiting,
+            total_owing         => $total,
+        );
     }
-
-    $template->param(
-        checkouts           => $checkouts,
-        overdues            => $overdues_count,
-        holds_pending       => $holds_pending,
-        holds_waiting       => $holds_waiting,
-        total_owing         => $total,
-    );
 }
 
 $template->param(
@@ -100,8 +102,4 @@ if (C4::Context->preference('GoogleIndicTransliteration')) {
         $template->param('GoogleIndicTransliteration' => 1);
 }
 
-if (C4::Context->preference('OPACNumbersPreferPhrase')) {
-        $template->param('numbersphr' => 1);
-}
-
 output_html_with_http_headers $input, $cookie, $template->output;