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

(-)a/C4/Circulation.pm (-1 / +6 lines)
Lines 2861-2866 sub AddRenewal { Link Here
2861
    my $branch          = shift;
2861
    my $branch          = shift;
2862
    my $datedue         = shift;
2862
    my $datedue         = shift;
2863
    my $lastreneweddate = shift || DateTime->now(time_zone => C4::Context->tz)->ymd();
2863
    my $lastreneweddate = shift || DateTime->now(time_zone => C4::Context->tz)->ymd();
2864
    my $opacrenewal     = shift;
2864
2865
2865
    my $item   = GetItem($itemnumber) or return;
2866
    my $item   = GetItem($itemnumber) or return;
2866
    my $biblio = GetBiblioFromItemNumber($itemnumber) or return;
2867
    my $biblio = GetBiblioFromItemNumber($itemnumber) or return;
Lines 2963-2972 sub AddRenewal { Link Here
2963
        DelUniqueDebarment({ borrowernumber => $borrowernumber, type => 'OVERDUES' });
2964
        DelUniqueDebarment({ borrowernumber => $borrowernumber, type => 'OVERDUES' });
2964
    }
2965
    }
2965
2966
2967
    unless ( $opacrenewal ) { #if from opac we are obeying OpacRenewalBranch as calculated in opac-renew.pl
2968
        $branch = C4::Context->userenv ? C4::Context->userenv->{branch} : $branch;
2969
    }
2970
2966
    # Add the renewal to stats
2971
    # Add the renewal to stats
2967
    UpdateStats(
2972
    UpdateStats(
2968
        {
2973
        {
2969
            branch => C4::Context->userenv ? C4::Context->userenv->{branch} : $branch,
2974
            branch         => $branch,
2970
            type           => 'renew',
2975
            type           => 'renew',
2971
            amount         => $charge,
2976
            amount         => $charge,
2972
            itemnumber     => $itemnumber,
2977
            itemnumber     => $itemnumber,
(-)a/opac/opac-renew.pl (-1 / +1 lines)
Lines 83-89 else { Link Here
83
            else {
83
            else {
84
                $branchcode = 'OPACRenew';
84
                $branchcode = 'OPACRenew';
85
            }
85
            }
86
            AddRenewal( $borrowernumber, $itemnumber, $branchcode );
86
            AddRenewal( $borrowernumber, $itemnumber, $branchcode, undef, undef, 1 );
87
            push( @renewed, $itemnumber );
87
            push( @renewed, $itemnumber );
88
        }
88
        }
89
        else {
89
        else {
(-)a/t/db_dependent/Circulation/issue.t (-2 / +16 lines)
Lines 17-23 Link Here
17
17
18
use Modern::Perl;
18
use Modern::Perl;
19
19
20
use Test::More tests => 33;
20
use Test::More tests => 34;
21
use DateTime::Duration;
21
use DateTime::Duration;
22
22
23
use t::lib::Mocks;
23
use t::lib::Mocks;
Lines 230-235 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 );
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 );
231
ok( $stat, "Bug 17781 - 'Improper branchcode set during renewal' still fixed" );
231
ok( $stat, "Bug 17781 - 'Improper branchcode set during renewal' still fixed" );
232
232
233
#Let's do an opac renewal - whatever branchcode we send should be used
234
my $opac_renew_issue = $builder->build({ source=>"Issue",value=>{
235
        date_due => '2017-01-01',
236
        branch => $branchcode_1,
237
        itype => $itemtype,
238
        borrowernumber => $borrower_id1
239
        }
240
        });
241
242
my $datedue4 = AddRenewal( $opac_renew_issue->{borrowernumber}, $opac_renew_issue->{itemnumber}, "Stavromula", $datedue1, $daysago10, 1 );
243
244
$stat = $dbh->selectrow_hashref("SELECT * FROM statistics WHERE type = 'renew' AND borrowernumber = ? AND itemnumber = ? AND branch = ?", undef,  $opac_renew_issue->{borrowernumber},  $opac_renew_issue->{itemnumber}, "Stavromula" );
245
ok( $stat, "Bug 18572 - 'Bug 18572 - OpacRenewalBranch is now respected" );
246
247
233
248
234
#Test GetBiblioIssues
249
#Test GetBiblioIssues
235
is( GetBiblioIssues(), undef, "GetBiblio Issues without parameters" );
250
is( GetBiblioIssues(), undef, "GetBiblio Issues without parameters" );
236
- 

Return to bug 18572