|
Lines 564-583
if ( $borrowernumber && $borrower->{'category_type'} eq 'C') {
Link Here
|
| 564 |
$template->param( 'catcode' => $patron_categories->next ) if $patron_categories->count == 1; |
564 |
$template->param( 'catcode' => $patron_categories->next ) if $patron_categories->count == 1; |
| 565 |
} |
565 |
} |
| 566 |
|
566 |
|
| 567 |
my $librarian_messages = Koha::Patron::Messages->search( |
567 |
my $all_messages = Koha::Patron::Messages->search( |
| 568 |
{ |
568 |
{ |
| 569 |
borrowernumber => $borrowernumber, |
569 |
'me.borrowernumber' => $borrowernumber, |
| 570 |
message_type => 'L', |
570 |
}, |
| 571 |
} |
|
|
| 572 |
); |
| 573 |
|
| 574 |
my $patron_messages = Koha::Patron::Messages->search( |
| 575 |
{ |
571 |
{ |
| 576 |
borrowernumber => $borrowernumber, |
572 |
join => 'manager', |
| 577 |
message_type => 'B', |
573 |
'+select' => ['manager.surname', 'manager.firstname' ], |
|
|
574 |
'+as' => ['manager_surname', 'manager_firstname'], |
| 578 |
} |
575 |
} |
| 579 |
); |
576 |
); |
| 580 |
|
577 |
|
|
|
578 |
my @messages; |
| 579 |
while ( my $content = $all_messages->next ) { |
| 580 |
my $this_item; |
| 581 |
|
| 582 |
$this_item->{borrowernumber} = $content->borrowernumber; |
| 583 |
$this_item->{message_id} = $content->message_id; |
| 584 |
$this_item->{branchcode} = $content->branchcode; |
| 585 |
$this_item->{message_type} = $content->message_type; |
| 586 |
$this_item->{message_date} = $content->message_date; |
| 587 |
$this_item->{message} = $content->message; |
| 588 |
$this_item->{manager_id} = $content->manager_id; |
| 589 |
$this_item->{name} = $content->_result->get_column('manager_firstname') . ' ' . $content->_result->get_column('manager_surname'); |
| 590 |
|
| 591 |
push @messages, $this_item; |
| 592 |
} |
| 593 |
|
| 581 |
my $fast_cataloging = 0; |
594 |
my $fast_cataloging = 0; |
| 582 |
if (defined getframeworkinfo('FA')) { |
595 |
if (defined getframeworkinfo('FA')) { |
| 583 |
$fast_cataloging = 1 |
596 |
$fast_cataloging = 1 |
|
Lines 625-632
if ($restoreduedatespec || $stickyduedate) {
Link Here
|
| 625 |
} |
638 |
} |
| 626 |
|
639 |
|
| 627 |
$template->param( |
640 |
$template->param( |
| 628 |
librarian_messages => $librarian_messages, |
641 |
messages => \@messages, |
| 629 |
patron_messages => $patron_messages, |
|
|
| 630 |
borrower => $borrower, |
642 |
borrower => $borrower, |
| 631 |
borrowernumber => $borrowernumber, |
643 |
borrowernumber => $borrowernumber, |
| 632 |
categoryname => $borrower->{'description'}, |
644 |
categoryname => $borrower->{'description'}, |