From 65dac9522eb6b4412a9d6f417fca1db7ef4ed653 Mon Sep 17 00:00:00 2001
From: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Date: Fri, 8 Jul 2022 15:46:04 +0100
Subject: [PATCH] Bug 31121: Fix date formatting in cashup summary modal

Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
---
 koha-tmpl/intranet-tmpl/prog/en/modules/pos/register.tt  | 2 +-
 koha-tmpl/intranet-tmpl/prog/en/modules/pos/registers.tt | 1 +
 koha-tmpl/intranet-tmpl/prog/js/cashup_modal.js          | 6 ++++--
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/pos/register.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/pos/register.tt
index b5604d8f97..e447a791dc 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/pos/register.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/pos/register.tt
@@ -332,9 +332,9 @@
     [% MACRO jsinclude BLOCK %]
     [% INCLUDE 'datatables.inc' %]
     [% Asset.js("lib/jquery/plugins/rowGroup/dataTables.rowGroup.min.js") | $raw %]
+    [% INCLUDE 'js-date-format.inc' %]
     [% Asset.js("js/cashup_modal.js") | $raw %]
     [% INCLUDE 'calendar.inc' %]
-    [% INCLUDE 'js-date-format.inc' %]
     <script>
         var sales_table = $("#sales").dataTable($.extend(true, {}, dataTablesDefaults, {
             orderFixed: [ 0, 'asc'],
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/pos/registers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/pos/registers.tt
index 4a15758d6a..695afcb82d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/pos/registers.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/pos/registers.tt
@@ -195,6 +195,7 @@
 
         [% MACRO jsinclude BLOCK %]
         [% INCLUDE 'datatables.inc' %]
+        [% INCLUDE 'js-date-format.inc' %]
         [% Asset.js("js/cashup_modal.js") | $raw %]
         <script>
             $(document).ready(function () {
diff --git a/koha-tmpl/intranet-tmpl/prog/js/cashup_modal.js b/koha-tmpl/intranet-tmpl/prog/js/cashup_modal.js
index 01e8849e23..0d7f63f8c0 100644
--- a/koha-tmpl/intranet-tmpl/prog/js/cashup_modal.js
+++ b/koha-tmpl/intranet-tmpl/prog/js/cashup_modal.js
@@ -11,8 +11,10 @@ $('#cashupSummaryModal').on('show.bs.modal', function(e) {
         },
         async: false,
         success: function(data) {
-            summary_modal.find('#from_date').text(data.summary.from_date);
-            summary_modal.find('#to_date').text(data.summary.to_date);
+            let from_date = $datetime(data.summary.from_date);
+            summary_modal.find('#from_date').text(from_date);
+            let to_date = $datetime(data.summary.to_date);
+            summary_modal.find('#to_date').text(to_date);
             var tbody = summary_modal.find('tbody')
             tbody.empty();
             for (out of data.summary.payout_grouped) {
-- 
2.30.2