Attachment #43092 for bug #14948

View | Details | Raw Unified | Return to bug 14948
Collapse All | Expand All

Lines 1-9 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table-footer.inc (-3 / +3 lines)
1	<tfoot>	1	<tfoot>
2	<tr>	2	<tr>
3	<td colspan="10" style="text-align: right; font-weight:bold;">Totals:</td>	3	<td colspan="10" style="text-align: right; font-weight:bold;">Totals:</td>
4	<td id="totaldue">[% totaldue %]</td>	4	<td id="totaldue" style="text-align: right;">[% totaldue %]</td>
5	<td id="totalfine">[% finetotal %]</td>	5	<td id="totalfine" style="text-align: right;">[% finetotal %]</td>
6	<td id="totalprice">[% totalprice %]</td>	6	<td id="totalprice" style="text-align: right;">[% totalprice %]</td>
7	<td colspan="3"><div class="date-select">	7	<td colspan="3"><div class="date-select">
8	<p><label for="newduedate">Renewal due date:</label> <input type="text" size="12" id="newduedate" name="newduedate" value="[% newduedate %]" readonly="readonly" />	8	<p><label for="newduedate">Renewal due date:</label> <input type="text" size="12" id="newduedate" name="newduedate" value="[% newduedate %]" readonly="readonly" />
9	</p>	9	</p>




                {
                    "mDataProp": function ( oObj ) {
                        if ( ! oObj.charge ) oObj.charge = 0;
                        return '<span style="text-align: right; display: block;">' + parseFloat(oObj.charge).toFixed(2) + '<span>';
                    }
                },
                {
                    "mDataProp": function ( oObj ) {
                        if ( ! oObj.fine ) oObj.fine = 0;
                        return '<span style="text-align: right; display: block;">' + parseFloat(oObj.fine).toFixed(2)  + '<span>';
                    }
                },
                {
                    "mDataProp": function ( oObj ) {
                        if ( ! oObj.price ) oObj.price = 0;
                        return '<span style="text-align: right; display: block;">' + parseFloat(oObj.price).toFixed(2) + '<span>';
                    }
                },
                {




        [%- IF account.description %], [% account.description %][% END %]
        &nbsp;[% IF ( account.itemnumber ) %]<a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% account.biblionumber %]&amp;itemnumber=[% account.itemnumber %]">View item</a>&nbsp;[% END %][% account.title |html %]</td>
      <td>[% account.note | html_line_break %]</td>
      [% IF ( account.amountcredit ) %]<td class="credit" style="text-align: right;">[% ELSE %]<td class="debit" style="text-align: right;">[% END %][% account.amount %]</td>
      [% IF ( account.amountoutstandingcredit ) %]<td class="credit" style="text-align: right;">[% ELSE %]<td class="debit" style="text-align: right;">[% END %][% account.amountoutstanding %]</td>
    [% IF ( reverse_col ) %]
      <td>
	[% IF ( account.payment ) %]

  <tr>
    <td colspan="4">Total due</td>
    [% IF ( totalcredit ) %]
        <td class="credit" style="text-align: right;">[% total %]</td>
        <td colspan="3" class="credit">
      [% ELSE %]
        <td colspan="2" class="credit">
      [% END %]
    [% ELSE %]
       <td class="debit"style="text-align: right;">[% total %]</td>
    [% END %]
    [% IF ( reverse_col ) %]
      <td colspan="2"></td>
      [% ELSE %]
        <td></td>
      [% END %]
    [% END %]
    [% total %]</td>
  </tr>
  </tfoot>
</table>




<tfoot>
<tr>
    <td class="total" colspan="8">Total due:</td>
    <td style="text-align: right;">[% total | format('%.2f') %]</td>
</tr>
</tfoot>
<tbody>

    <td>[% line.accounttype %]</td>
    <td>[% line.notify_id %]</td>
    <td>[% line.notify_level %]</td>
    <td class="debit" style="text-align: right;">[% line.amount | format('%.2f') %]</td>
    <td class="debit" style="text-align: right;">[% line.amountoutstanding | format('%.2f') %]</td>
</tr>
[% END %]
[% IF ( account_grp.total ) %]
<tr>

    <td class="total" colspan="8" style="text-align: right;">Sub total:</td>
    <td style="text-align: right;">[% account_grp.total | format('%.2f') %]</td>
</tr>
[% END %]
[% END %]

Lines 24-30 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/tables/members_results.tt (-2 / +1 lines)
24	"dt_od_checkouts":	24	"dt_od_checkouts":
25	"[% IF data.overdues %]<span class='overdue'><strong>[% data.overdues %]</strong></span>[% ELSE %][% data.overdues %][% END %] / [% data.issues %]",	25	"[% IF data.overdues %]<span class='overdue'><strong>[% data.overdues %]</strong></span>[% ELSE %][% data.overdues %][% END %] / [% data.issues %]",
26	"dt_fines":	26	"dt_fines":
27	"[% IF data.fines < 0 %]<span class='credit'>[% data.fines \|html %]</span> [% ELSIF data.fines > 0 %] <span class='debit'><strong>[% data.fines \|html %]</strong></span> [% ELSE %] [% data.fines \|html%] [% END %]</td>",	27	"<span style='text-align: right; display: block;'>[% IF data.fines < 0 %]<span class='credit'>[% data.fines \|html %]</span> [% ELSIF data.fines > 0 %] <span class='debit'><strong>[% data.fines \|html %]</strong></span> [% ELSE %] [% data.fines \|html%] [% END %]</span>",
28	"dt_borrowernotes":	28	"dt_borrowernotes":
29	"[% data.borrowernotes.replace('\\\\' , '\\\\') \|html \|html_line_break \|collapse %]",	29	"[% data.borrowernotes.replace('\\\\' , '\\\\') \|html \|html_line_break \|collapse %]",
30	"dt_action":	30	"dt_action":
31	-

Return to bug 14948

Lines 266-284 $(document).ready(function() { Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/js/checkouts.js (-3 / +3 lines)
266	{	266	{
267	"mDataProp": function ( oObj ) {	267	"mDataProp": function ( oObj ) {
268	if ( ! oObj.charge ) oObj.charge = 0;	268	if ( ! oObj.charge ) oObj.charge = 0;
269	return parseFloat(oObj.charge).toFixed(2);	269	return '<span style="text-align: right; display: block;">' + parseFloat(oObj.charge).toFixed(2) + '<span>';
270	}	270	}
271	},	271	},
272	{	272	{
273	"mDataProp": function ( oObj ) {	273	"mDataProp": function ( oObj ) {
274	if ( ! oObj.fine ) oObj.fine = 0;	274	if ( ! oObj.fine ) oObj.fine = 0;
275	return parseFloat(oObj.fine).toFixed(2);	275	return '<span style="text-align: right; display: block;">' + parseFloat(oObj.fine).toFixed(2) + '<span>';
276	}	276	}
277	},	277	},
278	{	278	{
279	"mDataProp": function ( oObj ) {	279	"mDataProp": function ( oObj ) {
280	if ( ! oObj.price ) oObj.price = 0;	280	if ( ! oObj.price ) oObj.price = 0;
281	return parseFloat(oObj.price).toFixed(2);	281	return '<span style="text-align: right; display: block;">' + parseFloat(oObj.price).toFixed(2) + '<span>';
282	}	282	}
283	},	283	},
284	{	284	{

Lines 102-109 $(document).ready(function() { Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt (-12 / +8 lines)
102	[%- IF account.description %], [% account.description %][% END %]	102	[%- IF account.description %], [% account.description %][% END %]
103	[% IF ( account.itemnumber ) %]<a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% account.biblionumber %]&itemnumber=[% account.itemnumber %]">View item</a> [% END %][% account.title \|html %]</td>	103	[% IF ( account.itemnumber ) %]<a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% account.biblionumber %]&itemnumber=[% account.itemnumber %]">View item</a> [% END %][% account.title \|html %]</td>
104	<td>[% account.note \| html_line_break %]</td>	104	<td>[% account.note \| html_line_break %]</td>
105	[% IF ( account.amountcredit ) %]<td class="credit">[% ELSE %]<td class="debit">[% END %][% account.amount %]</td>	105	[% IF ( account.amountcredit ) %]<td class="credit" style="text-align: right;">[% ELSE %]<td class="debit" style="text-align: right;">[% END %][% account.amount %]</td>
106	[% IF ( account.amountoutstandingcredit ) %]<td class="credit">[% ELSE %]<td class="debit">[% END %][% account.amountoutstanding %]</td>	106	[% IF ( account.amountoutstandingcredit ) %]<td class="credit" style="text-align: right;">[% ELSE %]<td class="debit" style="text-align: right;">[% END %][% account.amountoutstanding %]</td>
107	[% IF ( reverse_col ) %]	107	[% IF ( reverse_col ) %]
108	<td>	108	<td>
109	[% IF ( account.payment ) %]	109	[% IF ( account.payment ) %]
Lines 127-145 $(document).ready(function() { Link Here
127	<tr>	127	<tr>
128	<td colspan="4">Total due</td>	128	<td colspan="4">Total due</td>
129	[% IF ( totalcredit ) %]	129	[% IF ( totalcredit ) %]
130	[% IF ( reverse_col ) %]	130	<td class="credit" style="text-align: right;">[% total %]</td>
131	<td colspan="3" class="credit">
132	[% ELSE %]
133	<td colspan="2" class="credit">
134	[% END %]
135	[% ELSE %]	131	[% ELSE %]
136	[% IF ( reverse_col ) %]	132	<td class="debit"style="text-align: right;">[% total %]</td>
137	<td colspan="3" class="debit">	133	[% END %]
		134	[% IF ( reverse_col ) %]
		135	<td colspan="2"></td>
138	[% ELSE %]	136	[% ELSE %]
139	<td colspan="2" class="credit">	137	<td></td>
140	[% END %]
141	[% END %]	138	[% END %]
142	[% total %]</td>
143	</tr>	139	</tr>
144	</tfoot>	140	</tfoot>
145	</table>	141	</table>

Lines 85-91 function enableCheckboxActions(){ Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt (-5 / +5 lines)
85	<tfoot>	85	<tfoot>
86	<tr>	86	<tr>
87	<td class="total" colspan="8">Total due:</td>	87	<td class="total" colspan="8">Total due:</td>
88	<td>[% total \| format('%.2f') %]</td>	88	<td style="text-align: right;">[% total \| format('%.2f') %]</td>
89	</tr>	89	</tr>
90	</tfoot>	90	</tfoot>
91	<tbody>	91	<tbody>
Lines 142-156 function enableCheckboxActions(){ Link Here
142	<td>[% line.accounttype %]</td>	142	<td>[% line.accounttype %]</td>
143	<td>[% line.notify_id %]</td>	143	<td>[% line.notify_id %]</td>
144	<td>[% line.notify_level %]</td>	144	<td>[% line.notify_level %]</td>
145	<td class="debit">[% line.amount \| format('%.2f') %]</td>	145	<td class="debit" style="text-align: right;">[% line.amount \| format('%.2f') %]</td>
146	<td class="debit">[% line.amountoutstanding \| format('%.2f') %]</td>	146	<td class="debit" style="text-align: right;">[% line.amountoutstanding \| format('%.2f') %]</td>
147	</tr>	147	</tr>
148	[% END %]	148	[% END %]
149	[% IF ( account_grp.total ) %]	149	[% IF ( account_grp.total ) %]
150	<tr>	150	<tr>
151		151
152	<td class="total" colspan="8">Sub total:</td>	152	<td class="total" colspan="8" style="text-align: right;">Sub total:</td>
153	<td>[% account_grp.total \| format('%.2f') %]</td>	153	<td style="text-align: right;">[% account_grp.total \| format('%.2f') %]</td>
154	</tr>	154	</tr>
155	[% END %]	155	[% END %]
156	[% END %]	156	[% END %]