From 25eff2cdbfe56998b1793d7abfd6aae02f784c79 Mon Sep 17 00:00:00 2001 From: Your Full Name Date: Thu, 19 Jan 2017 02:57:39 +0000 Subject: [PATCH] Bug 9692: [FOLLOWUP] Add a checkbox to display statistical fields in basket.tt --- .../intranet-tmpl/prog/en/modules/acqui/basket.tt | 45 ++++++++-------------- 1 file changed, 17 insertions(+), 28 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt index b2fb290..c85b5ea 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt @@ -35,10 +35,13 @@ transfer_order_popup( $(this).data("ordernumber")); }); - $("#show_all_prices").click(function(){ - if ($("#show_all_prices").is(":checked")){ - $("table .tax_excluded").show(); + $("table .statistics").hide(); + $("table .tax_included").hide(); + + $("#show_all_prices").on("click",function(){ + if ($("#show_all_prices").is(":checked") ){ $("table .tax_included").show(); + $("table .tax_excluded").show(); } else { [% IF ( listincgst ) %] $("table .tax_excluded").hide(); @@ -505,15 +508,10 @@ [% foot_loo.total_tax_included | $Price %]   [% foot_loo.tax_value | $Price %] -   -   [% foot_loo.totalgste %] [% foot_loo.totalgsti %] - - [% foot_loo.gstvalue %] - - - +   +   [% IF ( active ) %] [% UNLESS ( closedate ) %]   @@ -534,15 +532,11 @@ [% total_tax_included | $Price %]   [% total_tax_value | $Price %] -   -   - [% total_gste %] - [% total_gsti %] - - [% total_gstvalue %] - - - + [% foot_loo.totalgste %] + [% foot_loo.totalgsti %] +   +   + [% IF ( active ) %] [% UNLESS ( closedate ) %]   @@ -680,8 +674,8 @@ GST % GST Fund - Statistic 1 - Statistic 2 + Statistic 1 + Statistic 2 @@ -732,14 +726,9 @@ [% order.total_tax_included | $Price %] [% order.tax_rate * 100 %] [% order.tax_value | $Price %] - [% order.budget_name %] - [% order.totalgste %] - [% order.totalgsti %] - [% order.gstgsti %] - [% order.gstvalue %] [% order.budget_name %] - [% order.sort1 %] - [% order.sort2 %] + [% order.sort1 %] + [% order.sort2 %] [% END %] -- 2.1.4