573f1ac474
This patch moves all the code into an include which can be accessed from the 'Add a new message' link or the patron toolbar.
EDIT: Ensuring modal opens on all pages
EDIT2: Once the form has been submitted the page will redirect to where you submitted the form from.
EDIT3: Fixing indentation of member-add-message.inc
Ensuring messages save on every page
Fill branch
Ensure predefined notes appear
Form redirects to where it was submitted from, or just the circulation page.
EDIT4: Removing the new include file and moving it all into the modal in the toolbar
EDIT5: Removing swp file and unnecessary code duplication by utilising plugins
EDIT6: Batch checkout fixes
EDIT7: Ensure you do not get JS error from Comment 24 (Batch checkout syspref must be turned on)
To test:
1) Go to a patron circ page (circ/circulation.pl?borrowernumber=X)
2) Click 'Add a new message' under Messages
3) Confirm this brings up the modal to add a message. Confirm clicking Save saves your message. If it is an OPAC message (for the user), confirm it shows as expected on the OPAC.
4) Click Cancel. Confirm this closes the modal.
5) Click 'Add message' button in toolbar. Complete steps 3 and 4.
6) Confirm the modal opens from all other pages with the members toolbar. Confirm predefined notes shows.
circ/circulation.pl
members/moremember.pl
members/routing-lists.pl
members/statistics.pl
members/boraccount.pl
members/pay.pl
members/maninvoice.pl
members/mancredit.pl
members/readingrec.pl
members/notices.pl
members/member-flags.pl
members/member-password.pl
members/paycollect.pl
members/files.pl
turn on BatchCheckouts syspref and put in appropriate patron category
circ/circulation.pl?borrowernumber=X&batch=1
7) Confirm that the page redirects to where you submitted the form from once you have submitted it.
8) Go to Check Out tab and confirm your message saved (or OPAC, wherever you saved it)
Sponsored-by: Catalyst IT
Followed test plan, works as expected. (Re-tested for comment #24)
Signed-off-by: Marc Véron <veron@veron.ch>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
114 lines
3.4 KiB
Perl
Executable file
114 lines
3.4 KiB
Perl
Executable file
#!/usr/bin/perl
|
|
|
|
# Copyright 2012 Prosentient Systems
|
|
#
|
|
# This file is part of Koha.
|
|
#
|
|
# Koha is free software; you can redistribute it and/or modify it
|
|
# under the terms of the GNU General Public License as published by
|
|
# the Free Software Foundation; either version 3 of the License, or
|
|
# (at your option) any later version.
|
|
#
|
|
# Koha is distributed in the hope that it will be useful, but
|
|
# WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
# GNU General Public License for more details.
|
|
#
|
|
# You should have received a copy of the GNU General Public License
|
|
# along with Koha; if not, see <http://www.gnu.org/licenses>.
|
|
|
|
use strict;
|
|
#use warnings; FIXME - Bug 2505
|
|
use CGI qw ( -utf8 );
|
|
use C4::Output;
|
|
use C4::Auth qw/:DEFAULT/;
|
|
use C4::Branch; # GetBranches
|
|
use C4::Members;
|
|
use C4::Members::Attributes qw(GetBorrowerAttributes);
|
|
use C4::Context;
|
|
use C4::Serials;
|
|
use Koha::Patron::Images;
|
|
use CGI::Session;
|
|
|
|
my $query = new CGI;
|
|
|
|
my ( $template, $loggedinuser, $cookie ) = get_template_and_user (
|
|
{
|
|
template_name => 'members/routing-lists.tt',
|
|
query => $query,
|
|
type => "intranet",
|
|
authnotrequired => 0,
|
|
flagsrequired => { circulate => 'circulate_remaining_permissions' },
|
|
}
|
|
);
|
|
|
|
my $branches = GetBranches();
|
|
|
|
my $findborrower = $query->param('findborrower');
|
|
$findborrower =~ s|,| |g;
|
|
|
|
my $borrowernumber = $query->param('borrowernumber');
|
|
|
|
my $branch = C4::Context->userenv->{'branch'};
|
|
|
|
# get the borrower information.....
|
|
my $borrower;
|
|
if ($borrowernumber) {
|
|
$borrower = GetMemberDetails( $borrowernumber, 0 );
|
|
}
|
|
|
|
|
|
##################################################################################
|
|
# BUILD HTML
|
|
# I'm trying to show the title of subscriptions where the borrowernumber is attached via a routing list
|
|
|
|
if ($borrowernumber) {
|
|
# new op dev
|
|
my $count;
|
|
my @borrowerSubscriptions;
|
|
($count, @borrowerSubscriptions) = GetSubscriptionsFromBorrower($borrowernumber );
|
|
my @subscripLoop;
|
|
|
|
foreach my $num_res (@borrowerSubscriptions) {
|
|
my %getSubscrip;
|
|
$getSubscrip{subscriptionid} = $num_res->{'subscriptionid'};
|
|
$getSubscrip{title} = $num_res->{'title'};
|
|
$getSubscrip{borrowernumber} = $num_res->{'borrowernumber'};
|
|
push( @subscripLoop, \%getSubscrip );
|
|
}
|
|
|
|
$template->param(
|
|
countSubscrip => scalar @subscripLoop,
|
|
subscripLoop => \@subscripLoop,
|
|
routinglistview => 1
|
|
);
|
|
|
|
$template->param( adultborrower => 1 ) if ( $borrower->{'category_type'} eq 'A' );
|
|
}
|
|
|
|
##################################################################################
|
|
|
|
$template->param(%$borrower);
|
|
|
|
$template->param(
|
|
findborrower => $findborrower,
|
|
borrower => $borrower,
|
|
borrowernumber => $borrowernumber,
|
|
branch => $branch,
|
|
branchname => GetBranchName($borrower->{'branchcode'}),
|
|
categoryname => $borrower->{description},
|
|
RoutingSerials => C4::Context->preference('RoutingSerials'),
|
|
);
|
|
|
|
if (C4::Context->preference('ExtendedPatronAttributes')) {
|
|
my $attributes = GetBorrowerAttributes($borrowernumber);
|
|
$template->param(
|
|
ExtendedPatronAttributes => 1,
|
|
extendedattributes => $attributes
|
|
);
|
|
}
|
|
|
|
my $patron_image = Koha::Patron::Images->find($borrower->{borrowernumber});
|
|
$template->param( picture => 1 ) if $patron_image;
|
|
|
|
output_html_with_http_headers $query, $cookie, $template->output;
|