X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=opac%2Fopac-user.pl;h=02002a3bef997964ad9ab5320517e0b023090ad7;hb=b056f93c4d33a9a56d56bbb081924f7c4c974a79;hp=4dbc4328bcf24c6aa3e030c6baa3ec33299bdb38;hpb=068e5be6395088793aeab66d67c36c2b9da2c5d9;p=koha_fer

diff --git a/opac/opac-user.pl b/opac/opac-user.pl
index 4dbc4328bc..02002a3bef 100755
--- a/opac/opac-user.pl
+++ b/opac/opac-user.pl
@@ -30,7 +30,6 @@ use C4::Members;
 use C4::Members::AttributeTypes;
 use C4::Members::Attributes qw/GetBorrowerAttributeValue/;
 use C4::Output;
-use C4::Overdues qw/CheckBorrowerDebarred/;
 use C4::Biblio;
 use C4::Items;
 use C4::Letters;
@@ -80,7 +79,7 @@ my ($warning_year, $warning_month, $warning_day) = split /-/, $borr->{'dateexpir
 
 $borr->{'ethnicity'} = fixEthnicity( $borr->{'ethnicity'} );
 
-my $debar = CheckBorrowerDebarred($borrowernumber);
+my $debar = $borr->{'debarred'};
 my $userdebarred;
 
 if ($debar) {
@@ -105,11 +104,12 @@ if ( 5 >= $borr->{'amountoutstanding'} && $borr->{'amountoutstanding'} > 0 ) {
 my $no_renewal_amt = C4::Context->preference( 'OPACFineNoRenewals' );
 $no_renewal_amt ||= 0;
 
-if ( $borr->{amountoutstanding} > $no_renewal_amt ) {
+if (  C4::Context->preference( 'OpacRenewalAllowed' ) && $borr->{amountoutstanding} > $no_renewal_amt ) {
     $borr->{'flagged'} = 1;
     $canrenew = 0;
     $template->param(
         renewal_blocked_fines => sprintf( '%.02f', $no_renewal_amt ),
+        renewal_blocked_fines_amountoutstanding => sprintf( '%.02f', $borr->{amountoutstanding} ),
     );
 }
 
@@ -124,24 +124,26 @@ my @bordat;
 $bordat[0] = $borr;
 
 # Warningdate is the date that the warning starts appearing
-if ( $borr->{dateexpiry} && C4::Context->preference('NotifyBorrowerDeparture') &&
-    Date_to_Days(Add_Delta_Days($warning_year,$warning_month,$warning_day,- C4::Context->preference('NotifyBorrowerDeparture'))) <
-    Date_to_Days( $today_year, $today_month, $today_day ) ) 
-{
-    # borrower card soon to expire, warn the borrower
-    $borr->{'warndeparture'} = $borr->{dateexpiry};
-    if (C4::Context->preference('ReturnBeforeExpiry')){
-        $borr->{'returnbeforeexpiry'} = 1;
-    }
+if ( $borr->{dateexpiry} && Date_to_Days( $today_year, $today_month, $today_day ) > Date_to_Days( $warning_year, $warning_month, $warning_day ) ) {
+    $borr->{'warnexpired'} = 1;
+}
+elsif ( $borr->{dateexpiry} && C4::Context->preference('NotifyBorrowerDeparture') &&
+        Date_to_Days(Add_Delta_Days($warning_year, $warning_month, $warning_day,- C4::Context->preference('NotifyBorrowerDeparture'))) <
+        Date_to_Days( $today_year, $today_month, $today_day ) ) {
+        # borrower card soon to expire, warn the borrower
+        $borr->{'warndeparture'} = $borr->{dateexpiry};
+        if (C4::Context->preference('ReturnBeforeExpiry')){
+            $borr->{'returnbeforeexpiry'} = 1;
+        }
 }
 
+
 $template->param(   BORROWER_INFO     => \@bordat,
                     borrowernumber    => $borrowernumber,
                     patron_flagged    => $borr->{flagged},
                     OPACMySummaryHTML => (C4::Context->preference("OPACMySummaryHTML")) ? 1 : 0,
                     surname           => $borr->{surname},
                     showname          => $borr->{showname},
-
                 );
 
 #get issued items ....
@@ -153,58 +155,55 @@ my @issuedat;
 my $itemtypes = GetItemTypes();
 my $issues = GetPendingIssues($borrowernumber);
 if ($issues){
-	foreach my $issue ( sort { $b->{date_due}->datetime() cmp $a->{date_due}->datetime() } @{$issues} ) {
-		# check for reserves
-		my ( $restype, $res, undef ) = CheckReserves( $issue->{'itemnumber'} );
-		if ( $restype ) {
-			$issue->{'reserved'} = 1;
-		}
-		
-		my ( $total , $accts, $numaccts) = GetMemberAccountRecords( $borrowernumber );
-		my $charges = 0;
-		foreach my $ac (@$accts) {
-			if ( $ac->{'itemnumber'} == $issue->{'itemnumber'} ) {
-				$charges += $ac->{'amountoutstanding'}
-				  if $ac->{'accounttype'} eq 'F';
-				$charges += $ac->{'amountoutstanding'}
-				  if $ac->{'accounttype'} eq 'L';
-			}
-		}
-		$issue->{'charges'} = $charges;
-
-		# get publictype for icon
-
-		my $publictype = $issue->{'publictype'};
-		$issue->{$publictype} = 1;
-
-		# check if item is renewable
-		my ($status,$renewerror) = CanBookBeRenewed( $borrowernumber, $issue->{'itemnumber'} );
-		($issue->{'renewcount'},$issue->{'renewsallowed'},$issue->{'renewsleft'}) = GetRenewCount($borrowernumber, $issue->{'itemnumber'});
+    foreach my $issue ( sort { $b->{date_due}->datetime() cmp $a->{date_due}->datetime() } @{$issues} ) {
+        # check for reserves
+        my $restype = GetReserveStatus( $issue->{'itemnumber'} );
+        if ( $restype ) {
+            $issue->{'reserved'} = 1;
+        }
+
+        my ( $total , $accts, $numaccts) = GetMemberAccountRecords( $borrowernumber );
+        my $charges = 0;
+        foreach my $ac (@$accts) {
+            if ( $ac->{'itemnumber'} == $issue->{'itemnumber'} ) {
+                $charges += $ac->{'amountoutstanding'}
+                  if $ac->{'accounttype'} eq 'F';
+                $charges += $ac->{'amountoutstanding'}
+                  if $ac->{'accounttype'} eq 'FU';
+                $charges += $ac->{'amountoutstanding'}
+                  if $ac->{'accounttype'} eq 'L';
+            }
+        }
+        $issue->{'charges'} = $charges;
+        $issue->{'subtitle'} = GetRecordValue('subtitle', GetMarcBiblio($issue->{'biblionumber'}), GetFrameworkCode($issue->{'biblionumber'}));
+        # check if item is renewable
+        my ($status,$renewerror) = CanBookBeRenewed( $borrowernumber, $issue->{'itemnumber'} );
+        ($issue->{'renewcount'},$issue->{'renewsallowed'},$issue->{'renewsleft'}) = GetRenewCount($borrowernumber, $issue->{'itemnumber'});
         if($status && C4::Context->preference("OpacRenewalAllowed")){
             $issue->{'status'} = $status;
         }
-		$issue->{'too_many'} = 1 if $renewerror and $renewerror eq 'too_many';
-		$issue->{'on_reserve'} = 1 if $renewerror and $renewerror eq 'on_reserve';
-
-		if ( $issue->{'overdue'} ) {
-			push @overdues, $issue;
-			$overdues_count++;
-			$issue->{'overdue'} = 1;
-		}
-		else {
-			$issue->{'issued'} = 1;
-		}
-		# imageurl:
-		my $itemtype = $issue->{'itemtype'};
-		if ( $itemtype ) {
-			$issue->{'imageurl'}    = getitemtypeimagelocation( 'opac', $itemtypes->{$itemtype}->{'imageurl'} );
-			$issue->{'description'} = $itemtypes->{$itemtype}->{'description'};
-		}
-		push @issuedat, $issue;
-		$count++;
-		
-		my $isbn = GetNormalizedISBN($issue->{'isbn'});
-		$issue->{normalized_isbn} = $isbn;
+        $issue->{'too_many'} = 1 if $renewerror and $renewerror eq 'too_many';
+        $issue->{'on_reserve'} = 1 if $renewerror and $renewerror eq 'on_reserve';
+
+        if ( $issue->{'overdue'} ) {
+            push @overdues, $issue;
+            $overdues_count++;
+            $issue->{'overdue'} = 1;
+        }
+        else {
+            $issue->{'issued'} = 1;
+        }
+        # imageurl:
+        my $itemtype = $issue->{'itemtype'};
+        if ( $itemtype ) {
+            $issue->{'imageurl'}    = getitemtypeimagelocation( 'opac', $itemtypes->{$itemtype}->{'imageurl'} );
+            $issue->{'description'} = $itemtypes->{$itemtype}->{'description'};
+        }
+        push @issuedat, $issue;
+        $count++;
+
+        my $isbn = GetNormalizedISBN($issue->{'isbn'});
+        $issue->{normalized_isbn} = $isbn;
 
                 # My Summary HTML
                 if (my $my_summary_html = C4::Context->preference('OPACMySummaryHTML')){
@@ -216,7 +215,7 @@ if ($issues){
                     $issue->{biblionumber} ? $my_summary_html =~ s/{BIBLIONUMBER}/$issue->{biblionumber}/g : $my_summary_html =~ s/{BIBLIONUMBER}//g;
                     $issue->{MySummaryHTML} = $my_summary_html;
                 }
-	}
+    }
 }
 $template->param( ISSUES       => \@issuedat );
 $template->param( issues_count => $count );
@@ -256,9 +255,7 @@ foreach my $res (@reserves) {
     if ( $res->{'expirationdate'} eq '0000-00-00' ) {
       $res->{'expirationdate'} = '';
     }
-    
-    my $publictype = $res->{'publictype'};
-    $res->{$publictype} = 1;
+    $res->{'subtitle'} = GetRecordValue('subtitle', GetMarcBiblio($res->{'biblionumber'}), GetFrameworkCode($res->{'biblionumber'}));
     $res->{'waiting'} = 1 if $res->{'found'} eq 'W';
     $res->{'branch'} = $branches->{ $res->{'branchcode'} }->{'branchname'};
     my $biblioData = GetBiblioData($res->{'biblionumber'});
@@ -290,7 +287,7 @@ foreach my $res (@reserves) {
         if ( ( $res->{'found'} eq 'W' ) ) {
             my $item = $res->{'itemnumber'};
             $item = GetBiblioFromItemNumber($item,undef);
-            $res->{'wait'}= 1; 
+            $res->{'wait'}= 1;
             $res->{'holdingbranch'}=$item->{'holdingbranch'};
             $res->{'biblionumber'}=$item->{'biblionumber'};
             $res->{'barcode'} = $item->{'barcode'};
@@ -316,7 +313,7 @@ foreach my $res (@reserves) {
     # can be cancelled
     #$res->{'cancelable'} = 1 if ($res->{'wait'} && $res->{'atdestination'} && $res->{'found'} ne "1");
     $res->{'cancelable'} = 1 if    ($res->{wait} and not $res->{found}) or (not $res->{wait} and not $res->{intransit});
-    
+
 }
 
 $template->param( WAITING => \@waiting );
@@ -340,12 +337,12 @@ if (C4::Context->preference('BakerTaylorEnabled')) {
 if (C4::Context->preference("OPACAmazonCoverImages") or 
     C4::Context->preference("GoogleJackets") or
     C4::Context->preference("BakerTaylorEnabled") or
-	C4::Context->preference("SyndeticsCoverImages")) {
+    C4::Context->preference("SyndeticsCoverImages")) {
         $template->param(JacketImages=>1);
 }
 
 if ( GetMessagesCount( $borrowernumber, 'B' ) ) {
-	$template->param( bor_messages => 1 );
+    $template->param( bor_messages => 1 );
 }
 
 if ( $borr->{'opacnote'} ) {
@@ -356,18 +353,17 @@ if ( $borr->{'opacnote'} ) {
 }
 
 $template->param(
-    bor_messages_loop	=> GetMessages( $borrowernumber, 'B', 'NONE' ),
+    bor_messages_loop    => GetMessages( $borrowernumber, 'B', 'NONE' ),
     waiting_count      => $wcount,
     patronupdate => $patronupdate,
     OpacRenewalAllowed => C4::Context->preference("OpacRenewalAllowed"),
     userview => 1,
-    dateformat    => C4::Context->preference("dateformat"),
 );
 
-$template->param( DHTMLcalendar_dateformat  => C4::Dates->DHTMLcalendar() );
 $template->param(
     SuspendHoldsOpac => C4::Context->preference('SuspendHoldsOpac'),
-    AutoResumeSuspendedHolds => C4::Context->preference('AutoResumeSuspendedHolds') ,
+    AutoResumeSuspendedHolds => C4::Context->preference('AutoResumeSuspendedHolds'),
+    OpacHoldNotes => C4::Context->preference('OpacHoldNotes'),
 );
 
 output_html_with_http_headers $query, $cookie, $template->output;