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

(-)a/admin/columns_settings.yml (+50 lines)
Lines 1343-1348 modules: Link Here
1343
            -
1343
            -
1344
              columnname: non-public_note
1344
              columnname: non-public_note
1345
1345
1346
    print_summary:
1347
        print-summary-checkouts:
1348
            columns:
1349
                -
1350
                    columnname: title
1351
                -
1352
                    columnname: author
1353
                -
1354
                    columnname: call_number
1355
                -
1356
                    columnname: item_type
1357
                -
1358
                    columnname: date_due
1359
                -
1360
                    columnname: barcode
1361
                -
1362
                    columnname: inventory_number
1363
                -
1364
                    columnname: charge
1365
                -
1366
                    columnname: price
1367
                -
1368
                    columnname: status
1369
1370
        print-summary-holds:
1371
            columns:
1372
                -
1373
                    columnname: title
1374
                -
1375
                    columnname: author
1376
                -
1377
                    columnname: placed_on
1378
                -
1379
                    columnname: expires_on
1380
                -
1381
                    columnname: pick up_location
1382
1383
        print-summary-fines:
1384
            columns:
1385
                -
1386
                    columnname: date
1387
                -
1388
                    columnname: description_of_charges
1389
                -
1390
                    columnname: note
1391
                -
1392
                    columnname: amount
1393
                -
1394
                    columnname: outstanding
1395
1346
  opac:
1396
  opac:
1347
    biblio-detail:
1397
    biblio-detail:
1348
      holdingst:
1398
      holdingst:
(-)a/koha-tmpl/intranet-tmpl/prog/css/print.css (-1 / +3 lines)
Lines 213-218 tfoot td, tfoot td:last-child { Link Here
213
}
213
}
214
214
215
td.credit, td.debit, td.sum {
215
td.credit, td.debit, td.sum {
216
    color: #000;
216
	font-family : "Courier New", Courier, monospace;
217
	font-family : "Courier New", Courier, monospace;
217
	text-align : right;
218
	text-align : right;
218
}
219
}
Lines 307-313 fieldset.action, Link Here
307
.print,
308
.print,
308
.ui-tabs-nav,
309
.ui-tabs-nav,
309
.browse-controls,
310
.browse-controls,
310
.cart-controls {
311
.cart-controls,
312
button.dt-button {
311
    display: none;
313
    display: none;
312
}
314
}
313
315
(-)a/koha-tmpl/intranet-tmpl/prog/css/src/_tables.scss (+27 lines)
Lines 26-31 table { Link Here
26
                margin: 0 .5em 0 0;
26
                margin: 0 .5em 0 0;
27
            }
27
            }
28
        }
28
        }
29
30
        button {
31
            &.dt-button {
32
                background: transparent none;
33
                border: 0;
34
                color: #595959;
35
                font-size: 60%;
36
                margin: 0 .5em;
37
38
                &:hover:not(.disabled):active:not(.disabled) {
39
                    background: transparent none;
40
                    border: 0;
41
                    box-shadow: none;
42
                    color: #000;
43
                }
44
45
                &:hover:not(.disabled) {
46
                    background: transparent none;
47
                    border: 0;
48
                    color: #000;
49
                }
50
            }
51
        }
52
53
        div.dt-button-collection {
54
            font-size: 70%;
55
        }
29
    }
56
    }
30
57
31
    &.invis {
58
    &.invis {
(-)a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss (+10 lines)
Lines 2279-2284 td { Link Here
2279
        min-height: unset;
2279
        min-height: unset;
2280
        padding: 0;
2280
        padding: 0;
2281
    }
2281
    }
2282
2283
    &.credit,
2284
    &.debit,
2285
    &.total {
2286
        text-align: right;
2287
2288
        tfoot & {
2289
            color: #000;
2290
        }
2291
    }
2282
}
2292
}
2283
2293
2284
.cover-image {
2294
.cover-image {
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tt (-94 / +188 lines)
Lines 3-8 Link Here
3
[% USE KohaDates %]
3
[% USE KohaDates %]
4
[% USE Price %]
4
[% USE Price %]
5
[% USE ItemTypes %]
5
[% USE ItemTypes %]
6
[% USE TablesSettings %]
6
[% PROCESS 'member-display-address-style.inc' %]
7
[% PROCESS 'member-display-address-style.inc' %]
7
[% SET footerjs = 1 %]
8
[% SET footerjs = 1 %]
8
9
Lines 31-102 Link Here
31
        </ul>
32
        </ul>
32
33
33
        [% IF ( issues ) %]
34
        [% IF ( issues ) %]
34
            <table>
35
            <table id="print-summary-checkouts">
35
                <caption>Items checked out</caption>
36
                <caption>Items checked out</caption>
36
                <tr>
37
                <thead>
37
                    <th>Title</th>
38
                    <tr>
38
                    <th>Author</th>
39
                        <th>Title</th>
39
                    <th>Call number</th>
40
                        <th>Author</th>
40
                    <th>Item type</th>
41
                        <th>Call number</th>
41
                    <th>Date due</th>
42
                        <th>Item type</th>
42
                    <th>Barcode</th>
43
                        <th>Date due</th>
43
                    <th>Inventory number</th>
44
                        <th>Barcode</th>
44
                    <th>Charge</th>
45
                        <th>Inventory number</th>
45
                    <th>Price</th>
46
                        <th>Charge</th>
46
                    <th>Status</th>
47
                        <th>Price</th>
47
                </tr>
48
                        <th>Status</th>
48
49
                    </tr>
49
                [% FOREACH issue IN issues %]
50
                </thead>
50
                    [% IF ( issue.overdue ) %]<tr class="overdue">[% ELSE %]<tr>[% END %]
51
                <tbody>
51
                        <td>
52
                    [% FOREACH issue IN issues %]
52
                            [% issue.title | html %]
53
                        <tr>
53
                            <a href="/cgi-bin/koha/catalogue/detail.pl?item=[% issue.itemnumber | uri %]&amp;biblionumber=[% issue.biblionumber | uri %]&amp;bi=[% issue.biblioitemnumber | uri %]"></a>
54
                            <td>
55
                                [% INCLUDE 'biblio-title.inc' biblio=issue link = 0 %]
56
                            </td>
57
                            <td>[% issue.author | html %]</td>
58
                            <td>[% issue.itemcallnumber | html %]</td>
59
                            <td>[% ItemTypes.GetDescription( issue.itype ) | html %]</td>
60
                            <td>[% issue.date_due | $KohaDates  as_due_date => 1 %]</td>
61
                            <td>[% issue.barcode | html %]</td>
62
                            <td>[% issue.stocknumber | html %]</td>
63
                            [% IF ( issue.charge <= 0 ) %]
64
                                <td class="credit">
65
                            [% ELSE %]
66
                                <td class="debit">
67
                            [% END %]
68
                                [% issue.charge | $Price %]
69
                            </td>
70
                            [% IF ( issue.replacementprice <= 0 ) %]
71
                                <td class="credit">
72
                            [% ELSE %]
73
                                <td class="debit">
74
                            [% END %]
75
                                [% issue.replacementprice | $Price %]
76
                            </td>
77
                            <td>[% IF ( issue.overdue ) %]Overdue![% ELSE %]&nbsp;[% END %]</td>
78
                        </tr>
79
                    [% END %]
80
                </tbody>
81
                 <tfoot>
82
                    <tr>
83
                        <td></td>
84
                        <td></td>
85
                        <td></td>
86
                        <td></td>
87
                        <td></td>
88
                        <td></td>
89
                        <td style="text-align: right; font-weight:bold;">Totals:</td>
90
                        [% IF ( totaldue <= 0 ) %]
91
                            <td class="credit">
92
                        [% ELSE %]
93
                            <td class="debit">
94
                        [% END %]
95
                            [% totaldue | $Price %]
96
                        </td>
97
                        [% IF ( totalprice <= 0 ) %]
98
                            <td class="credit">
99
                        [% ELSE %]
100
                            <td class="debit">
101
                        [% END %]
102
                            [% totalprice | $Price %]
54
                        </td>
103
                        </td>
55
                        <td>[% issue.author | html %]</td>
104
                        <td></td>
56
                        <td>[% issue.itemcallnumber | html %]</td>
57
                        <td>[% ItemTypes.GetDescription( issue.itype ) | html %]</td>
58
                        <td>[% issue.date_due | $KohaDates  as_due_date => 1 %]</td>
59
                        <td>[% issue.barcode | html %]</td>
60
                        <td>[% issue.stocknumber | html %]</td>
61
                        <td>[% issue.charge | $Price %]</td>
62
                        <td>[% issue.replacementprice | $Price %]</td>
63
                        <td>[% IF ( issue.overdue ) %]Overdue![% ELSE %]&nbsp;[% END %]</td>
64
                    </tr>
105
                    </tr>
65
                [% END %]
106
                </tfoot>
66
107
            </table>
67
            <tr>
108
        [% END %]
68
                <td colspan="7" style="text-align: right; font-weight:bold;">Totals:</td>
69
                <td>[% totaldue | $Price %]</td>
70
                <td>[% totalprice | $Price %]</td>
71
                <td colspan="3">&nbsp;</td>
72
            </tr>
73
        </table>
74
    [% END %]
75
109
76
    [% IF ( reserves ) %]
110
    [% IF ( reserves ) %]
77
        <table>
111
        <table id="print-summary-holds">
78
            <caption>Pending holds</caption>
112
            <caption>Pending holds</caption>
79
            <tr>
113
            <thead>
80
                <th>Title</th>
81
                <th>Author</th>
82
                <th>Placed on</th>
83
                <th>Expires on</th>
84
                <th>Pick up location</th>
85
            </tr>
86
87
            [% FOREACH reserve IN reserves %]
88
                <tr>
114
                <tr>
89
                    <td>[% reserve.title | html %]</td>
115
                    <th>Title</th>
90
                    <td>[% reserve.author | html %]</td>
116
                    <th>Author</th>
91
                    <td>[% reserve.reservedate | $KohaDates %]</td>
117
                    <th>Placed on</th>
92
                    <td>[% reserve.expirationdate | $KohaDates %]</td>
118
                    <th>Expires on</th>
93
                    <td>[% reserve.waiting_at | html %]</td>
119
                    <th>Pick up location</th>
94
                </tr>
120
                </tr>
95
            [% END %]
121
            </thead>
122
            <tbody>
123
                [% FOREACH reserve IN reserves %]
124
                    <tr>
125
                        <td>[% reserve.title | html %]</td>
126
                        <td>[% reserve.author | html %]</td>
127
                        <td>[% reserve.reservedate | $KohaDates %]</td>
128
                        <td>[% reserve.expirationdate | $KohaDates %]</td>
129
                        <td>[% reserve.waiting_at | html %]</td>
130
                    </tr>
131
                [% END %]
132
            </tbody>
96
        </table>
133
        </table>
97
    [% END %]
134
    [% END %]
98
    [% IF accounts && totaldue != 0 %]
135
    [% IF accounts && totaldue != 0 %]
99
        <table id="table_account_fines">
136
        <table id="print-summary-fines">
100
            <caption>Account fines and payments</caption>
137
            <caption>Account fines and payments</caption>
101
            <thead>
138
            <thead>
102
              <tr>
139
              <tr>
Lines 107-152 Link Here
107
                  <th>Outstanding</th>
144
                  <th>Outstanding</th>
108
                </tr>
145
                </tr>
109
            </thead>
146
            </thead>
110
147
            <tbody>
111
            [% FOREACH account IN accounts %]
148
                [% FOREACH account IN accounts %]
112
               <tr>
149
                    <tr>
113
                  <td>[% account.date | $KohaDates %]</td>
150
                        <td>[% account.date | $KohaDates %]</td>
114
                  <td>
151
                        <td>
115
                      [% PROCESS account_type_description account=account %]
152
                            [% PROCESS account_type_description account=account %]
116
                      [%- IF account.payment_type %]
153
                            [%- IF account.payment_type %]
117
                          , [% AuthorisedValues.GetByCode('PAYMENT_TYPE', account.payment_type) | html %]
154
                                , [% AuthorisedValues.GetByCode('PAYMENT_TYPE', account.payment_type) | html %]
118
                      [% END %]
155
                            [% END %]
119
                      [%- IF account.description %]
156
                            [%- IF account.description %]
120
                          , [% account.description | html %]
157
                                , [% account.description | html %]
121
                      [% END %]
158
                            [% END %]
122
                      &nbsp;
159
                            &nbsp;
123
                      [% IF ( account.itemnumber AND account.debit_type_code != 'OVERDUE' ) %]
160
                            [% IF ( account.itemnumber AND account.debit_type_code != 'OVERDUE' ) %]
124
                          <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% account.item.biblionumber | uri %]&amp;itemnumber=[% account.itemnumber | uri %]">[% account.item.biblio.title | html %]</a>
161
                                <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% account.item.biblionumber | uri %]&amp;itemnumber=[% account.itemnumber | uri %]">[% account.item.biblio.title | html %]</a>
125
                      [% END %]
162
                            [% END %]
126
                  </td>
163
                        </td>
127
                  <td>
164
                        <td>
128
                      [% account.note | html_line_break %]
165
                            [% account.note | html_line_break %]
129
                  </td>
166
                        </td>
130
                  [% IF ( account.amount < 0 ) %]
167
                        [% IF ( account.amount <= 0 ) %]
131
                      <td class="credit" style="text-align: right;">
168
                            <td class="credit">
132
                  [% ELSE %]
169
                        [% ELSE %]
133
                      <td class="debit" style="text-align: right;">
170
                            <td class="debit">
134
                  [% END %][% account.amount | $Price %]
171
                        [% END %]
135
                      </td>
172
                            [% account.amount | $Price %]
136
                  [% IF ( account.amountoutstanding < 0 ) %]
173
                        </td>
137
                      <td class="credit" style="text-align: right;">
174
                        [% IF ( account.amountoutstanding <= 0 ) %]
138
                  [% ELSE %]
175
                            <td class="credit">
139
                      <td class="debit" style="text-align: right;">
176
                        [% ELSE %]
140
                  [% END %]
177
                            <td class="debit">
141
                          [% account.amountoutstanding | $Price %]
178
                        [% END %]
142
                      </td>
179
                            [% account.amountoutstanding | $Price %]
143
                </tr>
180
                        </td>
144
            [% END %]
181
                    </tr>
145
182
                [% END %]
183
            </tbody>
146
            <tfoot>
184
            <tfoot>
147
                <tr>
185
                <tr>
148
                    <td colspan="4">Total due</td>
186
                    <td></td>
149
                    <td colspan="2" style="text-align:right;">[% totaldue | $Price %]</td>
187
                    <td></td>
188
                    <td ></td>
189
                    [% IF ( totaldue < 0 ) %]
190
                        <td class="credit">
191
                    [% ELSE %]
192
                        <td class="debit">
193
                    [% END %]
194
                        Total due:
195
                    </td>
196
                    [% IF ( totaldue < 0 ) %]
197
                        <td class="credit">
198
                    [% ELSE %]
199
                        <td class="debit">
200
                    [% END %]
201
                        [% totaldue | $Price %]
202
                    </td>
150
                </tr>
203
                </tr>
151
            </tfoot>
204
            </tfoot>
152
        </table>
205
        </table>
Lines 154-159 Link Here
154
207
155
[% MACRO jsinclude BLOCK %]
208
[% MACRO jsinclude BLOCK %]
156
    [% INCLUDE 'slip-print.inc' #printThenClose %]
209
    [% INCLUDE 'slip-print.inc' #printThenClose %]
210
    [% INCLUDE 'datatables.inc' %]
211
    [% INCLUDE 'columns_settings.inc' %]
212
    <script>
213
        var checkouts_columns = [% TablesSettings.GetColumns( 'circ', 'print_summary', 'print-summary-checkouts', 'json' ) | $raw %];
214
        var holds_columns = [% TablesSettings.GetColumns( 'circ', 'print_summary', 'print-summary-holds', 'json' ) | $raw %];
215
        var fines_columns = [% TablesSettings.GetColumns( 'circ', 'print_summary', 'print-summary-fines', 'json' ) | $raw %];
216
217
        function moveColumnsButton( tableId ){
218
            /* Hide the export button */
219
            $("#" + tableId + "_wrapper").find("button.export_controls").remove();
220
            /* We don't show the table controls toolbar here, so the columns settings button looks better as part of the caption */
221
            $("#" + tableId).find("caption").append( $("#" + tableId + "_wrapper").find("button.columns_controls") );
222
        }
223
224
        $(document).ready(function() {
225
226
            KohaTable("print-summary-checkouts", {
227
                "dom": "Bt",
228
                "paging": "false",
229
                initComplete: function( settings) {
230
                    moveColumnsButton( settings.nTable.id );
231
                }
232
            }, checkouts_columns);
233
234
            KohaTable("print-summary-holds", {
235
                "dom": "Bt",
236
                "paging": "false",
237
                initComplete: function( settings) {
238
                    moveColumnsButton( settings.nTable.id );
239
                }
240
            }, holds_columns);
241
242
            KohaTable("print-summary-fines", {
243
                "dom": "Bt",
244
                "paging": "false",
245
                initComplete: function( settings) {
246
                    moveColumnsButton( settings.nTable.id );
247
                }
248
            }, fines_columns);
249
250
        });
251
    </script>
157
[% END %]
252
[% END %]
158
253
159
[% INCLUDE 'intranet-bottom.inc' %]
254
[% INCLUDE 'intranet-bottom.inc' %]
160
- 

Return to bug 28450