From b3782a7275af773155a2a2e672fa1eac2a37fd6b Mon Sep 17 00:00:00 2001 From: Lucas Gass Date: Thu, 26 Mar 2020 21:17:42 +0000 Subject: [PATCH] Bug 24995: Add issuedate to table_account_fines and finest TO TEST: 1. Have a patron with some fines on an item. Try accruing fines. 2. Go to the accounting tab and look at both the Tranaction tab and Make a payment Tab 3. No Issue Date 4. Apply patch 5. Check those tabs again and see the issue date displays. 6. Go to column configuration and try to hide the issuedate, make sure it hides properly. Try this for both tables. Also make sure other columns hide properly. 7. Sign off! --- admin/columns_settings.yml | 4 ++++ .../intranet-tmpl/prog/en/modules/members/boraccount.tt | 6 ++++-- koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt | 12 +++++++++--- 3 files changed, 17 insertions(+), 5 deletions(-) diff --git a/admin/columns_settings.yml b/admin/columns_settings.yml index 08ea52b925..4339a10a93 100644 --- a/admin/columns_settings.yml +++ b/admin/columns_settings.yml @@ -531,6 +531,8 @@ modules: - columnname: returndate - + columnname: issuedate + - columnname: note - columnname: amount @@ -568,6 +570,8 @@ modules: - columnname: returndate - + columnname: issuedate + - columnname: note - columnname: amount diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt index b16da005f9..c6bf2a4f67 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt @@ -50,6 +50,7 @@ Barcode Due date Return date + Issue date Home library Note Amount @@ -71,6 +72,7 @@ [% IF ( account.itemnumber ) %][% account.item.barcode | html %][% END %] [% IF ( account.issue_id ) %][% account.checkout.date_due | $KohaDates as_due_date => 1 %][% END %] [% IF ( account.issue_id ) %][% account.checkout.returndate | $KohaDates with_hours => 1 %][% END %] + [% account.checkout.issuedate | $KohaDates %] [% IF account.itemnumber %][% Branches.GetName( account.item.homebranch ) | html %][% END %] [% account.note | html_line_break %] [% IF account.amount <= 0 %][% ELSE %][% END %][% account.amount | $Price %] @@ -100,7 +102,7 @@ [% END %] - Total due + Total due [% IF ( totalcredit ) %] [% total | $Price %] [% ELSE %] @@ -328,7 +330,7 @@ var filteredValue = '^((?!0.00).*)$'; //Filter not matching 0.00 http://stackoverflow.com/a/406408 $(this).html(' '+txtInactivefilter); } - table_account_fines.fnFilter(filteredValue, 9, true, false); + table_account_fines.fnFilter(filteredValue, 10, true, false); $(this).toggleClass('filtered'); }); diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt index 406b3b0766..d79c845651 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt @@ -52,6 +52,7 @@ Barcode Due date Return date + Issue date Payment note Amount Amount outstanding @@ -106,6 +107,11 @@ [% line.checkout.returndate | $KohaDates with_hours => 1 %] [% END %] + + [% IF line.issue_id %] + [% line.checkout.issuedate | $KohaDates %] + [% END %] + Add note @@ -118,16 +124,16 @@ - Total due: + Total due: [% total | $Price %] [% IF outstanding_credits.total_outstanding < 0 %] - Outstanding credits could be applied: + Outstanding credits could be applied: - Total due if credit applied: + Total due if credit applied: [% total + outstanding_credits.total_outstanding | $Price %] [% END %] -- 2.11.0