Attachment 26574 Details for Bug 11988 – Bug 11988: Display aqbasketgroup.closeddate on late orders table

[patch] Bug 11988: Display aqbasketgroup.closeddate on late orders table

Bug-11988-Display-aqbasketgroupcloseddate-on-late-.patch (text/plain), 2.96 KB, created by David Cook on 2014-03-26 04:12:59 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: David Cook

Created: 2014-03-26 04:12:59 UTC

Size: 2.96 KB

patch

obsolete

>From 22458766b7644f21973fe4bf18100846855b6f19 Mon Sep 17 00:00:00 2001
>From: Jonathan Druart <jonathan.druart@biblibre.com>
>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 <dcook@prosentient.com.au>
>---
> C4/Acquisition.pm                                           |    1 +
> acqui/lateorders.pl                                         |    6 ++++--
> koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt |    8 +++++++-
> 3 files changed, 12 insertions(+), 3 deletions(-)
>
>diff --git a/C4/Acquisition.pm b/C4/Acquisition.pm
>index 33aa8e3..8d827ee 100644
>--- a/C4/Acquisition.pm
>+++ b/C4/Acquisition.pm
>@@ -2022,6 +2022,7 @@ sub GetLateOrders {
>     my @query_params = ();
>     my $select = "
>     SELECT aqbasket.basketno,
>+        aqbasket.basketgroupid,
>         aqorders.ordernumber,
>         DATE(aqbasket.closedate)  AS orderdate,
>         aqorders.rrp              AS unitpricesupplier,
>diff --git a/acqui/lateorders.pl b/acqui/lateorders.pl
>index 1a64a4c..680f997 100755
>--- a/acqui/lateorders.pl
>+++ b/acqui/lateorders.pl
>@@ -155,8 +155,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;
>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 c76cf2d..68e6290 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt
>@@ -117,6 +117,7 @@ $(document).ready(function() {
>             <th>Information</th>
>             <th>Total cost</th>
>             <th>Basket</th>
>+            <th>Basket group</th>
>             <th>Claims count</th>
>             <th>Claimed date</th>
>         </tr>
>@@ -163,6 +164,11 @@ $(document).ready(function() {
>                  </p>
>                  <p title="branch">[% lateorder.branch %]</p>
>             </td>
>+            <td>
>+              [% IF lateorder.basketgroup.id %]
>+                [% lateorder.basketgroup.name %] ([% lateorder.basketgroup.id %]) [% IF lateorder.basketgroup.closeddate %]closed on [% lateorder.basketgroup.closeddate | $KohaDates %].[% END %]
>+              [% END %]
>+            </td>
>             <td>[% lateorder.claims_count %]</td>
>             <td>[% lateorder.claimed_date %]</td>
>         </tr>
>@@ -172,7 +178,7 @@ $(document).ready(function() {
>         <tr>
>             <th colspan="5">Total</th>
>             <th>[% total %]</th>
>-            <th colspan="3">&nbsp;</th>
>+            <th colspan="4">&nbsp;</th>
>         </tr>
>       </tfoot>
>     </table>
>-- 
>1.7.10.4

Actions: View | Diff | Splinter Review

Attachments on bug 11988: 26533 | 26554 | 26574 | 27285 | 58866