Bugzilla – Attachment 29543 Details for
Bug 12448
Ask for confirmation when checking out an item with rental fees
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 12448 - Follow-up to Comment 32.
Bug-12448---Follow-up-to-Comment-32.patch (text/plain), 2.75 KB, created by
Maxime Beaulieu
on 2014-07-07 12:47:28 UTC
(
hide
)
Description:
Bug 12448 - Follow-up to Comment 32.
Filename:
MIME Type:
Creator:
Maxime Beaulieu
Created:
2014-07-07 12:47:28 UTC
Size:
2.75 KB
patch
obsolete
>From 53358760680a73cc82db414407d89c48ae69b57d Mon Sep 17 00:00:00 2001 >From: mbeaulieu <mbeaulieu@inlibro.com> >Date: Mon, 7 Jul 2014 08:34:50 -0400 >Subject: [PATCH] Bug 12448 - Follow-up to Comment 32. >MIME-Version: 1.0 >Content-Type: text/plain; charset=UTF-8 >Content-Transfer-Encoding: 8bit > >In C4/Circulation.pm, 'GetIssuingCharges' is now called after the syspref is checked. >The text for the system preference now reads "When checking out an item with rental fees [ask/don't ask]Â for confirmation. > > modified: C4/Circulation.pm > modified: koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref >--- > C4/Circulation.pm | 14 +++++++------- > .../en/modules/admin/preferences/circulation.pref | 2 +- > 2 files changed, 8 insertions(+), 8 deletions(-) > >diff --git a/C4/Circulation.pm b/C4/Circulation.pm >index c5cae12..b51ab71 100644 >--- a/C4/Circulation.pm >+++ b/C4/Circulation.pm >@@ -909,20 +909,20 @@ sub CanBookBeIssued { > # > # CHECK IF THERE IS RENTAL CHARGES. RENTAL MUST BE CONFIRMED BY THE BORROWER > # >- my ($rentalCharge) = GetIssuingCharges( $item->{'itemnumber'}, $borrower->{'borrowernumber'} ); > my $rentalConfirmation = C4::Context->preference("RentalFeesCheckoutConfirmation"); > >- if ( $rentalConfirmation && $rentalCharge != 0 ) >- { >- $rentalCharge = sprintf("%.02f", $rentalCharge); >- $needsconfirmation{RENTALCHARGE} = $rentalCharge; >+ if ( $rentalConfirmation ){ >+ my ($rentalCharge) = GetIssuingCharges( $item->{'itemnumber'}, $borrower->{'borrowernumber'} ); >+ if ( $rentalCharge ){ >+ $rentalCharge = sprintf("%.02f", $rentalCharge); >+ $needsconfirmation{RENTALCHARGE} = $rentalCharge; >+ } > } > > # > # CHECK IF BOOK ALREADY ISSUED TO THIS BORROWER > # >- if ( $issue->{borrowernumber} && $issue->{borrowernumber} eq $borrower->{'borrowernumber'} ) >- { >+ if ( $issue->{borrowernumber} && $issue->{borrowernumber} eq $borrower->{'borrowernumber'} ){ > > # Already issued to current borrower. Ask whether the loan should > # be renewed. >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref >index 558a395..51593df 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref >@@ -334,7 +334,7 @@ Circulation: > choices: > yes: ask > no: "do not ask" >- - a confirmation to check-out. >+ - "for confirmation." > - > - On checkin route the returned item to > - pref: HomeOrHoldingBranchReturn >-- >1.7.9.5
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 12448
:
28954
|
29123
|
29124
|
29182
|
29311
|
29312
|
29313
|
29361
|
29362
|
29363
|
29364
|
29367
|
29368
|
29371
|
29372
|
29373
|
29374
|
29543
|
30307
|
30515
|
30862
|
30864
|
33434