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

(-)a/C4/Bookseller.pm (-1 / +1 lines)
Lines 73-79 sub GetBooksellersWithLateOrders { Link Here
73
            AND aqbasket.closedate IS NOT NULL
73
            AND aqbasket.closedate IS NOT NULL
74
    ";
74
    ";
75
    if ( defined $delay && $delay >= 0 ) {
75
    if ( defined $delay && $delay >= 0 ) {
76
        $query .= " AND (closedate <= DATE_SUB(CAST(now() AS date),INTERVAL ? + COALESCE(aqbooksellers.deliverytime,0) DAY)) ";
76
        $query .= " AND (closedate <= DATE_SUB(CAST(now() AS date),INTERVAL ? DAY)) " ;
77
        push @query_params, $delay;
77
        push @query_params, $delay;
78
    } elsif ( $delay && $delay < 0 ){
78
    } elsif ( $delay && $delay < 0 ){
79
        warn 'WARNING: GetBooksellerWithLateOrders is called with a negative value';
79
        warn 'WARNING: GetBooksellerWithLateOrders is called with a negative value';
(-)a/t/db_dependent/Bookseller.t (-5 / +4 lines)
Lines 443-458 isnt( exists( $suppliers{$id_supplier4} ), 1, "Supplier4 hasnt late orders" ) Link Here
443
443
444
#Case 2: With $delay = 4
444
#Case 2: With $delay = 4
445
#    today + 0 > now-$delay -NOT LATE-
445
#    today + 0 > now-$delay -NOT LATE-
446
#    (today-5) + 2   <= now() - $delay -NOT LATE-
446
#    (today-5)  <= now() - $delay -NOT LATE-
447
#    (today-10) + 3  <= now() - $delay -LATE-
447
#    (today-10) <= now() - $delay -LATE-
448
#    quantityreceived = quantity -NOT LATE-
448
#    quantityreceived = quantity -NOT LATE-
449
%suppliers = C4::Bookseller::GetBooksellersWithLateOrders( 4, undef, undef );
449
%suppliers = C4::Bookseller::GetBooksellersWithLateOrders( 4, undef, undef );
450
isnt( exists( $suppliers{$id_supplier1} ),
450
isnt( exists( $suppliers{$id_supplier1} ),
451
    1, "Supplier1 has late orders but  today  > now() - 4 days" );
451
    1, "Supplier1 has late orders but  today  > now() - 4 days" );
452
isnt( exists( $suppliers{$id_supplier2} ),
452
isnt( exists( $suppliers{$id_supplier2} ),
453
    1, "Supplier2 has late orders and $daysago5 <= now() - (4 days+2)" );
453
    1, "Supplier2 has late orders and $daysago5 <= now() - (4 days)" );
454
ok( exists( $suppliers{$id_supplier3} ),
454
ok( exists( $suppliers{$id_supplier3} ),
455
    "Supplier3 has late orders and $daysago10  <= now() - (4 days+3)" );
455
    "Supplier3 has late orders and $daysago10  <= now() - (4 days)" );
456
isnt( exists( $suppliers{$id_supplier4} ), 1, "Supplier4 hasnt late orders" );
456
isnt( exists( $suppliers{$id_supplier4} ), 1, "Supplier4 hasnt late orders" );
457
457
458
#Case 3: With $delay = -1
458
#Case 3: With $delay = -1
459
- 

Return to bug 25266