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

(-)a/C4/Letters.pm (-5 / +158 lines)
Lines 22-27 use warnings; Link Here
22
22
23
use MIME::Lite;
23
use MIME::Lite;
24
use Mail::Sendmail;
24
use Mail::Sendmail;
25
use Date::Calc qw( Add_Delta_Days );
26
use Encode;
27
use Carp;
28
use Template;
29
use Module::Load::Conditional qw(can_load);
25
30
26
use C4::Koha qw(GetAuthorisedValueByCode);
31
use C4::Koha qw(GetAuthorisedValueByCode);
27
use C4::Members;
32
use C4::Members;
Lines 31-41 use C4::Log; Link Here
31
use C4::SMS;
36
use C4::SMS;
32
use C4::Debug;
37
use C4::Debug;
33
use Koha::DateUtils;
38
use Koha::DateUtils;
34
use Date::Calc qw( Add_Delta_Days );
35
use Encode;
36
use Carp;
37
use Koha::Email;
39
use Koha::Email;
38
use Koha::DateUtils qw( format_sqldatetime );
40
use Koha::DateUtils qw( format_sqldatetime dt_from_string );
39
41
40
use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
42
use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
41
43
Lines 715-722 sub GetPreparedLetter { Link Here
715
        }
717
        }
716
    }
718
    }
717
719
720
    $letter->{content} = _process_tt(
721
        {
722
            content => $letter->{content},
723
            tables  => $tables,
724
        }
725
    );
726
718
    $letter->{content} =~ s/<<\S*>>//go; #remove any stragglers
727
    $letter->{content} =~ s/<<\S*>>//go; #remove any stragglers
719
#   $letter->{content} =~ s/<<[^>]*>>//go;
720
728
721
    return $letter;
729
    return $letter;
722
}
730
}
Lines 1316-1321 sub _set_message_status { Link Here
1316
    return $result;
1324
    return $result;
1317
}
1325
}
1318
1326
1327
sub _process_tt {
1328
    my ( $params ) = @_;
1329
1330
    my $content = $params->{content};
1331
    my $tables = $params->{tables};
1332
1333
    my $use_template_cache = C4::Context->config('template_cache_dir') && defined $ENV{GATEWAY_INTERFACE};
1334
    my $template           = Template->new(
1335
        {
1336
            EVAL_PERL    => 1,
1337
            ABSOLUTE     => 1,
1338
            PLUGIN_BASE  => 'Koha::Template::Plugin',
1339
            COMPILE_EXT  => $use_template_cache ? '.ttc' : '',
1340
            COMPILE_DIR  => $use_template_cache ? C4::Context->config('template_cache_dir') : '',
1341
            FILTERS      => {},
1342
            ENCODING     => 'UTF-8',
1343
        }
1344
    ) or die Template->error();
1345
1346
    my $tt_params = _get_tt_params( $tables );
1347
1348
    my $output;
1349
    $template->process( \$content, $tt_params, \$output ) || croak "ERROR PROCESSING TEMPLATE: " . $template->error();
1350
1351
    return $output;
1352
}
1353
1354
sub _get_tt_params {
1355
    my ($tables) = @_;
1356
1357
    my $params;
1358
1359
    my $config = {
1360
        biblio => {
1361
            module   => 'Koha::Biblios',
1362
            singular => 'biblio',
1363
            plural   => 'biblios',
1364
            pk       => 'biblionumber',
1365
        },
1366
        borrowers => { #FIXME: Bug 15548 will require this to be updated
1367
            module   => 'Koha::Borrowers', # to Koha::Patrons
1368
            singular => 'borrower',
1369
            plural   => 'borrowers',
1370
            pk       => 'borrowernumber',
1371
        },
1372
        branches => {
1373
            module   => 'Koha::Libraries',
1374
            singular => 'branch',
1375
            plural   => 'branches',
1376
            pk       => 'branchcode',
1377
        },
1378
        items => {
1379
            module   => 'Koha::Items',
1380
            singular => 'item',
1381
            plural   => 'items',
1382
            pk       => 'itemnumber',
1383
        },
1384
        opac_news => {
1385
            module   => 'Koha::News',
1386
            singular => 'news',
1387
            plural   => 'news',
1388
            pk       => 'idnew',
1389
        },
1390
        reserves => {
1391
            module   => 'Koha::Holds',
1392
            singular => 'hold',
1393
            plural   => 'holds',
1394
            fk       => [ 'borrowernumber', 'biblionumber' ],
1395
        },
1396
        serial => {
1397
            module   => 'Koha::Serials',
1398
            singular => 'serial',
1399
            plural   => 'serials',
1400
            pk       => 'serialid',
1401
        },
1402
        subscription => {
1403
            module   => 'Koha::Subscriptions',
1404
            singular => 'subscription',
1405
            plural   => 'subscriptions',
1406
            pk       => 'subscriptionid',
1407
        },
1408
        suggestions => {
1409
            module   => 'Koha::Suggestions',
1410
            singular => 'suggestion',
1411
            plural   => 'suggestions',
1412
            pk       => 'suggestionid',
1413
        },
1414
        issues => {
1415
            module   => 'Koha::Checkouts',
1416
            singular => 'checkout',
1417
            plural   => 'checkouts',
1418
            fk       => 'itemnumber',
1419
        },
1420
        borrower_modifications => {
1421
            module   => 'Koha::Borrower::Modifications',
1422
            singular => 'patron_modification',
1423
            plural   => 'patron_modifications',
1424
            fk       => 'verification_token',
1425
        },
1426
    };
1427
1428
    foreach my $table ( keys %$tables ) {
1429
        next unless $config->{$table};
1430
1431
        my $ref = ref( $tables->{$table} ) || q{};
1432
        my $module = $config->{$table}->{module};
1433
1434
        if ( can_load( modules => { $module => undef } ) ) {
1435
            my $pk = $config->{$table}->{pk};
1436
            my $fk = $config->{$table}->{fk};
1437
1438
            if ( $ref eq q{} || $ref eq 'HASH' ) {
1439
                my $id = ref $ref eq 'HASH' ? $tables->{$table}->{$pk} : $tables->{$table};
1440
                my $object;
1441
                if ( $fk ) { # Using a foreign key for lookup
1442
                    $object = $module->search( { $fk => $id } )->next();
1443
                } else { # using the table's primary key for lookup
1444
                    $object = $module->find($id);
1445
                }
1446
                $params->{ $config->{$table}->{singular} } = $object;
1447
            }
1448
            else {    # $ref eq 'ARRAY'
1449
                my $object;
1450
                if ( @{ $tables->{$table} } == 1 ) {    # Param is a single key
1451
                    $object = $module->search( { $pk => $tables->{$table} } )->next();
1452
                }
1453
                else {                                  # Params are mutliple foreign keys
1454
                    my @values = @{ $tables->{$table} };
1455
                    my @keys   = @{ $config->{$table}->{fk} };
1456
                    my %params = map { $_ => shift(@values) } @keys;
1457
                    $object = $module->search( \%params )->next();
1458
                }
1459
                $params->{ $config->{$table}->{singular} } = $object;
1460
            }
1461
        }
1462
        else {
1463
            croak "ERROR LOADING MODULE $module: $Module::Load::Conditional::ERROR";
1464
        }
1465
    }
1466
1467
    $params->{today} = dt_from_string();
1468
1469
    return $params;
1470
}
1471
1319
1472
1320
1;
1473
1;
1321
__END__
1474
__END__
(-)a/Koha/Borrower/Modification.pm (+52 lines)
Line 0 Link Here
1
package Koha::Borrower::Modification;
2
3
# Copyright ByWater Solutions 2014
4
#
5
# This file is part of Koha.
6
#
7
# Koha is free software; you can redistribute it and/or modify it under the
8
# terms of the GNU General Public License as published by the Free Software
9
# Foundation; either version 3 of the License, or (at your option) any later
10
# version.
11
#
12
# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
13
# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
14
# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
15
#
16
# You should have received a copy of the GNU General Public License along
17
# with Koha; if not, write to the Free Software Foundation, Inc.,
18
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
19
20
use Modern::Perl;
21
22
use Carp;
23
24
use Koha::Database;
25
26
use base qw(Koha::Object);
27
28
=head1 NAME
29
30
Koha::Item - Koha Item object class
31
32
=head1 API
33
34
=head2 Class Methods
35
36
=cut
37
38
=head3 type
39
40
=cut
41
42
sub type {
43
    return 'BorrowerModification';
44
}
45
46
=head1 AUTHOR
47
48
Kyle M Hall <kyle@bywatersolutions.com>
49
50
=cut
51
52
1;
(-)a/Koha/Borrower/Modifications.pm (-2 / +22 lines)
Lines 27-36 use Modern::Perl; Link Here
27
use C4::Context;
27
use C4::Context;
28
use C4::Debug;
28
use C4::Debug;
29
29
30
use base qw(Koha::Objects);
31
30
sub new {
32
sub new {
31
    my ( $class, %args ) = @_;
33
    my ( $self, %args ) = @_;
34
35
    $self = $self->SUPER::new(@_);
36
37
    foreach my $key ( keys %args ) {
38
        $self->{$key} = $args{$key};
39
    }
32
40
33
    return bless( \%args, $class );
41
    return $self;
34
}
42
}
35
43
36
=head2 AddModifications
44
=head2 AddModifications
Lines 304-307 sub GetModifications { Link Here
304
    return $data;
312
    return $data;
305
}
313
}
306
314
315
sub type {
316
    return 'BorrowerModification';
317
}
318
319
=head3 object_class
320
321
=cut
322
323
sub object_class {
324
    return 'Koha::Borrower::Modification';
325
}
326
307
1;
327
1;
(-)a/Koha/Checkout.pm (+52 lines)
Line 0 Link Here
1
package Koha::Checkout;
2
3
# Copyright ByWater Solutions 2015
4
#
5
# This file is part of Koha.
6
#
7
# Koha is free software; you can redistribute it and/or modify it under the
8
# terms of the GNU General Public License as published by the Free Software
9
# Foundation; either version 3 of the License, or (at your option) any later
10
# version.
11
#
12
# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
13
# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
14
# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
15
#
16
# You should have received a copy of the GNU General Public License along
17
# with Koha; if not, write to the Free Software Foundation, Inc.,
18
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
19
20
use Modern::Perl;
21
22
use Carp;
23
24
use Koha::Database;
25
26
use base qw(Koha::Object);
27
28
=head1 NAME
29
30
Koha::Checkout - Koha Checkout object class
31
32
=head1 API
33
34
=head2 Class Methods
35
36
=cut
37
38
=head3 type
39
40
=cut
41
42
sub type {
43
    return 'Issue';
44
}
45
46
=head1 AUTHOR
47
48
Kyle M Hall <kyle@bywatersolutions.com>
49
50
=cut
51
52
1;
(-)a/Koha/Checkouts.pm (+62 lines)
Line 0 Link Here
1
package Koha::Checkouts;
2
3
# Copyright ByWater Solutions 2015
4
#
5
# This file is part of Koha.
6
#
7
# Koha is free software; you can redistribute it and/or modify it under the
8
# terms of the GNU General Public License as published by the Free Software
9
# Foundation; either version 3 of the License, or (at your option) any later
10
# version.
11
#
12
# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
13
# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
14
# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
15
#
16
# You should have received a copy of the GNU General Public License along
17
# with Koha; if not, write to the Free Software Foundation, Inc.,
18
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
19
20
use Modern::Perl;
21
22
use Carp;
23
24
use Koha::Database;
25
26
use Koha::Checkout;
27
28
use base qw(Koha::Objects);
29
30
=head1 NAME
31
32
Koha::Checkouts - Koha Checkout object set class
33
34
=head1 API
35
36
=head2 Class Methods
37
38
=cut
39
40
=head3 type
41
42
=cut
43
44
sub type {
45
    return 'Issue';
46
}
47
48
=head3 object_class
49
50
=cut
51
52
sub object_class {
53
    return 'Koha::Checkout';
54
}
55
56
=head1 AUTHOR
57
58
Kyle M Hall <kyle@bywatersolutions.com>
59
60
=cut
61
62
1;
(-)a/Koha/News.pm (+62 lines)
Line 0 Link Here
1
package Koha::News;
2
3
# Copyright ByWater Solutions 2015
4
#
5
# This file is part of Koha.
6
#
7
# Koha is free software; you can redistribute it and/or modify it under the
8
# terms of the GNU General Public License as published by the Free Software
9
# Foundation; either version 3 of the License, or (at your option) any later
10
# version.
11
#
12
# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
13
# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
14
# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
15
#
16
# You should have received a copy of the GNU General Public License along
17
# with Koha; if not, write to the Free Software Foundation, Inc.,
18
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
19
20
use Modern::Perl;
21
22
use Carp;
23
24
use Koha::Database;
25
26
use Koha::NewsItem;
27
28
use base qw(Koha::Objects);
29
30
=head1 NAME
31
32
Koha::News - Koha News object set class
33
34
=head1 API
35
36
=head2 Class Methods
37
38
=cut
39
40
=head3 type
41
42
=cut
43
44
sub type {
45
    return 'OpacNews';
46
}
47
48
=head3 object_class
49
50
=cut
51
52
sub object_class {
53
    return 'Koha::NewsItem';
54
}
55
56
=head1 AUTHOR
57
58
Kyle M Hall <kyle@bywatersolutions.com>
59
60
=cut
61
62
1;
(-)a/Koha/NewsItem.pm (+54 lines)
Line 0 Link Here
1
package Koha::NewsItem;
2
3
# Copyright ByWater Solutions 2015
4
#
5
# This file is part of Koha.
6
#
7
# Koha is free software; you can redistribute it and/or modify it under the
8
# terms of the GNU General Public License as published by the Free Software
9
# Foundation; either version 3 of the License, or (at your option) any later
10
# version.
11
#
12
# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
13
# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
14
# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
15
#
16
# You should have received a copy of the GNU General Public License along
17
# with Koha; if not, write to the Free Software Foundation, Inc.,
18
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
19
20
use Modern::Perl;
21
22
use Carp;
23
24
use Koha::Database;
25
26
use base qw(Koha::Object);
27
28
=head1 NAME
29
30
Koha::NewsItem - Koha News Item object class
31
32
Koha::NewsItem represents a single piece of news from the opac_news table
33
34
=head1 API
35
36
=head2 Class Methods
37
38
=cut
39
40
=head3 type
41
42
=cut
43
44
sub type {
45
    return 'OpacNews';
46
}
47
48
=head1 AUTHOR
49
50
Kyle M Hall <kyle@bywatersolutions.com>
51
52
=cut
53
54
1;
(-)a/Koha/Suggestion.pm (+52 lines)
Line 0 Link Here
1
package Koha::Suggestion;
2
3
# Copyright ByWater Solutions 2015
4
#
5
# This file is part of Koha.
6
#
7
# Koha is free software; you can redistribute it and/or modify it under the
8
# terms of the GNU General Public License as published by the Free Software
9
# Foundation; either version 3 of the License, or (at your option) any later
10
# version.
11
#
12
# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
13
# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
14
# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
15
#
16
# You should have received a copy of the GNU General Public License along
17
# with Koha; if not, write to the Free Software Foundation, Inc.,
18
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
19
20
use Modern::Perl;
21
22
use Carp;
23
24
use Koha::Database;
25
26
use base qw(Koha::Object);
27
28
=head1 NAME
29
30
Koha::Suggestion - Koha Suggestion object class
31
32
=head1 API
33
34
=head2 Class Methods
35
36
=cut
37
38
=head3 type
39
40
=cut
41
42
sub type {
43
    return 'Suggestion';
44
}
45
46
=head1 AUTHOR
47
48
Kyle M Hall <kyle@bywatersolutions.com>
49
50
=cut
51
52
1;
(-)a/Koha/Suggestions.pm (-1 / +62 lines)
Line 0 Link Here
0
- 
1
package Koha::Suggestions;
2
3
# Copyright ByWater Solutions 2015
4
#
5
# This file is part of Koha.
6
#
7
# Koha is free software; you can redistribute it and/or modify it under the
8
# terms of the GNU General Public License as published by the Free Software
9
# Foundation; either version 3 of the License, or (at your option) any later
10
# version.
11
#
12
# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
13
# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
14
# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
15
#
16
# You should have received a copy of the GNU General Public License along
17
# with Koha; if not, write to the Free Software Foundation, Inc.,
18
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
19
20
use Modern::Perl;
21
22
use Carp;
23
24
use Koha::Database;
25
26
use Koha::Suggestion;
27
28
use base qw(Koha::Objects);
29
30
=head1 NAME
31
32
Koha::Suggestions - Koha Suggestion object set class
33
34
=head1 API
35
36
=head2 Class Methods
37
38
=cut
39
40
=head3 type
41
42
=cut
43
44
sub type {
45
    return 'Suggestion';
46
}
47
48
=head3 object_class
49
50
=cut
51
52
sub object_class {
53
    return 'Koha::Suggestion';
54
}
55
56
=head1 AUTHOR
57
58
Kyle M Hall <kyle@bywatersolutions.com>
59
60
=cut
61
62
1;

Return to bug 14757