more bug fixes

moremember.pl

@@ -25,6 +25,18 @@ $data->{'dateenrolled'}="$temp[2]/$temp[1]/$temp[0]";
 $data->{'expiry'}="$temp[2]/$temp[1]/$temp[0]";
 @temp=split('-',$data->{'dateofbirth'});
 $data->{'dateofbirth'}="$temp[2]/$temp[1]/$temp[0]";
+if ($data->{'ethnicity'} eq 'maori'){
+  $data->{'ethnicity'} = 'Maori';
+}
+if ($data->{'ethnicity'}eq 'european'){
+  $data->{'ethnicity'} = 'European/Pakeha';
+}
+if ($data->{'ethnicity'}eq 'pi'){
+  $data->{'ethnicity'} = 'Pacific Islander';
+}
+if ($data->{'ethnicity'}eq 'asian'){
+  $data->{'ethnicity'} = 'Asian';
+}
 print <<printend
 <FONT SIZE=6><em>$data->{'othernames'} $data->{'surname'}</em></FONT><P>
 <p>
@@ -39,22 +51,24 @@ print <<printend
 </form>
 </P><br>
 <FONT SIZE=2  face="arial, helvetica">$data->{'title'} $data->{'othernames'}  $data->{'surname'} ($data->{'firstname'}, $data->{'initials'})<p>
-Membership Number: $data->{'borrowernumber'}<BR>
+
 Card Number: $data->{'cardnumber'}<BR>
-Membership: $data->{'categorycode'}<BR>
-Area: $data->{'area'}<BR>
-Fee:$30/year, Paid<BR>
-Joined: $data->{'dateenrolled'},  Expires: $data->{'expiry'} <BR>
-Joining Branch: Levin<P>
-Ethnicity: $data->{'ethnicity'}, $data->{'ethnotes'}<BR>
-DoB: $data->{'dateofbirth'}<BR>
-Sex: $data->{'sex'}<P>
 Postal Address: $data->{'streetaddress'}, $data->{'city'}<BR>
 Home Address: $data->{'physstreet'}, $data->{'streetcity'}<BR>
 Phone (Home): $data->{'phone'}<BR>
 Phone (Daytime): $data->{'phoneday'}<BR>
 Fax: $data->{'faxnumber'}<BR>
 E-mail: <a href="mailto:$data->{'emailaddress'}">$data->{'emailaddress'}</a><P>
+Membership Number: $data->{'borrowernumber'}<BR>
+Membership: $data->{'categorycode'}<BR>
+Area: $data->{'area'}<BR>
+Fee:$30/year, Paid<BR>
+Joined: $data->{'dateenrolled'},  Expires: $data->{'expiry'} <BR>
+Joining Branch: $data->{'homebranch'}<P>
+Ethnicity: $data->{'ethnicity'}, $data->{'ethnotes'}<BR>
+DoB: $data->{'dateofbirth'}<BR>
+Sex: $data->{'sex'}<P>
+
 Alternative Contact:$data->{'contactname'}<BR>
 Phone: $data->{'altphone'}<BR>
 Relationship: $data->{'altrelationship'}<BR>

request.pl

@@ -70,6 +70,7 @@ print <<printend
 <option value=L>Levin
 <option value=F>Foxton
 <option value=S>Shannon
+<option value=T>Tokomaru
 </select>
 </td>
 <td><input type=checkbox name=request value=any>Next Available, <br>(or choose from list below)</td>
@@ -172,21 +173,26 @@ print "</select>
 <TD><a href=/cgi-bin/koha/member.pl?member=$bor>$reserves->[$i]{'firstname'} $reserves->[$i]{'surname'}</a></td>
 <TD>$date</td>
 <TD><select name=pickup>
-<option value=levin";
+<option value=L";
 if ($reserves->[$i]{'branchcode'} eq 'L'){
   print " selected";
 }
 print ">Levin
-<option value=foxton";
+<option value=F";
 if ($reserves->[$i]{'branchcode'} eq 'F'){
   print " selected";
 }
 print ">Foxton
-<option value=Shannon";
+<option value=S";
 if ($reserves->[$i]{'branchcode'} eq 'S'){
   print " selected";
 }
 print">Shannon
+<option value=T";
+if ($reserves->[$i]{'branchcode'} eq 'T'){
+  print " selected";
+}
+print ">Tokomaru
 </select>
 </td>
 <TD>$type</td>

stats.pl

@@ -26,6 +26,11 @@ if ($time eq 'daybefore'){
   $date=ParseDate('2 days ago');
   $date2=ParseDate('yesterday');
 }
+if ($time=~ /\//){
+  $date=ParseDate($time);
+  $date2=ParseDateDelta('+ 1 day');
+  $date2=DateCalc($date,$date2);
+}
 $date=UnixDate($date,'%Y-%m-%d');
 $date2=UnixDate($date2,'%Y-%m-%d');
 my @payments=TotalPaid($date);