Attachment 79139 Details for Bug 20656 – Bug 20656: Better formatting for print summary

[patch] Bug 20656: Better formatting for print summary

Bug-20656-Better-formatting-for-print-summary.patch (text/plain), 4.02 KB, created by Josef Moravec on 2018-09-20 09:36:30 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Josef Moravec

Created: 2018-09-20 09:36:30 UTC

Size: 4.02 KB

patch

obsolete

>From 40cf234f823966d127391f0e979b79badb0ffa65 Mon Sep 17 00:00:00 2001
>From: Nick Clemens <nick@bywatersolutions.com>
>Date: Tue, 24 Apr 2018 20:58:50 +0000
>Subject: [PATCH] Bug 20656: Better formatting for print summary
>
>This patch is a slightly edited c&p from boraccount.tt
>
>1 - Manually add a credit with no notes to patron
>2 - Print summary
>3 - Inspect the line
>4 - Note that td has extra newlines and no words
>5 - Apply patch
>6 - Print summary again
>7 - Note better formatting
>
>Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
>
>Signed-off-by: Josef Moravec <josef.moravec@gmail.com>
>---
> .../prog/en/modules/members/moremember-print.tt    | 38 ++++++++++++----------
> 1 file changed, 21 insertions(+), 17 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tt
>index 968c800..089a6e5 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tt
>@@ -93,31 +93,35 @@
>         </table>
>     [% END %]
>     [% IF accounts && totaldue != 0 %]
>-        <table>
>+        <table id="table_account_fines">
>             <caption>Account fines and payments</caption>
>-            <tr>
>-                <th>Description of charges</th>
>-                <th>Date</th>
>-                <th>Amount</th>
>-                <th>Outstanding</th>
>-            </tr>
>+            <thead>
>+              <tr>
>+                  <th>Date</th>
>+                  <th>Description of charges</th>
>+                  <th>Note</th>
>+                  <th>Amount</th>
>+                  <th>Outstanding</th>
>+                </tr>
>+            </thead>
> 
>             [% FOREACH account IN accounts %]
>-                <tr>
>-                    <td>
>-                        [% IF ( account.itemnumber ) %]<a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% account.item.biblionumber | html %]&amp;itemnumber=[% account.itemnumber | html %]">[% END %]
>-                        [% account.description | html %]&nbsp;[% IF account.itemnumber AND account.accounttype != 'F' AND account.accounttype != 'FU' %] [% account.item.biblio.title | html %][% END %]
>-                        [% IF ( account.itemnumber ) %]</a>[% END %]
>-                    </td>
>-                    <td>[% account.date | $KohaDates %]</td>
>-                    <td style="text-align:right;">[% account.amount | $Price | html %]</td>
>-                    <td style="text-align:right;">[% account.amountoutstanding | $Price | html %]</td>
>+               <tr>
>+                  <td>[% account.date | $KohaDates %]</td>
>+                  <td>
>+                    [% INCLUDE 'accounttype.inc' accountline => account %]
>+                    [%- IF account.payment_type %], [% AuthorisedValues.GetByCode('PAYMENT_TYPE', account.payment_type) | html %][% END %]
>+                    [%- IF account.description %], [% account.description | html %][% END %]
>+                    &nbsp;[% IF ( account.itemnumber ) %]<a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% account.item.biblionumber %]&amp;itemnumber=[% account.itemnumber | html %]">[% account.item.biblio.title | html %]</a>[% END %]</td>
>+                  <td>[% account.note | html_line_break %]</td>
>+                  [% IF ( account.amount < 0 ) %]<td class="credit" style="text-align: right;">[% ELSE %]<td class="debit" style="text-align: right;">[% END %][% account.amount | $Price | html %]</td>
>+                  [% IF ( account.amountoutstanding < 0 ) %]<td class="credit" style="text-align: right;">[% ELSE %]<td class="debit" style="text-align: right;">[% END %][% account.amountoutstanding | $Price | html %]</td>
>                 </tr>
>             [% END %]
> 
>             <tfoot>
>                 <tr>
>-                    <td colspan="3">Total due</td>
>+                    <td colspan="4">Total due</td>
>                     <td colspan="2" style="text-align:right;">[% totaldue | $Price | html %]</td>
>                 </tr>
>             </tfoot>
>-- 
>2.1.4

Actions: View | Diff | Splinter Review

Attachments on bug 20656: 74829 | 74830 | 76775 | 76776 | 79002 | 79003 | 79024 | 79095 | 79096 | 79097 | 79138 | 79139 | 79140 | 79176