From 2156e83b399cbd874aea95389df64196d285304c Mon Sep 17 00:00:00 2001 From: Josef Moravec Date: Wed, 27 Mar 2019 08:27:13 +0000 Subject: [PATCH] Bug 22588: Simplify getting fines information in opac and selfcheckout Test plan: 0) Have patron with some fines and credits 1) Go to opac and log in 2) Go to 'your summary' page and confirm it shows the right amount and description for both, credit and debit 3) Go to 'your fines' page and confirm it show right information 4) Go to self checkout page and confirm the fines are right here Signed-off-by: Josef Moravec --- .../bootstrap/en/includes/account-table.inc | 10 ++++----- .../opac-tmpl/bootstrap/en/modules/opac-user.tt | 25 +++++----------------- opac/opac-account.pl | 21 +++--------------- opac/opac-user.pl | 11 ---------- opac/sco/sco-main.pl | 23 ++++---------------- 5 files changed, 17 insertions(+), 73 deletions(-) diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/account-table.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/account-table.inc index 7c376847fd..37c99765fc 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/account-table.inc +++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/account-table.inc @@ -27,7 +27,7 @@ [% FOREACH ACCOUNT_LINE IN ACCOUNT_LINES %] - [% IF ( ACCOUNT_LINE.odd ) %][% ELSE %][% END %] + [% IF ENABLE_OPAC_PAYMENTS %] [% IF ACCOUNT_LINE.amountoutstanding > 0 %] @@ -64,10 +64,10 @@ [%- END -%] [%- IF ACCOUNT_LINE.payment_type %], [% AuthorisedValues.GetByCode('PAYMENT_TYPE', ACCOUNT_LINE.payment_type, 1) | html %][% END %] [%- IF ACCOUNT_LINE.description %], [% ACCOUNT_LINE.description | html %][% END %] - [% IF ACCOUNT_LINE.title %]([% ACCOUNT_LINE.title | html %])[% END %] + [% IF ACCOUNT_LINE.itemnumber %]([% ACCOUNT_LINE.item.biblio.title | html %])[% END %] - [% IF ( ACCOUNT_LINE.amountcredit ) %][% ELSE %][% END %][% ACCOUNT_LINE.amount | $Price %] - [% IF ( ACCOUNT_LINE.amountoutstandingcredit ) %][% ELSE %][% END %][% ACCOUNT_LINE.amountoutstanding | $Price %] + [% IF ( ACCOUNT_LINE.amount <= 0 ) %][% ACCOUNT_LINE.amount * -1 | $Price %][% ELSE %][% ACCOUNT_LINE.amount | $Price %][% END %] + [% IF ( ACCOUNT_LINE.amountoutstanding <= 0 ) %][% ACCOUNT_LINE.amountoutstanding * -1 | $Price %][% ELSE %][% ACCOUNT_LINE.amountoutstanding | $Price %][% END %] [% END %] @@ -109,4 +109,4 @@ [% ELSE %]

You have no fines or charges

-[% END %] \ No newline at end of file +[% END %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt index 6f074a8c07..12aad6bbe0 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt @@ -149,9 +149,8 @@ [% IF relatives %]
  • Relatives' checkouts
    • [% END %] [% IF ( overdues_count ) %]
  • Overdue ([% overdues_count | html %])
    • [% END %] [% IF ( OPACFinesTab ) %] - [% IF ( borrower.amountoverfive ) %]
  • Fines ([% amountoutstanding | $Price %])
    • [% END %] - [% IF ( borrower.amountoverzero ) %]
  • Fines ([% amountoutstanding | $Price %])
    • [% END %] - [% IF ( borrower.amountlessthanzero ) %]
  • Credits ([% amountoutstanding | $Price %])
    • [% END %] + [% IF ( amountoutstanding > 0 ) %]
  • Fines ([% amountoutstanding | $Price %])
    • [% END %] + [% IF ( amountoutstanding < 0 ) %]
  • Credits ([% amountoutstanding * -1 | $Price %])
    • [% END %] [% END %] [% IF borrower_club_enrollments.count || borrower_enrollable_clubs.count %] @@ -386,7 +385,7 @@ [% IF ( OPACFinesTab ) %] - [% IF borrower.amountoverfive %] + [% IF ( amountoutstanding > 0 ) %]

    Fines and charges

    @@ -400,27 +399,13 @@ [% END %] - [% IF borrower.amountoverzero %] -

    Fines and charges

    -
    Amount
    - - - - - - - -
    Amount
    You currently owe fines and charges amounting to:[% amountoutstanding | $Price %]
    -
    - [% END %] - - [% IF borrower.amountlessthanzero %] + [% IF ( amountoutstanding < 0 ) %]

    Credits

    - +
    Amount
    You have a credit of:[% amountoutstanding | $Price %]You have a credit of:[% amountoutstanding * -1 | $Price %]
    diff --git a/opac/opac-account.pl b/opac/opac-account.pl index 2cbbf4e053..4e4d789a4d 100755 --- a/opac/opac-account.pl +++ b/opac/opac-account.pl @@ -41,29 +41,14 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user( my $patron = Koha::Patrons->find( $borrowernumber ); my $total = $patron->account->balance; -my $accts = Koha::Account::Lines->search( +my @accts = Koha::Account::Lines->search( { borrowernumber => $patron->borrowernumber }, { order_by => { -desc => 'accountlines_id' } } ); -my @accountlines; -while ( my $line = $accts->next ) { - my $accountline = $line->unblessed; - $accountline->{'amount'} = sprintf( "%.2f", $accountline->{'amount'} || '0.00'); - if ( $accountline->{'amount'} >= 0 ) { - $accountline->{'amountcredit'} = 1; - } - $accountline->{'amountoutstanding'} = - sprintf( "%.2f", $accountline->{'amountoutstanding'} || '0.00' ); - if ( $accountline->{'amountoutstanding'} >= 0 ) { - $accountline->{'amountoutstandingcredit'} = 1; - } - push @accountlines, $accountline; -} - $template->param( - ACCOUNT_LINES => \@accountlines, - total => sprintf( "%.2f", $total ), # FIXME Use TT plugin Price + ACCOUNT_LINES => \@accts, + total => $total, accountview => 1, message => scalar $query->param('message') || q{}, message_value => scalar $query->param('message_value') || q{}, diff --git a/opac/opac-user.pl b/opac/opac-user.pl index 1fde24b538..bd638afc7d 100755 --- a/opac/opac-user.pl +++ b/opac/opac-user.pl @@ -120,12 +120,6 @@ if ( $userdebarred || $borr->{'gonenoaddress'} || $borr->{'lost'} ) { } my $amountoutstanding = $patron->account->balance; -if ( $amountoutstanding > 5 ) { - $borr->{'amountoverfive'} = 1; -} -if ( 5 >= $amountoutstanding && $amountoutstanding > 0 ) { - $borr->{'amountoverzero'} = 1; -} my $no_renewal_amt = C4::Context->preference( 'OPACFineNoRenewals' ); $no_renewal_amt = undef unless looks_like_number( $no_renewal_amt ); @@ -141,11 +135,6 @@ if ( C4::Context->preference('OpacRenewalAllowed') ); } -if ( $amountoutstanding < 0 ) { - $borr->{'amountlessthanzero'} = 1; - $amountoutstanding = -1 * ( $amountoutstanding ); -} - # Warningdate is the date that the warning starts appearing if ( $borr->{'dateexpiry'} && C4::Context->preference('NotifyBorrowerDeparture') ) { my $days_to_expiry = Date_to_Days( $warning_year, $warning_month, $warning_day ) - Date_to_Days( $today_year, $today_month, $today_day ); diff --git a/opac/sco/sco-main.pl b/opac/sco/sco-main.pl index 7fd6ee8e40..46e84ce55a 100755 --- a/opac/sco/sco-main.pl +++ b/opac/sco/sco-main.pl @@ -278,26 +278,11 @@ if ($borrower) { } my $total = $patron->account->balance; - my $accts = Koha::Account::Lines->search( + my @accts = Koha::Account::Lines->search( { borrowernumber => $borrower->{borrowernumber} }, { order_by => { -desc => 'accountlines_id' } } ); - my @accountlines; - while ( my $line = $accts->next ) { - my $accountline = $line->unblessed; - $accountline->{'amount'} = sprintf( "%.2f", $accountline->{'amount'} || '0.00'); - if ( $accountline->{'amount'} >= 0 ) { - $accountline->{'amountcredit'} = 1; - } - $accountline->{'amountoutstanding'} = - sprintf( "%.2f", $accountline->{'amountoutstanding'} || '0.00' ); - if ( $accountline->{'amountoutstanding'} >= 0 ) { - $accountline->{'amountoutstandingcredit'} = 1; - } - push @accountlines, $accountline; - } - my $holds = $patron->holds; $template->param( @@ -314,9 +299,9 @@ if ($borrower) { borrowernumber => $borrower->{'borrowernumber'}, SuspendHoldsOpac => C4::Context->preference('SuspendHoldsOpac'), AutoResumeSuspendedHolds => C4::Context->preference('AutoResumeSuspendedHolds'), - showpriority => $show_priority, - ACCOUNT_LINES => \@accountlines, - total => sprintf( "%.2f", $total ), + howpriority => $show_priority, + ACCOUNT_LINES => \@accts, + total => $total, ); my $patron_messages = Koha::Patron::Messages->search( -- 2.11.0