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

(-)a/C4/Letters.pm (-1 / +3 lines)
Lines 782-787 sub GetPreparedLetter { Link Here
782
            content => $letter->{content},
782
            content => $letter->{content},
783
            tables  => $tables,
783
            tables  => $tables,
784
            loops  => $loops,
784
            loops  => $loops,
785
            substitute => $substitute,
785
        }
786
        }
786
    );
787
    );
787
788
Lines 1455-1460 sub _process_tt { Link Here
1455
    my $content = $params->{content};
1456
    my $content = $params->{content};
1456
    my $tables = $params->{tables};
1457
    my $tables = $params->{tables};
1457
    my $loops = $params->{loops};
1458
    my $loops = $params->{loops};
1459
    my $substitute = $params->{substitute} || {};
1458
1460
1459
    my $use_template_cache = C4::Context->config('template_cache_dir') && defined $ENV{GATEWAY_INTERFACE};
1461
    my $use_template_cache = C4::Context->config('template_cache_dir') && defined $ENV{GATEWAY_INTERFACE};
1460
    my $template           = Template->new(
1462
    my $template           = Template->new(
Lines 1469-1475 sub _process_tt { Link Here
1469
        }
1471
        }
1470
    ) or die Template->error();
1472
    ) or die Template->error();
1471
1473
1472
    my $tt_params = { %{ _get_tt_params( $tables ) }, %{ _get_tt_params( $loops, 'is_a_loop' ) } };
1474
    my $tt_params = { %{ _get_tt_params( $tables ) }, %{ _get_tt_params( $loops, 'is_a_loop' ) }, %$substitute };
1473
1475
1474
    $content = qq|[% USE KohaDates %]$content|;
1476
    $content = qq|[% USE KohaDates %]$content|;
1475
1477
(-)a/t/db_dependent/Letters/TemplateToolkit.t (-2 / +30 lines)
Lines 286-292 $prepared_letter = GetPreparedLetter( Link Here
286
is( $prepared_letter->{content}, $modification->id(), 'Patron modification object used correctly' );
286
is( $prepared_letter->{content}, $modification->id(), 'Patron modification object used correctly' );
287
287
288
subtest 'regression tests' => sub {
288
subtest 'regression tests' => sub {
289
    plan tests => 3;
289
    plan tests => 4;
290
290
291
    my $library = $builder->build( { source => 'Branch' } );
291
    my $library = $builder->build( { source => 'Branch' } );
292
    my $patron  = $builder->build( { source => 'Borrower' } );
292
    my $patron  = $builder->build( { source => 'Borrower' } );
Lines 504-509 subtest 'loops' => sub { Link Here
504
        my $expected_letter = join '', ( $checkout_1->{issue_id}, $checkout_2->{issue_id} );
504
        my $expected_letter = join '', ( $checkout_1->{issue_id}, $checkout_2->{issue_id} );
505
        is( $letter->{content}, $expected_letter, );
505
        is( $letter->{content}, $expected_letter, );
506
    };
506
    };
507
508
    subtest 'DUEDGST|count' => sub {
509
        plan tests => 1;
510
511
        my $code = 'DUEDGST';
512
513
        my $dbh = C4::Context->dbh;
514
        # Enable notification for DUEDGST - Things are hardcoded here but should work with default data
515
        $dbh->do(q|INSERT INTO borrower_message_preferences( borrowernumber, message_attribute_id ) VALUES ( ?, ? )|, undef, $patron->{borrowernumber}, 1 );
516
        my $borrower_message_preference_id = $dbh->last_insert_id(undef, undef, "borrower_message_preferences", undef);
517
        $dbh->do(q|INSERT INTO borrower_message_transport_preferences( borrower_message_preference_id, message_transport_type) VALUES ( ?, ? )|, undef, $borrower_message_preference_id, 'email' );
518
519
        my $params = {
520
            code => $code,
521
            substitute => { count => 42 },
522
        };
523
524
        my $template = q|
525
You have <<count>> items due
526
        |;
527
        my $letter = process_letter( { template => $template, %$params });
528
529
        my $tt_template = q|
530
You have [% count %] items due
531
        |;
532
        my $tt_letter = process_letter( { template => $tt_template, %$params });
533
        is( $tt_letter->{content}, $letter->{content}, );
534
    };
535
507
};
536
};
508
537
509
sub reset_template {
538
sub reset_template {
510
- 

Return to bug 17965