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

(-)a/misc/cronjobs/overdue_notices.pl (-9 / +4 lines)
Lines 454-459 SELECT biblio.*, items.*, issues.*, biblioitems.itemtype, TO_DAYS($date)-TO_DAYS Link Here
454
    AND b.branchcode = items.homebranch
454
    AND b.branchcode = items.homebranch
455
    AND biblio.biblionumber   = biblioitems.biblionumber
455
    AND biblio.biblionumber   = biblioitems.biblionumber
456
    AND issues.borrowernumber = ?
456
    AND issues.borrowernumber = ?
457
    AND TO_DAYS($date)-TO_DAYS(issues.date_due) >= 0
457
END_SQL
458
END_SQL
458
459
459
    my $query = "SELECT * FROM overduerules WHERE delay1 IS NOT NULL AND branchcode = ? ";
460
    my $query = "SELECT * FROM overduerules WHERE delay1 IS NOT NULL AND branchcode = ? ";
Lines 499-513 END_SQL Link Here
499
	    # itemcount is interpreted here as the number of items in the overdue range defined by the current notice or all overdues < max if(-list-all).
500
	    # itemcount is interpreted here as the number of items in the overdue range defined by the current notice or all overdues < max if(-list-all).
500
            # <date> <itemcount> <firstname> <lastname> <address1> <address2> <address3> <city> <postcode> <country>
501
            # <date> <itemcount> <firstname> <lastname> <address1> <address2> <address3> <city> <postcode> <country>
501
502
502
            my $borrower_sql = <<'END_SQL';
503
            my $borrower_sql = <<"END_SQL";
503
SELECT issues.borrowernumber, firstname, surname, address, address2, city, zipcode, country, email, emailpro, B_email, smsalertnumber, phone, cardnumber,
504
SELECT issues.borrowernumber, firstname, surname, address, address2, city, zipcode, country, email, emailpro, B_email, smsalertnumber, phone, cardnumber, date_due
504
TO_DAYS(?)-TO_DAYS(date_due) as difference, date_due
505
FROM   issues,borrowers,categories
505
FROM   issues,borrowers,categories
506
WHERE  issues.borrowernumber=borrowers.borrowernumber
506
WHERE  issues.borrowernumber=borrowers.borrowernumber
507
AND    borrowers.categorycode=categories.categorycode
507
AND    borrowers.categorycode=categories.categorycode
508
AND    TO_DAYS($date)-TO_DAYS(issues.date_due) >= 0
508
END_SQL
509
END_SQL
509
            my @borrower_parameters;
510
            my @borrower_parameters;
510
            push @borrower_parameters, $date_to_run->datetime();
511
            if ($branchcode) {
511
            if ($branchcode) {
512
                $borrower_sql .= ' AND issues.branchcode=? ';
512
                $borrower_sql .= ' AND issues.branchcode=? ';
513
                push @borrower_parameters, $branchcode;
513
                push @borrower_parameters, $branchcode;
Lines 526-533 END_SQL Link Here
526
            my $borrowernumber;
526
            my $borrowernumber;
527
            while ( my $data = $sth->fetchrow_hashref ) {
527
            while ( my $data = $sth->fetchrow_hashref ) {
528
528
529
                next unless ( DateTime->compare( $date_to_run, dt_from_string($data->{date_due})) ) == 1;
530
531
                # check the borrower has at least one item that matches
529
                # check the borrower has at least one item that matches
532
                my $days_between;
530
                my $days_between;
533
                if ( C4::Context->preference('OverdueNoticeCalendar') )
531
                if ( C4::Context->preference('OverdueNoticeCalendar') )
Lines 616-623 END_SQL Link Here
616
                my $j = 0;
614
                my $j = 0;
617
                my $exceededPrintNoticesMaxLines = 0;
615
                my $exceededPrintNoticesMaxLines = 0;
618
                while ( my $item_info = $sth2->fetchrow_hashref() ) {
616
                while ( my $item_info = $sth2->fetchrow_hashref() ) {
619
                    next unless ( DateTime->compare( $date_to_run,  dt_from_string($item_info->{date_due})) ) == 1;
620
621
                    if ( C4::Context->preference('OverdueNoticeCalendar') ) {
617
                    if ( C4::Context->preference('OverdueNoticeCalendar') ) {
622
                        my $calendar =
618
                        my $calendar =
623
                          Koha::Calendar->new( branchcode => $branchcode );
619
                          Koha::Calendar->new( branchcode => $branchcode );
624
- 

Return to bug 15240