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

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt (-1 / +4 lines)
Lines 207-217 Link Here
207
    [% Asset.js("lib/jquery/plugins/treetable/jquery.treetable.js") | $raw %]
207
    [% Asset.js("lib/jquery/plugins/treetable/jquery.treetable.js") | $raw %]
208
    [% Asset.js("js/acquisitions-menu.js") | $raw %]
208
    [% Asset.js("js/acquisitions-menu.js") | $raw %]
209
    [% IF loop_budget %]
209
    [% IF loop_budget %]
210
        <script>
211
            var table_settings = [% TablesSettings.GetTableSettings( 'acqui', 'acq_acqui-home', 'accounts', 'json' ) | $raw %];
212
        </script>
213
210
        <script>
214
        <script>
211
            dt_overwrite_html_sorting_localeCompare();
215
            dt_overwrite_html_sorting_localeCompare();
212
216
213
            $(document).ready(function() {
217
            $(document).ready(function() {
214
                var table_settings = [% TablesSettings.GetTableSettings( 'acqui', 'acq_acqui-home', 'accounts', 'json' ) | $raw %];
215
                var oTable = $("#accounts").kohaTable({
218
                var oTable = $("#accounts").kohaTable({
216
                    drawCallback: function ( oSettings ) {
219
                    drawCallback: function ( oSettings ) {
217
                        if ( oSettings.aiDisplay.length == 0 )
220
                        if ( oSettings.aiDisplay.length == 0 )
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt (-3 / +6 lines)
Lines 1406-1412 Link Here
1406
        </script>
1406
        </script>
1407
    [% END # /UNLESS (closedate) %]
1407
    [% END # /UNLESS (closedate) %]
1408
    <script>
1408
    <script>
1409
        $(document).ready(function() {
1410
            var table_settings = [% TablesSettings.GetTableSettings( 'acqui', 'basket', 'orders', 'json' ) | $raw %];
1409
            var table_settings = [% TablesSettings.GetTableSettings( 'acqui', 'basket', 'orders', 'json' ) | $raw %];
1411
1410
1412
            let supplier_report_column = table_settings.columns.find(c => c.columnname == 'supplier_report');
1411
            let supplier_report_column = table_settings.columns.find(c => c.columnname == 'supplier_report');
Lines 1434-1439 Link Here
1434
            [% END %]
1433
            [% END %]
1435
            cancel_column.force_visibility = 1;
1434
            cancel_column.force_visibility = 1;
1436
1435
1436
            let skip_confirm_reopen = [% skip_confirm_reopen ? 1 : 0 %];
1437
    </script>
1438
1439
    <script>
1440
        $(document).ready(function() {
1437
            $("#orders").kohaTable({
1441
            $("#orders").kohaTable({
1438
                bKohaColumnsUseNames: true,
1442
                bKohaColumnsUseNames: true,
1439
                pagingType: "full",
1443
                pagingType: "full",
Lines 1444-1451 Link Here
1444
                pagingType: "full"
1448
                pagingType: "full"
1445
            });
1449
            });
1446
            $("#reopenform").on("submit",function(e){
1450
            $("#reopenform").on("submit",function(e){
1447
                var skip = [% IF ( skip_confirm_reopen ) %] 1 [% ELSE %] 0 [% END %];
1451
                var is_confirmed = skip_confirm_reopen || confirm(_("Are you sure you want to reopen this basket?"));
1448
                var is_confirmed = skip || confirm(_("Are you sure you want to reopen this basket?"));
1449
                if( is_confirmed ){ return true; }
1452
                if( is_confirmed ){ return true; }
1450
                else{ return false }
1453
                else{ return false }
1451
            });
1454
            });
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt (-7 / +12 lines)
Lines 396-401 Link Here
396
396
397
[% MACRO jsinclude BLOCK %]
397
[% MACRO jsinclude BLOCK %]
398
    [% INCLUDE 'datatables.inc' %]
398
    [% INCLUDE 'datatables.inc' %]
399
    <script>
400
        let listclosed = [% listclosed ? 1 : 0 %];
401
        let grouping = [% grouping ? 1 : 0 %];
402
    </script>
403
399
    <script>
404
    <script>
400
        function submitForm(form) {
405
        function submitForm(form) {
401
            if (form.closedbg.checked == true) {
406
            if (form.closedbg.checked == true) {
Lines 419-430 Link Here
419
        }
424
        }
420
425
421
        $(document).ready(function() {
426
        $(document).ready(function() {
422
            [% IF ( listclosed) %]
427
            if (listclosed){
423
                $("#basket_groups a[href='#closed']").tab("show");
428
                $("#basket_groups a[href='#closed']").tab("show");
424
            [% ELSE %]
429
            } else {
425
                $("#basket_groups a[href='#opened']").tab("show");
430
                $("#basket_groups a[href='#opened']").tab("show");
426
            [% END %]
431
            }
427
            [% UNLESS ( grouping ) %]
432
433
            if (!grouping){
428
                let dt_params = {
434
                let dt_params = {
429
                    autoWidth: false,
435
                    autoWidth: false,
430
                    pagingType: "full",
436
                    pagingType: "full",
Lines 433-439 Link Here
433
                $("#grouped").kohaTable(dt_params);
439
                $("#grouped").kohaTable(dt_params);
434
                $("#basket_group_opened").kohaTable(dt_params);
440
                $("#basket_group_opened").kohaTable(dt_params);
435
                $("#basket_group_closed").kohaTable(dt_params);
441
                $("#basket_group_closed").kohaTable(dt_params);
436
            [% ELSE %]
442
            } else {
437
                grouped = $("#grouped").kohaTable({
443
                grouped = $("#grouped").kohaTable({
438
                    dom: "t",
444
                    dom: "t",
439
                    autoWidth: false,
445
                    autoWidth: false,
Lines 448-454 Link Here
448
                        emptyTable: _("There are no ungrouped baskets"),
454
                        emptyTable: _("There are no ungrouped baskets"),
449
                    },
455
                    },
450
                });
456
                });
451
            [% END %]
457
            }
452
458
453
            $("#basketgroupcolumns").on("click", ".addtogroup", function(){
459
            $("#basketgroupcolumns").on("click", ".addtogroup", function(){
454
                const row = $("#" + $(this).data("basketid") );
460
                const row = $("#" + $(this).data("basketid") );
455
- 

Return to bug 41324