Bugzilla – Attachment 31342 Details for
Bug 11882
Add a new button to the checkout confirmation dialog when checking out an on hold item
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 11882 - Add a new button to the checkout confirmation dialog when checking out a reserved item
Bug-11882---Add-a-new-button-to-the-checkout-confi.patch (text/plain), 4.34 KB, created by
simith.doliveira
on 2014-09-03 13:00:08 UTC
(
hide
)
Description:
Bug 11882 - Add a new button to the checkout confirmation dialog when checking out a reserved item
Filename:
MIME Type:
Creator:
simith.doliveira
Created:
2014-09-03 13:00:08 UTC
Size:
4.34 KB
patch
obsolete
>From 860627023f90a34d1cc78055a6562b1d70abfdfa Mon Sep 17 00:00:00 2001 >From: simith <simith@inlibro.com> >Date: Wed, 3 Sep 2014 08:57:26 -0400 >Subject: [PATCH] Bug 11882 - Add a new button to the checkout confirmation > dialog when checking out a reserved item > >This patch adds a "Don't Check Out and Print Slip" button to the dialog that appears > when trying to checkout a reserved item. > >Test case : >* Put a hold on an item for User A. >* Try to check out it item with User B. >* The "Please confirm checkout" box should appear. The "Don't Check Out and Print Slip" button should appear in this box. >* Click on the "Don't Check Out and Print Slip" button. >* A print popup will appear >--- > circ/circulation.pl | 11 +++++++++++ > .../prog/en/modules/circ/circulation.tt | 20 +++++++++++++------- > 2 files changed, 24 insertions(+), 7 deletions(-) > >diff --git a/circ/circulation.pl b/circ/circulation.pl >index c766e88..7ec54b3 100755 >--- a/circ/circulation.pl >+++ b/circ/circulation.pl >@@ -499,6 +499,17 @@ my $relatives_issues_count = > Koha::Database->new()->schema()->resultset('Issue') > ->count( { borrowernumber => \@relatives } ); > >+(my $returned, my $messages) = AddReturn( $barcode, $branch); >+if ( $messages->{'ResFound'}) { >+ my $reserve = $messages->{'ResFound'}; >+ # get biblio description >+ my $biblio = GetBiblioFromItemNumber($reserve->{'itemnumber'}); >+ $template->param( >+ reserveborrowernumber => $reserve->{'borrowernumber'}, >+ itembiblionumber => $biblio->{'biblionumber'} >+ ); >+} >+ > $template->param( > lib_messages_loop => $lib_messages_loop, > bor_messages_loop => $bor_messages_loop, >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt >index 18f145c..2b94c84 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt >@@ -42,7 +42,9 @@ var MSG_ADD_MESSAGE = _("Add a new message"); > var MSG_EXPORT_SELECT_CHECKOUTS = _("You must select checkout(s) to export"); > [% IF ( borrowernumber ) %]if($.cookie("holdfor") != [% borrowernumber %]){ $.cookie("holdfor",null, { path: "/", expires: 0 }); }[% ELSE %]$.cookie("holdfor",null, { path: "/", expires: 0 });[% END %] > [% UNLESS ( borrowernumber ) %][% UNLESS ( selectborrower ) %]window.onload=function(){ $('#findborrower').focus(); };[% END %][% END %] >- >+function Dopop(link) { >+ var newin = window.open(link, 'popup', 'width=600,height=400,resizable=1,toolbar=0,scrollbars=1,top'); >+} > $(document).ready(function() { > [% IF !( CircAutoPrintQuickSlip == 'clear' ) %] > // listen submit to trigger qslip on empty checkout >@@ -289,16 +291,20 @@ $(document).ready(function() { > [% END %] > > [% IF ( RESERVED ) %] >-<form method="get" action="/cgi-bin/koha/circ/returns.pl"> >- <input type="hidden" name="barcode" value="[% barcode %]" /> >- <input type="submit" class="print" value="Don't Check Out and Print Slip (P)" accesskey="p" /> >+<form method="get" action="/cgi-bin/koha/circ/circulation.pl"> >+ <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" /> >+ <input type="hidden" name="duedatespec" value="[% duedatespec %]" /> >+ <input type="hidden" name="stickyduedate" value="[% stickyduedate %]" /> >+ <input class="print" type="submit" onclick="Dopop('hold-transfer-slip.pl?borrowernumber=[% reserveborrowernumber %]&biblionumber=[% itembiblionumber %]&op=slip');this.form.submit();" value="Don't Check Out and Print Slip (P)"> > </form> > [% END %] > > [% IF ( RESERVE_WAITING ) %] >-<form method="get" action="/cgi-bin/koha/circ/returns.pl"> >- <input type="hidden" name="barcode" value="[% barcode %]" /> >- <input type="submit" class="print" value="Don't Check Out and Print Slip (P)" accesskey="p" /> >+<form method="get" action="/cgi-bin/koha/circ/circulation.pl"> >+ <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" /> >+ <input type="hidden" name="duedatespec" value="[% duedatespec %]" /> >+ <input type="hidden" name="stickyduedate" value="[% stickyduedate %]" /> >+ <input class="print" type="submit" onclick="Dopop('hold-transfer-slip.pl?borrowernumber=[% reserveborrowernumber %]&biblionumber=[% itembiblionumber %]&op=slip');this.form.submit();" value="Don't Check Out and Print Slip (P)"> > </form> > [% END %] > >-- >1.9.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 11882
:
25748
|
25819
|
31342
|
31400
|
33156
|
34420
|
34421
|
34605
|
35315
|
36195
|
36196
|
36197
|
36545
|
40692