From 81f1a4cbe3585dbe2b9361d3a24b3d8bce44172c Mon Sep 17 00:00:00 2001
From: Josef Moravec <josef.moravec@gmail.com>
Date: Sun, 13 Nov 2016 16:49:58 +0000
Subject: [PATCH] Bug 17734: Make possible to pay and writeoff from boraccount
 page and make action buttons split button
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Test plan
0) Have a patron with some fines - some payd and some unpaid
1) Apply the patch
2) Go to boraccount.pl page
3) In most right column you should see apropriate combination of buttons for
each row:
    Print - fee which was writted-off and write-off line
    Pay + Print in dropdown - unpaid fee, for user without permissin to writeoff
    Pay + Print and Write off in dropdown - unpaid fee, user with permission to writeoff
    Print + Reverse in dropdown - for payment row
4) Try all combination and use buttons and confirm they work as expected

Signed-off-by: Radek Šiman <rbit@rbit.cz>
---
 koha-tmpl/intranet-tmpl/prog/css/staff-global.css  | 18 ++++++-------
 .../prog/en/modules/members/boraccount.tt          | 31 +++++++++++++++++-----
 2 files changed, 33 insertions(+), 16 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/css/staff-global.css b/koha-tmpl/intranet-tmpl/prog/css/staff-global.css
index ba6c8fb..70a35b8 100644
--- a/koha-tmpl/intranet-tmpl/prog/css/staff-global.css
+++ b/koha-tmpl/intranet-tmpl/prog/css/staff-global.css
@@ -2033,7 +2033,7 @@ ul.ui-tabs-nav li {
     color: #538200;
 }
 
-.statictabs ul {
+.statictabs > ul {
     background: none repeat scroll 0 0 transparent;
     border: 0 none;
     margin: 0;
@@ -2051,17 +2051,17 @@ ul.ui-tabs-nav li {
     text-decoration: none;
 }
 
-.statictabs ul:after {
+.statictabs > ul:after {
     clear: both;
 }
 
-.statictabs ul:before,
-.statictabs ul:after {
+.statictabs > ul:before,
+.statictabs > ul:after {
     content: "";
     display: table;
 }
 
-.statictabs ul li {
+.statictabs > ul li {
     background: none repeat scroll 0 0 #E6F0F2;
     border: 1px solid #B9D8D9;
     border-bottom: 0 none;
@@ -2080,14 +2080,14 @@ ul.ui-tabs-nav li {
 
 }
 
-.statictabs ul li.active {
+.statictabs > ul li.active {
     background-color: #FFFFFF;
     color: #212121;
     font-weight: normal;
     padding-bottom: 1px;
 }
 
-.statictabs ul li a {
+.statictabs > ul li a {
     color: #004D99;
     cursor: pointer;
     float: left;
@@ -2095,14 +2095,14 @@ ul.ui-tabs-nav li {
     text-decoration: none;
 }
 
-.statictabs ul li a:hover {
+.statictabs > ul li a:hover {
     background-color : #EDF4F5;
     border-top-right-radius: 4px;
     border-top-left-radius: 4px;
     color : #538200;
 }
 
-.statictabs ul li.active a {
+.statictabs > ul li.active a {
     color: #000000;
     font-weight: bold;
     cursor: text;
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 ca0a804..66f0616 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt
@@ -108,18 +108,35 @@ $(document).ready(function() {
       [% IF ( account.amountcredit ) %]<td class="credit" style="text-align: right;">[% ELSE %]<td class="debit" style="text-align: right;">[% END %][% account.amount %]</td>
       [% IF ( account.amountoutstandingcredit ) %]<td class="credit" style="text-align: right;">[% ELSE %]<td class="debit" style="text-align: right;">[% END %][% account.amountoutstanding %]</td>
       <td class="actions">
-        [% IF ( account.payment ) %]
-          <a target="_blank" href="printfeercpt.pl?action=print&amp;accountlines_id=[% account.accountlines_id %]&amp;borrowernumber=[% account.borrowernumber %]" class="btn btn-mini"><i class="fa fa-print"></i> Print</a>
+        <div class="dropdown">
+        <div class="btn-group">
+        [% IF ( account.amountoutstanding > 0 ) %]
+          <a class="btn btn-mini" href="paycollect.pl?borrowernumber=[% account.borrowernumber %]&pay_individual=1&accounttype=[% account.accounttype %]&amount=[% account.amount %]&amountoutstanding=[% account.amountoutstanding %]&description=[% account.description %]&notify_id=[% account.notify_id %]&notify_level=[% account.notify_level %]&accountlines_id=[% account.accountlines_id %]"><i class="fa fa-dollar"></i> Pay</a>a
+          [% # If there is amount outstanding, we have at least two actions (pay, print, sometimes writeoff), so we need dropdown %]
+          <a class="btn btn-mini dropdown-toggle" id="subactions[% account.accountlines_id %]" role="button" data-toggle="dropdown" href="#"><i class="caret"></i></a>
+          <ul class="dropdown-menu" role="menu" arialabelledby="subactions[% account.accountlines_id %]">
         [% ELSE %]
-          <a target="_blank" href="printinvoice.pl?action=print&amp;accountlines_id=[% account.accountlines_id %]&amp;borrowernumber=[% account.borrowernumber %]" class="btn btn-mini"><i class="fa fa-print"></i> Print</a>
-        [% END %]
-        [% IF ( reverse_col) %]
           [% IF ( account.payment ) %]
-            <a href="boraccount.pl?action=reverse&amp;accountlines_id=[% account.accountlines_id %]&amp;borrowernumber=[% account.borrowernumber %]" class="btn btn-mini"><i class="fa fa-undo"></i> Reverse</a>
+            <a target="_blank" href="printfeercpt.pl?action=print&amp;accountlines_id=[% account.accountlines_id %]&amp;borrowernumber=[% account.borrowernumber %]" class="btn btn-mini"><i class="fa fa-print"></i> Print</a>
           [% ELSE %]
-            &nbsp;
+            <a target="_blank" href="printinvoice.pl?action=print&amp;accountlines_id=[% account.accountlines_id %]&amp;borrowernumber=[% account.borrowernumber %]" class="btn btn-mini"><i class="fa fa-print"></i> Print</a>
           [% END %]
         [% END %]
+        [% # If user can reverse, we need the dropdown %]
+        [% IF ( reverse_col && account.payment ) %]
+          <a class="btn btn-mini dropdown-toggle" id="subactions[% account.accountlines_id %]" role="button" data-toggle="dropdown" href="#"><i class="caret"></i></a>
+          <ul class="dropdown-menu" role="menu" arialabelledby="subactions[% account.accountlines_id %]">
+        [% END %]
+
+        [% IF ( account.amountoutstanding > 0 ) %]
+            [% IF CAN_user_updatecharges_writeoff %]
+            <li><a href="paycollect.pl?borrowernumber=[% account.borrowernumber %]&writeoff_individual=1&accounttype=[% account.accounttype %]&amount=[% account.amount %]&amountoutstanding=[% account.amountoutstanding %]&description=[% account.description %]&notify_id=[% account.notify_id %]&notify_level=[% account.notify_level %]&accountlines_id=[% account.accountlines_id %]"><i class="fa fa-times"></i> Write off</a></li>
+            [% END %]
+            <li><a target="_blank" href="printinvoice.pl?action=print&amp;accountlines_id=[% account.accountlines_id %]&amp;borrowernumber=[% account.borrowernumber %]"><i class="fa fa-print"></i> Print</a></li>
+        [% END %]
+        [% IF ( reverse_col && account.payment ) %]
+            <li><a href="boraccount.pl?action=reverse&amp;accountlines_id=[% account.accountlines_id %]&amp;borrowernumber=[% account.borrowernumber %]"><i class="fa fa-undo"></i> Reverse</a></li>
+        [% END %]
       </td>
     </tr>
 
-- 
2.1.4