@@ -, +, @@
- update fines/checkouts info
- show/hide checkouts form and messages
---
circ/circulation.pl | 14 -----
.../prog/en/includes/blocked-fines.inc | 18 +++---
.../prog/en/includes/checkouts-table.inc | 7 +--
.../prog/en/modules/circ/circulation.tt | 72 ++++++++--------------
.../prog/en/modules/members/moremember.tt | 6 +-
koha-tmpl/intranet-tmpl/prog/js/checkouts.js | 40 ++++++++++++
members/moremember.pl | 3 -
svc/patron/fines | 40 ++++++++++++
8 files changed, 121 insertions(+), 79 deletions(-)
create mode 100755 svc/patron/fines
--- a/circ/circulation.pl
+++ a/circ/circulation.pl
@@ -261,7 +261,6 @@ if ($findborrower) {
# get the borrower information.....
if ($borrowernumber) {
$borrower = GetMemberDetails( $borrowernumber, 0 );
- my ( $od, $issue, $fines ) = GetMemberIssuesAndFines( $borrowernumber );
# Warningdate is the date that the warning starts appearing
my ( $today_year, $today_month, $today_day) = Today();
@@ -291,12 +290,6 @@ if ($borrowernumber) {
$template->param("returnbeforeexpiry" => 1);
}
}
- $template->param(
- overduecount => $od,
- issuecount => $issue,
- finetotal => $fines
- );
-
if ( Koha::Patrons->find( $borrowernumber )->is_debarred ) {
$template->param(
'userdebarred' => $borrower->{debarred},
@@ -411,9 +404,6 @@ if (@$barcodes) {
}
}
- # FIXME If the issue is confirmed, we launch another time GetMemberIssuesAndFines, now display the issue count after issue
- my ( $od, $issue, $fines ) = GetMemberIssuesAndFines($borrowernumber);
-
if ($question->{RESERVE_WAITING} or $question->{RESERVED}){
$template->param(
reserveborrowernumber => $question->{'resborrowernumber'}
@@ -424,10 +414,6 @@ if (@$barcodes) {
itembiblionumber => $getmessageiteminfo->{'biblionumber'}
);
-
-
- $template_params->{issuecount} = $issue;
-
if ( $iteminfo ) {
$iteminfo->{subtitle} = GetRecordValue('subtitle', GetMarcBiblio($iteminfo->{biblionumber}), GetFrameworkCode($iteminfo->{biblionumber}));
$template_params->{item} = $iteminfo;
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/blocked-fines.inc
+++ a/koha-tmpl/intranet-tmpl/prog/en/includes/blocked-fines.inc
@@ -1,13 +1,15 @@
-[% USE Price %]
-[% SET NoIssuesCharge = Koha.Preference('noissuescharge') %]
-[% IF fines > 0 %]
-
+
+
Fees & Charges:
- Patron has outstanding fees & charges of [% fines | $Price %].
- [% IF !Koha.Preference('AllowFineOverride') && NoIssuesCharge && fines > NoIssuesCharge %]
- Checkouts are BLOCKED because fine balance is OVER THE LIMIT.
+ Patron has outstanding fees & charges of
+ .
+
+ [% IF !Koha.Preference('AllowFineOverride') %]
+ Checkouts are BLOCKED because fine balance is OVER THE LIMIT.
[% END %]
Make paymentPay all fines
-[% END %]
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table.inc
+++ a/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table.inc
@@ -1,6 +1,6 @@
[% USE Koha %]