@@ -, +, @@
on Check Out page
---
circ/del_message.pl | 9 +++++--
.../prog/en/modules/members/moremember.tt | 28 ++++++++++++++++++++--
members/moremember.pl | 14 +++++++++++
3 files changed, 47 insertions(+), 4 deletions(-)
--- a/circ/del_message.pl
+++ a/circ/del_message.pl
@@ -43,5 +43,10 @@ my $message_id = $input->param('message_id');
my $message = Koha::Patron::Messages->find($message_id);
$message->delete if $message;
-print $input->redirect(
- "/cgi-bin/koha/circ/circulation.pl?borrowernumber=$borrowernumber");
+if ( $input->param('from') == "moremember" ) {
+ print $input->redirect(
+ "/cgi-bin/koha/members/moremember.pl?borrowernumber=$borrowernumber");
+} else {
+ print $input->redirect(
+ "/cgi-bin/koha/circ/circulation.pl?borrowernumber=$borrowernumber");
+}
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
@@ -41,6 +41,7 @@ var relatives_borrowernumbers = new Array();
[% END %]
var MSG_EXPORT_SELECT_CHECKOUTS = _("You must select checkout(s) to export");
+var MSG_CONFIRM_DELETE_MESSAGE = _("Are you sure you want to delete this message? This cannot be undone.");
columns_settings = [% ColumnsSettings.GetColumns( 'members', 'moremember', 'issues-table', 'json' ) %]
@@ -190,6 +191,31 @@ function validate1(date) {
[% END %]
+
[% IF ( flagged ) %]
@@ -217,7 +243,6 @@ function validate1(date) {
[% END %]
-
[% UNLESS ( I ) %]
[% title | html %] [% firstname | html %] [% END %] [% surname | html %] ([% cardnumber | html %])
@@ -500,7 +525,6 @@ function validate1(date) {
-
- [% issuecount %] Checkout(s)
--- a/members/moremember.pl
+++ a/members/moremember.pl
@@ -55,6 +55,7 @@ use Koha::AuthorisedValues;
use Koha::CsvProfiles;
use Koha::Patron::Debarments qw(GetDebarments);
use Koha::Patron::Images;
+use Koha::Patron::Messages;
use Module::Load;
if ( C4::Context->preference('NorwegianPatronDBEnable') && C4::Context->preference('NorwegianPatronDBEnable') == 1 ) {
load Koha::NorwegianPatronDB, qw( NLGetSyncDataFromBorrowernumber );
@@ -332,6 +333,18 @@ if ( C4::Context->preference("ExportCircHistory") ) {
$template->param(csv_profiles => [ Koha::CsvProfiles->search({ type => 'marc' }) ]);
}
+my $messages = Koha::Patron::Messages->search(
+ {
+ 'me.borrowernumber' => $borrowernumber,
+ },
+ {
+ join => 'manager',
+ '+select' => ['manager.surname', 'manager.firstname' ],
+ '+as' => ['manager_surname', 'manager_firstname'],
+ }
+);
+
+
# Display the language description instead of the code
# Note that this is certainly wrong
my ( $subtag, $region ) = split '-', $patron->lang;
@@ -361,6 +374,7 @@ $template->param(
PatronsPerPage => C4::Context->preference("PatronsPerPage") || 20,
relatives_issues_count => $relatives_issues_count,
relatives_borrowernumbers => \@relatives,
+ messages => $messages,
);
output_html_with_http_headers $input, $cookie, $template->output;
--