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

(-)a/api/v1/swagger/paths/cash_registers.json (-1 / +4 lines)
Lines 57-63 Link Here
57
                "permissions": {
57
                "permissions": {
58
                    "cash_management": "cashup"
58
                    "cash_management": "cashup"
59
                }
59
                }
60
            }
60
            },
61
            "x-koha-embed": [
62
                "manager"
63
            ]
61
        }
64
        }
62
    },
65
    },
63
    "/cashups/{cashup_id}": {
66
    "/cashups/{cashup_id}": {
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/pos/register.tt (-3 / +16 lines)
Lines 229-234 Link Here
229
                <thead>
229
                <thead>
230
                    <tr>
230
                    <tr>
231
                        <th>Date</th>
231
                        <th>Date</th>
232
                        <th>Cashier</th>
232
                        <th>Amount</th>
233
                        <th>Amount</th>
233
                        <th data-class-name="actions">Actions</th>
234
                        <th data-class-name="actions">Actions</th>
234
                    </tr>
235
                    </tr>
Lines 408-416 Link Here
408
            "ajax": {
409
            "ajax": {
409
                "url": cashups_table_url
410
                "url": cashups_table_url
410
            },
411
            },
411
            "order": [[ 1, "asc" ]],
412
            "header_filter": true,
413
            "embed": [
414
               "manager"
415
            ],
416
            "order": [[ 0, "asc" ]],
412
            "columnDefs": [ {
417
            "columnDefs": [ {
413
                "targets": [0,1],
418
                "targets": [0,1,2],
414
                "render": function (data, type, row, meta) {
419
                "render": function (data, type, row, meta) {
415
                    if ( type == 'display' ) {
420
                    if ( type == 'display' ) {
416
                        return data.escapeHtml();
421
                        return data.escapeHtml();
Lines 428-433 Link Here
428
                    }
433
                    }
429
                },
434
                },
430
                {
435
                {
436
                    "data": "manager.firstname:manager.surname",
437
                    "searchable": true,
438
                    "orderable": true,
439
                    "render": function(data, type, row, meta) {
440
                        var fullname = row.manager.firstname + " " + row.manager.surname;
441
                        return fullname;
442
                    }
443
                },
444
                {
431
                    "data": "amount",
445
                    "data": "amount",
432
                    "searchable": true,
446
                    "searchable": true,
433
                    "orderable": true,
447
                    "orderable": true,
434
- 

Return to bug 26273