From 13d794f17f24149e66533abee97f698060ecc8c6 Mon Sep 17 00:00:00 2001 From: Srdjan Date: Wed, 15 Jun 2016 15:40:03 +1200 Subject: [PATCH] bug 14803: KOHA.Checkouts js object * Use javascript to: - update fines/checkouts info - show/hide checkouts form and messages * Created svc/patron/fines --- circ/circulation.pl | 14 ----- .../prog/en/includes/blocked-fines.inc | 16 ++--- .../prog/en/modules/circ/circulation.tt | 72 ++++++++-------------- .../prog/en/modules/members/moremember.tt | 6 +- koha-tmpl/intranet-tmpl/prog/js/checkouts.js | 36 +++++++++++ members/moremember.pl | 3 - svc/patron/fines | 40 ++++++++++++ 7 files changed, 110 insertions(+), 77 deletions(-) create mode 100755 svc/patron/fines diff --git a/circ/circulation.pl b/circ/circulation.pl index b2201cf..11bc8dd 100755 --- a/circ/circulation.pl +++ b/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 ( IsDebarred($borrowernumber) ) { $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; diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/blocked-fines.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/blocked-fines.inc index 596c0c7..547fa7f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/blocked-fines.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/blocked-fines.inc @@ -1,14 +1,11 @@ -[% USE Price %] -[% SET NoIssuesCharge = Koha.Preference('noissuescharge') %] - -[% IF NoIssuesCharge && fines > NoIssuesCharge %] -
  • + +
  • -[% END %] 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 f8666bd..fd9ce38 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt @@ -23,6 +23,9 @@ [% INCLUDE 'strings.inc' %] [% INCLUDE 'datatables.inc' %] [% INCLUDE 'columns_settings.inc' %] + [% INCLUDE 'timepicker.inc' %] @@ -82,6 +85,10 @@ function toggle_onsite_checkout(){ function Dopop(link) { var newin = window.open(link, 'popup', 'width=600,height=400,resizable=1,toolbar=0,scrollbars=1,top'); } + +KOHA.Checkouts.DisallowIssue = [% noissues ? "true" : "false" %]; +KOHA.Checkouts.ForceAllowIssue = [% forceallow ? "true" : "false" %]; +KOHA.Checkouts.ForceOnSiteCheckouts = [% Koha.Preference('OnSiteCheckouts') && Koha.Preference('OnSiteCheckoutsForce') ? "true" : "false" %]; $(document).ready(function() { $('#mainform').on('submit',function() { if ($("#barcode") && $("#barcode").val()) { @@ -424,9 +431,7 @@ $(document).ready(function() { [% IF ( RESERVED || ISSUED_TO_ANOTHER ) && (CAN_user_reserveforothers_place_holds ) %] - [% UNLESS noissues %] - - [% END %] + [% END %] [% END %] @@ -589,7 +594,6 @@ No patron matched [% message %]
    Error: This patron has requested their circulation history be anonymized on check-in, but the AnonymousPatron system preference is empty or incorrect.
    [% END %] -[% IF ( !noissues ) || ( Koha.Preference('OnSiteCheckouts') && Koha.Preference('OnSiteCheckoutsForce') )%]
    @@ -622,7 +626,6 @@ No patron matched [% message %]
    - [% UNLESS ( noissues && Koha.Preference('OnSiteCheckoutsForce') ) %] [% IF ( SpecifyDueDate ) %]
    Specify due date [% INCLUDE 'date-format.inc' %]:
    @@ -640,10 +643,8 @@ No patron matched [% message %]
    [% END %] - [% END %] - [% UNLESS ( noissues ) %] -
    +
    [% IF NEEDSCONFIRMATION %] [% ELSE %] @@ -670,19 +671,17 @@ No patron matched [% message %]
    [% END %] - [% END %] [% IF Koha.Preference('OnSiteCheckouts') %]
    - [% IF noissues %] -
    +
    - [% ELSE %] +
    - [% END %] +
    [% END %] @@ -704,35 +703,20 @@ No patron matched [% message %] [% END %]
    -[% END %] - -[% IF ( noissues ) %] - [% IF ( Koha.Preference('OnSiteCheckouts') && Koha.Preference('OnSiteCheckoutsForce') ) %] -
    - [% ELSE %] -
    - [% END %] -[% ELSE %]
    -[% END %] - - [% IF ( noissues ) %] - [% IF ( Koha.Preference('OnSiteCheckouts') && Koha.Preference('OnSiteCheckoutsForce') ) %] -
    - [% ELSE %] +
    +

    Attention:

    +
    + [% IF !( Koha.Preference('OnSiteCheckouts') && Koha.Preference('OnSiteCheckoutsForce') ) %]

    Checking out to [% INCLUDE 'patron-title.inc' %]

    -
    [% END %] -

    - Cannot check out! - [% IF ( Koha.Preference('OnSiteCheckouts') && Koha.Preference('OnSiteCheckoutsForce') ) %] - Only on-site checkouts are allowed - [% END %] -

    - [% ELSE %] -
    -

    Attention:

    - [% END %] +

    + Cannot check out! + [% IF ( Koha.Preference('OnSiteCheckouts') && Koha.Preference('OnSiteCheckoutsForce') ) %] + Only on-site checkouts are allowed + [% END %] +

    +
      @@ -786,8 +770,8 @@ No patron matched [% message %]
      View restrictions - [% IF (noissues && borrowernumber && CAN_user_circulate_force_checkout) %] - + [% IF (borrowernumber && CAN_user_circulate_force_checkout) %] + Override restriction temporarily [% END %] @@ -885,11 +869,7 @@ No patron matched [% message %]
      • - [% IF ( issuecount ) %] - [% issuecount %] Checkout(s) - [% ELSE %] - 0 Checkouts - [% END %] + 0 Checkout(s)
      • [% IF relatives_issues_count %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt index 80a80a9..c092aa2 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt @@ -173,9 +173,7 @@ function validate1(date) { [% ELSE %] [% IF ( was_renewed ) %]
        Patron's account has been renewed until [% dateexpiry | $KohaDates %]
        [% END %] - [% IF fines %] - [% INCLUDE 'blocked-fines.inc' %] - [% END %] + [% INCLUDE 'blocked-fines.inc' %] [% IF ( flagged ) %]
        @@ -447,7 +445,7 @@ function validate1(date) {
          -
        • [% issuecount %] Checkout(s)
        • +
        • 0 Checkout(s)
        • [% IF relatives_issues_count %]
        • Relatives' checkouts
        • [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/js/checkouts.js b/koha-tmpl/intranet-tmpl/prog/js/checkouts.js index 9643d0e..e26970e 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/checkouts.js +++ b/koha-tmpl/intranet-tmpl/prog/js/checkouts.js @@ -1,6 +1,40 @@ +if ( KOHA === undefined ) var KOHA = {}; +KOHA.Checkouts = { + NoIssuesCharge: null, + BorrowerNumber: null, + DisallowIssue: false, + ForceAllowIssue: false, + ForceOnSiteCheckouts: false, + ToggleInput: function( allow_issue ) { + if (KOHA.Checkouts.DisallowIssue) allow_issue = false; + if (KOHA.Checkouts.ForceAllowIssue) allow_issue = true; + + $(".issue-allow").toggle(allow_issue); + $(".issue-disallow").toggle(!allow_issue); + $("#mainform").toggle(allow_issue || KOHA.Checkouts.ForceOnSiteCheckouts); + + if (!allow_issue) { + $(".circmessage.attention").removeClass("attention").addClass("warning"); + } + }, + UpdateCheckoutsAndFees: function(checkouts_only=false) { + $.get( "/cgi-bin/koha/svc/patron/fines", {borrowernumber: KOHA.Checkouts.BorrowerNumber}, function( data ) { + $("#issuecount").text(data.issuecount); + if (checkouts_only) return; + + var noissue = KOHA.Checkouts.NoIssuesCharge && data.owing >= KOHA.Checkouts.NoIssuesCharge; + $("#outstanding-fees").toggle(noissue); + $("#outstanding-fees-amount").text(data.owing_formatted); + KOHA.Checkouts.ToggleInput(!noissue); + } ); + } +} + $(document).ready(function() { $.ajaxSetup ({ cache: false }); + KOHA.Checkouts.UpdateCheckoutsAndFees(); + var barcodefield = $("#barcode"); var issuesTable; @@ -65,6 +99,7 @@ $(document).ready(function() { content = ""; if ( data.returned ) { + KOHA.Checkouts.UpdateCheckoutsAndFees(true); content = CIRCULATION_RETURNED; $(id).parent().parent().addClass('ok'); $('#date_due_' + data.itemnumber).html(CIRCULATION_RETURNED); @@ -97,6 +132,7 @@ $(document).ready(function() { var content = ""; if ( data.renew_okay ) { + KOHA.Checkouts.UpdateCheckoutsAndFees(); issuesTable.api().ajax.reload(); content = CIRCULATION_RENEWED_DUE + " " + data.date_due; $('#date_due_' + data.itemnumber).replaceWith( data.date_due ); diff --git a/members/moremember.pl b/members/moremember.pl index e7c54f4..c6fe21d 100755 --- a/members/moremember.pl +++ b/members/moremember.pl @@ -115,9 +115,6 @@ my $borrowernumber = $input->param('borrowernumber'); my $error = $input->param('error'); $template->param( error => $error ) if ( $error ); -my ( $od, $issue, $fines ) = GetMemberIssuesAndFines($borrowernumber); -$template->param( issuecount => $issue, fines => $fines ); - my $data = GetMember( 'borrowernumber' => $borrowernumber ); if ( not defined $data ) { diff --git a/svc/patron/fines b/svc/patron/fines new file mode 100755 index 0000000..d61df9c --- /dev/null +++ b/svc/patron/fines @@ -0,0 +1,40 @@ +#!/usr/bin/perl + +# Copyright 2016 CatalystIT +# +# This file is part of Koha. +# +# Koha is free software; you can redistribute it and/or modify it under the +# terms of the GNU General Public License as published by the Free Software +# Foundation; either version 3 of the License, or (at your option) any later +# version. +# +# Koha is distributed in the hope that it will be useful, but WITHOUT ANY +# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR +# A PARTICULAR PURPOSE. See the GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with Koha; if not, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +use strict; +use warnings; + +use C4::Service; +use C4::Members qw/GetMemberIssuesAndFines/; +use Koha::Number::Price; + +my ( $query, $response ) = C4::Service->init( borrowers => '*' ); + +my $borrowernumber = $query->param('borrowernumber'); + +my ( $od, $issue, $owing ) = GetMemberIssuesAndFines( $borrowernumber ); + +$response->param( + overduecount => $od, + issuecount => $issue, + owing => $owing || 0.00, + owing_formatted => Koha::Number::Price->new( $owing )->format, +); + +C4::Service->return_success( $response ); -- 2.7.4