Bug 29983: Format dates in templates using KohaDates (and display the time part)

The time part is displayed on the checkout list

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>

diff --git a/circ/overdue.pl b/circ/overdue.pl
index 9e96c4c..69750c6 100755 (executable)
--- a/circ/overdue.pl
+++ b/circ/overdue.pl
@@ -311,11 +311,6 @@ if ($noreport) {
         my $pattrs = $borrowernumber_to_attributes{$data->{borrowernumber}} || {};  # patron attrs for this borrower
         # $pattrs is a hash { attrcode => [  [value,displayvalue], [value,displayvalue]... ] }
 
-        my $return_claim_created_on = $data->{return_claim_created_on};
-        if ( defined $return_claim_created_on ) {
-            $return_claim_created_on = output_pref({ dt => dt_from_string($return_claim_created_on ) });
-        }
-
         my @patron_attr_value_loop;   # template array [ {value=>v1}, {value=>v2} ... } ]
         for my $pattr_filter (grep { ! $_->{isclone} } @patron_attr_filter_loop) {
             my @displayvalues = map { $_->[1] } @{ $pattrs->{$pattr_filter->{code}} };   # grab second value from each subarray
@@ -355,7 +350,7 @@ if ($noreport) {
             itemcallnumber         => $data->{itemcallnumber},
             replacementprice       => $data->{replacementprice},
             itemnotes_nonpublic    => $data->{itemnotes_nonpublic},
-            return_claim_created_on => $return_claim_created_on,
+            return_claim_created_on => $data->{return_claim_created_on},
             return_claim_id        => $data->{return_claim_id},
             enumchron              => $data->{enumchron},
             itemtype               => $data->{itype},

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt
index 3926f80..04b43cd 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt
@@ -122,7 +122,7 @@
           <td>[% overdueloo.itemnotes_nonpublic | html %]</td>
           <td>
             [% IF ( overdueloo.return_claim_created_on ) %]
-                <span class="badge">[% overdueloo.return_claim_created_on | html %]</span>
+                <span class="badge">[% overdueloo.return_claim_created_on | $KohaDates with_hours => 1 %]</span>
             [% ELSIF Koha.Preference('ClaimReturnedLostValue') %]
                 <a class="btn btn-default btn-xs claim-returned-btn" data-itemnumber=[% overdueloo.itemnum | html %]>
                     <i class="fa fa-exclamation-circle"></i> Claim returned