View | Details | Raw Unified | Return to bug 24381
Collapse All | Expand All

(-)a/C4/Letters.pm (+9 lines)
Lines 29-34 use C4::Members; Link Here
29
use C4::Log qw( logaction );
29
use C4::Log qw( logaction );
30
use C4::SMS;
30
use C4::SMS;
31
use C4::Templates;
31
use C4::Templates;
32
use Koha::DateUtils;
32
use Koha::SMS::Providers;
33
use Koha::SMS::Providers;
33
34
34
use Koha::Email;
35
use Koha::Email;
Lines 1591-1596 sub _process_tt { Link Here
1591
        push @includes, "$htdocs/$_/en/includes" unless $lang eq 'en';
1592
        push @includes, "$htdocs/$_/en/includes" unless $lang eq 'en';
1592
    }
1593
    }
1593
1594
1595
    my $htdocs = C4::Context->config('intrahtdocs');
1596
    my ($theme, $lang, $activethemes)= C4::Templates::themelanguage( $htdocs, 'about.tt', 'intranet');
1597
    my @includes;
1598
    foreach (@$activethemes) {
1599
        push @includes, "$htdocs/$_/$lang/includes";
1600
        push @includes, "$htdocs/$_/en/includes" unless $lang eq 'en';
1601
    }
1602
1594
    my $use_template_cache = C4::Context->config('template_cache_dir') && defined $ENV{GATEWAY_INTERFACE};
1603
    my $use_template_cache = C4::Context->config('template_cache_dir') && defined $ENV{GATEWAY_INTERFACE};
1595
    my $template           = Template->new(
1604
    my $template           = Template->new(
1596
        {
1605
        {
(-)a/members/printfeercpt.pl (-20 / +2 lines)
Lines 56-77 output_and_exit_if_error( Link Here
56
);
56
);
57
57
58
my $letter = C4::Letters::GetPreparedLetter(
58
my $letter = C4::Letters::GetPreparedLetter(
59
    module                 => 'circulation',
60
    letter_code            => 'CREDIT_' . $credit->credit_type_code,
61
    branchcode             => C4::Context::mybranch,
62
    message_transport_type => 'print',
63
    lang                   => $patron->lang,
64
    tables                 => {
65
        credits   => $credit_id,
66
        borrowers => $patron->borrowernumber
67
    },
68
    substitute => {
69
        tendered => scalar $input->param('tendered'),
70
        change   => scalar $input->param('change')
71
    }
72
);
73
74
$letter //= C4::Letters::GetPreparedLetter(
75
    module                 => 'circulation',
59
    module                 => 'circulation',
76
    letter_code            => 'ACCOUNT_CREDIT',
60
    letter_code            => 'ACCOUNT_CREDIT',
77
    branchcode             => C4::Context::mybranch,
61
    branchcode             => C4::Context::mybranch,
Lines 88-96 $letter //= C4::Letters::GetPreparedLetter( Link Here
88
);
72
);
89
73
90
$template->param(
74
$template->param(
91
    slip   => $letter->{content},
75
    slip => $letter->{content},
92
    plain  => !$letter->{is_html},
76
    plain => !$letter->{is_html}
93
    patron => $patron,
94
);
77
);
95
78
96
output_html_with_http_headers $input, $cookie, $template->output;
79
output_html_with_http_headers $input, $cookie, $template->output;
97
- 

Return to bug 24381