gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug 24381: (follow-up) Notice improvements 

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
This commit is contained in:
Martin Renvoize 2020-10-13 12:28:31 +01:00 committed by Tomas Cohen Arazi
parent 25ed7f9d62
commit 36e07f5ce2
No known key found for this signature in database
GPG Key ID: 0A272EA1B2F3C15F
2 changed files with 119 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
installer/data/mysql/atomicupdate/bug_24381.perl
View File

@ -3,7 +3,9 @@ if ( CheckVersion($DBversion) ) {
# ACCOUNT_CREDIT
my $account_credit = q{
[% PROCESS "accounts.inc" %]
[%- USE AuthorisedValues -%]
[%- USE Price -%]
[%- PROCESS "accounts.inc" -%]
<table>
[% IF ( LibraryName ) %]
<tr>
@ -21,7 +23,7 @@ if ( CheckVersion($DBversion) ) {
[% END %]
<tr>
<th colspan="2" class="centerednames">
<h3>[% credit.date | $KohaDates %]</h3>
<h3>[% today | $KohaDates %]</h3>
</th>
</tr>
<tr>
@ -32,40 +34,76 @@ if ( CheckVersion($DBversion) ) {
<td>Operator ID: </td>
<td>[% credit.manager_id %]</td>
</tr>
[% IF credit.payment_type %]
<tr>
<td>Payment type: </td>
<td>[% credit.payment_type %]</td>
<td>[% AuthorisedValues.GetByCode('PAYMENT_TYPE', credit.payment_type) %]</td>
</tr>
[% END %]
<tr>
<th colspan="2" class="centerednames">
<h2><u>Payment receipt</u></h2>
<h2><u>[%- PROCESS credit_type_description credit_type = credit.credit_type -%] receipt</u></h2>
</th>
</tr>
[% IF ( credit.credit_type_code == 'PAYMENT' ) %]
<tr>
<th colspan="2">
Received with thanks from [% credit.patron.firstname | html %] [% credit.patron.surname | html %] <br />
Card number: [% credit.patron.cardnumber | html %]<br />
</th>
</tr>
[% ELSIF ( credit.credit_type_code == 'CREDIT' ) %]
<tr>
<th colspan="2">
Credit added to account for [% credit.patron.firstname | html %] [% credit.patron.surname | html %] <br />
Card number: [% credit.patron.cardnumber | html %]<br />
</th>
</tr>
[% ELSIF ( credit.credit_type_code == 'WRITEOFF' ) %]
<tr>
<th colspan="2">
Writeoff added to account for [% credit.patron.firstname | html %] [% credit.patron.surname | html %] <br />
Card number: [% credit.patron.cardnumber | html %]<br />
</th>
</tr>
[% END %]
[% IF credit.amountoutstanding + 0 != 0 %]
<tr>
<th>Description of credit</th>
<th>Amount</th>
</tr>
<tr>
<td>[%- PROCESS credit_type_description credit_type = credit.credit_type -%]</td>
<td>[% credit.amount * -1 | $Price %]</td>
</tr>
<tr>
<th style="text-align:right;">Total available:</th>
<td>[% credit.amountoutstanding * -1 | $Price %]</td>
</tr>
[% END %]
[% IF credit.amount != credit.amountoutstanding %]
<tr>
<th>Description of charges</th>
<th>Amount</th>
</tr>
[% FOREACH offset IN credit.credit_offsets %]
<tr>
<td>[% PROCESS account_type_description account=offset.debit %]</td>
<td>[% PROCESS account_type_description account=offset.debit %][% IF ( offset.debit.itemnumber ) %] - [% offset.debit.item.biblio.title %][% END %]</td>
<td>[% offset.amount * -1 | $Price %]</td>
</tr>
[% END %]
[% END %]
<tfoot>
<tr class="highlight">
<td>Total:</td>
<td>[% credit.amount * -1 | $Price %]</td>
</tr>
[% IF change.defined %]
<tr>
<td>Change given: </td>
<td>[% change | $Price %]</td>
</tr>
[% END %]
<tr>
<td colspan="2"></td>
</tr>
@ -111,11 +149,6 @@ q{UPDATE letter SET content = ? WHERE code = 'ACCOUNT_CREDIT' AND REPLACE(REPLAC
</th>
</tr>
[% END %]
<tr>
<th colspan="3" class="centerednames">
<h3>[% debit.date | $KohaDates %]</h3>
</th>
</tr>
<tr>
<td colspan="2" style="text-align:right;">Fee ID: </td>
<td>[% debit.accountlines_id %]</td>
@ -137,6 +170,22 @@ q{UPDATE letter SET content = ? WHERE code = 'ACCOUNT_CREDIT' AND REPLACE(REPLAC
Card number: [% debit.patron.cardnumber | html %]<br />
</th>
</tr>
[% IF debit.amountoutstanding != 0 %]
<tr>
<th>Date</th>
<th>Description of charges</th>
<th>Amount</th>
</tr>
<tr>
<td>[% debit.date | $KohaDates %]</td>
<td>[% PROCESS account_type_description account=debit %]</td>
<td>[% debit.amount | $Price %]</td>
</tr>
<tr>
<td colspan="2" style="text-align:right;">Total owed:</td>
<td>[% debit.amount | $Price %]</td>
</tr>
[% END %]
[% IF debit.amount != debit.amountoutstanding %]
<tr>
<th>Date</th>
@ -160,11 +209,7 @@ q{UPDATE letter SET content = ? WHERE code = 'ACCOUNT_CREDIT' AND REPLACE(REPLAC
<tr>
<tfoot>
<tr>
<td colspan="2" style="text-align:right;">Total owed:</td>
<td>[% debit.amount | $Price %]</td>
</tr>
<tr>
<td colspan="2" style="text-align:right;">Total outstanding:</td>
<th colspan="2" style="text-align:right;">Total outstanding:</th>
<td>[% debit.amountoutstanding | $Price %]</td>
</tr>
</tfoot>

74
installer/data/mysql/en/mandatory/sample_notices.yml
View File

@ -52,7 +52,8 @@ tables:
message_transport_type: print
lang: default
content:
- "[% PROCESS \"accounts.inc\" %]"
- "[%- USE AuthorisedValues -%]"
- "[%- PROCESS \"accounts.inc\" -%]"
- "<table>"
- " [% IF ( LibraryName ) %]"
- " <tr>"
@ -70,7 +71,7 @@ tables:
- " [% END %]"
- " <tr>"
- " <th colspan=\"2\" class=\"centerednames\">"
- " <h3>[% credit.date | $KohaDates %]</h3>"
- " <h3>[% today | $KohaDates %]</h3>"
- " </th>"
- " </tr>"
- " <tr>"
@ -81,40 +82,76 @@ tables:
- " <td>Operator ID: </td>"
- " <td>[% credit.manager_id %]</td>"
- " </tr>"
- " [% IF credit.payment_type %]"
- " <tr>"
- " <td>Payment type: </td>"
- " <td>[% credit.payment_type %]</td>"
- " <td>[% AuthorisedValues.GetByCode('PAYMENT_TYPE', credit.payment_type) %]</td>"
- " </tr>"
- " [% END %]"
- " <tr>"
- " <th colspan=\"2\" class=\"centerednames\">"
- " <h2><u>Payment receipt</u></h2>"
- " <h2><u>[%- PROCESS credit_type_description credit_type = credit.credit_type -%] receipt</u></h2>"
- " </th>"
- " </tr>"
- " [% IF ( credit.credit_type_code == 'PAYMENT' ) %]"
- " <tr>"
- " <th colspan=\"2\">"
- " Received with thanks from [% credit.patron.firstname | html %] [% credit.patron.surname | html %] <br />"
- " Card number: [% credit.patron.cardnumber | html %]<br />"
- " </th>"
- " </tr>"
- " [% ELSIF ( credit.credit_type_code == 'CREDIT' ) %]"
- " <tr>"
- " <th colspan=\"2\">"
- " Credit added to account for [% credit.patron.firstname | html %] [% credit.patron.surname | html %] <br />"
- " Card number: [% credit.patron.cardnumber | html %]<br />"
- " </th>"
- " </tr>"
- " [% ELSIF ( credit.credit_type_code == 'WRITEOFF' ) %]"
- " <tr>"
- " <th colspan=\"2\">"
- " Writeoff added to account for [% credit.patron.firstname | html %] [% credit.patron.surname | html %] <br />"
- " Card number: [% credit.patron.cardnumber | html %]<br />"
- " </th>"
- " </tr>"
- " [% END %]"
- " [% IF credit.amountoutstanding + 0 != 0 %]"
- " <tr>"
- " <th>Description of credit</th>"
- " <th>Amount</th>"
- " </tr>"
- " <tr>"
- " <td>[%- PROCESS credit_type_description credit_type = credit.credit_type -%]</td>"
- " <td>[% credit.amount * -1 | $Price %]</td>"
- " </tr>"
- " <tr>"
- " <th style=\"text-align:right;\">Total available:</th>"
- " <td>[% credit.amountoutstanding * -1 | $Price %]</td>"
- " </tr>"
- " [% END %]"
- " [% IF credit.amount != credit.amountoutstanding %]"
- " <tr>"
- " <th>Description of charges</th>"
- " <th>Amount</th>"
- " </tr>"
- " [% FOREACH offset IN credit.credit_offsets %]"
- " <tr>"
- " <td>[% PROCESS account_type_description account=offset.debit %]</td>"
- " <td>[% PROCESS account_type_description account=offset.debit %][% IF ( offset.debit.itemnumber ) %] - [% offset.debit.item.biblio.title %][% END %]</td>"
- " <td>[% offset.amount * -1 | $Price %]</td>"
- " </tr>"
- " [% END %]"
- " [% END %]"
- " <tfoot>"
- " <tr class=\"highlight\">"
- " <td>Total:</td>"
- " <td>[% credit.amount * -1 | $Price %]</td>"
- " </tr>"
- " [% IF change.defined %]"
- " <tr>"
- " <td>Change given: </td>"
- " <td>[% change | $Price %]</td>"
- " </tr>"
- " [% END %]"
- " <tr>"
- " <td colspan=\"2\"></td>"
- " </tr>"
@ -152,11 +189,6 @@ tables:
- " </tr>"
- " [% END %]"
- " <tr>"
- " <th colspan=\"3\" class=\"centerednames\">"
- " <h3>[% debit.date | $KohaDates %]</h3>"
- " </th>"
- " </tr>"
- " <tr>"
- " <td colspan=\"2\" style=\"text-align:right;\">Fee ID: </td>"
- " <td>[% debit.accountlines_id %]</td>"
- " </tr>"
@ -177,6 +209,22 @@ tables:
- " Card number: [% debit.patron.cardnumber | html %]<br />"
- " </th>"
- " </tr>"
- " [% IF debit.amountoutstanding != 0 %]"
- " <tr>"
- " <th>Date</th>"
- " <th>Description of charges</th>"
- " <th>Amount</th>"
- " </tr>"
- " <tr>"
- " <td>[% debit.date | $KohaDates %]</td>"
- " <td>[% PROCESS account_type_description account=debit %]</td>"
- " <td>[% debit.amount | $Price %]</td>"
- " </tr>"
- " <tr>"
- " <td colspan=\"2\" style=\"text-align:right;\">Total owed:</td>"
- " <td>[% debit.amount | $Price %]</td>"
- " </tr>"
- " [% END %]"
- " [% IF debit.amount != debit.amountoutstanding %]"
- " <tr>"
- " <th>Date</th>"
@ -200,11 +248,7 @@ tables:
- " <tr>"
- " <tfoot>"
- " <tr>"
- " <td colspan=\"2\" style=\"text-align:right;\">Total owed:</td>"
- " <td>[% debit.amount | $Price %]</td>"
- " </tr>"
- " <tr>"
- " <td colspan=\"2\" style=\"text-align:right;\">Total outstanding:</td>"
- " <th colspan=\"2\" style=\"text-align:right;\">Total outstanding:</th>"
- " <td>[% debit.amountoutstanding | $Price %]</td>"
- " </tr>"
- " </tfoot>"