X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=members%2Fmoremember.pl;h=723bb74aaa945647a88d518fefaea2faca3670c1;hb=b9ecd6561057ea6551af4d9d84032568c50204a6;hp=16f5eeeb24392a5da06e4991526a8084e12b743d;hpb=a3999812e691110f2e16fffd91ce0ed82d69178c;p=koha.git

diff --git a/members/moremember.pl b/members/moremember.pl
index 16f5eeeb24..723bb74aaa 100755
--- a/members/moremember.pl
+++ b/members/moremember.pl
@@ -17,7 +17,6 @@
 # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
 # Suite 330, Boston, MA  02111-1307 USA
 
-# $Id$
 
 =head1 moremember.pl
 
@@ -33,37 +32,48 @@
 =cut
 
 use strict;
-use C4::Auth;
+use CGI;
 use C4::Context;
+use C4::Auth;
 use C4::Output;
-use C4::Interface::CGI::Output;
-use C4::Interface::CGI::Template;
-use CGI;
 use C4::Members;
-use Date::Manip;
-use C4::Date;
-use C4::Reserves2;
-use C4::Circulation::Circ2;
+use C4::Members::Attributes;
+use C4::Dates;
+use C4::Reserves;
+use C4::Circulation;
 use C4::Koha;
 use C4::Letters;
 use C4::Biblio;
+use C4::Reserves;
 use C4::Branch; # GetBranchName
 
+#use Smart::Comments;
+#use Data::Dumper;
+
+use vars qw($debug);
+
+BEGIN {
+	$debug = $ENV{DEBUG} || 0;
+}
+
 my $dbh = C4::Context->dbh;
 
 my $input = new CGI;
+$debug or $debug = $input->param('debug') || 0;
 my $print = $input->param('print');
+my @failedrenews = $input->param('failedrenew');
+my @failedreturns = $input->param('failedreturn');
+my $error = $input->param('error');
+my @renew_failed;
+for my $renew (@failedrenews) { $renew_failed[$renew] = 1; }
+my @return_failed;
+for my $failedret (@failedreturns) { $return_failed[$failedret] = 1; }
+
 my $template_name;
 
-if ( $print eq "page" ) {
-    $template_name = "members/moremember-print.tmpl";
-}
-elsif ( $print eq "slip" ) {
-    $template_name = "members/moremember-receipt.tmpl";
-}
-else {
-    $template_name = "members/moremember.tmpl";
-}
+if    ($print eq "page") { $template_name = "members/moremember-print.tmpl";   }
+elsif ($print eq "slip") { $template_name = "members/moremember-receipt.tmpl"; }
+else {                     $template_name = "members/moremember.tmpl";         }
 
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     {
@@ -78,58 +88,65 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
 my $borrowernumber = $input->param('borrowernumber');
 
 #start the page and read in includes
-my $data           = borrdata( '', $borrowernumber );
+my $data           = GetMember( $borrowernumber ,'borrowernumber');
 my $reregistration = $input->param('reregistration');
 
 if ( not defined $data ) {
-    $template->param (
-        unknowuser => 1
-    );
-    output_html_with_http_headers $input, $cookie, $template->output;
+    $template->param (unknowuser => 1);
+	output_html_with_http_headers $input, $cookie, $template->output;
     exit;
 }
 
 # re-reregistration function to automatic calcul of date expiry
-(
-    $data->{'dateexpiry'} = GetMembeReregistration(
-        $data->{'categorycode'},
-        $borrowernumber, $data->{'dateenrolled'}
-    )
-) if ( $reregistration eq 'y' );
-my ( undef, undef, undef, $category_type ) =
-  getborrowercategory( $data->{'categorycode'} );
-  
+if ( $reregistration eq 'y' ) {
+	$data->{'dateexpiry'} = ExtendMemberSubscriptionTo( $borrowernumber );
+}
+
+my $category_type = $data->{'category_type'};
+
+### $category_type
+
 # in template <TMPL_IF name="I"> => instutitional (A for Adult& C for children) 
 $template->param( $data->{'categorycode'} => 1 ); 
 
-$data->{'dateenrolled'} = format_date( $data->{'dateenrolled'} );
-$data->{'dateexpiry'}   = format_date( $data->{'dateexpiry'} );
-$data->{'dateofbirth'}  = format_date( $data->{'dateofbirth'} );
-$data->{'IS_ADULT'}     = ( $data->{'categorycode'} ne 'I' );
-
-if (   $data->{'debarred'}
-    || $data->{'gonenoaddress'}
-    || $data->{'lost'}
-    || $data->{'borrowernotes'} )
-{
-    $template->param( flagged => 1 );
+$debug and printf STDERR "dates (enrolled,expiry,birthdate) raw: (%s, %s, %s)\n", map {$data->{$_}} qw(dateenrolled dateexpiry dateofbirth);
+foreach (qw(dateenrolled dateexpiry dateofbirth)) {
+		my $userdate = $data->{$_};
+		unless ($userdate) {
+			$debug and warn sprintf "Empty \$data{%12s}", $_;
+			$data->{$_} = '';
+			next;
+		}
+		$userdate = C4::Dates->new($userdate,'iso')->output('syspref');
+		$data->{$_} = $userdate || '';
+		$template->param( $_ => $userdate );
 }
+$data->{'IS_ADULT'} = ( $data->{'categorycode'} ne 'I' );
 
-$data->{'ethnicity'} = fixEthnicity( $data->{'ethnicity'} );
+for (qw(debarred gonenoaddress lost borrowernotes)) {
+	 $data->{$_} and $template->param(flagged => 1) and last;
+}
 
-$data->{ &expand_sex_into_predicate( $data->{'sex'} ) } = 1;
+$data->{'ethnicity'} = fixEthnicity( $data->{'ethnicity'} );
+$data->{ "sex_".$data->{'sex'}."_p" } = 1;
 
+my $catcode;
 if ( $category_type eq 'C' and $data->{'guarantorid'} ne '0' ) {
-    my $data2 = borrdata( '', $data->{'guarantorid'} );
-    $data->{'address'}   = $data2->{'address'};
-    $data->{'city'}      = $data2->{'city'};
-    $data->{'B_address'} = $data2->{'B_address'};
-    $data->{'B_city'}    = $data2->{'B_city'};
-    $data->{'phone'}     = $data2->{'phone'};
-    $data->{'mobile'}    = $data2->{'mobile'};
-    $data->{'zipcode'}   = $data2->{'zipcode'};
+    my $data2 = GetMember( $data->{'guarantorid'} ,'borrowernumber');
+    foreach (qw(address city B_address B_city phone mobile zipcode)) {
+        $data->{$_} = $data2->{$_};
+    }
+    my  ( $catcodes, $labels ) = 
+        GetborCatFromCatType( 'A', 'WHERE category_type = ?' );
+    my $cnt = scalar(@$catcodes);
+
+#     $cnt  =  1;
+    $template->param( 'CATCODE_MULTI' => 1) if $cnt > 1;
+	
+    $template->param( 'catcode' =>    $catcodes->[0])  if $cnt == 1;
 }
 
+
 if ( $data->{'ethnicity'} || $data->{'ethnotes'} ) {
     $template->param( printethnicityline => 1 );
 }
@@ -140,35 +157,32 @@ if ( $category_type eq 'A' ) {
     # It looks like the $i is only being returned to handle walking through
     # the array, which is probably better done as a foreach loop.
     #
-    my ( $count, $guarantees ) = findguarantees( $data->{'borrowernumber'} );
+    my ( $count, $guarantees ) = GetGuarantees( $data->{'borrowernumber'} );
     my @guaranteedata;
     for ( my $i = 0 ; $i < $count ; $i++ ) {
-        push(
-            @guaranteedata,
+        push(@guaranteedata,
             {
                 borrowernumber => $guarantees->[$i]->{'borrowernumber'},
                 cardnumber     => $guarantees->[$i]->{'cardnumber'},
                 name           => $guarantees->[$i]->{'firstname'} . " "
-                  . $guarantees->[$i]->{'surname'}
+                                . $guarantees->[$i]->{'surname'}
             }
         );
     }
     $template->param( guaranteeloop => \@guaranteedata );
     ( $template->param( adultborrower => 1 ) ) if ( $category_type eq 'A' );
-
 }
 else {
-    my ($guarantorid) = findguarantor( $data->{'borrowernumber'} );
-    ( $template->param( guarantor => 1 ) )
-      if ( ( $data->{'guarantorid'} > '0' ) );
-    if ( $guarantorid->{'borrowernumber'} ) {
-        $template->param(
-            guarantorborrowernumber => $guarantorid->{'borrowernumber'},
-            guarantorcardnumber     => $guarantorid->{'cardnumber'},
-            guarantorfirstname      => $guarantorid->{'firstname'},
-            guarantorsurname        => $guarantorid->{'surname'}
-        );
+    if ($data->{'guarantorid'}){
+	    my ($guarantor) = GetMember( $data->{'guarantorid'},'biblionumber');
+		$template->param(guarantor => 1);
+		foreach (qw(borrowernumber cardnumber firstname surname)) {        
+			  $template->param("guarantor$_" => $guarantor->{$_});
+        }
     }
+	if ($category_type eq 'C'){
+		$template->param('C' => 1);
+	}
 }
 
 #Independant branches management
@@ -189,15 +203,11 @@ if ( C4::Context->preference("IndependantBranches") ) {
     }
     $samebranch = 1 if ( $userenv->{flags} == 1 );
 }
+my $branchdetail = GetBranchDetail( $data->{'branchcode'});
+$data->{'branchname'} = $branchdetail->{branchname};
 
-$data->{'branchname'} =
-  ( ( GetBranchDetail( $data->{'branchcode'} ) )->{'branchname'} );
-
-# Converts the categorycode to the description
-( $data->{'categorycode'}, undef, undef ) =
-  &getborrowercategory( $data->{'categorycode'} );
 
-my ( $numaccts, $accts, $total ) = getboracctrecord( '', \%bor );
+my ( $total, $accts, $numaccts) = GetMemberAccountRecords( $borrowernumber );
 my $lib1 = &GetSortDetails( "Bsort1", $data->{'sort1'} );
 my $lib2 = &GetSortDetails( "Bsort2", $data->{'sort2'} );
 ( $template->param( lib1 => $lib1 ) ) if ($lib1);
@@ -205,33 +215,27 @@ my $lib2 = &GetSortDetails( "Bsort2", $data->{'sort2'} );
 
 # current issues
 #
-my ( $count, $issue ) = borrissues($borrowernumber);
+my ( $count, $issue ) = GetPendingIssues($borrowernumber);
 my $roaddetails = &GetRoadTypeDetails( $data->{'streettype'} );
-my $today       = ParseDate('today');
+my $today       = POSIX::strftime("%Y-%m-%d", localtime);	# iso format
 my @issuedata;
 my $totalprice = 0;
 my $toggle     = 0;
 for ( my $i = 0 ; $i < $count ; $i++ ) {
-    my $datedue = ParseDate( $issue->[$i]{'date_due'} );
-    $issue->[$i]{'date_due'} = format_date( $issue->[$i]{'date_due'} );
+    my $datedue = $issue->[$i]{'date_due'};
+    $issue->[$i]{'date_due'} = C4::Dates->new($issue->[$i]{'date_due'},'iso')->output('syspref');
+    $issue->[$i]{'issuedate'} = C4::Dates->new($issue->[$i]{'issuedate'},'iso')->output('syspref');
     my %row = %{ $issue->[$i] };
     $totalprice += $issue->[$i]{'replacementprice'};
     $row{'replacementprice'} = $issue->[$i]{'replacementprice'};
-    if ( $datedue < $today ) {
+    if ( $datedue lt $today ) {
         $row{'red'} = 1;    #print "<font color=red>";
-    }
+	}
     $row{toggle} = $toggle++ % 2;
 
     #find the charge for an item
-    # FIXME - This is expecting
-    # &C4::Circulation::Renewals2::calc_charges, but it's getting
-    # &C4::Circulation::Circ2::calc_charges, which only returns one
-    # element, so itemtype isn't being set.
-    # But &C4::Circulation::Renewals2::calc_charges doesn't appear to
-    # return the correct item type either (or a properly-formatted
-    # charge, for that matter).
     my ( $charge, $itemtype ) =
-      calc_charges( $dbh, $issue->[$i]{'itemnumber'}, $borrowernumber );
+      GetIssuingCharges( $issue->[$i]{'itemnumber'}, $borrowernumber );
 
     my $itemtypeinfo = getitemtypeinfo($itemtype);
     $row{'itemtype_description'} = $itemtypeinfo->{description};
@@ -239,67 +243,38 @@ for ( my $i = 0 ; $i < $count ; $i++ ) {
 
     $row{'charge'} = sprintf( "%.2f", $charge );
 
-    #check item is not reserved
-    my ( $restype, $reserves ) = CheckReserves( $issue->[$i]{'itemnumber'} );
-    if ($restype) {
-
-#		print "<TD><a href=/cgi-bin/koha/reserve/request.pl?biblionumber=$issue->[$i]{'biblionumber'}>On Request - no renewals</a></td></tr>";
-#  } elsif ($issue->[$i]->{'renewals'} > 0) {
-#      print "<TD>Previously Renewed - no renewals</td></tr>";
-        $row{'norenew'} = 1;
-    }
-    else {
-        $row{'norenew'} = 0;
-    }
+	my ( $renewokay,$renewerror ) = CanBookBeRenewed( $borrowernumber, $issue->[$i]{'itemnumber'});
+	$row{'norenew'} = !$renewokay;
+	$row{"norenew_reason_$renewerror"} = 1 if $renewerror;
+	$row{'renew_failed'} = $renew_failed[$issue->[$i]{'itemnumber'}];		
+	$row{'return_failed'} = $return_failed[$issue->[$i]{'barcode'}];   
     push( @issuedata, \%row );
 }
 
-#
-# find reserves
-#
-# my ($rescount,$reserves)=FindReserves('',$borrowernumber); #From C4::Reserves2
-# my @reservedata;
-# $toggle = 0;
-# foreach my $reserveline (@$reserves) {
-# 	$reserveline->{'reservedate2'} = format_date($reserveline->{'reservedate'});
-# 	my $restitle;
-# 	my %row = %$reserveline;
-#         $row{toggle} = $toggle++%2;
-# 	if ($reserveline->{'constrainttype'} eq 'o'){
-# 		$restitle=GetReserveTitle($reserveline->{'biblionumber'},$reserveline->{'borrowernumber'},$reserveline->{'reservedate'},$reserveline->{'rtimestamp'});
-# 		%row =  (%row , %$restitle) if $restitle;
-# 	}
-# 	push (@reservedata, \%row);
-# }
-
-##################################################################################
+### ###############################################################################
 # BUILD HTML
 # show all reserves of this borrower, and the position of the reservation ....
 if ($borrowernumber) {
 
     # new op dev
     # now we show the status of the borrower's reservations
-    my @borrowerreserv = GetReservations( 0, $borrowernumber );
+    my @borrowerreserv = GetReservesFromBorrowernumber($borrowernumber );
     my @reservloop;
     foreach my $num_res (@borrowerreserv) {
         my %getreserv;
-        my %env;
-        my $getiteminfo  = getiteminformation( $num_res->{'itemnumber'} );
+        my $getiteminfo  = GetBiblioFromItemNumber( $num_res->{'itemnumber'} );
         my $itemtypeinfo = getitemtypeinfo( $getiteminfo->{'itemtype'} );
         my ( $transfertwhen, $transfertfrom, $transfertto ) =
-          checktransferts( $num_res->{'itemnumber'} );
+            GetTransfers( $num_res->{'itemnumber'} );
 
-        $getreserv{waiting}       = 0;
-        $getreserv{transfered}    = 0;
-        $getreserv{nottransfered} = 0;
-
-        $getreserv{reservedate}    = format_date( $num_res->{'reservedate'} );
-        $getreserv{biblionumber}   = $getiteminfo->{'biblionumber'};
-        $getreserv{title}          = $getiteminfo->{'title'};
-        $getreserv{itemtype}       = $itemtypeinfo->{'description'};
-        $getreserv{author}         = $getiteminfo->{'author'};
-        $getreserv{barcodereserv}  = $getiteminfo->{'barcode'};
-        $getreserv{itemcallnumber} = $getiteminfo->{'itemcallnumber'};
+		foreach (qw(waiting transfered nottransfered)) {
+				$getreserv{$_} = 0;
+		}
+        $getreserv{reservedate}  = C4::Dates->new($num_res->{'reservedate'},'iso')->output('syspref');
+		foreach (qw(biblionumber title author barcodereserv itemcallnumber )) {
+				$getreserv{$_} = $getiteminfo->{$_};
+		}
+        $getreserv{itemtype}  = $itemtypeinfo->{'description'};
 
         # 		check if we have a waitin status for reservations
         if ( $num_res->{'found'} eq 'W' ) {
@@ -311,7 +286,7 @@ if ($borrowernumber) {
         if ($transfertwhen) {
             $getreserv{color}      = 'transfered';
             $getreserv{transfered} = 1;
-            $getreserv{datesent}   = format_date($transfertwhen);
+            $getreserv{datesent}   = C4::Dates->new($transfertwhen, 'iso')->output('syspref') or die "Cannot get new($transfertwhen, 'iso') from C4::Dates";
             $getreserv{frombranch} = GetBranchName($transfertfrom);
         }
 
@@ -320,7 +295,7 @@ if ($borrowernumber) {
         {
             $getreserv{nottransfered}   = 1;
             $getreserv{nottransferedby} =
-              GetBranchName( $getiteminfo->{'holdingbranch'} );
+                GetBranchName( $getiteminfo->{'holdingbranch'} );
         }
 
 # 		if we don't have a reserv on item, we put the biblio infos and the waiting position
@@ -333,8 +308,7 @@ if ($borrowernumber) {
             $getreserv{nottransfered}   = 0;
             $getreserv{itemtype}        = $getbibtype->{'description'};
             $getreserv{author}          = $getbibinfo->{'author'};
-            $getreserv{itemcallnumber}  = '----------';
-	     $getreserv{biblionumber}  = $num_res->{'biblionumber'};	
+            $getreserv{biblionumber}  = $num_res->{'biblionumber'};	
         }
 
         push( @reservloop, \%getreserv );
@@ -342,7 +316,6 @@ if ($borrowernumber) {
 
     # return result to the template
     $template->param( reservloop => \@reservloop );
-
 }
 
 # current alert subscriptions
@@ -351,26 +324,40 @@ foreach (@$alerts) {
     $_->{ $_->{type} } = 1;
     $_->{relatedto} = findrelatedto( $_->{type}, $_->{externalid} );
 }
-my $picture;
-my $htdocs = C4::Context->config('intrahtdocs');
-$picture = "/borrowerimages/" . $borrowernumber . ".jpg";
-if ( -e $htdocs . "$picture" ) {
-    $template->param( picture => $picture );
-}
 
+# check to see if patron's image exists in the database
+# basically this gives us a template var to condition the display of
+# patronimage related interface on
+my ($picture, $dberror) = GetPatronImage($data->{'cardnumber'});
+$template->param( picture => 1 ) if $picture;
+
+my $branch=C4::Context->userenv->{'branch'};
 
 $template->param($data);
 
+if (C4::Context->preference('ExtendedPatronAttributes')) {
+    $template->param(ExtendedPatronAttributes => 1);
+    $template->param(patron_attributes => C4::Members::Attributes::GetBorrowerAttributes($borrowernumber));
+}
+
 $template->param(
+	detailview => 1,
+  DHTMLcalendar_dateformat=>C4::Dates->DHTMLcalendar(), 
     roaddetails      => $roaddetails,
     borrowernumber   => $borrowernumber,
+    categoryname	=> $data->{'description'},
     reregistration   => $reregistration,
+    branch	     => $branch,	
     totalprice       => sprintf( "%.2f", $totalprice ),
     totaldue         => sprintf( "%.2f", $total ),
     issueloop        => \@issuedata,
     unvalidlibrarian => $unvalidlibrarian,
-    
-    # 		 reserveloop     => \@reservedata,
+   	error	         => $error,
+	$error			=> 1,
+    StaffMember		=> ($category_type eq 'S'),
+	is_child        => ($category_type eq 'C'),
+	# 		 reserveloop     => \@reservedata,
+	dateformat    => C4::Context->preference("dateformat"),
 );
 
 output_html_with_http_headers $input, $cookie, $template->output;