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

(-)a/Koha/Acquisition/Orders.pm (-3 lines)
Lines 131-139 sub filter_by_lates { Link Here
131
                ? ( 'borrower.branchcode' => C4::Context->userenv->{branch} )
131
                ? ( 'borrower.branchcode' => C4::Context->userenv->{branch} )
132
                : ()
132
                : ()
133
            ),
133
            ),
134
135
            ( orderstatus => { '-not_in' => ['cancelled', 'complete'] } ),
136
137
        },
134
        },
138
        {
135
        {
139
            '+select' => [
136
            '+select' => [
(-)a/acqui/lateorders.pl (-2 / +2 lines)
Lines 50-56 use C4::Output qw( output_html_with_http_headers ); Link Here
50
use C4::Context;
50
use C4::Context;
51
use C4::Letters qw( SendAlerts GetLetters );
51
use C4::Letters qw( SendAlerts GetLetters );
52
use Koha::DateUtils qw( dt_from_string );
52
use Koha::DateUtils qw( dt_from_string );
53
use Koha::Acquisition::Orders qw( filter_by_lates );
53
use Koha::Acquisition::Orders;
54
use Koha::CsvProfiles;
54
use Koha::CsvProfiles;
55
55
56
my $input = CGI->new;
56
my $input = CGI->new;
Lines 119-125 my @lateorders = Koha::Acquisition::Orders->filter_by_lates( Link Here
119
            : ()
119
            : ()
120
        )
120
        )
121
    },
121
    },
122
)->as_list;
122
)->filter_by_active->as_list;
123
123
124
my $booksellers = Koha::Acquisition::Booksellers->search(
124
my $booksellers = Koha::Acquisition::Booksellers->search(
125
    {
125
    {
(-)a/t/db_dependent/Koha/Acquisition/Order.t (-15 / +14 lines)
Lines 507-554 subtest 'filter_by_late' => sub { Link Here
507
        }
507
        }
508
    );
508
    );
509
509
510
    my $late_orders = $orders->filter_by_lates;
510
    my $late_orders = $orders->filter_by_lates->filter_by_active;
511
    is( $late_orders->count, 3 );
511
    is( $late_orders->count, 3 );
512
512
513
    $late_orders = $orders->filter_by_lates( { delay => 0 } );
513
    $late_orders = $orders->filter_by_lates( { delay => 0 } )->filter_by_active;
514
    is( $late_orders->count, 3 );
514
    is( $late_orders->count, 3 );
515
515
516
    $late_orders = $orders->filter_by_lates( { delay => 1 } );
516
    $late_orders = $orders->filter_by_lates( { delay => 1 } )->filter_by_active;
517
    is( $late_orders->count, 3 );
517
    is( $late_orders->count, 3 );
518
518
519
    $late_orders = $orders->filter_by_lates( { delay => 3 } );
519
    $late_orders = $orders->filter_by_lates( { delay => 3 } )->filter_by_active;
520
    is( $late_orders->count, 2 );
520
    is( $late_orders->count, 2 );
521
521
522
    $late_orders = $orders->filter_by_lates( { delay => 4 } );
522
    $late_orders = $orders->filter_by_lates( { delay => 4 } )->filter_by_active;
523
    is( $late_orders->count, 1 );
523
    is( $late_orders->count, 1 );
524
524
525
    $late_orders = $orders->filter_by_lates( { delay => 5 } );
525
    $late_orders = $orders->filter_by_lates( { delay => 5 } )->filter_by_active;
526
    is( $late_orders->count, 1 );
526
    is( $late_orders->count, 1 );
527
527
528
    $late_orders = $orders->filter_by_lates( { delay => 6 } );
528
    $late_orders = $orders->filter_by_lates( { delay => 6 } )->filter_by_active;
529
    is( $late_orders->count, 0 );
529
    is( $late_orders->count, 0 );
530
530
531
    $late_orders = $orders->filter_by_lates(
531
    $late_orders = $orders->filter_by_lates(
532
        { estimated_from => $now->clone->subtract( days => 6 ) } );
532
        { estimated_from => $now->clone->subtract( days => 6 ) } )->filter_by_active;
533
    is( $late_orders->count,             2 );
533
    is( $late_orders->count,             2 );
534
    is( $late_orders->next->ordernumber, $order_3->ordernumber );
534
    is( $late_orders->next->ordernumber, $order_3->ordernumber );
535
535
536
    $late_orders = $orders->filter_by_lates(
536
    $late_orders = $orders->filter_by_lates(
537
        { estimated_from => $now->clone->subtract( days => 5 ) } );
537
        { estimated_from => $now->clone->subtract( days => 5 ) } )->filter_by_active;
538
    is( $late_orders->count,             2 );
538
    is( $late_orders->count,             2 );
539
    is( $late_orders->next->ordernumber, $order_3->ordernumber );
539
    is( $late_orders->next->ordernumber, $order_3->ordernumber );
540
540
541
    $late_orders = $orders->filter_by_lates(
541
    $late_orders = $orders->filter_by_lates(
542
        { estimated_from => $now->clone->subtract( days => 4 ) } );
542
        { estimated_from => $now->clone->subtract( days => 4 ) } )->filter_by_active;
543
    is( $late_orders->count,             2 );
543
    is( $late_orders->count,             2 );
544
    is( $late_orders->next->ordernumber, $order_3->ordernumber );
544
    is( $late_orders->next->ordernumber, $order_3->ordernumber );
545
545
546
    $late_orders = $orders->filter_by_lates(
546
    $late_orders = $orders->filter_by_lates(
547
        { estimated_from => $now->clone->subtract( days => 3 ) } );
547
        { estimated_from => $now->clone->subtract( days => 3 ) } )->filter_by_active;
548
    is( $late_orders->count, 2 );
548
    is( $late_orders->count, 2 );
549
549
550
    $late_orders = $orders->filter_by_lates(
550
    $late_orders = $orders->filter_by_lates(
551
        { estimated_from => $now->clone->subtract( days => 1 ) } );
551
        { estimated_from => $now->clone->subtract( days => 1 ) } )->filter_by_active;
552
    is( $late_orders->count, 1 );
552
    is( $late_orders->count, 1 );
553
553
554
    $late_orders = $orders->filter_by_lates(
554
    $late_orders = $orders->filter_by_lates(
Lines 556-562 subtest 'filter_by_late' => sub { Link Here
556
            estimated_from => $now->clone->subtract( days => 4 ),
556
            estimated_from => $now->clone->subtract( days => 4 ),
557
            estimated_to   => $now->clone->subtract( days => 3 )
557
            estimated_to   => $now->clone->subtract( days => 3 )
558
        }
558
        }
559
    );
559
    )->filter_by_active;
560
    is( $late_orders->count, 1 );
560
    is( $late_orders->count, 1 );
561
561
562
    my $basket_5 = $builder->build_object(    # closed today
562
    my $basket_5 = $builder->build_object(    # closed today
Lines 584-590 subtest 'filter_by_late' => sub { Link Here
584
            estimated_from => $now->clone->subtract( days => 3 ),
584
            estimated_from => $now->clone->subtract( days => 3 ),
585
            estimated_to   => $now->clone->subtract( days => 2 )
585
            estimated_to   => $now->clone->subtract( days => 2 )
586
        }
586
        }
587
    );
587
    )->filter_by_active;
588
    is( $late_orders->count, 1 );
588
    is( $late_orders->count, 1 );
589
589
590
    $schema->storage->txn_rollback;
590
    $schema->storage->txn_rollback;
591
- 

Return to bug 33653