Attachment 137429 Details for Bug 31121 – Bug 31121: Fix date formatting in cashup summary modal

[patch] Bug 31121: Fix date formatting in cashup summary modal

Bug-31121-Fix-date-formatting-in-cashup-summary-mo.patch (text/plain), 2.69 KB, created by Martin Renvoize (ashimema) on 2022-07-08 15:19:15 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Renvoize (ashimema)

Created: 2022-07-08 15:19:15 UTC

Size: 2.69 KB

patch

obsolete

>From 689b62fa7f99a085368120afccf72f9fcde213f5 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
>
>---
> 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.20.1

Actions: View | Diff | Splinter Review

Attachments on bug 31121: 137428 | 137429 | 137432 | 138005