Cleanup - moremember.pl and .tmpl

[koha.git] / members / moremember.pl

diff --git a/members/moremember.pl b/members/moremember.pl
index ae3f82d..e7b718a 100755 (executable)
--- a/members/moremember.pl
+++ b/members/moremember.pl
@@ -38,6 +38,7 @@ use C4::Auth;
 use C4::Output;
 use C4::Members;
 use C4::Members::Attributes;
+use C4::Members::AttributeTypes;
 use C4::Dates;
 use C4::Reserves;
 use C4::Circulation;
@@ -46,6 +47,7 @@ use C4::Letters;
 use C4::Biblio;
 use C4::Reserves;
 use C4::Branch; # GetBranchName
+use C4::Form::MessagingPreferences;
 
 #use Smart::Comments;
 #use Data::Dumper;
@@ -61,6 +63,7 @@ my $dbh = C4::Context->dbh;
 my $input = new CGI;
 $debug or $debug = $input->param('debug') || 0;
 my $print = $input->param('print');
+my $override_limit = $input->param("override_limit") || 0;
 my @failedrenews = $input->param('failedrenew');
 my @failedreturns = $input->param('failedreturn');
 my $error = $input->param('error');
@@ -184,12 +187,6 @@ else {
        }
 }
 
-#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'} = $borrowernumber;
 
@@ -197,10 +194,10 @@ $bor{'borrowernumber'} = $borrowernumber;
 my $samebranch;
 if ( C4::Context->preference("IndependantBranches") ) {
     my $userenv = C4::Context->userenv;
-    unless ( $userenv->{flags} == 1 ) {
+    unless ( $userenv->{flags} % 2 == 1 ) {
         $samebranch = ( $data->{'branchcode'} eq $userenv->{branch} );
     }
-    $samebranch = 1 if ( $userenv->{flags} == 1 );
+    $samebranch = 1 if ( $userenv->{flags} % 2 == 1 );
 }
 my $branchdetail = GetBranchDetail( $data->{'branchcode'});
 $data->{'branchname'} = $branchdetail->{branchname};
@@ -209,30 +206,29 @@ $data->{'branchname'} = $branchdetail->{branchname};
 my ( $total, $accts, $numaccts) = GetMemberAccountRecords( $borrowernumber );
 my $lib1 = &GetSortDetails( "Bsort1", $data->{'sort1'} );
 my $lib2 = &GetSortDetails( "Bsort2", $data->{'sort2'} );
-( $template->param( lib1 => $lib1 ) ) if ($lib1);
-( $template->param( lib2 => $lib2 ) ) if ($lib2);
+$template->param( lib1 => $lib1 ) if ($lib1);
+$template->param( lib2 => $lib2 ) if ($lib2);
 
 # current issues
 #
-my ( $count, $issue ) = GetPendingIssues($borrowernumber);
+my $issue = GetPendingIssues($borrowernumber);
+my $count = scalar(@$issue);
 my $roaddetails = &GetRoadTypeDetails( $data->{'streettype'} );
 my $today       = POSIX::strftime("%Y-%m-%d", localtime);      # iso format
 my @issuedata;
 my $overdues_exist = 0;
 my $totalprice = 0;
-my $toggle     = 0;
 for ( my $i = 0 ; $i < $count ; $i++ ) {
     my $datedue = $issue->[$i]{'date_due'};
-    $issue->[$i]{'date_due'} = C4::Dates->new($issue->[$i]{'date_due'},'iso')->output('syspref');
+    $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 lt $today ) {
         $overdues_exist = 1;
-        $row{'red'} = 1;    #print "<font color=red>";
+        $row{'red'} = 1;
        }
-    $row{toggle} = $toggle++ % 2;
 
     #find the charge for an item
     my ( $charge, $itemtype ) =
@@ -244,10 +240,11 @@ for ( my $i = 0 ; $i < $count ; $i++ ) {
 
     $row{'charge'} = sprintf( "%.2f", $charge );
 
-       my ( $renewokay,$renewerror ) = CanBookBeRenewed( $borrowernumber, $issue->[$i]{'itemnumber'});
+       my ( $renewokay,$renewerror ) = CanBookBeRenewed( $borrowernumber, $issue->[$i]{'itemnumber'}, $override_limit );
        $row{'norenew'} = !$renewokay;
+       $row{'can_confirm'} = ( !$renewokay && $renewerror ne 'on_reserve' );
        $row{"norenew_reason_$renewerror"} = 1 if $renewerror;
-       $row{'renew_failed'} = $renew_failed{ $issue->[$i]{'itemnumber'} };
+       $row{'renew_failed'}  = $renew_failed{ $issue->[$i]{'itemnumber'} };
        $row{'return_failed'} = $return_failed{$issue->[$i]{'barcode'}};   
     push( @issuedata, \%row );
 }
@@ -268,13 +265,13 @@ if ($borrowernumber) {
         my ( $transfertwhen, $transfertfrom, $transfertto ) =
             GetTransfers( $num_res->{'itemnumber'} );
 
-               foreach (qw(waiting transfered nottransfered)) {
-                               $getreserv{$_} = 0;
-               }
+        foreach (qw(waiting transfered nottransfered)) {
+            $getreserv{$_} = 0;
+        }
         $getreserv{reservedate}  = C4::Dates->new($num_res->{'reservedate'},'iso')->output('syspref');
-               foreach (qw(biblionumber title author itemcallnumber )) {
-                               $getreserv{$_} = $getiteminfo->{$_};
-               }
+        foreach (qw(biblionumber title author itemcallnumber )) {
+            $getreserv{$_} = $getiteminfo->{$_};
+        }
         $getreserv{barcodereserv}  = $getiteminfo->{'barcode'};
         $getreserv{itemtype}  = $itemtypeinfo->{'description'};
 
@@ -340,27 +337,40 @@ $template->param($data);
 if (C4::Context->preference('ExtendedPatronAttributes')) {
     $template->param(ExtendedPatronAttributes => 1);
     $template->param(patron_attributes => C4::Members::Attributes::GetBorrowerAttributes($borrowernumber));
+    my @types = C4::Members::AttributeTypes::GetAttributeTypes();
+    if (scalar(@types) == 0) {
+        $template->param(no_patron_attribute_types => 1);
+    }
+}
+
+if (C4::Context->preference('EnhancedMessagingPreferences')) {
+    C4::Form::MessagingPreferences::set_form_values({ borrowernumber => $borrowernumber }, $template);
+    $template->param(messaging_form_inactive => 1);
+    $template->param(SMSSendDriver => C4::Context->preference("SMSSendDriver"));
+    $template->param(SMSnumber     => defined $data->{'smsalertnumber'} ? $data->{'smsalertnumber'} : $data->{'mobile'});
 }
 
 $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,
-    overdues_exist   => $overdues_exist,
-    unvalidlibrarian => $unvalidlibrarian,
-       error            => $error,
-       $error                  => 1,
-    StaffMember                => ($category_type eq 'S'),
-       is_child        => ($category_type eq 'C'),
-       #                reserveloop     => \@reservedata,
-       dateformat    => C4::Context->preference("dateformat"),
+    detailview => 1,
+    AllowRenewalLimitOverride => C4::Context->preference("AllowRenewalLimitOverride"),
+    DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(),
+    roaddetails     => $roaddetails,
+    borrowernumber  => $borrowernumber,
+    categoryname    => $data->{'description'},
+    reregistration  => $reregistration,
+    branch          => $branch,
+    totalprice      => sprintf("%.2f", $totalprice),
+    totaldue        => sprintf("%.2f", $total),
+    totaldue_raw    => $total,
+    issueloop       => \@issuedata,
+    overdues_exist  => $overdues_exist,
+    error           => $error,
+    $error          => 1,
+    StaffMember     => ($category_type eq 'S'),
+    is_child        => ($category_type eq 'C'),
+#   reserveloop     => \@reservedata,
+    dateformat      => C4::Context->preference("dateformat"),
+    "dateformat_" . (C4::Context->preference("dateformat") || '') => 1,
 );
 
 output_html_with_http_headers $input, $cookie, $template->output;