diff --git a/koha-tmpl/opac-tmpl/bootstrap/css/src/_responsive.scss b/koha-tmpl/opac-tmpl/bootstrap/css/src/_responsive.scss index 07359bec3f..d9d630feee 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/css/src/_responsive.scss +++ b/koha-tmpl/opac-tmpl/bootstrap/css/src/_responsive.scss @@ -256,14 +256,6 @@ #checkouts_filter { display: block; } - - table.finestable tfoot tr { - display: flex !important; - width: max-content; - } - table.finestable tfoot td, table.finestable tfoot th { - display: flex !important; - } } @media only screen and ( max-width: 700px ) { diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/account-table.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/account-table.inc index f0d85e087a..dcd0b0f1bb 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/account-table.inc +++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/account-table.inc @@ -12,6 +12,7 @@ Description Amount Amount outstanding + @@ -39,6 +40,7 @@ [% IF ( ACCOUNT_LINE.is_credit ) %][% ACCOUNT_LINE.amount * -1 | $Price %][% ELSE %][% ACCOUNT_LINE.amount | $Price %][% END %] [% IF ( ACCOUNT_LINE.is_credit ) %][% ACCOUNT_LINE.amountoutstanding * -1 | $Price %][% ELSE %][% ACCOUNT_LINE.amountoutstanding | $Price %][% END %] + [% END %] @@ -52,6 +54,7 @@ [%- END -%] Total due [% total | $Price %] + [% IF outstanding_credits.total_outstanding < 0 %] [% FOREACH outstanding_credit IN outstanding_credits %] @@ -97,6 +100,7 @@ Description Fine amount Amount outstanding + @@ -124,6 +128,7 @@ [% IF ( a.amount < 0 ) %][% ELSE %][% END %][% a.amount | $Price %] [% IF ( a.amountoutstanding < 0 ) %][% ELSE %][% END %][% a.amountoutstanding | $Price %] + [% END %] @@ -132,6 +137,7 @@ Total due [% account_sum | $Price %] + diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-account.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-account.tt index 8786a6fc31..adf358c116 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-account.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-account.tt @@ -96,13 +96,37 @@ $( document ).ready(function() { [% END %] "dom": '<"#filter_p">', "autoWidth": false, - "responsive": true, + "responsive": { + "details": { "type": 'column',"target": -1 } + }, + "columnDefs": [ + { "className": 'dtr-control', "orderable": false, "targets": -1 } + ], + 'fnDrawCallback': function() { + show_hiddentfoot('#finestable'); + } } )); $('table[id^="finestable-"]').dataTable($.extend(true, {}, dataTablesDefaults, { - "responsive": true + "autoWidth": false, + "responsive": { + "details": { "type": 'column',"target": -1 } + }, + "columnDefs": [ + { "className": 'dtr-control', "orderable": false, "targets": -1 } + ], + 'fnDrawCallback': function() { + show_hiddentfoot('table[id^="finestable-"]'); + } } )); + function show_hiddentfoot(selector) { + $('.finestable tfoot .sum').show(); + if ($(".finestable tfoot td.dtr-hidden").length > 0) { + $(selector+" tfoot th").removeAttr( "colspan" ); + $(".finestable tfoot .dtr-control").hide(); + } + } $("#filter_p").html('

'+txtActivefilter+''); $('#filter_paid').click(function(e) { e.preventDefault(); diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-curbside-pickups.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-curbside-pickups.tt index 992e0dbae5..46bc3b157c 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-curbside-pickups.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-curbside-pickups.tt @@ -179,6 +179,7 @@ Schedule Notes Actions + @@ -211,6 +212,7 @@ Cancel this pickup + [% END %] @@ -280,6 +282,7 @@ [% INCLUDE 'calendar.inc' %] + [% INCLUDE 'datatables.inc' %]