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

(-)a/C4/Circulation.pm (-2 / +1 lines)
Lines 2815-2821 sub AddRenewal { Link Here
2815
    my $branch          = shift;
2815
    my $branch          = shift;
2816
    my $datedue         = shift;
2816
    my $datedue         = shift;
2817
    my $lastreneweddate = shift || DateTime->now(time_zone => C4::Context->tz)->ymd();
2817
    my $lastreneweddate = shift || DateTime->now(time_zone => C4::Context->tz)->ymd();
2818
    my $opacrenewal     = shift;
2819
2818
2820
    my $item   = GetItem($itemnumber) or return;
2819
    my $item   = GetItem($itemnumber) or return;
2821
    my $item_object = Koha::Items->find( $itemnumber ); # Should replace $item
2820
    my $item_object = Koha::Items->find( $itemnumber ); # Should replace $item
Lines 2916-2922 sub AddRenewal { Link Here
2916
        DelUniqueDebarment({ borrowernumber => $borrowernumber, type => 'OVERDUES' });
2915
        DelUniqueDebarment({ borrowernumber => $borrowernumber, type => 'OVERDUES' });
2917
    }
2916
    }
2918
2917
2919
    unless ( $opacrenewal ) { #if from opac we are obeying OpacRenewalBranch as calculated in opac-renew.pl
2918
    unless ( C4::Context->interface eq 'opac' ) { #if from opac we are obeying OpacRenewalBranch as calculated in opac-renew.pl
2920
        $branch = C4::Context->userenv ? C4::Context->userenv->{branch} : $branch;
2919
        $branch = C4::Context->userenv ? C4::Context->userenv->{branch} : $branch;
2921
    }
2920
    }
2922
2921
(-)a/opac/opac-renew.pl (-1 / +1 lines)
Lines 82-88 else { Link Here
82
            else {
82
            else {
83
                $branchcode = 'OPACRenew';
83
                $branchcode = 'OPACRenew';
84
            }
84
            }
85
            AddRenewal( $borrowernumber, $itemnumber, $branchcode, undef, undef, 1 );
85
            AddRenewal( $borrowernumber, $itemnumber, $branchcode, undef, undef );
86
            push( @renewed, $itemnumber );
86
            push( @renewed, $itemnumber );
87
        }
87
        }
88
        else {
88
        else {
(-)a/t/db_dependent/Circulation/issue.t (-4 / +10 lines)
Lines 216-221 is ($countaccount,1,"1 accountline has been added"); Link Here
216
216
217
# Test AddRenewal
217
# Test AddRenewal
218
218
219
my $se = Test::MockModule->new( 'C4::Context' );
220
$se->mock( 'interface', sub {return 'intranet'});
221
219
# Let's renew this one at a different library for statistical purposes to test Bug 17781
222
# Let's renew this one at a different library for statistical purposes to test Bug 17781
220
C4::Context->set_userenv(@USERENV_DIFFERENT_LIBRARY);
223
C4::Context->set_userenv(@USERENV_DIFFERENT_LIBRARY);
221
my $datedue3 = AddRenewal( $borrower_id1, $item_id1, $branchcode_1, $datedue1, $daysago10 );
224
my $datedue3 = AddRenewal( $borrower_id1, $item_id1, $branchcode_1, $datedue1, $daysago10 );
Lines 230-243 like( Link Here
230
my $stat = $dbh->selectrow_hashref("SELECT * FROM statistics WHERE type = 'renew' AND borrowernumber = ? AND itemnumber = ? AND branch = ?", undef, $borrower_id1, $item_id1, $branchcode_3 );
233
my $stat = $dbh->selectrow_hashref("SELECT * FROM statistics WHERE type = 'renew' AND borrowernumber = ? AND itemnumber = ? AND branch = ?", undef, $borrower_id1, $item_id1, $branchcode_3 );
231
ok( $stat, "Bug 17781 - 'Improper branchcode set during renewal' still fixed" );
234
ok( $stat, "Bug 17781 - 'Improper branchcode set during renewal' still fixed" );
232
235
236
$se->mock( 'interface', sub {return 'opac'});
237
233
#Let's do an opac renewal - whatever branchcode we send should be used
238
#Let's do an opac renewal - whatever branchcode we send should be used
234
my $opac_renew_issue = $builder->build({ source=>"Issue",value=>{
239
my $opac_renew_issue = $builder->build({
240
    source=>"Issue",
241
    value=>{
235
        date_due => '2017-01-01',
242
        date_due => '2017-01-01',
236
        branch => $branchcode_1,
243
        branch => $branchcode_1,
237
        itype => $itemtype,
244
        itype => $itemtype,
238
        borrowernumber => $borrower_id1
245
        borrowernumber => $borrower_id1
239
        }
246
    }
240
        });
247
});
241
248
242
my $datedue4 = AddRenewal( $opac_renew_issue->{borrowernumber}, $opac_renew_issue->{itemnumber}, "Stavromula", $datedue1, $daysago10, 1 );
249
my $datedue4 = AddRenewal( $opac_renew_issue->{borrowernumber}, $opac_renew_issue->{itemnumber}, "Stavromula", $datedue1, $daysago10, 1 );
243
250
244
- 

Return to bug 18572