From 308001fa7dc05a2b421f41ae20ebf8668a9a41cb Mon Sep 17 00:00:00 2001
From: Jonathan Druart <jonathan.druart@biblibre.com>
Date: Wed, 15 Apr 2015 15:33:54 +0200
Subject: [PATCH] [PASSED QA] Bug 10423: Show date due with time if it's a
 hourly loan
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

On printing the summary from the patron account, the hours are not
displayed if needed.
The as_date_due flag should be set to display it correctly.
Problem, GetPendingIssues modify the value retrieved from the database.
In order to not add regression and check all calls to GetPendingIssues,
this patch backup the value before the change.

Test plan:
Check some items out, specify a hourly loan for some.
Click on print > print summary and confirm the date due are correctly
formatted.

Followed test plan. Date + time display as expected.
Signed-off-by: Marc Véron <veron@veron.ch>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
---
 C4/Members.pm                                                       | 2 ++
 koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tt | 2 +-
 members/summary-print.pl                                            | 2 ++
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/C4/Members.pm b/C4/Members.pm
index 4ca83b9..266dbc8 100644
--- a/C4/Members.pm
+++ b/C4/Members.pm
@@ -1200,6 +1200,8 @@ sub GetPendingIssues {
             $_->{issuedate} = dt_from_string($_->{issuedate}, 'sql');
         }
         $_->{date_due} or next;
+        $_->{date_due_sql} = $_->{date_due};
+        # FIXME no need to have this value
         $_->{date_due} = dt_from_string($_->{date_due}, 'sql');
         if ( DateTime->compare($_->{date_due}, $today) == -1 ) {
             $_->{overdue} = 1;
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tt
index 1d62a23..92526e8 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tt
@@ -50,7 +50,7 @@
                         <td>[% issue.author %]</td>
                         <td>[% issue.itemcallnumber %]</td>
                         <td>[% issue.itemtype_description %]</td>
-                        <td>[% issue.date_due | $KohaDates %]</td>
+                        <td>[% issue.date_due | $KohaDates as_due_date => 1 %]</td>
                         <td>[% issue.barcode %]</td>
                         <td>[% issue.charge %]</td>
                         <td>[% issue.replacementprice %]</td>
diff --git a/members/summary-print.pl b/members/summary-print.pl
index 39897db..4530e14 100755
--- a/members/summary-print.pl
+++ b/members/summary-print.pl
@@ -95,6 +95,8 @@ sub build_issue_data {
 
         $row{'charge'} = sprintf( "%.2f", $charge );
 
+        $row{date_due} = $row{date_due_sql};
+
         push( @{$return}, \%row );
     }
 
-- 
1.9.1