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

(-)a/misc/cronjobs/overdue_notices.pl (-7 / +7 lines)
Lines 542-547 END_SQL Link Here
542
    PERIOD: foreach my $i ( 1 .. 3 ) {
542
    PERIOD: foreach my $i ( 1 .. 3 ) {
543
543
544
            $verbose and warn "branch '$branchcode', categorycode = $overdue_rules->{categorycode} pass $i\n";
544
            $verbose and warn "branch '$branchcode', categorycode = $overdue_rules->{categorycode} pass $i\n";
545
            my $notice_branchcode = $branchcode;
545
546
546
            my $mindays = $overdue_rules->{"delay$i"};    # the notice will be sent after mindays days (grace period)
547
            my $mindays = $overdue_rules->{"delay$i"};    # the notice will be sent after mindays days (grace period)
547
            my $maxdays = (
548
            my $maxdays = (
Lines 647-654 END_SQL Link Here
647
648
648
                my $patron = Koha::Patrons->find($borrowernumber);
649
                my $patron = Koha::Patrons->find($borrowernumber);
649
                if ($patron_homelibrary) {
650
                if ($patron_homelibrary) {
650
                    $branchcode           = $patron->branchcode;
651
                    $notice_branchcode    = $patron->branchcode;
651
                    $library              = Koha::Libraries->find($branchcode);
652
                    $library              = Koha::Libraries->find($notice_branchcode);
652
                    $admin_email_address  = $library->from_email_address;
653
                    $admin_email_address  = $library->from_email_address;
653
                    $branch_email_address = C4::Context->preference('AddressForFailedOverdueNotices')
654
                    $branch_email_address = C4::Context->preference('AddressForFailedOverdueNotices')
654
                        || $library->inbound_email_address;
655
                        || $library->inbound_email_address;
Lines 669-675 END_SQL Link Here
669
                    {
670
                    {
670
                        module     => 'circulation',
671
                        module     => 'circulation',
671
                        code       => $overdue_rules->{"letter$i"},
672
                        code       => $overdue_rules->{"letter$i"},
672
                        branchcode => $branchcode,
673
                        branchcode => $notice_branchcode,
673
                        lang       => $patron->lang
674
                        lang       => $patron->lang
674
                    }
675
                    }
675
                );
676
                );
Lines 747-753 END_SQL Link Here
747
                $sth2->finish;
748
                $sth2->finish;
748
749
749
                my @message_transport_types =
750
                my @message_transport_types =
750
                    @{ GetOverdueMessageTransportTypes( $branchcode, $overdue_rules->{categorycode}, $i ) };
751
                    @{ GetOverdueMessageTransportTypes( $notice_branchcode, $overdue_rules->{categorycode}, $i ) };
751
                @message_transport_types =
752
                @message_transport_types =
752
                    @{ GetOverdueMessageTransportTypes( q{}, $overdue_rules->{categorycode}, $i ) }
753
                    @{ GetOverdueMessageTransportTypes( q{}, $overdue_rules->{categorycode}, $i ) }
753
                    unless @message_transport_types;
754
                    unless @message_transport_types;
Lines 772-778 END_SQL Link Here
772
                            module                 => 'circulation',
773
                            module                 => 'circulation',
773
                            code                   => $overdue_rules->{"letter$i"},
774
                            code                   => $overdue_rules->{"letter$i"},
774
                            message_transport_type => $effective_mtt,
775
                            message_transport_type => $effective_mtt,
775
                            branchcode             => $branchcode,
776
                            branchcode             => $notice_branchcode,
776
                            lang                   => $patron->lang
777
                            lang                   => $patron->lang
777
                        }
778
                        }
778
                    );
779
                    );
Lines 781-787 END_SQL Link Here
781
                        {
782
                        {
782
                            letter_code    => $overdue_rules->{"letter$i"},
783
                            letter_code    => $overdue_rules->{"letter$i"},
783
                            borrowernumber => $borrowernumber,
784
                            borrowernumber => $borrowernumber,
784
                            branchcode     => $branchcode,
785
                            branchcode     => $notice_branchcode,
785
                            items          => \@items,
786
                            items          => \@items,
786
                            substitute => {    # this appears to be a hack to overcome incomplete features in this code.
787
                            substitute => {    # this appears to be a hack to overcome incomplete features in this code.
787
                                bib             => $library->branchname,    # maybe 'bib' is a typo for 'lib<rary>'?
788
                                bib             => $library->branchname,    # maybe 'bib' is a typo for 'lib<rary>'?
788
- 

Return to bug 41315