Bugzilla – Attachment 111289 Details for
Bug 24083
Koha should support "seen" vs "unseen" renewals
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 24083: (follow-up) Include SelfCheckInModule
Bug-24083-follow-up-Include-SelfCheckInModule.patch (text/plain), 4.45 KB, created by
Andrew Isherwood
on 2020-10-06 11:25:35 UTC
(
hide
)
Description:
Bug 24083: (follow-up) Include SelfCheckInModule
Filename:
MIME Type:
Creator:
Andrew Isherwood
Created:
2020-10-06 11:25:35 UTC
Size:
4.45 KB
patch
obsolete
>From 61871099767fadaa638e19a927ccf2b857050e1b Mon Sep 17 00:00:00 2001 >From: Andrew Isherwood <andrew.isherwood@ptfs-europe.com> >Date: Mon, 5 Oct 2020 12:37:01 +0100 >Subject: [PATCH] Bug 24083: (follow-up) Include SelfCheckInModule > >As highlighted by Katrin, the selfcheckin module was not aware of this >work. This commits gives it awareness of the too_unseen renew error and >the "seen" argument that can be passed to AddRenewal >--- > koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt | 4 ++++ > opac/sco/sco-main.pl | 5 +++-- > 2 files changed, 7 insertions(+), 2 deletions(-) > >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt >index 5f503d1006..f2115e9f7a 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt >@@ -133,6 +133,7 @@ > <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> >@@ -142,6 +143,7 @@ > <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> >@@ -341,6 +343,8 @@ > <span>This item has been scheduled for automatic renewal and cannot be renewed</span> > [% ELSIF ISSUE.renew_error == 'onsite_checkout' %] > <span>This is a on-site checkout, it cannot be renewed.</span> >+ [% ELSIF ISSUE.renew_error == 'too_unseen' %] >+ <span>You have renewed this item the maximum number of consecutive times without it being seen by the library.</span> > [% ELSE %] > <span>No renewals allowed</span> > [% END %] >diff --git a/opac/sco/sco-main.pl b/opac/sco/sco-main.pl >index c7649f5f6d..cffd3c219b 100755 >--- a/opac/sco/sco-main.pl >+++ b/opac/sco/sco-main.pl >@@ -99,13 +99,14 @@ if (defined C4::Context->preference('SCOAllowCheckin')) { > } > > my $issuerid = $loggedinuser; >-my ($op, $patronid, $patronlogin, $patronpw, $barcode, $confirmed, $newissues) = ( >+my ($op, $patronid, $patronlogin, $patronpw, $barcode, $confirmed, $seen, $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") || '', > ); > >@@ -268,7 +269,7 @@ if ( $patron && ( $op eq 'renew' ) ) { > my ($status,$renewerror) = CanBookBeRenewed( $borrower->{borrowernumber}, $item->itemnumber ); > if ($status) { > #warn "renewing"; >- AddRenewal( $borrower->{borrowernumber}, $item->itemnumber ); >+ AddRenewal( $borrower->{borrowernumber}, $item->itemnumber, undef, undef, undef, undef, $seen ); > push @newissueslist, $barcode; > $template->param( renewed => 1 ); > } >-- >2.20.1
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 24083
:
95861
|
95862
|
95863
|
95864
|
95865
|
95866
|
95867
|
95868
|
98749
|
98750
|
98751
|
98752
|
98765
|
98766
|
98767
|
98768
|
100244
|
100245
|
100246
|
100247
|
100380
|
100381
|
100382
|
100383
|
100392
|
110607
|
110608
|
110609
|
110610
|
110611
|
111147
|
111148
|
111149
|
111150
|
111151
|
111152
|
111283
|
111284
|
111285
|
111286
|
111287
|
111288
|
111289
|
111290
|
111291
|
111292
|
111293
|
111849
|
111850
|
111851
|
111852
|
111853
|
111854
|
111855
|
111856
|
111857
|
111858
|
111859
|
111860
|
112230
|
112231
|
112232
|
112233
|
112234
|
112235
|
112236
|
112237
|
112238
|
112239
|
112240
|
112241
|
112242
|
112243
|
112410
|
112411
|
112412
|
112413
|
112414
|
112415
|
112416
|
112417
|
112418
|
112419
|
112420
|
112421
|
112422
|
112423
|
113073
|
113074
|
113075
|
113076
|
113077
|
113078
|
113079
|
113080
|
113314
|
113315
|
113484
|
113485
|
113486
|
113487
|
113488
|
113489
|
113490
|
113491
|
113492
|
113493
|
113494
|
113546
|
113556
|
113557
|
113814