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

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/pos/register.tt (-9 / +8 lines)
Lines 103-110 Link Here
103
                            [% IF credit.debit %]
103
                            [% IF credit.debit %]
104
                            <tr>
104
                            <tr>
105
                                <td>[% accountline.accountlines_id | html %]</td>
105
                                <td>[% accountline.accountlines_id | html %]</td>
106
                                <td>{ "type": "credit", "identifier": "[%- accountline.credit_number | html -%]", "description": "[%- PROCESS account_type_description account=accountline -%] ([% AuthorisedValues.GetByCode( 'PAYMENT_TYPE', accountline.payment_type ) | html %])", "amount": "[% accountline.amount * -1 | $Price %]" }</td>
106
                                <td>{ "type": "credit", "identifier": "[%- accountline.credit_number | html -%]", "description": "[%- PROCESS account_type_description account=accountline -%] ([% AuthorisedValues.GetByCode( 'PAYMENT_TYPE', accountline.payment_type ) | html %])", "amount": "[% accountline.amount * -1 | $Price %]", "timestamp": "[% accountline.timestamp | $KohaDates with_hours => 1 %]" }</td>
107
                                <td>[% IF accountline.timestamp %][% accountline.timestamp | $KohaDates with_hours => 1 %][% END %]</td>
107
                                <td></td>
108
                                <td>
108
                                <td>
109
                                    [%- PROCESS account_type_description account=credit.debit -%]
109
                                    [%- PROCESS account_type_description account=credit.debit -%]
110
                                    [%- IF credit.debit.description -%] ([% credit.debit.description | html %])[%- END -%]
110
                                    [%- IF credit.debit.description -%] ([% credit.debit.description | html %])[%- END -%]
Lines 127-133 Link Here
127
                            [% IF debit.credit %]
127
                            [% IF debit.credit %]
128
                            <tr>
128
                            <tr>
129
                                <td>[% accountline.accountlines_id | html %]</td>
129
                                <td>[% accountline.accountlines_id | html %]</td>
130
                                <td>{ "type": "debit", "identifier": "[%- accountline.credit_number | html -%]", "description": "[%- PROCESS account_type_description account=accountline -%] ([% AuthorisedValues.GetByCode( 'PAYMENT_TYPE', accountline.payment_type ) | html %])", "amount": "[% accountline.amount * -1 | $Price %]" }</td>
130
                                <td>{ "type": "debit", "identifier": "[%- accountline.credit_number | html -%]", "description": "[%- PROCESS account_type_description account=accountline -%] ([% AuthorisedValues.GetByCode( 'PAYMENT_TYPE', accountline.payment_type ) | html %])", "amount": "[% accountline.amount * -1 | $Price %]", "timestamp": "[% accountline.timestamp | $KohaDates with_hours => 1 %]" }</td>
131
                                <td></td>
131
                                <td></td>
132
                                <td>[%- PROCESS account_type_description account=debit.credit -%]</td>
132
                                <td>[%- PROCESS account_type_description account=debit.credit -%]</td>
133
                                <td>
133
                                <td>
Lines 192-199 Link Here
192
                            [% IF credit.debit %]
192
                            [% IF credit.debit %]
193
                            <tr>
193
                            <tr>
194
                                <td>[% accountline.accountlines_id | html %]</td>
194
                                <td>[% accountline.accountlines_id | html %]</td>
195
                                <td>{ "type": "credit", "identifier": "[%- accountline.credit_number | html -%]", "description": "[%- PROCESS account_type_description account=accountline -%] ([% AuthorisedValues.GetByCode( 'PAYMENT_TYPE', accountline.payment_type ) | html %])", "amount": "[% accountline.amount * -1 | $Price %]" }</td>
195
                                <td>{ "type": "credit", "identifier": "[%- accountline.credit_number | html -%]", "description": "[%- PROCESS account_type_description account=accountline -%] ([% AuthorisedValues.GetByCode( 'PAYMENT_TYPE', accountline.payment_type ) | html %])", "amount": "[% accountline.amount * -1 | $Price %]", "timestamp": "[% accountline.timestamp | $KohaDates with_hours => 1 %]" }</td>
196
                                <td>[% IF accountline.timestamp %][% accountline.timestamp | $KohaDates with_hours => 1 %][% END %]</td>
196
                                <td></td>
197
                                <td>
197
                                <td>
198
                                    [%- PROCESS account_type_description account=credit.debit -%]
198
                                    [%- PROCESS account_type_description account=credit.debit -%]
199
                                    [%- IF credit.debit.description -%] ([% credit.debit.description | html %])[%- END -%]
199
                                    [%- IF credit.debit.description -%] ([% credit.debit.description | html %])[%- END -%]
Lines 216-222 Link Here
216
                            [% IF debit.credit %]
216
                            [% IF debit.credit %]
217
                            <tr>
217
                            <tr>
218
                                <td>[% accountline.accountlines_id | html %]</td>
218
                                <td>[% accountline.accountlines_id | html %]</td>
219
                                <td>{ "type": "debit", "identifier": "[%- accountline.credit_number | html -%]", "description": "[%- PROCESS account_type_description account=accountline -%] ([% AuthorisedValues.GetByCode( 'PAYMENT_TYPE', accountline.payment_type ) | html %])", "amount": "[% accountline.amount * -1 | $Price %]" }</td>
219
                                <td>{ "type": "debit", "identifier": "[%- accountline.credit_number | html -%]", "description": "[%- PROCESS account_type_description account=accountline -%] ([% AuthorisedValues.GetByCode( 'PAYMENT_TYPE', accountline.payment_type ) | html %])", "amount": "[% accountline.amount * -1 | $Price %]", "timestamp": "[% accountline.timestamp | $KohaDates with_hours => 1 %]" }</td>
220
                                <td></td>
220
                                <td></td>
221
                                <td>[%- PROCESS account_type_description account=debit.credit -%]</td>
221
                                <td>[%- PROCESS account_type_description account=debit.credit -%]</td>
222
                                <td>
222
                                <td>
Lines 342-348 Link Here
342
                    var details = JSON.parse(rows.data().pluck(1).pop());
342
                    var details = JSON.parse(rows.data().pluck(1).pop());
343
                    var identifier = details.identifier || group;
343
                    var identifier = details.identifier || group;
344
                    return $('<tr class="'+details.type+'"/>')
344
                    return $('<tr class="'+details.type+'"/>')
345
                        .append( '<td>'+identifier+'</td>' )
345
                        .append( '<td>'+details.timestamp+' ('+identifier+')</td>' )
346
                        .append( '<td colspan="2">'+details.description+'</td>' )
346
                        .append( '<td colspan="2">'+details.description+'</td>' )
347
                        .append( '<td>'+details.amount+'</td>' )
347
                        .append( '<td>'+details.amount+'</td>' )
348
                        .append( '<td><button class="printReceipt btn btn-default btn-xs" data-accountline="'+group+'"><i class="fa fa-print"></i> ' + _("Print receipt") + '</button></td>');
348
                        .append( '<td><button class="printReceipt btn btn-default btn-xs" data-accountline="'+group+'"><i class="fa fa-print"></i> ' + _("Print receipt") + '</button></td>');
Lines 366-372 Link Here
366
                    var details = JSON.parse(rows.data().pluck(1).pop());
366
                    var details = JSON.parse(rows.data().pluck(1).pop());
367
                    var identifier = details.identifier || group;
367
                    var identifier = details.identifier || group;
368
                    return $('<tr class="'+details.type+'"/>')
368
                    return $('<tr class="'+details.type+'"/>')
369
                        .append( '<td>'+identifier+'</td>' )
369
                        .append( '<td>'+details.timestamp+' ('+identifier+')</td>' )
370
                        .append( '<td colspan="2">'+details.description+'</td>' )
370
                        .append( '<td colspan="2">'+details.description+'</td>' )
371
                        .append( '<td>'+details.amount+'</td>' )
371
                        .append( '<td>'+details.amount+'</td>' )
372
                        .append( '<td><button class="printReceipt btn btn-default btn-xs" data-accountline="'+group+'"><i class="fa fa-print"></i> Print receipt</button></td>');
372
                        .append( '<td><button class="printReceipt btn btn-default btn-xs" data-accountline="'+group+'"><i class="fa fa-print"></i> Print receipt</button></td>');
373
- 

Return to bug 28390