Browse Source

Bug 22521: Update UI to use accountlines.status

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Josef Moravec <josef.moravec@gmail.com>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
19.05.x
Martin Renvoize 4 years ago
committed by Nick Clemens
parent
commit
5cad2946ae
  1. 52
      koha-tmpl/intranet-tmpl/prog/en/includes/accounts.inc
  2. 2
      koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tt
  3. 2
      koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tt
  4. 12
      koha-tmpl/opac-tmpl/bootstrap/en/includes/account-table.inc
  5. 1
      koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-account.tt
  6. 2
      opac/opac-user.pl

52
koha-tmpl/intranet-tmpl/prog/en/includes/accounts.inc

@ -1,29 +1,28 @@
[%- BLOCK account_type_description -%]
[%- SWITCH account.accounttype -%]
[%- CASE 'Pay' -%]<span>Payment, thanks</span>
[%- CASE 'Pay00' -%]<span>Payment, thanks (cash via SIP2)</span>
[%- CASE 'Pay01' -%]<span>Payment, thanks (VISA via SIP2)</span>
[%- CASE 'Pay02' -%]<span>Payment, thanks (credit card via SIP2)</span>
[%- CASE 'VOID' -%]<span>Voided</span>
[%- CASE 'N' -%]<span>New card</span>
[%- CASE 'F' -%]<span>Fine</span>
[%- CASE 'A' -%]<span>Account management fee</span>
[%- CASE 'M' -%]<span>Sundry</span>
[%- CASE 'L' -%]<span>Lost item</span>
[%- CASE 'W' -%]<span>Writeoff</span>
[%- CASE 'FU' -%]<span>Accruing fine</span>
[%- CASE 'HE' -%]<span>Hold waiting too long</span>
[%- CASE 'Rent' -%]<span>Rental fee</span>
[%- CASE 'FOR' -%]<span>Forgiven</span>
[%- CASE 'Pay' -%]<span>Payment, thanks</span>
[%- CASE 'Pay00' -%]<span>Payment, thanks (cash via SIP2)</span>
[%- CASE 'Pay01' -%]<span>Payment, thanks (VISA via SIP2)</span>
[%- CASE 'Pay02' -%]<span>Payment, thanks (credit card via SIP2)</span>
[%- CASE 'VOID' -%]<span>Voided</span>
[%- CASE 'N' -%]<span>New card</span>
[%- CASE 'OVERDUE' -%]<span>Fine[%- PROCESS account_status_description account=account -%]</span>
[%- CASE 'A' -%]<span>Account management fee</span>
[%- CASE 'M' -%]<span>Sundry</span>
[%- CASE 'L' -%]<span>Lost item</span>
[%- CASE 'W' -%]<span>Writeoff</span>
[%- CASE 'HE' -%]<span>Hold waiting too long</span>
[%- CASE 'Rent' -%]<span>Rental fee</span>
[%- CASE 'FOR' -%]<span>Forgiven</span>
[%- CASE 'FFOR' -%]<span>Fine forgiven</span>
[%- CASE 'LR' -%]<span>Lost item fee refund</span>
[%- CASE 'LR' -%]<span>Lost item fee refund</span>
[%- CASE 'PF' -%]<span>Lost item processing fee</span>
[%- CASE 'PAY' -%]<span>Payment</span>
[%- CASE 'WO' -%]<span>Writeoff</span>
[%- CASE 'C' -%]<span>Credit</span>
[%- CASE 'CR' -%]<span>Credit</span>
[%- CASE 'Res' -%]<span>Hold fee</span>
[%- CASE -%][% account.accounttype | html %]
[%- CASE 'PAY' -%]<span>Payment</span>
[%- CASE 'WO' -%]<span>Writeoff</span>
[%- CASE 'C' -%]<span>Credit</span>
[%- CASE 'CR' -%]<span>Credit</span>
[%- CASE 'Res' -%]<span>Hold fee</span>
[%- CASE -%][% account.accounttype | html %]
[%- END -%]
[%- END -%]
@ -39,3 +38,12 @@
[%- CASE -%][% account_offset.type | html %]
[%- END -%]
[%- END -%]
[%- BLOCK account_status_description -%]
[%- SWITCH account.status -%]
[%- CASE 'UNRETURNED' -%]<span> (Accruing)</span>
[%- CASE 'RETURNED' -%]<span> (Returned)</span>
[%- CASE 'FORGIVEN' -%]<span> (Forgiven)</span>
[%- CASE -%]
[%- END -%]
[%- END -%]

2
koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tt

@ -79,7 +79,7 @@
[% INCLUDE 'str/members-menu.inc' %]
[% Asset.js("js/members-menu.js") | $raw %]
<script>
var type_fees = {'L':'','F':'','A':'','N':'','M':''};
var type_fees = {'L':'','OVERDUE':'','A':'','N':'','M':''};
[% FOREACH invoice_types_loo IN invoice_types_loop %]
type_fees['[% invoice_types_loo.authorised_value | html %]'] = "[% invoice_types_loo.lib | html %]";
[% END %]

2
koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tt

@ -121,7 +121,7 @@
, [% account.description | html %]
[% END %]
&nbsp;
[% IF ( account.itemnumber AND account.accounttype != 'F' AND account.accounttype != 'FU' ) %]
[% IF ( account.itemnumber AND account.accounttype != 'OVERDUE' ) %]
<a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% account.item.biblionumber | uri %]&amp;itemnumber=[% account.itemnumber | uri %]">[% account.item.biblio.title | html %]</a>
[% END %]
</td>

12
koha-tmpl/opac-tmpl/bootstrap/en/includes/account-table.inc

@ -35,12 +35,11 @@
[% CASE 'Pay02' %]Payment, thanks (credit card via SIP2)
[% CASE 'VOID' %]Voided
[% CASE 'N' %]New card
[% CASE 'F' %]Fine
[% CASE 'OVERDUE' %]Fine[%- PROCESS account_status_description account=account -%]
[% CASE 'A' %]Account management fee
[% CASE 'M' %]Sundry
[% CASE 'L' %]Lost item
[% CASE 'W' %]Writeoff
[% CASE 'FU' %]Accruing fine
[% CASE 'HE' %]Hold waiting too long
[% CASE 'Rent' %]Rental fee
[% CASE 'FOR' %]Forgiven
@ -116,3 +115,12 @@
[% ELSE %]
<h4>You have no fines or charges</h4>
[% END %]
[%- BLOCK account_status_description -%]
[%- SWITCH account.status -%]
[%- CASE 'UNRETURNED' -%]<span> (Accruing)</span>
[%- CASE 'RETURNED' -%]<span> (Returned)</span>
[%- CASE 'FORGIVEN' -%]<span> (Forgiven)</span>
[%- CASE -%]
[%- END -%]
[%- END -%]

1
koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-account.tt

@ -68,6 +68,7 @@
[% PROCESS 'account-table.inc' ACCOUNT_LINES = ACCOUNT_LINES, ENABLE_OPAC_PAYMENTS = ENABLE_OPAC_PAYMENTS, plugins = plugins %]
</div> <!-- / #useraccount -->
</div> <!-- / .span10 -->
</div> <!-- / .row-fluid -->

2
opac/opac-user.pl

@ -185,7 +185,7 @@ if ( $pending_checkouts->count ) { # Useless test
{
borrowernumber => $patron->borrowernumber,
amountoutstanding => { '>' => 0 },
accounttype => [ 'F', 'L' ],
accounttype => [ 'OVERDUE', 'L' ],
itemnumber => $issue->{itemnumber}
},
);

Loading…
Cancel
Save