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

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt (-9 / +8 lines)
Lines 348-354 Link Here
348
                        <th>Order number</th>
348
                        <th>Order number</th>
349
                        <th class="title-string">Creation date</th>
349
                        <th class="title-string">Creation date</th>
350
                        <th class="title-string">Receive date</th>
350
                        <th class="title-string">Receive date</th>
351
                        <th>Status</th>
351
                        <th class="title-string">Status</th>
352
                        <th>Fund</th>
352
                        <th>Fund</th>
353
                        <th>Ordered</th>
353
                        <th>Ordered</th>
354
                        <th>Spent</th>
354
                        <th>Spent</th>
Lines 377-387 Link Here
377
                        <td>[% IF order.datereceived %]<span title="[% order.datereceived | uri %]">[% order.datereceived | $KohaDates %]</span>[% END %]</td>
377
                        <td>[% IF order.datereceived %]<span title="[% order.datereceived | uri %]">[% order.datereceived | $KohaDates %]</span>[% END %]</td>
378
                        <td>
378
                        <td>
379
                          [% SWITCH order.orderstatus %]
379
                          [% SWITCH order.orderstatus %]
380
                            [% CASE 'new' %]New
380
                            [% CASE 'new' %]<span title="status_1">New</span>
381
                            [% CASE 'ordered' %]Ordered
381
                            [% CASE 'ordered' %]<span title="status_2">Ordered</span>
382
                            [% CASE 'partial' %]Partial
382
                            [% CASE 'partial' %]<span title="status_3">Partial</span>
383
                            [% CASE 'complete' %]Complete
383
                            [% CASE 'complete' %]<span title="status_4">Complete</span>
384
                            [% CASE 'cancelled' %]Cancelled
384
                            [% CASE 'cancelled' %]<span title="status_5">Cancelled</span>
385
                          [% END %]
385
                          [% END %]
386
                        </td>
386
                        </td>
387
                        <td>[% order.fund.budget_name | html %]</td>
387
                        <td>[% order.fund.budget_name | html %]</td>
Lines 434-440 Link Here
434
            var table = $("#orders").dataTable($.extend(true, {}, dataTablesDefaults, {
434
            var table = $("#orders").dataTable($.extend(true, {}, dataTablesDefaults, {
435
                'bPaginate': false,
435
                'bPaginate': false,
436
                'bAutoWidth': false,
436
                'bAutoWidth': false,
437
                "aaSorting": [[ 4, "desc" ]],
437
                "aaSorting": [[ 5, "asc" ], [ 2, "desc" ]], // Order by status then ordernumber
438
                "aoColumnDefs": [
438
                "aoColumnDefs": [
439
                    { "aTargets": "title-string", "sType": "title-string" }
439
                    { "aTargets": "title-string", "sType": "title-string" }
440
                ]
440
                ]
Lines 442-448 Link Here
442
442
443
            $("#hide_received_orders").click(function(e){
443
            $("#hide_received_orders").click(function(e){
444
                e.preventDefault();
444
                e.preventDefault();
445
                table.fnFilter( '.', 4, true ); // Not empty "Receive date" columns
445
                table.fnFilter( '^$', 4, true ); // Not empty "Receive date" columns
446
            });
446
            });
447
            $("#show_all_orders").click(function(e){
447
            $("#show_all_orders").click(function(e){
448
                e.preventDefault();
448
                e.preventDefault();
449
- 

Return to bug 20726