Browse Source

Bug 24083: (follow-up) Make requested changes

This commit makes the changes requested in comment #120

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
20.11.x
Andrew Isherwood 11 months ago
committed by Jonathan Druart
parent
commit
887022e0d2
  1. 2
      koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt
  2. 1
      misc/cronjobs/automatic_renewals.pl
  3. 5
      opac/sco/sco-main.pl

2
koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt

@ -133,7 +133,6 @@
<input type="hidden" name="patronid" value="[% patronid | html %]" />
<input type="hidden" name="barcode" value="[% barcode | html %]" />
<input type="hidden" name="confirmed" value="1" />
<input type="hidden" name="seen" value="1" />
<input type="hidden" name="newissues" value="[% newissues | html %]" />
<button type="submit" name="confirm" class="btn btn-primary"><i class="fa fa-refresh" aria-hidden="true"></i> Renew item</button>
</form>
@ -143,7 +142,6 @@
<input type="hidden" name="patronid" value="[% patronid | html %]" />
<input type="hidden" name="barcode" value="[% barcode | html %]" />
<input type="hidden" name="confirmed" value="1" />
<input type="hidden" name="seen" value="1" />
<input type="hidden" name="newissues" value="[% newissues | html %]" />
<button type="submit" class="btn btn-primary"><i class="fa fa-refresh" aria-hidden="true"></i> Renew item</button>
</form>

1
misc/cronjobs/automatic_renewals.pl

@ -103,6 +103,7 @@ while ( my $auto_renew = $auto_renews->next ) {
or $error eq 'on_reserve'
or $error eq 'restriction'
or $error eq 'overdue'
or $error eq 'too_unseen'
or $error eq 'auto_account_expired'
or $error eq 'auto_too_late'
or $error eq 'auto_too_much_oweing'

5
opac/sco/sco-main.pl

@ -99,14 +99,13 @@ if (defined C4::Context->preference('SCOAllowCheckin')) {
}
my $issuerid = $loggedinuser;
my ($op, $patronid, $patronlogin, $patronpw, $barcode, $confirmed, $seen, $newissues) = (
my ($op, $patronid, $patronlogin, $patronpw, $barcode, $confirmed, $newissues) = (
$query->param("op") || '',
$query->param("patronid") || '',
$query->param("patronlogin")|| '',
$query->param("patronpw") || '',
$query->param("barcode") || '',
$query->param("confirmed") || '',
$query->param("seen") || 0,
$query->param("newissues") || '',
);
@ -269,7 +268,7 @@ if ( $patron && ( $op eq 'renew' ) ) {
my ($status,$renewerror) = CanBookBeRenewed( $borrower->{borrowernumber}, $item->itemnumber );
if ($status) {
#warn "renewing";
AddRenewal( $borrower->{borrowernumber}, $item->itemnumber, undef, undef, undef, undef, $seen );
AddRenewal( $borrower->{borrowernumber}, $item->itemnumber, undef, undef, undef, undef, 1 );
push @newissueslist, $barcode;
$template->param( renewed => 1 );
}

Loading…
Cancel
Save