use Modern::Perl;
use CGI qw ( -utf8 );
-use C4::Auth; # get_template_and_user
-use C4::Output;
-use C4::NewsChannels; # GetNewsToDisplay
-use C4::Languages qw(getTranslatedLanguages accept_language);
-use Koha::Quote;
+use C4::Auth qw( get_template_and_user );
+use C4::Output qw( output_html_with_http_headers );
+use Koha::Quotes;
use C4::Members;
-use C4::Overdues;
+use C4::Overdues qw( checkoverdues );
use Koha::Checkouts;
use Koha::Holds;
-use Koha::News;
+use Koha::AdditionalContents;
+use Koha::Patron::Messages;
-my $input = new CGI;
+my $input = CGI->new;
my $dbh = C4::Context->dbh;
my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
casAuthentication => $casAuthentication,
);
-my $homebranch;
+my $homebranch = $ENV{OPAC_BRANCH_DEFAULT};
if (C4::Context->userenv) {
$homebranch = C4::Context->userenv->{'branch'};
}
}
my $news_id = $input->param('news_id');
-my @all_koha_news;
+my $koha_news;
if (defined $news_id){
- @all_koha_news = Koha::News->search({ idnew => $news_id, lang => { '!=', 'koha' } }); # get news that is not staff-only news
- if (scalar @all_koha_news > 0){
- $template->param( news_item => @all_koha_news );
+ $koha_news = Koha::AdditionalContents->search({ idnew => $news_id, location => ['opac_only', 'staff_and_opac'] }); # get news that is not staff-only news
+ if ( $koha_news->count > 0){
+ $template->param( news_item => $koha_news->next );
} else {
$template->param( single_news_error => 1 );
}
} else {
- @all_koha_news = &GetNewsToDisplay( $template->lang, $homebranch);
+ $koha_news = Koha::AdditionalContents->search_for_display(
+ {
+ category => 'news',
+ location => ['opac_only', 'staff_and_opac'],
+ lang => $template->lang,
+ library_id => $homebranch,
+ }
+ );
}
-my $quote = Koha::Quote->get_daily_quote(); # other options are to pass in an exact quote id or select a random quote each pass... see perldoc C4::Koha
-
# For dashboard
my $patron = Koha::Patrons->find( $borrowernumber );
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 $patron_messages = Koha::Patron::Messages->search(
+ {
+ borrowernumber => $borrowernumber,
+ message_type => 'B',
+ });
+ my $patron_note = $patron->opacnote;
my $total = $patron->account->balance;
-
- if ( $checkouts > 0 || $overdues_count > 0 || $holds_pending > 0 || $holds_waiting > 0 || $total > 0 ) {
+ if ( $checkouts > 0 || $overdues_count > 0 || $holds_pending > 0 || $holds_waiting > 0 || $total > 0 || $patron_note || $patron_messages->count ) {
$template->param(
dashboard_info => 1,
checkouts => $checkouts,
holds_pending => $holds_pending,
holds_waiting => $holds_waiting,
total_owing => $total,
+ patron_messages => $patron_messages,
+ opacnote => $patron_note,
);
}
}
$template->param(
- koha_news => @all_koha_news,
+ koha_news => $koha_news,
branchcode => $homebranch,
- display_daily_quote => C4::Context->preference('QuoteOfTheDay'),
- daily_quote => $quote,
+ daily_quote => Koha::Quotes->get_daily_quote(),
);
output_html_with_http_headers $input, $cookie, $template->output;