improvement: in member details page, issue and reserve lines are toggled.

[koha_fer] / members / moremember.pl

diff --git a/members/moremember.pl b/members/moremember.pl
index 5030ff2..e9583b5 100755 (executable)
--- a/members/moremember.pl
+++ b/members/moremember.pl
@@ -78,7 +78,7 @@ my $data=borrdata('',$bornum);
 $template->param($data->{'categorycode'} => 1); # in template <TMPL_IF name="I"> => instutitional (A for Adult & C for children)
 
 $data->{'dateenrolled'} = format_date($data->{'dateenrolled'});
-$data->{'expiry'} = format_date($data->{'expiry'});
+$data->{'dateexpiry'} = format_date($data->{'dateexpiry'});
 $data->{'dateofbirth'} = format_date($data->{'dateofbirth'});
 $data->{'IS_ADULT'} = ($data->{'categorycode'} ne 'I');
 
@@ -91,13 +91,13 @@ $data->{'ethnicity'} = fixEthnicity($data->{'ethnicity'});
 $data->{&expand_sex_into_predicate($data->{'sex'})} = 1;
 
 if ($data->{'categorycode'} eq 'C'){
-       my $data2=borrdata('',$data->{'guarantor'});
-       $data->{'streetaddress'}=$data2->{'streetaddress'};
+       my $data2=borrdata('',$data->{'guarantorid'});
+       $data->{'address'}=$data2->{'address'};
        $data->{'city'}=$data2->{'city'};
-       $data->{'physstreet'}=$data2->{'physstreet'};
-       $data->{'streetcity'}=$data2->{'streetcity'};
+       $data->{'B_address'}=$data2->{'B_address'};
+       $data->{'B_city'}=$data2->{'B_city'};
        $data->{'phone'}=$data2->{'phone'};
-       $data->{'phoneday'}=$data2->{'phoneday'};
+       $data->{'mobile'}=$data2->{'mobile'};
        $data->{'zipcode'} = $data2->{'zipcode'};
 }
 
@@ -106,7 +106,7 @@ if ($data->{'ethnicity'} || $data->{'ethnotes'}) {
        $template->param(printethnicityline => 1);
 }
 
-if ($data->{'categorycode'} ne 'C'){
+if ($data->{'category_type'} ne 'C'){
        $template->param(isguarantee => 1);
        # FIXME
        # It looks like the $i is only being returned to handle walking through
@@ -122,12 +122,15 @@ if ($data->{'categorycode'} ne 'C'){
        $template->param(guaranteeloop => \@guaranteedata);
 
 } else {
-       my ($guarantor)=findguarantor($data->{'borrowernumber'});
-       unless ($guarantor->{'borrowernumber'} == 0){
-               $template->param(guarantorborrowernumber => $guarantor->{'borrowernumber'}, guarantorcardnumber => $guarantor->{'cardnumber'});
+       my ($guarantorid)=findguarantor($data->{guarantorid});
+       if ($guarantorid->{'borrowernumber'}){
+               $template->param(guarantorborrowernumber => $guarantorid->{'borrowernumber'}, guarantorcardnumber => $guarantorid->{'cardnumber'});
        }
 }
 
+#Independant branches management
+my $unvalidlibrarian = ((C4::Context->preference("IndependantBranches")) && (C4::Context->userenv->{flags}!=1) && ($data->{'branchcode'} ne C4::Context->userenv->{branch}));
+
 my %bor;
 $bor{'borrowernumber'}=$bornum;
 
@@ -141,7 +144,7 @@ if (C4::Context->preference("IndependantBranches")) {
        $samebranch =1 if ($userenv->{flags} == 1);
 }
 
-$data->{'branchcode'} = &getbranchname($data->{'branchcode'});
+$data->{'branchname'} = &getbranchdetail($data->{'branchcode'});
 
 # Converts the categorycode to the description
 $data->{'categorycode'} = &getborrowercategory($data->{'categorycode'});
@@ -156,6 +159,7 @@ my ($count,$issue)=borrissues($bornum);
 my $today=ParseDate('today');
 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'});
@@ -165,6 +169,7 @@ for (my $i=0;$i<$count;$i++){
        if ($datedue < $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
@@ -174,8 +179,11 @@ for (my $i=0;$i<$count;$i++){
        # return the correct item type either (or a properly-formatted
        # charge, for that matter).
        my ($charge,$itemtype)=calc_charges($dbh,$issue->[$i]{'itemnumber'},$bornum);
-       my $itemtypedef = getitemtypeinfo($itemtype);
-       $row{'itemtype'}=$itemtypedef->{description};
+
+        my $itemtypeinfo = getitemtypeinfo($itemtype);
+       $row{'itemtype_description'} = $itemtypeinfo->{description};
+        $row{'itemtype_image'} = $itemtypeinfo->{imageurl};
+
        $row{'charge'}= sprintf("%.2f",$charge);
 
        #check item is not reserved
@@ -196,10 +204,12 @@ for (my $i=0;$i<$count;$i++){
 #
 my ($rescount,$reserves)=FindReserves('',$bornum); #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;
@@ -226,10 +236,7 @@ $template->param(
                 totalprice =>$totalprice,
                 totaldue =>$total,
                 issueloop       => \@issuedata,
-                reserveloop     => \@reservedata,
-                alertloop => $alerts);
-                independantbranches => C4::Context->preference("IndependantBranches"),
-                samebranch              => C4::Context->preference("IndependantBranches"?"":$samebranch,
-               );
+                unvalidlibrarian => $unvalidlibrarian,
+                reserveloop     => \@reservedata);
 
 output_html_with_http_headers $input, $cookie, $template->output;