Standardizing information shown in sidebar when patron-related pages are displayed...

Signed-off-by: Chris Cormack <crc@liblime.com>
Signed-off-by: Joshua Ferraro <jmf@liblime.com>

diff --git a/circ/circulation.pl b/circ/circulation.pl
index 5c8e0d1..a066774 100755 (executable)
--- a/circ/circulation.pl
+++ b/circ/circulation.pl
@@ -616,7 +616,8 @@ $template->param(
     expiry                      =>
       $borrower->{'dateexpiry'},    #format_date($borrower->{'dateexpiry'}),
     categorycode      => $borrower->{'categorycode'},
-    streetaddress     => $borrower->{'address'},
+    address     => $borrower->{'address'},
+    address2     => $borrower->{'address2'},
     email      => $borrower->{'email'},
        emailpro           => $borrower->{'emailpro'},
     borrowernotes     => $borrower->{'borrowernotes'},

diff --git a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
index f69e7e6..760731d 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
+++ b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
@@ -205,10 +205,18 @@ th {
        font-weight : bold;
 }
 
-td.highlight {
+tr.highlight td, td.highlight {
        background-color : #F3F3F3;
 }
 
+tr.onissue td {
+       background-color: #FFFFCC;
+}
+
+tr.highlight.onissue td {
+       background-color: #FFFFE1;
+}
+
 caption {
        font-size : 153.9%;
        font-weight : bold;
@@ -913,4 +921,25 @@ div.first fieldset {
  
  div.confirm input:hover {
        background-color : #ffc;
- }
\ No newline at end of file
+ }
+ 
+ div.results {
+       padding : .7em 0;
+ }
+ 
+ #section-nav ul {
+       margin : .5em 0 .5em 2px;
+       padding : 0;
+ }
+ 
+ #section-nav ul li {
+       display : inline;
+       list-style-type : none;
+ }
+ 
+ #section-nav ul li a {
+       background-color : #d2e9f5;
+       border : 1px solid #69C;
+       padding : 2px 3px;
+       text-decoration : none;
+ } 
\ No newline at end of file

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc
index 236ac3f..79f6927 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc
@@ -1,11 +1,12 @@
 <!-- TMPL_IF NAME="borrowernumber" -->
 <div class="patroninfo"><h5><!-- TMPL_VAR name="firstname" --> <!-- TMPL_VAR name="surname" --></h5>
 <ul>
-               <li><!-- TMPL_IF NAME="streetaddress"-->
-            <!-- TMPL_VAR NAME="streetaddress" -->,
+               <li><!-- TMPL_IF NAME="address"-->
+            <!-- TMPL_VAR NAME="address" -->
         <!-- TMPL_ELSE -->
             <span class="problem">No address stored for patron.</span>
         <!-- /TMPL_IF --></li>
+               <!-- TMPL_IF NAME="address2" --><li><!-- TMPL_VAR NAME="address2" --></li><!-- /TMPL_IF -->
        <li> <!-- TMPL_IF NAME="city" -->
             <!-- TMPL_VAR NAME="city" -->
         <!-- TMPL_ELSE -->

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tmpl
index 043fa1b..05037cc 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tmpl
@@ -14,18 +14,18 @@
    <div id="bd">
        <div id="yui-main">
        <div class="yui-b">
-<!-- TMPL_INCLUDE NAME="circ-toolbar.inc" --><!-- The manual invoice and credit buttons -->
-<div id="action">
-    <div class="view">
-        <a href="/cgi-bin/koha/members/pay.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->" >Pay fines</a>
-        <a href="/cgi-bin/koha/members/maninvoice.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->" >Create Manual Invoice</a>
-        <a href="/cgi-bin/koha/members/mancredit.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->" >Create Manual Credit</a>
-    </div>
-</div>
-
+<!-- TMPL_INCLUDE NAME="circ-toolbar.inc" -->
+
+<!-- The manual invoice and credit buttons -->
+<div class="toptabs">
+<ul class="tabs-nav">
+       <li class="tabs-selected"><a href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->">Account</a></li>
+       <li><a href="/cgi-bin/koha/members/pay.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->" >Pay fines</a></li>
+       <li><a href="/cgi-bin/koha/members/maninvoice.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->" >Create Manual Invoice</a></li>
+       <li><a href="/cgi-bin/koha/members/mancredit.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->" >Create Manual Credit</a></li>
+</ul>
+<div class="tabs-container">
 <!-- The table with the account items -->
-<h1>Account for <!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --></h1>
-
 <table>
   <tr>
        <th>Date</th>
@@ -51,12 +51,13 @@
   </tr>
   </tfoot>
 </table>
+</div></div>
 
 </div>
 </div>
 
 <div class="yui-b">
-<!-- TMPL_INCLUDE NAME="members-menu.inc" -->
+<!-- TMPL_INCLUDE NAME="circ-menu.inc" -->
 </div>
 </div>
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tmpl
index 4a8ef08..2bb4884 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tmpl
@@ -15,6 +15,17 @@
        <div id="yui-main">
        <div class="yui-b">
 <!-- TMPL_INCLUDE NAME="circ-toolbar.inc" -->
+
+<!-- The manual invoice and credit buttons -->
+<div class="toptabs">
+<ul class="tabs-nav">
+       <li><a href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->">Account</a></li>
+       <li><a href="/cgi-bin/koha/members/pay.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->" >Pay fines</a></li>
+       <li><a href="/cgi-bin/koha/members/maninvoice.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->" >Create Manual Invoice</a></li>
+       <li class="tabs-selected"><a href="/cgi-bin/koha/members/mancredit.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->" >Create Manual Credit</a></li>
+</ul>
+<div class="tabs-container">
+
 <form action="/cgi-bin/koha/members/mancredit.pl" method="post">
 <input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR Name="borrowernumber" -->" />
 
@@ -34,12 +45,13 @@
 
 <form action="/cgi-bin/koha/members/boraccount.pl" method="get"><input type="hidden" value="<!-- TMPL_VAR Name="borrowernumber" -->" name="borrowernumber" /><input type="submit" value="Cancel" /></form>
 
+</div></div>
 
 </div>
 </div>
 
 <div class="yui-b">
-<!-- TMPL_INCLUDE NAME="members-menu.inc" -->
+<!-- TMPL_INCLUDE NAME="circ-menu.inc" -->
 </div>
 </div>
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tmpl
index ce80da8..eff645d 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tmpl
@@ -14,7 +14,19 @@
    <div id="bd">
        <div id="yui-main">
        <div class="yui-b">
-<!-- TMPL_INCLUDE NAME="circ-toolbar.inc" --><!-- TMPL_IF NAME="ERROR" -->
+<!-- TMPL_INCLUDE NAME="circ-toolbar.inc" -->
+
+<!-- The manual invoice and credit buttons -->
+<div class="toptabs">
+<ul class="tabs-nav">
+       <li><a href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->">Account</a></li>
+       <li><a href="/cgi-bin/koha/members/pay.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->" >Pay fines</a></li>
+       <li class="tabs-selected"><a href="/cgi-bin/koha/members/maninvoice.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->" >Create Manual Invoice</a></li>
+       <li><a href="/cgi-bin/koha/members/mancredit.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->" >Create Manual Credit</a></li>
+</ul>
+<div class="tabs-container">
+
+<!-- TMPL_IF NAME="ERROR" -->
 <!-- TMPL_IF NAME="ITEMNUMBER" -->
   ERROR an invalid itemnumber was entered, please hit back and try again
 <!-- /TMPL_IF -->
@@ -41,6 +53,7 @@
 <form action="/cgi-bin/koha/members/boraccount.pl" method="get"><input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR Name="borrowernumber" -->" /><input type="submit" value="Cancel" /></form>
 
 <!-- /TMPL_IF -->
+</div></div>
 
 </div>
 </div>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tmpl
index 140571d..aef944b 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tmpl
@@ -9,15 +9,15 @@
 
 <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <!-- TMPL_IF NAME="searching" --><a href="/cgi-bin/koha/members/members-home.pl">Patrons</a>  &rsaquo; Search Results<!-- TMPL_ELSE -->Patrons<!-- /TMPL_IF --></div>
 
-<div id="doc3" class="yui-t2">
+<div id="doc" class="yui-t7">
    
    <div id="bd">
        <div id="yui-main">
-       <div class="yui-b">
+       <div class="yui-g">
        
 <!-- TMPL_INCLUDE NAME="patron-toolbar.inc" -->
 
-<div>
+<!-- TMPL_UNLESS NAME="resultsloop" --><div>
     Browse by last name:
     <a href="/cgi-bin/koha/members/member.pl?member=a">A</a>
     <a href="/cgi-bin/koha/members/member.pl?member=b">B</a>
@@ -45,9 +45,11 @@
     <a href="/cgi-bin/koha/members/member.pl?member=x">X</a>
     <a href="/cgi-bin/koha/members/member.pl?member=y">Y</a>
     <a href="/cgi-bin/koha/members/member.pl?member=z">Z</a>
-</div>
+</div><!-- /TMPL_UNLESS -->
 
 <!-- TMPL_IF NAME="resultsloop" -->
+    <h3>Results for Search: <span class="ex"><!-- TMPL_VAR NAME="member" --></span></h3>
+       <div class="results"><!-- TMPL_VAR Name ="numresults" --> patrons found.</div>
 <div class="searchresults">
     <table>
     <tr>
@@ -58,6 +60,7 @@
     <th>OD/Issues</th>
     <th>Fines</th>
     <th>Notes</th>
+       <th>&nbsp;</th>
     </tr>
     <!-- TMPL_LOOP NAME="resultsloop" -->
     <!-- TMPL_IF name="overdue" -->
@@ -70,14 +73,13 @@
     <!-- /TMPL_IF -->
     <!-- /TMPL_IF -->
     <td><!-- TMPL_VAR NAME="cardnumber" --></td>
-    <td><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->"><!-- TMPL_VAR NAME="surname" -->, <!-- TMPL_VAR NAME="firstname" --></a>
-    <!-- TMPL_VAR NAME="streetaddress" --> <!-- TMPL_VAR NAME="city" -->
-    </td>
+    <td style="white-space: nowrap;"><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->"><!-- TMPL_VAR NAME="surname" -->, <!-- TMPL_VAR NAME="firstname" --></a> <br /> <!-- TMPL_VAR NAME="address" --><!-- TMPL_IF NAME="address2" --><br /><!-- TMPL_VAR NAME="address2" --><!-- /TMPL_IF --><!-- TMPL_IF NAME="city" --><br /><!-- TMPL_VAR NAME=city --><!-- /TMPL_IF --></td>
     <td><!-- TMPL_VAR NAME="category_description" --> (<!-- TMPL_VAR name="category_type" -->)</td>
     <td><!-- TMPL_VAR NAME="branchcode" --></td>
     <td><!-- TMPL_VAR NAME="odissue" --></td>
     <td><!-- TMPL_VAR NAME="fines" --></td>
     <td><!-- TMPL_VAR NAME="borrowernotes" --></td>
+       <td><a href="/cgi-bin/koha/members/memberentry.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->">Edit</a></td>
     </tr>
     <!-- /TMPL_LOOP -->
     </table>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl
index 3fa169c..a61a519 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl
@@ -9,7 +9,7 @@
 
 <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/members/members-home.pl">Patrons</a>  &rsaquo; <!-- TMPL_IF NAME="unknowuser" -->Patron does not exist<!-- TMPL_ELSE -->Patron Details for <!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --> (<!-- TMPL_VAR NAME="cardnumber" -->)<!-- /TMPL_IF --> </div>
 
-<div id="doc3" class="yui-t2">
+<div id="doc3" class="yui-t1">
    
    <div id="bd">
        <div id="yui-main">

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tmpl
index edb5f9d..ee686ad 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tmpl
@@ -16,6 +16,16 @@
        <div class="yui-b">
 <!-- TMPL_INCLUDE NAME="circ-toolbar.inc" -->
 
+<!-- The manual invoice and credit buttons -->
+<div class="toptabs">
+<ul class="tabs-nav">
+       <li><a href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->">Account</a></li>
+       <li class="tabs-selected"><a href="/cgi-bin/koha/members/pay.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->" >Pay fines</a></li>
+       <li><a href="/cgi-bin/koha/members/maninvoice.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->" >Create Manual Invoice</a></li>
+       <li><a href="/cgi-bin/koha/members/mancredit.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->" >Create Manual Credit</a></li>
+</ul>
+<div class="tabs-container">
+
 <!-- TMPL_IF NAME="allfile" --><form action="/cgi-bin/koha/members/pay.pl" method="post">
        <input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR name="borrowernumber" -->" />
 
@@ -66,12 +76,13 @@
 <!-- /TMPL_LOOP  -->
 </table>
 <input type="submit" name="submit"  value="Make Payment" class="submit" /></form><!-- TMPL_ELSE --><p><!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --> has no outstanding fines.</p><!-- /TMPL_IF -->
+</div></div>
 
 </div>
 </div>
 
 <div class="yui-b">
-<!-- TMPL_INCLUDE NAME="members-menu.inc" -->
+<!-- TMPL_INCLUDE NAME="circ-menu.inc" -->
 </div>
 </div>
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tmpl
index fef2b4b..59a9f07 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tmpl
@@ -15,19 +15,12 @@
        <div id="yui-main">
        <div class="yui-b">
 <!-- TMPL_INCLUDE NAME="circ-toolbar.inc" -->
-<!-- TMPL_IF NAME="showfulllink" -->
-<ul>
-       <li>Showing All Items</li>
-       <li><a href="readingrec.pl?borrowernumber=<!-- TMPL_VAR name="borrowernumber" -->&amp;limit=full">Show Last 50 Items Only</a></li>
-</ul>
-<!-- TMPL_ELSE -->
-<ul>
-       <li>Showing Last 50 Items</li>
-       <li><a href="readingrec.pl?borrowernumber=<!-- TMPL_VAR name="borrowernumber" -->&amp;limit=full">Show All Items</a></li>
-</ul>
-<!-- /TMPL_IF -->
-<h1>Reading Record for <!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --></h1>
+<h1>Reading Record</h1>
+
 <table>
+<tr><td colspan="4"><!-- TMPL_IF NAME="showfulllink" -->Showing All Items |
+       <a href="readingrec.pl?borrowernumber=<!-- TMPL_VAR name="borrowernumber" -->&amp;limit=full">Show Last 50 Items Only</a> <!-- TMPL_ELSE -->    Showing Last 50 Items | 
+       <a href="readingrec.pl?borrowernumber=<!-- TMPL_VAR name="borrowernumber" -->&amp;limit=full">Show All Items</a><!-- /TMPL_IF --></td></tr>
 <tr>
        <th>
                <a href="readingrec.pl?borrowernumber=<!-- TMPL_VAR name="borrowernumber" -->&amp;order=title&amp;amp;limit=<!-- TMPL_VAR name="limit" -->">Title</a>
@@ -42,35 +35,27 @@
 </tr>
 <!-- TMPL_LOOP name="loop_reading" -->
 <!-- TMPL_IF NAME="toggle" -->
-    <tr class="highlight">
+    <!-- TMPL_IF NAME="returndate" --><tr class="highlight"><!-- TMPL_ELSE --><tr class="highlight onissue"><!-- /TMPL_IF -->
 <!-- TMPL_ELSE -->
-    <tr>
+    <!-- TMPL_IF NAME="returndate" --><tr><!-- TMPL_ELSE --><tr class="onissue"><!-- /TMPL_IF -->
 <!-- /TMPL_IF -->
-        <!-- TMPL_IF NAME="returndate" -->
+
             <td>
-        <!-- TMPL_ELSE --> 
-            <td class="onissue" >
         <!-- /TMPL_IF -->
             <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">
                 <!-- TMPL_VAR name="title" -->
             </a>
         </td>
-        <!-- TMPL_IF NAME="returndate" -->
+
             <td>
-        <!-- TMPL_ELSE -->
-            <td class="onissue">
         <!-- /TMPL_IF -->
         <!-- TMPL_VAR name="author" --></td>
-       <!-- TMPL_IF NAME="returndate" -->
+
             <td>
-        <!-- TMPL_ELSE -->
-            <td class="onissue">
         <!-- /TMPL_IF -->
         <!-- TMPL_VAR NAME="classification" --></td>
-        <!-- TMPL_IF NAME="returndate" -->
+
             <td>
-        <!-- TMPL_ELSE -->
-            <td class="onissue">
         <!-- /TMPL_IF -->
         <!-- TMPL_IF NAME="returndate" -->
             <!-- TMPL_VAR name="returndate" -->
@@ -81,13 +66,12 @@
 </tr>
 <!-- /TMPL_LOOP -->
 </table>
-<form action="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR name="borrowernumber" -->" method="get"><input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->" /> <input type="submit" value="Return to Patron Record" /></form>
 
 </div>
 </div>
 
 <div class="yui-b">
-<!-- TMPL_INCLUDE NAME="members-menu.inc" -->
+<!-- TMPL_INCLUDE NAME="circ-menu.inc" -->
 </div>
 </div>
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->

diff --git a/members/boraccount.pl b/members/boraccount.pl
index 350b537..006d6b7 100755 (executable)
--- a/members/boraccount.pl
+++ b/members/boraccount.pl
@@ -90,7 +90,18 @@ $template->param(
                 firstname       => $data->{'firstname'},
                 surname         => $data->{'surname'},
                 borrowernumber          => $borrowernumber,
-                total           => sprintf("%.2f",$total),
+                               cardnumber => $data->{'cardnumber'},
+                           categorycode => $data->{'categorycode'},
+                           category_type => $data->{'category_type'},
+                           category_description => $data->{'description'},
+                           address => $data->{'address'},
+                               address2 => $data->{'address2'},
+                           city => $data->{'city'},
+                               zipcode => $data->{'zipcode'},
+                               phone => $data->{'phone'},
+                               email => $data->{'email'},
+                           branchcode => $data->{'branchcode'},
+                   total           => sprintf("%.2f",$total),
                 totalcredit => $totalcredit,
                 accounts        => \@accountrows );
 

diff --git a/members/mancredit.pl b/members/mancredit.pl
index 4f2fe50..2f809d3 100755 (executable)
--- a/members/mancredit.pl
+++ b/members/mancredit.pl
@@ -57,6 +57,16 @@ if ($add){
                     borrowernumber => $borrowernumber,
                     firstname => $data->{'firstname'},
                     surname  => $data->{'surname'},
+                                       cardnumber => $data->{'cardnumber'},
+                                   categorycode => $data->{'categorycode'},
+                                   category_type => $data->{'category_type'},
+                                   category_description => $data->{'description'},
+                                   address => $data->{'address'},
+                                       address2 => $data->{'address2'},
+                                   city => $data->{'city'},
+                                       zipcode => $data->{'zipcode'},
+                                       phone => $data->{'phone'},
+                                       email => $data->{'email'},
     );
        print $input->header(
            -type => 'utf-8',

diff --git a/members/maninvoice.pl b/members/maninvoice.pl
index 4652095..faa38a8 100755 (executable)
--- a/members/maninvoice.pl
+++ b/members/maninvoice.pl
@@ -77,6 +77,16 @@ if ($add){
                     borrowernumber => $borrowernumber,
                     firstname => $data->{'firstname'},
                     surname  => $data->{'surname'},
+                                       cardnumber => $data->{'cardnumber'},
+                                   categorycode => $data->{'categorycode'},
+                               category_type => $data->{'category_type'},
+                                   category_description => $data->{'description'},
+                                   address => $data->{'address'},
+                                       address2 => $data->{'address2'},
+                                   city => $data->{'city'},
+                                       zipcode => $data->{'zipcode'},
+                                       phone => $data->{'phone'},
+                                       email => $data->{'email'},
     );
     print $input->header(
            -type => 'utf-8',

diff --git a/members/member-flags.pl b/members/member-flags.pl
index 8ba5ff4..a7c6011 100755 (executable)
--- a/members/member-flags.pl
+++ b/members/member-flags.pl
@@ -71,8 +71,20 @@ if ($input->param('newflags')) {
     }
 
     $template->param(borrowernumber => $member,
-                       surname => $bor->{'surname'},
-                       firstname => $bor->{'firstname'},
+                   borrowernumber => $bor->{'borrowernumber'},
+               cardnumber => $bor->{'cardnumber'},
+                   surname => $bor->{'surname'},
+                   firstname => $bor->{'firstname'},
+                   categorycode => $bor->{'categorycode'},
+                   category_type => $bor->{'category_type'},
+                   category_description => $bor->{'description'},
+                   address => $bor->{'address'},
+                       address2 => $bor->{'address2'},
+                   city => $bor->{'city'},
+                       zipcode => $bor->{'zipcode'},
+                       phone => $bor->{'phone'},
+                       email => $bor->{'email'},
+                   branchcode => $bor->{'branchcode'},
                        loop => \@loop,
                        );
 

diff --git a/members/member-password.pl b/members/member-password.pl
index d600c07..315d07c 100755 (executable)
--- a/members/member-password.pl
+++ b/members/member-password.pl
@@ -71,12 +71,21 @@ if ( $newpassword ) {
                        surname     => $bor->{'surname'},
                        firstname   => $bor->{'firstname'},
                        borrowernumber => $bor->{'borrowernumber'},
+                       cardnumber => $bor->{'cardnumber'},
+                   categorycode => $bor->{'categorycode'},
+                   category_type => $bor->{'category_type'},
+                   category_description => $bor->{'description'},
+                   address => $bor->{'address'},
+                       address2 => $bor->{'address2'},
+                   city => $bor->{'city'},
+                       zipcode => $bor->{'zipcode'},
+                       phone => $bor->{'phone'},
+                       email => $bor->{'email'},
+                   branchcode => $bor->{'branchcode'},
                        userid      => $bor->{'userid'},
                        defaultnewpassword => $defaultnewpassword );
 
 
 }
 
-$template->param( member => $member,
-
 output_html_with_http_headers $input, $cookie, $template->output;

diff --git a/members/member.pl b/members/member.pl
index 0e0b5b5..fe33062 100755 (executable)
--- a/members/member.pl
+++ b/members/member.pl
@@ -79,13 +79,13 @@ else
 
 
 my @resultsdata;
-my $background = 0;
+my $toggle = 0;
 for (my $i=0; $i < $count; $i++){
   #find out stats
   my ($od,$issue,$fines)=GetMemberIssuesAndFines($results->[$i]{'borrowernumber'});
 
   my %row = (
-    background => $background,
+    toggle => $toggle,
     count => $i+1,
     borrowernumber => $results->[$i]{'borrowernumber'},
     cardnumber => $results->[$i]{'cardnumber'},
@@ -94,8 +94,10 @@ for (my $i=0; $i < $count; $i++){
     categorycode => $results->[$i]{'categorycode'},
     category_type => $results->[$i]{'category_type'},
     category_description => $results->[$i]{'description'},
-    streetaddress => $results->[$i]{'streetaddress'},
+    address => $results->[$i]{'address'},
+       address2 => $results->[$i]{'address2'},
     city => $results->[$i]{'city'},
+       zipcode => $results->[$i]{'zipcode'},
     branchcode => $results->[$i]{'branchcode'},
     overdues => $od,
     issues => $issue,
@@ -105,7 +107,7 @@ for (my $i=0; $i < $count; $i++){
     sort1 => $results->[$i]{'sort1'},
     sort2 => $results->[$i]{'sort2'},
     );
-  if ( $background ) { $background = 0; } else {$background = 1; }
+  if ( $toggle ) { $toggle = 0; } else {$toggle = 1; }
   push(@resultsdata, \%row);
 }
 

diff --git a/members/pay.pl b/members/pay.pl
index feb09e1..eb29032 100755 (executable)
--- a/members/pay.pl
+++ b/members/pay.pl
@@ -133,6 +133,17 @@ if ( $check == 0 ) {
         firstname      => $data->{'firstname'},
         surname        => $data->{'surname'},
         borrowernumber => $borrowernumber,
+               cardnumber => $data->{'cardnumber'},
+           categorycode => $data->{'categorycode'},
+           category_type => $data->{'category_type'},
+           category_description => $data->{'description'},
+           address => $data->{'address'},
+               address2 => $data->{'address2'},
+           city => $data->{'city'},
+               zipcode => $data->{'zipcode'},
+               phone => $data->{'phone'},
+               email => $data->{'email'},
+           branchcode => $data->{'branchcode'},
         total          => sprintf( "%.2f", $total )
     );
     output_html_with_http_headers $input, $cookie, $template->output;

diff --git a/members/readingrec.pl b/members/readingrec.pl
index 5e3067b..dcecbf0 100755 (executable)
--- a/members/readingrec.pl
+++ b/members/readingrec.pl
@@ -85,6 +85,16 @@ $template->param(
                                                limit => $limit,
                                                firstname => $data->{'firstname'},
                                                cardnumber => $data->{'cardnumber'},
+                                           categorycode => $data->{'categorycode'},
+                                           category_type => $data->{'category_type'},
+                                           category_description => $data->{'description'},
+                                           address => $data->{'address'},
+                                               address2 => $data->{'address2'},
+                                           city => $data->{'city'},
+                                               zipcode => $data->{'zipcode'},
+                                               phone => $data->{'phone'},
+                                               email => $data->{'email'},
+                                               branchcode => $data->{'branchcode'},
                                                showfulllink => ($count > 50),                                  
                                                loop_reading => \@loop_reading);
 output_html_with_http_headers $input, $cookie, $template->output;