fix for #671 (add institution member)

note member management code is really dirty & can be factorised, will be done in HEAD branch (2.1.x version)

diff --git a/koha-tmpl/intranet-tmpl/default/en/newimember.tmpl b/koha-tmpl/intranet-tmpl/default/en/newimember.tmpl
index 300ca22..c5fb447 100644 (file)
--- a/koha-tmpl/intranet-tmpl/default/en/newimember.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/newimember.tmpl
@@ -6,6 +6,167 @@
        <!-- TMPL_IF NAME=invalid -->
                Invalid cardnumber.<p>
        <!-- TMPL_ELSE -->
+       <H1> Confirm Record </H1>
+       <table border=0 cellspacing=0 cellpadding=5>
+               <tr valign=top bgcolor="<!-- TMPL_VAR Name="main" -->" >
+                       <td colspan=2 background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif">
+                               <B> NEW MEMBER </B>
+                       </td>
+               </tr>
+               <tr valign=top bgcolor="white" >
+                       <td>
+                               <B>Name</B>
+                       </td>
+                       <td>
+                               <!-- TMPL_VAR Name="institution_name" -->
+                       </td>
+               </tr>
+               <tr valign=top bgcolor="<!-- TMPL_VAR Name="main" -->" >
+                       <td colspan=2 background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif">
+                               <B> MEMBERSHIP DETAILS </B>
+                       </td>
+               </tr>
+               <tr valign=top bgcolor="white" >
+                       <td>
+                               <B>Membership Number</B>
+                       </td>
+                       <td>
+                               <!-- TMPL_VAR Name="bornum" -->
+                       </td>
+               </tr>
+               <tr valign=top bgcolor="white" >
+                       <td>
+                               <B>Card Number</B>
+                       </td>
+                       <td>
+                               <!-- TMPL_VAR Name="cardnumber_institution" -->
+                       </td>
+               </tr>
+               <tr valign=top bgcolor="white" >
+                       <td>
+                               <B>Joining Branch</B>
+                       </td>
+                       <td>
+                               <!-- TMPL_VAR Name="branchcode" -->
+                       </td>
+               </tr>
+               <tr valign=top bgcolor="<!-- TMPL_VAR Name="main" -->" >
+                       <td colspan=2 background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif">
+                               <B>MEMBER ADDRESS</B>
+                       </td>
+               </tr>
+               <tr valign=top bgcolor="white" >
+                       <td>
+                               <B>Postal Address</B>
+                       </td>
+                       <td>
+                               <!-- TMPL_VAR Name="postal" -->
+                       </td>
+               </tr>
+               <tr valign=top bgcolor="white" >
+                       <td>
+                               <B>Home Address</B>
+                       </td>
+                       <td>
+                               <!-- TMPL_VAR Name="home" -->
+                       </td>
+               </tr>
+               <tr valign=top bgcolor="<!-- TMPL_VAR Name="main" -->" >
+                       <td colspan=2 background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif">
+                               <B>MEMBER CONTACT DETAIL</B>
+                       </td>
+               </tr>
+               <tr valign=top bgcolor="white" >
+                       <td>
+                               <B>Phone (Home)</B>
+                       </td>
+                       <td>
+                               <!-- TMPL_VAR Name="phone" -->
+                       </td>
+               </tr>
+               <tr valign=top bgcolor="white" >
+                       <td>
+                               <B>Phone (Daytime)</B>
+                       </td>
+                       <td>
+                               <!-- TMPL_VAR Name="phoneday" -->
+                       </td>
+               </tr>
+               <tr valign=top bgcolor="white" >
+                       <td>
+                               <B>Fax</B>
+                       </td>
+                       <td>
+                               <!-- TMPL_VAR Name="faxnumber" -->
+                       </td>
+               </tr>
+               <tr valign=top bgcolor="white" >
+                       <td>
+                               <B>E-mail</B>
+                       </td>
+                       <td>
+                               <!-- TMPL_VAR Name="emailaddress" -->
+                       </td>
+               </tr>
+                <tr valign=top bgcolor="white" >
+                        <td>
+                                <B>Text messaging</B>
+                       </td>
+                       <td>
+                               <!-- TMPL_VAR NAME=textmessaging -->
+                       </td>
+               </tr>
+               <tr valign=top bgcolor="<!-- TMPL_VAR Name="main" -->" >
+                       <td colspan=2 background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif">
+                               <B>ALTERNATIVE CONTACT DETAIL</B>
+                       </td>
+               </tr>
+               <tr valign=top bgcolor="white" >
+                       <td>
+                               <B>Name</B>
+                       </td>
+                       <td>
+                               <!-- TMPL_VAR Name="contactname" -->
+                       </td>
+               </tr>
+               <tr valign=top bgcolor="white" >
+                       <td>
+                               <B>Phone</B>
+                       </td>
+                       <td>
+                               <!-- TMPL_VAR Name="altphone" -->
+                       </td>
+               </tr>
+               <tr valign=top bgcolor="white" >
+                       <td>
+                               <B>Relationship</B>
+                       </td>
+                       <td>
+                               <!-- TMPL_VAR Name="altrelationship" -->
+                       </td>
+               </tr>
+               <tr valign=top bgcolor="white" >
+                       <td>
+                               <B>Notes</B>
+                       </td>
+                       <td>
+                               <!-- TMPL_VAR Name="altnotes" -->
+                       </td>
+               </tr>
+               <tr valign=top bgcolor="<!-- TMPL_VAR Name="main" -->" >
+                       <td colspan=2 background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif">
+                               <B>NOTES</B>
+                       </td>
+               </tr>
+               <tr valign=top bgcolor="white" >
+                       <td>
+                               <B>General Notes</B>
+                       </td>
+                       <td>
+                               <!-- TMPL_VAR Name="bornotes" -->
+                       </td>
+               </tr>
+               </TABLE><p>
                Valid values. click OK to confirm this new borrower
                <form action="/cgi-bin/koha/insertidata.pl" method=post>
                        <!-- TMPL_LOOP NAME=inputsloop -->

diff --git a/newimember.pl b/newimember.pl
index 04a1a3b..cef87c8 100755 (executable)
--- a/newimember.pl
+++ b/newimember.pl
@@ -106,7 +106,27 @@ if ($missing !=1) {
            push(@inputs, { 'key'       => $key,
                            'value'     => CGI::escapeHTML($value) });
        }
-       $template->param(inputsloop => \@inputs);
+    $template->param(institution_name => $data{institution_name},
+                    bornum => $data{'borrowernumber'},
+                    cardnumber_institution => $data{'cardnumber_institution'},
+                    memcat => $data{'categorycode'},
+                    branchcode => $data{'branchcode'},
+                    sex => $data{sex},
+                    postal => $data{postal},
+                    home => $data{home},
+                       zipcode => $data{'zipcode'},
+                       homezipcode => $data{'homezipcode'},
+                    phone => $data{'phone'},
+                    phoneday => $data{'phoneday'},
+                    faxnumber => $data{'faxnumber'},
+                    emailaddress => $data{'emailaddress'},
+                       textmessaging => $data{'textmessaging'},
+                    contactname => $data{'contactname'},
+                    altphone => $data{'altphone'},
+                    altrelationship => $data{'altrelationship'},
+                    altnotes => $data{'altnotes'},
+                    bornotes => $data{'borrowernotes'},
+                    inputsloop => \@inputs);
     }
 }
 output_html_with_http_headers $input, $cookie, $template->output;