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

Return to bug 20726