X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;ds=sidebyside;f=members%2Fpay.pl;h=8f5233cbf55baab4a834221f92e7818f6c5424e9;hb=6e60986819e9c37e3d41584b89fbddbf68e7484d;hp=9389f82018b0efd98bc2f026113eac8b972d66c2;hpb=c5fe424c0f826a16caf3674b66df638d18bc6449;p=koha_fer

diff --git a/members/pay.pl b/members/pay.pl
index 9389f82018..8f5233cbf5 100755
--- a/members/pay.pl
+++ b/members/pay.pl
@@ -41,9 +41,9 @@ use C4::Overdues;
 use C4::Branch;
 use C4::Members::Attributes qw(GetBorrowerAttributes);
 
-my $input = CGI->new;
+our $input = CGI->new;
 
-my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
+our ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     {   template_name   => 'members/pay.tmpl',
         query           => $input,
         type            => 'intranet',
@@ -53,23 +53,20 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     }
 );
 
-my $writeoff_sth;
-my $add_writeoff_sth;
-
 my @names = $input->param;
 
-my $borrowernumber = $input->param('borrowernumber');
+our $borrowernumber = $input->param('borrowernumber');
 if ( !$borrowernumber ) {
     $borrowernumber = $input->param('borrowernumber0');
 }
 
 # get borrower details
-my $borrower = GetMember( borrowernumber => $borrowernumber );
-my $user = $input->remote_user;
+our $borrower = GetMember( borrowernumber => $borrowernumber );
+our $user = $input->remote_user;
 $user ||= q{};
 
 my $branches = GetBranches();
-my $branch = GetBranch( $input, $branches );
+our $branch = GetBranch( $input, $branches );
 
 my $writeoff_item = $input->param('confirm_writeoff');
 my $paycollect    = $input->param('paycollect');
@@ -89,8 +86,8 @@ if ($writeoff_all) {
     my $accountno    = $input->param('accountno');
     my $itemno       = $input->param('itemnumber');
     my $account_type = $input->param('accounttype');
-    my $amount       = $input->param('amount');
-    writeoff( $accountno, $itemno, $account_type, $amount );
+    my $amount       = $input->param('amountoutstanding');
+    WriteOffFee( $borrowernumber, $accountno, $itemno, $account_type, $amount, $branch );
 }
 
 for (@names) {
@@ -103,25 +100,12 @@ for (@names) {
     }
 }
 
+$template->param( activeBorrowerRelationship => (C4::Context->preference('borrowerRelationship') ne '') );
+
 add_accounts_to_template();
 
 output_html_with_http_headers $input, $cookie, $template->output;
 
-sub writeoff {
-    my ( $accountnum, $itemnum, $accounttype, $amount ) = @_;
-
-    # if no item is attached to fine, make sure to store it as a NULL
-    $itemnum ||= undef;
-    get_writeoff_sth();
-    $writeoff_sth->execute( $accountnum, $borrowernumber );
-
-    my $acct = getnextacctno($borrowernumber);
-    $add_writeoff_sth->execute( $borrowernumber, $acct, $itemnum, $amount );
-
-    UpdateStats( $branch, 'writeoff', $amount, q{}, q{}, q{}, $borrowernumber );
-
-    return;
-}
 
 sub add_accounts_to_template {
 
@@ -198,9 +182,9 @@ sub writeoff_all {
 
             #    my $borrowernum    = $input->param("borrowernumber$value");
             my $itemno    = $input->param("itemnumber$value");
-            my $amount    = $input->param("amount$value");
+            my $amount    = $input->param("amountoutstanding$value");
             my $accountno = $input->param("accountno$value");
-            writeoff( $accountno, $itemno, $accounttype, $amount );
+            WriteOffFee( $borrowernumber, $accountno, $itemno, $accounttype, $amount, $branch );
         }
     }
 
@@ -233,7 +217,13 @@ sub borrower_add_additional_fields {
     if ($picture) {
         $b_ref->{has_picture} = 1;
     }
-    $b_ref->{extendedattributes} = GetBorrowerAttributes($borrowernumber);
+
+    if (C4::Context->preference('ExtendedPatronAttributes')) {
+        $b_ref->{extendedattributes} = GetBorrowerAttributes($borrowernumber);
+        $template->param(
+            ExtendedPatronAttributes => 1,
+        );
+    }
 
     $b_ref->{branchname} = GetBranchName( $b_ref->{branchcode} );
     return;
@@ -260,23 +250,3 @@ sub payselected {
     print $input->redirect($redirect);
     return;
 }
-
-sub get_writeoff_sth {
-
-    # lets prepare these statement handles only once
-    if ($writeoff_sth) {
-        return;
-    } else {
-        my $dbh = C4::Context->dbh;
-
-        # Do we need to validate accounttype
-        my $sql = 'Update accountlines set amountoutstanding=0 '
-          . 'WHERE accountno=? and borrowernumber=?';
-        $writeoff_sth = $dbh->prepare($sql);
-        my $insert =
-q{insert into accountlines (borrowernumber,accountno,itemnumber,date,amount,description,accounttype)}
-          . q{values (?,?,?,now(),?,'Writeoff','W')};
-        $add_writeoff_sth = $dbh->prepare($insert);
-    }
-    return;
-}