From 23ba5b0de0d77d02e304a7f21ba043086a108e9b 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>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit c12d037da294944cf82208b2bd72d3348b66c0cf)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
(cherry picked from commit a75cacaf34c9a9193734fdc4b4e91a335d6cfb89)
Signed-off-by: Arthur Suzuki <arthur.suzuki@biblibre.com>
---
 koha-tmpl/intranet-tmpl/prog/en/modules/pos/register.tt  | 1 +
 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(+), 2 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 b4c8c6e1b4..88892c7e01 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/pos/register.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/pos/register.tt
@@ -333,6 +333,7 @@
     [% INCLUDE 'datatables.inc' %]
     [% Asset.js("lib/jquery/plugins/rowGroup/dataTables.rowGroup.min.js") | $raw %]
     [% INCLUDE 'format_price.inc' %]
+    [% INCLUDE 'js-date-format.inc' %]
     [% Asset.js("js/cashup_modal.js") | $raw %]
     [% INCLUDE 'calendar.inc' %]
     [% INCLUDE 'js-date-format.inc' %]
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 a92326a84f..3aabcfee17 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/pos/registers.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/pos/registers.tt
@@ -196,6 +196,7 @@
         [% MACRO jsinclude BLOCK %]
         [% INCLUDE 'datatables.inc' %]
         [% INCLUDE 'format_price.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 e207c754f3..ddc480dd95 100644
--- a/koha-tmpl/intranet-tmpl/prog/js/cashup_modal.js
+++ b/koha-tmpl/intranet-tmpl/prog/js/cashup_modal.js
@@ -12,8 +12,10 @@ $(document).ready(function() {
             },
             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.39.5