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

(-)a/C4/Circulation.pm (-3 / +5 lines)
Lines 3018-3024 sub CanBookBeRenewed { Link Here
3018
3018
3019
=head2 AddRenewal
3019
=head2 AddRenewal
3020
3020
3021
  &AddRenewal($borrowernumber, $itemnumber, $branch, [$datedue], [$lastreneweddate], [$seen]);
3021
  &AddRenewal($borrowernumber, $itemnumber, $branch, [$datedue], [$lastreneweddate], [$seen], [$automatic]);
3022
3022
3023
Renews a loan.
3023
Renews a loan.
3024
3024
Lines 3047-3052 C<$seen> is a boolean flag indicating if the item was seen or not during the ren Link Here
3047
informs the incrementing of the unseen_renewals column. If this flag is not supplied, we
3047
informs the incrementing of the unseen_renewals column. If this flag is not supplied, we
3048
fallback to a true value
3048
fallback to a true value
3049
3049
3050
C<$automatic> is a boolean flag indicating the renewal was triggered automatically and not by a person ( librarian or patron )
3051
3050
=cut
3052
=cut
3051
3053
3052
sub AddRenewal {
3054
sub AddRenewal {
Lines 3057-3062 sub AddRenewal { Link Here
3057
    my $lastreneweddate = shift || dt_from_string();
3059
    my $lastreneweddate = shift || dt_from_string();
3058
    my $skipfinecalc    = shift;
3060
    my $skipfinecalc    = shift;
3059
    my $seen            = shift;
3061
    my $seen            = shift;
3062
    my $automatic       = shift;
3060
3063
3061
    # Fallback on a 'seen' renewal
3064
    # Fallback on a 'seen' renewal
3062
    $seen = defined $seen && $seen == 0 ? 0 : 1;
3065
    $seen = defined $seen && $seen == 0 ? 0 : 1;
Lines 3066-3073 sub AddRenewal { Link Here
3066
    my $issue  = $item_object->checkout;
3069
    my $issue  = $item_object->checkout;
3067
    my $item_unblessed = $item_object->unblessed;
3070
    my $item_unblessed = $item_object->unblessed;
3068
3071
3069
    my ($package, $filename, $line) = caller;
3072
    my $renewal_type = $automatic ? "Automatic" : "Manual";
3070
    my $renewal_type = $filename =~ m/automatic_renewals.pl/ ? "Automatic" : "Manual";
3071
3073
3072
    my $dbh = C4::Context->dbh;
3074
    my $dbh = C4::Context->dbh;
3073
3075
(-)a/misc/cronjobs/automatic_renewals.pl (-1 / +1 lines)
Lines 180-186 while ( my $auto_renew = $auto_renews->next ) { Link Here
180
              $auto_renew->issue_id, $auto_renew->borrowernumber, $auto_renew->itemnumber, $confirm ? 'will' : 'would';
180
              $auto_renew->issue_id, $auto_renew->borrowernumber, $auto_renew->itemnumber, $confirm ? 'will' : 'would';
181
        }
181
        }
182
        if ($confirm){
182
        if ($confirm){
183
            my $date_due = AddRenewal( $auto_renew->borrowernumber, $auto_renew->itemnumber, $auto_renew->branchcode, undef, undef, undef, 0 );
183
            my $date_due = AddRenewal( $auto_renew->borrowernumber, $auto_renew->itemnumber, $auto_renew->branchcode, undef, undef, undef, 0, 1 );
184
            $auto_renew->auto_renew_error(undef)->store;
184
            $auto_renew->auto_renew_error(undef)->store;
185
        }
185
        }
186
        push @{ $report{ $auto_renew->borrowernumber } }, $auto_renew
186
        push @{ $report{ $auto_renew->borrowernumber } }, $auto_renew
(-)a/t/db_dependent/Circulation.t (-3 / +3 lines)
Lines 4606-4612 subtest 'AddRenewal and AddIssuingCharge tests' => sub { Link Here
4606
};
4606
};
4607
4607
4608
subtest 'AddRenewal() adds to renewals' => sub {
4608
subtest 'AddRenewal() adds to renewals' => sub {
4609
    plan tests => 4;
4609
    plan tests => 5;
4610
4610
4611
    my $library  = $builder->build_object({ class => 'Koha::Libraries' });
4611
    my $library  = $builder->build_object({ class => 'Koha::Libraries' });
4612
    my $patron   = $builder->build_object({
4612
    my $patron   = $builder->build_object({
Lines 4623-4629 subtest 'AddRenewal() adds to renewals' => sub { Link Here
4623
    is(ref($issue), 'Koha::Checkout', 'Issue added');
4623
    is(ref($issue), 'Koha::Checkout', 'Issue added');
4624
4624
4625
    # Renew item
4625
    # Renew item
4626
    my $duedate = AddRenewal( $patron->id, $item->id, $library->id );
4626
    my $duedate = AddRenewal( $patron->id, $item->id, $library->id, undef, undef, undef, undef, 1 );
4627
4627
4628
    ok( $duedate, "Renewal added" );
4628
    ok( $duedate, "Renewal added" );
4629
4629
Lines 4631-4636 subtest 'AddRenewal() adds to renewals' => sub { Link Here
4631
    is($renewals->count, 1, 'One renewal added');
4631
    is($renewals->count, 1, 'One renewal added');
4632
    my $THE_renewal = $renewals->next;
4632
    my $THE_renewal = $renewals->next;
4633
    is( $THE_renewal->renewer_id, C4::Context->userenv->{'number'}, 'Renewer recorded from context' );
4633
    is( $THE_renewal->renewer_id, C4::Context->userenv->{'number'}, 'Renewer recorded from context' );
4634
    is( $THE_renewal->renewal_type, 'Automatic', 'AddRenewal "automatic" parameter sets renewal type to "Automatic"');
4634
};
4635
};
4635
4636
4636
subtest 'ProcessOfflinePayment() tests' => sub {
4637
subtest 'ProcessOfflinePayment() tests' => sub {
4637
- 

Return to bug 30642