Martin Renvoize
4dfa570936
Test plan - Regression 1/ Login to the OPAC as a user with various account charges and payments. 2/ Navigate to the 'Your charges' page. 3/ Compare the display of the table before and after applying the patchset. They should match. Test plan - Sync 1/ Compare koha-tmpl/intranet-tmpl/prog/en/includes/accounts.inc with koha-tmpl/opac-tmpl/bootstrap/en/includes/accounts.inc. 2/ They files should match after the patch is applied. Test plan - Translation 1) ./translate update fr-CA 2) Open fr-CA-opac-bootstrap.po and translated this part msgid "" "%s %s %sPayment %sWriteoff %sForgiven %sCredit %sLost item fee refund " "%sRefund %s%s %s %s %s %sAccount creation fee %sAccount renewal fee %sLost " "item %sManual fee %sNew card %sFine %sLost item processing fee %sRental fee " "%sDaily rental fee %sRenewal of rental item %sRenewal of daily rental item " "%sHold fee %sHold waiting too long %s%s %s %s %s " 3) ./translate install fr-CA 4) Login to the OPAC as a patron with various charges 5) Check 'My charges' (in fr-CA) to confirm the translations have been picked up. Signed-off-by: Caroline Cyr La Rose <caroline.cyr-la-rose@inlibro.com> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
172 lines
9.4 KiB
HTML
172 lines
9.4 KiB
HTML
[% PROCESS 'accounts.inc' %]
|
|
<form method="post" action="opac-account-pay.pl" class="form-horizontal">
|
|
[% IF ( ACCOUNT_LINES ) %]
|
|
<table class="table table-bordered table-striped" id="finestable">
|
|
<caption>Your charges</caption>
|
|
<thead>
|
|
<tr>
|
|
[% IF ENABLE_OPAC_PAYMENTS %]<th> </th>[% END %]
|
|
<th class="title-string">Date</th>
|
|
<th>Type</th>
|
|
<th>Description</th>
|
|
<th>Amount</th>
|
|
<th>Amount outstanding</th>
|
|
</tr>
|
|
</thead>
|
|
|
|
<tbody>
|
|
[% FOREACH ACCOUNT_LINE IN ACCOUNT_LINES %]
|
|
[% IF ACCOUNT_LINE.amountoutstanding > 0 || ACCOUNT_LINE.amountoutstanding < 0 %]<tr class="outstanding">[% ELSE %]<tr>[% END%]
|
|
[% IF ENABLE_OPAC_PAYMENTS %]
|
|
<td>
|
|
[% IF ACCOUNT_LINE.amountoutstanding > 0 %]
|
|
[% SET DISPLAY_PAYMENT_BLOCK = 1 %]
|
|
<input class="checkbox-pay pay-online hidden" name="accountline" type="checkbox" id="checkbox-pay-[% ACCOUNT_LINE.accountlines_id | html %]" value="[% ACCOUNT_LINE.accountlines_id | html %]">
|
|
<input type="hidden" id="amount-[% ACCOUNT_LINE.accountlines_id | html %]" value="[% ACCOUNT_LINE.amountoutstanding | html %]" />
|
|
[% END %]
|
|
</td>
|
|
[% END %]
|
|
<td><span title="[% ACCOUNT_LINE.date | html %]">[% ACCOUNT_LINE.date | $KohaDates %]</span></td>
|
|
<td>
|
|
[% PROCESS account_type_description account=ACCOUNT_LINE %]
|
|
</td>
|
|
<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.itemnumber %]([% ACCOUNT_LINE.item.biblio.title | html %])[% END %]
|
|
</td>
|
|
[% IF ( ACCOUNT_LINE.is_credit ) %]<td class="credit">[% ACCOUNT_LINE.amount * -1 | $Price %][% ELSE %]<td class="debit">[% ACCOUNT_LINE.amount | $Price %][% END %]</td>
|
|
[% IF ( ACCOUNT_LINE.is_credit ) %]<td class="credit">[% ACCOUNT_LINE.amountoutstanding * -1 | $Price %][% ELSE %]<td class="debit">[% ACCOUNT_LINE.amountoutstanding | $Price %][% END %]</td>
|
|
</tr>
|
|
[% END %]
|
|
</tbody>
|
|
|
|
<tfoot>
|
|
<tr>
|
|
[%- IF ENABLE_OPAC_PAYMENTS -%]
|
|
[%- SET COLSPAN = 5 -%]
|
|
[%- ELSE -%]
|
|
[%- SET COLSPAN = 4 -%]
|
|
[%- END -%]
|
|
<th class="sum" colspan="[% COLSPAN | html %]">Total due</th>
|
|
<td class="sum">[% total | $Price %]</td>
|
|
</tr>
|
|
[% IF outstanding_credits.total_outstanding < 0 %]
|
|
[% FOREACH outstanding_credit IN outstanding_credits %]
|
|
[% IF outstanding_credit.amountoutstanding < 0 %]<tr class="outstanding">[% ELSE %]<tr>[% END%]
|
|
[% IF ENABLE_OPAC_PAYMENTS %]<td></td>[% END %]
|
|
<td><span title="[% outstanding_credit.date | html %]">[% outstanding_credit.date | $KohaDates %]</span></td>
|
|
<td>
|
|
[% PROCESS account_type_description account=outstanding_credit %]
|
|
</td>
|
|
<td>
|
|
[%- IF outstanding_credit.payment_type %][% AuthorisedValues.GetByCode('PAYMENT_TYPE', outstanding_credit.payment_type, 1) | html %][% END %]
|
|
[%- IF outstanding_credit.description %][% outstanding_credit.description | html %][% END %]
|
|
[% IF outstanding_credit.itemnumber %]([% outstanding_credit.item.biblio.title | html %])[% END %]
|
|
</td>
|
|
<td class="credit">[% outstanding_credit.amount * -1 | $Price %]</td>
|
|
<td class="credit">[% outstanding_credit.amountoutstanding * -1 | $Price %]</td>
|
|
</tr>
|
|
[% END %]
|
|
<tr>
|
|
<th class="sum" colspan="[% COLSPAN | html %]">Total due if credit(s) applied:</th>
|
|
<td class="sum">[% total + outstanding_credits.total_outstanding | $Price %]</td>
|
|
</tr>
|
|
[% END %]
|
|
</tfoot>
|
|
|
|
</table>
|
|
|
|
|
|
[% ELSE %]
|
|
<h3>You have no fines or charges</h3>
|
|
[% END # /IF ( ACCOUNT_LINES ) %]
|
|
|
|
[% FOREACH r IN relatives %]
|
|
<h3 id="g[% r.patron.id | html %]">[% r.patron.firstname | html %] [% r.patron.surname | html %]'s fines and charges</h3>
|
|
|
|
<table class="table table-bordered table-striped" id="finestable-[% r.id | html %]">
|
|
<thead>
|
|
<tr>
|
|
[% IF ENABLE_OPAC_PAYMENTS %]<th> </th>[% END %]
|
|
<th class="title-string">Date</th>
|
|
<th>Description</th>
|
|
<th>Fine amount</th>
|
|
<th>Amount outstanding</th>
|
|
</tr>
|
|
</thead>
|
|
|
|
<tbody>
|
|
[% SET account_sum = 0 %]
|
|
[% FOREACH a IN r.accountlines %]
|
|
[% SET account_sum = account_sum + a.amountoutstanding %]
|
|
<tr>
|
|
[% IF ENABLE_OPAC_PAYMENTS %]
|
|
<td>
|
|
[% IF a.amountoutstanding > 0 %]
|
|
[% SET DISPLAY_PAYMENT_BLOCK = 1 %]
|
|
<input class="checkbox-pay pay-online hidden" name="accountline" type="checkbox" id="checkbox-pay-[% a.accountlines_id | html %]" value="[% a.accountlines_id | html %]">
|
|
<input type="hidden" id="amount-[% a.accountlines_id | html %]" value="[% a.amountoutstanding | html %]" />
|
|
[% END %]
|
|
</td>
|
|
[% END %]
|
|
<td><span title="[% a.date | html %]">[% a.date | $KohaDates %]</span></td>
|
|
<td>
|
|
[% PROCESS account_type_description account=a %]
|
|
[%- IF a.payment_type %], [% AuthorisedValues.GetByCode('PAYMENT_TYPE', a.payment_type, 1) | html %][% END %]
|
|
[%- IF a.description %], [% a.description | html %][% END %]
|
|
[% IF a.itemnumber %]([% a.item.biblio.title | html %])[% END %]
|
|
</td>
|
|
[% IF ( a.amount < 0 ) %]<td class="credit">[% ELSE %]<td class="debit">[% END %][% a.amount | $Price %]</td>
|
|
[% IF ( a.amountoutstanding < 0 ) %]<td class="credit">[% ELSE %]<td class="debit">[% END %][% a.amountoutstanding | $Price %]</td>
|
|
</tr>
|
|
[% END %]
|
|
</tbody>
|
|
|
|
<tfoot>
|
|
<tr>
|
|
<th class="sum" colspan="3">Total due</th>
|
|
<td class="sum">[% account_sum | $Price %]</td>
|
|
</tr>
|
|
</tfoot>
|
|
</table>
|
|
[% END # /FOREACH r %]
|
|
|
|
[% IF ENABLE_OPAC_PAYMENTS && DISPLAY_PAYMENT_BLOCK %]
|
|
<fieldset class="pay-online hidden">
|
|
<legend>Pay selected fines and charges</legend>
|
|
<span class="help-block"><h3>Payment method</h3></span>
|
|
|
|
[% IF Koha.Preference('EnablePayPalOpacPayments') %]
|
|
<div class="control-group">
|
|
<label class="radio">
|
|
<input type="radio" name="payment_method" id="payment_method-paypal" value="paypal" checked="checked" />
|
|
<!-- PayPal Logo -->
|
|
<a href="https://www.paypal.com/webapps/mpp/paypal-popup" title="How PayPal Works" class="paypal">
|
|
<img src="https://www.paypalobjects.com/webstatic/mktg/logo/AM_SbyPP_mc_vs_dc_ae.jpg" alt="PayPal Acceptance Mark" />
|
|
</a>
|
|
<!-- PayPal Logo -->
|
|
</label>
|
|
</div>
|
|
[% END %]
|
|
|
|
[% FOREACH p IN plugins %]
|
|
<div class="control-group">
|
|
<label class="radio">
|
|
<input type="radio" data-threshold="[% p.opac_online_payment_threshold | html %]" name="payment_method" id="payment_method-[% p.class | html %]" value="[% p.class | html %]" checked="checked" />
|
|
[% p.get_metadata.name | html %]
|
|
</label>
|
|
<small class="help-block text-muted"></small>
|
|
</div>
|
|
[% END %]
|
|
|
|
<div class="control-group">
|
|
<input type="hidden" id="payment-amount" name="payment_amount" value="0" />
|
|
<button id="submit-pay" type="submit" class="btn btn-primary" disabled="disabled">Make payment</button>
|
|
<span id="amount-to-pay-label">
|
|
Amount to pay: <span id="amount-to-pay">0.00</span>
|
|
</span>
|
|
</div>
|
|
</fieldset>
|
|
[% END # /IF ENABLE_OPAC_PAYMENTS && DISPLAY_PAYMENT_BLOCK %]
|
|
</form>
|