Bugzilla – Attachment 142931 Details for
Bug 31713
Allow easy printing of patron's fines
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 31713: (QA follow-up) Make credits positive
Bug-31713-QA-follow-up-Make-credits-positive.patch (text/plain), 3.95 KB, created by
Katrin Fischer
on 2022-11-02 11:53:44 UTC
(
hide
)
Description:
Bug 31713: (QA follow-up) Make credits positive
Filename:
MIME Type:
Creator:
Katrin Fischer
Created:
2022-11-02 11:53:44 UTC
Size:
3.95 KB
patch
obsolete
>From 052701f86b69450e42abd6dd924c5cd6d950e9cd Mon Sep 17 00:00:00 2001 >From: Katrin Fischer <katrin.fischer.83@web.de> >Date: Wed, 2 Nov 2022 11:50:42 +0000 >Subject: [PATCH] Bug 31713: (QA follow-up) Make credits positive > >* This makes amount and amountoutstanding for credits positive >* Adapts the total line to read credits instead of due when the > balance is >0 >--- > installer/data/mysql/atomicupdate/bug_31713.pl | 15 +++++++++++---- > .../data/mysql/en/mandatory/sample_notices.yml | 17 +++++++++++------ > 2 files changed, 22 insertions(+), 10 deletions(-) > >diff --git a/installer/data/mysql/atomicupdate/bug_31713.pl b/installer/data/mysql/atomicupdate/bug_31713.pl >index 13d608c7e6..c0deacdff7 100644 >--- a/installer/data/mysql/atomicupdate/bug_31713.pl >+++ b/installer/data/mysql/atomicupdate/bug_31713.pl >@@ -82,8 +82,8 @@ return { > [% PROCESS account_type_description account=credit %] > [%- IF credit.description %], [% credit.description | html %][% END %] > </td> >- <td class='credit'>[% credit.amount | $Price %]</td> >- <td class='credit'>[% credit.amountoutstanding | $Price %]</td> >+ <td class='credit'>[% credit.amount *-1 | $Price %]</td> >+ <td class='credit'>[% credit.amountoutstanding *-1 | $Price %]</td> > </tr> > [% END %] > [% ELSE %] >@@ -94,8 +94,15 @@ return { > > <tfoot> > <tr> >- <td colspan='3'>Total outstanding dues as of [% today | $KohaDates %]: </td> >- [% IF ( borrower.account.balance <= 0 ) %]<td class='credit'>[% ELSE %]<td class='debit'>[% END %][% borrower.account.balance | $Price %]</td> >+ <td colspan='3'> >+ [% IF borrower.account.balance < 0 %] >+ Total credit as of [% today | $KohaDates %]: >+ [% ELSE %] >+ Total outstanding dues as of [% today | $KohaDates %]: >+ [% END %] >+ </td> >+ [% IF ( borrower.account.balance <= 0 ) %]<td class='credit'>[% borrower.account.balance * -1 | $Price %]</td> >+ [% ELSE %]<td class='debit'>[% borrower.account.balance | $Price %]</td>[% END %] > </tr> > </tfoot> > </table> >diff --git a/installer/data/mysql/en/mandatory/sample_notices.yml b/installer/data/mysql/en/mandatory/sample_notices.yml >index 09b594a759..ed55b289b9 100644 >--- a/installer/data/mysql/en/mandatory/sample_notices.yml >+++ b/installer/data/mysql/en/mandatory/sample_notices.yml >@@ -1366,8 +1366,8 @@ tables: > - " [% PROCESS account_type_description account=credit %]" > - " [%- IF credit.description %], [% credit.description | html %][% END %]" > - " </td>" >- - " <td class='credit'>[% credit.amount | $Price %]</td>" >- - " <td class='credit'>[% credit.amountoutstanding | $Price %]</td>" >+ - " <td class='credit'>[% credit.amount *-1 | $Price %]</td>" >+ - " <td class='credit'>[% credit.amountoutstanding *-1 | $Price %]</td>" > - " </tr>" > - " [% END %]" > - " [% ELSE %]" >@@ -1377,10 +1377,15 @@ tables: > - " [% END %]" > - "" > - " <tfoot>" >- - " <tr>" >- - " <td colspan='3'>Total outstanding dues as of [% today | $KohaDates %]: </td>" >- - " [% IF ( borrower.account.balance <= 0 ) %]<td class='credit'>[% ELSE %]<td class='debit'>[% END %][% borrower.account.balance | $Price %]</td>" >- - " </tr>" >+ - " <td colspan='3'>" >+ - " [% IF borrower.account.balance < 0 %]" >+ - " Total credit as of [% today | $KohaDates %]:" >+ - " [% ELSE %]" >+ - " Total outstanding dues as of [% today | $KohaDates %]:" >+ - " [% END %]" >+ - " </td>" >+ - " [% IF ( borrower.account.balance <= 0 ) %]<td class='credit'>[% borrower.account.balance * -1 | $Price %]</td>" >+ - " [% ELSE %]<td class='debit'>[% borrower.account.balance | $Price %]</td>[% END %]" > - " </tfoot>" > - "</table>" > >-- >2.30.2
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 31713
:
141517
|
141572
|
141573
|
141574
|
141575
|
142340
|
142341
|
142342
|
142360
|
142760
|
142871
|
142872
|
142873
|
142874
|
142875
|
142876
|
142926
|
142927
|
142928
|
142929
|
142930
| 142931