Browse Source

Bug 14280: Add branches fields to discharges letters

Currently, when generating a discharge letter, branches fields are not translated in the letter (<<branches.branchname>>, <<branches.branchaddress1>>, etc.)
This patch fixes that.

How I tested:
- Set syspref 'useDischarge' to 'allow'
- Go to Home > Tools > Notices & Slips
- Edit DISCHARGE, add to 'Email message':
<p><<branches.branchname>><br />
<<branches.branchaddress1>><br />
<<branches.branchaddress2>><br />
<<branches.branchaddress3>><br />
<<branches.zip>> <<branches.city>><br />
</p>
- Go to detail page of a patron > discharge
- Click 'Generate discharge'
- Verify that the PDF contains the information above.

Signed-off-by: Marc Véron <veron@veron.ch>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@unc.edu.ar>
3.22.x
Matthias Meusburger 9 years ago
committed by Tomas Cohen Arazi
parent
commit
cc7b795f84
  1. 2
      Koha/Borrower/Discharge.pm
  2. 2
      members/discharge.pl
  3. 6
      opac/opac-discharge.pl

2
Koha/Borrower/Discharge.pm

@ -95,7 +95,7 @@ sub generate_as_pdf {
my $letter = C4::Letters::GetPreparedLetter(
module => 'members',
letter_code => 'DISCHARGE',
tables => { borrowers => $params->{borrowernumber}, },
tables => { borrowers => $params->{borrowernumber}, branches => $params->{'branchcode'}, },
);
my $today = output_pref( dt_from_string() );

2
members/discharge.pl

@ -78,7 +78,7 @@ if ( $input->param('borrowernumber') ) {
}
eval {
my $pdf_path = Koha::Borrower::Discharge::generate_as_pdf(
{ borrowernumber => $borrowernumber, } );
{ borrowernumber => $borrowernumber, branchcode => $data->{'branchcode'} } );
binmode(STDOUT);
print $input->header(

6
opac/opac-discharge.pl

@ -57,8 +57,12 @@ if ( $op eq 'request' ) {
}
elsif ( $op eq 'get' ) {
eval {
# Getting member data
my $data = GetMember( borrowernumber => $loggedinuser );
my $pdf_path = Koha::Borrower::Discharge::generate_as_pdf({
borrowernumber => $loggedinuser
borrowernumber => $loggedinuser,
branchcode => $data->{'branchcode'},
});
binmode(STDOUT);

Loading…
Cancel
Save