@@ -, +, @@ - update fines/checkouts info - show/hide checkouts form and messages --- circ/circulation.pl | 14 ---- .../prog/en/includes/blocked-fines.inc | 22 ++++--- .../prog/en/includes/checkouts-table.inc | 7 +- .../prog/en/modules/circ/circulation.tt | 76 +++++++--------------- .../prog/en/modules/members/moremember.tt | 5 +- koha-tmpl/intranet-tmpl/prog/js/checkouts.js | 40 ++++++++++++ members/moremember.pl | 8 --- svc/patron/fines | 45 +++++++++++++ 8 files changed, 127 insertions(+), 90 deletions(-) create mode 100755 svc/patron/fines --- a/circ/circulation.pl +++ a/circ/circulation.pl @@ -262,10 +262,6 @@ my $patron; if ($borrowernumber) { $patron = Koha::Patrons->find( $borrowernumber ); $borrower = GetMember( borrowernumber => $borrowernumber ); - my $overdues = $patron->get_overdues; - my $issues = $patron->checkouts; - my $balance = $patron->account->balance; - # if the expiry date is before today ie they have expired if ( $patron->is_expired ) { @@ -285,11 +281,6 @@ if ($borrowernumber) { $template->param("returnbeforeexpiry" => 1); } } - $template->param( - overduecount => $overdues->count, - issuecount => $issues->count, - finetotal => $balance, - ); if ( $patron and $patron->is_debarred ) { $template->param( @@ -416,11 +407,6 @@ if (@$barcodes) { itembiblionumber => $getmessageiteminfo->{'biblionumber'} ); - - # FIXME If the issue is confirmed, we launch another time checkouts->count, now display the issue count after issue - $patron = Koha::Patrons->find( $borrowernumber ); - $template_params->{issuecount} = $patron->checkouts->count; - 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,19 @@ -[% USE Price %] -[% SET NoIssuesCharge = Koha.Preference('noissuescharge') %] -[% IF fines > 0 %] -
  • + + +
  • -[% 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 %]
    - [% IF ( issuecount ) %] + +
    --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt @@ -20,12 +20,14 @@ [% INCLUDE 'strings.inc' %] [% INCLUDE 'datatables.inc' %] [% INCLUDE 'columns_settings.inc' %] + [% INCLUDE 'timepicker.inc' %] - -