From 71bd03a418d807265dfd1e3f06cd14af779f0e97 Mon Sep 17 00:00:00 2001 From: mbeaulieu Date: Tue, 29 Jul 2014 16:20:39 -0400 Subject: [PATCH] Bug 12448 - New patch for master v3.17.00.010 Squashed commit of everything there was before. --- C4/Circulation.pm | 15 +++++++++++++-- installer/data/mysql/sysprefs.sql | 1 + installer/data/mysql/updatedatabase.pl | 9 +++++++++ .../en/modules/admin/preferences/circulation.pref | 9 ++++++++- .../prog/en/modules/circ/circulation.tt | 6 +++++- 5 files changed, 36 insertions(+), 4 deletions(-) diff --git a/C4/Circulation.pm b/C4/Circulation.pm index dc7334a..41d1c75 100644 --- a/C4/Circulation.pm +++ b/C4/Circulation.pm @@ -913,12 +913,23 @@ sub CanBookBeIssued { if ( $borrower->{'branchcode'} ne $userenv->{branch} ); } } + # + # CHECK IF THERE IS RENTAL CHARGES. RENTAL MUST BE CONFIRMED BY THE BORROWER + # + my $rentalConfirmation = C4::Context->preference("RentalFeesCheckoutConfirmation"); + + 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/installer/data/mysql/sysprefs.sql b/installer/data/mysql/sysprefs.sql index d820b94..57b9489 100644 --- a/installer/data/mysql/sysprefs.sql +++ b/installer/data/mysql/sysprefs.sql @@ -331,6 +331,7 @@ INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` ('RenewalPeriodBase','date_due','date_due|now','Set whether the renewal date should be counted from the date_due or from the moment the Patron asks for renewal ','Choice'), ('RenewalSendNotice','0','',NULL,'YesNo'), ('RenewSerialAddsSuggestion','0',NULL,'If ON, adds a new suggestion at serial subscription renewal','YesNo'), +('RentalFeesCheckoutConfirmation', '0', NULL , 'Allow user to confirm when checking out an item with rental fees.', 'YesNo'), ('RentalsInNoissuesCharge','1',NULL,'Rental charges block checkouts (added to noissuescharge).','YesNo'), ('RequestOnOpac','1',NULL,'If ON, globally enables patron holds on OPAC','YesNo'), ('ReservesControlBranch','PatronLibrary','ItemHomeLibrary|PatronLibrary','Branch checked for members reservations rights','Choice'), diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index 531bb12..e19ed93 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -8589,6 +8589,15 @@ if ( CheckVersion($DBversion) ) { SetVersion ($DBversion); } +$DBversion = "XXX"; +if ( CheckVersion($DBversion) ) { + $dbh->do(q| + INSERT INTO systempreferences (variable,value,options,explanation,type) VALUES('RentalFeesCheckoutConfirmation', '0', NULL , 'Allow user to confirm when checking out an item with rental fees.', 'YesNo') + |); + print "Upgrade to $DBversion done (Bug 11169 - Add RentalFeesCheckoutConfirmation syspref)\n"; + SetVersion($DBversion); +} + =head1 FUNCTIONS =head2 TableExists($table) 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 55d8a78..6ac5e93 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 @@ -321,7 +321,14 @@ Circulation: block: Block noblock: "Don't block" confirmation: Ask for confirmation - - when checking out to a borrower that has overdues outstanding + - when checking out to a borrower that has overdues outstanding + - + - "When checking out an item with rental fees, " + - pref: RentalFeesCheckoutConfirmation + choices: + yes: ask + no: "do not ask" + - "for confirmation." - - On checkin route the returned item to - pref: HomeOrHoldingBranchReturn 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 d573ba4..a281643 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt @@ -160,7 +160,11 @@ $(document).ready(function() { [% END %] [% IF ( DEBT ) %] -
  • The patron has a debt of [% DEBT %]
  • +
  • The patron has a debt of [% DEBT %].
  • +[% END %] + +[% IF ( RENTALCHARGE ) %] +
  • Rental charge for this item: [% RENTALCHARGE %]
  • [% END %] [% IF ( RENEW_ISSUE ) %] -- 1.7.9.5