Koha-community
/
Koha
13
5
Fork 0
Code Issues Releases Wiki Activity
Browse Source

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 <josef.moravec@gmail.com>

Signed-off-by: Owen Leonard <oleonard@myacpl.org>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
19.05.x
Josef Moravec 5 years ago
committed by Nick Clemens
parent
2d7eba5be3
commit
6d6aa48f6a
5 changed files with 16 additions and 72 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      koha-tmpl/opac-tmpl/bootstrap/en/includes/account-table.inc
  2. 25
      koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt
  3. 21
      opac/opac-account.pl
  4. 11
      opac/opac-user.pl
  5. 23
      opac/sco/sco-main.pl

8
koha-tmpl/opac-tmpl/bootstrap/en/includes/account-table.inc
View File

@ -16,7 +16,7 @@
<tbody>
[% FOREACH ACCOUNT_LINE IN ACCOUNT_LINES %]
[% IF ( ACCOUNT_LINE.odd ) %]<tr class="highlight">[% ELSE %]<tr>[% END %]
<tr>
[% IF ENABLE_OPAC_PAYMENTS %]
<td>
[% IF ACCOUNT_LINE.amountoutstanding > 0 %]
@ -58,10 +58,10 @@
<td>
[%- 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 %]
</td>
[% IF ( ACCOUNT_LINE.amountcredit ) %]<td class="credit">[% ELSE %]<td class="debit">[% END %][% ACCOUNT_LINE.amount | $Price %]</td>
[% IF ( ACCOUNT_LINE.amountoutstandingcredit ) %]<td class="credit">[% ELSE %]<td class="debit">[% END %][% ACCOUNT_LINE.amountoutstanding | $Price %]</td>
[% IF ( ACCOUNT_LINE.amount <= 0 ) %]<td class="credit">[% ACCOUNT_LINE.amount * -1 | $Price %][% ELSE %]<td class="debit">[% ACCOUNT_LINE.amount | $Price %][% END %]</td>
[% IF ( ACCOUNT_LINE.amountoutstanding <= 0 ) %]<td class="credit">[% ACCOUNT_LINE.amountoutstanding * -1 | $Price %][% ELSE %]<td class="debit">[% ACCOUNT_LINE.amountoutstanding | $Price %][% END %]</td>
</tr>
[% END %]
</tbody>

25
koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt
View File

@ -149,9 +149,8 @@
[% IF relatives %]<li><a href="#opac-user-relative-issues">Relatives' checkouts</a></li>[% END %]
[% IF ( overdues_count ) %]<li><a href="#opac-user-overdues">Overdue ([% overdues_count | html %])</a></li>[% END %]
[% IF ( OPACFinesTab ) %]
[% IF ( borrower.amountoverfive ) %]<li><a href="#opac-user-fines">Fines ([% amountoutstanding | $Price %])</a></li>[% END %]
[% IF ( borrower.amountoverzero ) %]<li><a href="#opac-user-fines">Fines ([% amountoutstanding | $Price %])</a></li>[% END %]
[% IF ( borrower.amountlessthanzero ) %]<li><a href="#opac-user-fines">Credits ([% amountoutstanding | $Price %])</a></li>[% END %]
[% IF ( amountoutstanding > 0 ) %]<li><a href="#opac-user-fines">Fines ([% amountoutstanding | $Price %])</a></li>[% END %]
[% IF ( amountoutstanding < 0 ) %]<li><a href="#opac-user-fines">Credits ([% amountoutstanding * -1 | $Price %])</a></li>[% END %]
[% END %]
[% IF borrower_club_enrollments.count || borrower_enrollable_clubs.count %]
@ -386,7 +385,7 @@
[% IF ( OPACFinesTab ) %]
<!-- FINES BOX -->
[% IF borrower.amountoverfive %]
[% IF ( amountoutstanding > 0 ) %]
<div id="opac-user-fines"> <h3>Fines and charges</h3>
<table class="table table-bordered table-striped">
<thead><tr><th colspan="2">Amount</th></tr></thead>
@ -400,27 +399,13 @@
</div>
[% END %]
[% IF borrower.amountoverzero %]
<div id="opac-user-fines"> <h3>Fines and charges</h3>
<table class="table table-bordered table-striped">
<thead><tr><th colspan="2">Amount</th></tr></thead>
<tbody>
<tr>
<td>You currently owe fines and charges amounting to:</td>
<td><a href="/cgi-bin/koha/opac-account.pl">[% amountoutstanding | $Price %]</a></td>
</tr>
</tbody>
</table>
</div>
[% END %]
[% IF borrower.amountlessthanzero %]
[% IF ( amountoutstanding < 0 ) %]
<div id="opac-user-fines"> <h3>Credits</h3>
<table class="table table-bordered table-striped">
<thead><tr><th colspan="2">Amount</th></tr></thead>
<tbody>
<tr>
<td>You have a credit of:</td><td><a href="/cgi-bin/koha/opac-account.pl">[% amountoutstanding | $Price %]</a></td>
<td>You have a credit of:</td><td><a href="/cgi-bin/koha/opac-account.pl">[% amountoutstanding * -1 | $Price %]</a></td>
</tr>
</tbody>
</table>

21
opac/opac-account.pl
View File

@ -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{},

11
opac/opac-user.pl
View File

@ -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 );

23
opac/sco/sco-main.pl
View File

@ -279,26 +279,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(
@ -315,9 +300,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(

Write Preview
Loading…
Cancel
Save