From 54ae78f62969a4e520138ebdb81dde433422de61 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Fri, 21 Oct 2011 10:19:30 -0400 Subject: [PATCH] Bug 7080 - Revised - Clean up interface on fine payment screens - Move some content out of table cells - Improve table markup with , , and - Improve breadcrumb specificity on paycollect.pl - Add clearer messages for different actions (Pay selected fines, pay an individual fine, etc. - Add client-side warning to pay.pl when writing-off all - Correcting terminology: When a verb, "write off," when a noun: "Writeoff." Revision: Correcting tab label case according to Bug 2780 guidelines Signed-off-by: Katrin Fischer I checked all 4 fine tabs and performed different fine actions. The layout on all pages looks clean and correct. I tested the new client-side warning and made sure it's translatable. Labels have proper capitalization. Signed-off-by: Paul Poulain (cherry picked from commit 0f80707d7c7b609fab357b12913da242b212e63b) Signed-off-by: Chris Nighswonger --- .../prog/en/modules/members/mancredit.tt | 4 +- .../prog/en/modules/members/maninvoice.tt | 4 +- .../prog/en/modules/members/pay.tt | 47 +++--- .../prog/en/modules/members/paycollect.tt | 159 ++++++++---------- 4 files changed, 106 insertions(+), 108 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tt index abc1df18a6..f7833502ac 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tt @@ -27,8 +27,8 @@ $(document).ready(function(){
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tt index 6393550886..318bd59717 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tt @@ -27,8 +27,8 @@ $(document).ready(function(){
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 8b0a5457cd..d88395800e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt @@ -1,19 +1,23 @@ [% INCLUDE 'doc-head-open.inc' %] Koha › Patrons › Pay Fines for [% borrower.firstname %] [% borrower.surname %] [% INCLUDE 'doc-head-close.inc' %] + [% INCLUDE 'header.inc' %] [% INCLUDE 'patron-search.inc' %] - -
@@ -28,8 +32,8 @@ function confirmWriteoffAll() {
@@ -38,6 +42,7 @@ function confirmWriteoffAll() { + @@ -48,14 +53,21 @@ function confirmWriteoffAll() { - + + + + + + + + [% FOREACH account_grp IN accounts %] [% FOREACH line IN account_grp.accountlines %] [% END %] [% END %] - - - - +
Fines & Charges SelAmount Amount Outstanding
Total Due:[% total | format('%.2f') %]
[% IF ( line.amountoutstanding > 0 ) %] - + [% END %] @@ -89,15 +101,12 @@ function confirmWriteoffAll() {
Total Due:[% total | format('%.2f') %]
- - - + + + Cancel
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt index ba182153fb..c3bdc1e530 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt @@ -57,7 +57,7 @@ function moneyFormat(textObj) { [% INCLUDE 'header.inc' %] [% INCLUDE 'patron-search.inc' %] - +
@@ -77,10 +77,10 @@ function moneyFormat(textObj) { Pay fines
  • - Create Manual Invoice + Create manual invoice
  • - Create Manual Credit + Create manual credit
    • @@ -103,50 +103,50 @@ function moneyFormat(textObj) { + +
    + Pay an individual fine - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + +
    DescriptionAccount TypeNotify idLevelAmountAmount Outstanding
    - [% description %] [% title %] - [% accounttype %][% notify_id %][% notify_level %][% amount | format('%.2f') %][% amountoutstanding | format('%.2f') %]
    Total Amount Payable : [% amountoutstanding | format('%.2f') %]
    Collect From Patron: +
    DescriptionAccount TypeNotify idLevelAmountAmount Outstanding
    Total amount payable:[% amountoutstanding | format('%.2f') %]
    + [% description %] [% title %] + [% accounttype %][% notify_id %][% notify_level %][% amount | format('%.2f') %][% amountoutstanding | format('%.2f') %]
    + +
      + +
    1. + - - - - - - - Cancel - - +
      2. +
    +
    - +
    + Cancel
    [% ELSIF ( writeoff_individual ) %]
    +
    + Write off an individual fine @@ -159,33 +159,27 @@ function moneyFormat(textObj) { - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + +
    DescriptionAccount TypeNotify idLevelAmountAmount Outstanding
    [% description %] [% title %][% accounttype %][% notify_id %][% notify_level %][% amount | format('%.2f') %][% amountoutstanding | format('%.2f') %]
    Writeoff This Charge?
    - - Cancel -
    DescriptionAccount TypeNotify idLevelAmountAmount Outstanding
    Total amount to be written off:[% amountoutstanding | format('%.2f') %]
    [% description %] [% title %][% accounttype %][% notify_id %][% notify_level %][% amount | format('%.2f') %][% amountoutstanding | format('%.2f') %]
    +
    +
    + Cancel
    [% ELSE %] @@ -194,27 +188,22 @@ function moneyFormat(textObj) { - - - - - - - - - - - - - - -
    Total Amount Outstanding : [% total | format('%.2f') %]
    Collect From Patron: +
    + [% IF ( selected_accts ) %]Pay an amount toward selected fines[% ELSE %]Pay an amount toward all fines[% END %] +
      +
    1. + Total amount outstanding: + [% total | format('%.2f') %] +
      2. +
    2. + -
    - - Cancel -
    + + + +
    + Cancel
    [% END %]
    -- 2.39.5