From 97b433ff3094fa07c24e32728bf9ec9fe6873d55 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Mon, 24 Mar 2014 14:48:29 +0100 Subject: [PATCH] Bug 11988: Display aqbasketgroup.closeddate on late orders table Test plan: Display the late orders table and verify the basket group close date is correctly displayed. Signed-off-by: David Cook Signed-off-by: Kyle M Hall --- acqui/lateorders.pl | 6 ++++-- koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt | 5 ++++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/acqui/lateorders.pl b/acqui/lateorders.pl index fe1acc3..dd4cb84 100755 --- a/acqui/lateorders.pl +++ b/acqui/lateorders.pl @@ -158,8 +158,10 @@ if ($estimateddeliverydateto_dt) { my @lateorders = GetLateOrders( @parameters ); my $total; -foreach (@lateorders){ - $total += $_->{subtotal}; +for my $order ( @lateorders ) { + $total += $order->{subtotal}; + $order->{basketgroup} = GetBasketgroup( $order->{basketgroupid} ) + if $order->{basketgroupid}; } my $letters = GetLetters({ module => "claimacquisition" }); diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt index 2363765..72371bd 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt @@ -175,7 +175,10 @@ $(document).ready(function() { [% IF ( CAN_user_acquisition_group_manage ) %] [% lateorder.basketgroupname %] ([% lateorder.basketgroupid %]) [% ELSE %] - [% lateorder.basketgroupname %] ([% lateorder.basketgroupid %]) + [% lateorder.basketgroupname %] ([% lateorder.basketgroupid %]) + [% END %] + [% IF lateorder.basketgroup.closeddate %] + closed on [% lateorder.basketgroup.closeddate | $KohaDates %] [% END %] [% END %] -- 2.1.4