X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=members%2Fmancredit.pl;h=014d82248689bc39e5e61df8baf7c064dad7a1d3;hb=refs%2Fheads%2Fkoha_ffzg;hp=4855c24cde84fc9990b8f5e9bfd5a4dc3b992f61;hpb=2b90ea2cb0e5e976de7ddef0151ae83d8ac578e6;p=koha.git

diff --git a/members/mancredit.pl b/members/mancredit.pl
index 4855c24cde..014d822486 100755
--- a/members/mancredit.pl
+++ b/members/mancredit.pl
@@ -22,8 +22,7 @@
 # You should have received a copy of the GNU General Public License
 # along with Koha; if not, see <http://www.gnu.org/licenses>.
 
-use strict;
-use warnings;
+use Modern::Perl;
 
 use C4::Auth;
 use C4::Output;
@@ -33,54 +32,74 @@ use C4::Members;
 use C4::Accounts;
 use C4::Items;
 use C4::Members::Attributes qw(GetBorrowerAttributes);
-use Koha::Patrons;
 
+use Koha::Items;
+use Koha::Patrons;
 use Koha::Patron::Categories;
+use Koha::Token;
 
 my $input=new CGI;
-my $flagsrequired = { borrowers => 1, updatecharges => 1 };
 
-my $borrowernumber=$input->param('borrowernumber');
+my ($template, $loggedinuser, $cookie) = get_template_and_user(
+    {
+        template_name   => "members/mancredit.tt",
+        query           => $input,
+        type            => "intranet",
+        authnotrequired => 0,
+        flagsrequired   => { borrowers     => 'edit_borrowers',
+                             updatecharges => 'remaining_permissions' }
+    }
+);
+
+my $logged_in_user = Koha::Patrons->find($loggedinuser) or die "Not logged in";
+my $borrowernumber = $input->param('borrowernumber');
+my $patron         = Koha::Patrons->find($borrowernumber);
+
+output_and_exit_if_error( $input, $cookie, $template,
+    { module => 'members', logged_in_user => $logged_in_user, current_patron => $patron } );
 
-my $patron = Koha::Patrons->find( $borrowernumber );
-my $add=$input->param('add');
+my $add = $input->param('add');
 
 if ($add){
-    if ( checkauth( $input, 0, $flagsrequired, 'intranet' ) ) {
-        my $barcode = $input->param('barcode');
-        my $itemnum;
-        if ($barcode) {
-            $itemnum = GetItemnumberFromBarcode($barcode);
-        }
-        my $desc    = $input->param('desc');
-        my $note    = $input->param('note');
-        my $amount  = $input->param('amount') || 0;
-        $amount = -$amount;
-        my $type = $input->param('type');
-        manualinvoice( $borrowernumber, $itemnum, $desc, $type, $amount, $note );
-        print $input->redirect("/cgi-bin/koha/members/boraccount.pl?borrowernumber=$borrowernumber");
+
+    output_and_exit( $input, $cookie, $template, 'wrong_csrf_token' )
+        unless Koha::Token->new->check_csrf( {
+            session_id => scalar $input->cookie('CGISESSID'),
+            token  => scalar $input->param('csrf_token'),
+        });
+
+    # Note: If the logged in user is not allowed to see this patron an invoice can be forced
+    # Here we are trusting librarians not to hack the system
+    my $barcode = $input->param('barcode');
+    my $item_id;
+    if ($barcode) {
+        my $item = Koha::Items->find({barcode => $barcode});
+        $item_id = $item->itemnumber if $item;
     }
-} else {
-    my ($template, $loggedinuser, $cookie) = get_template_and_user(
-        {
-            template_name   => "members/mancredit.tt",
-            query           => $input,
-            type            => "intranet",
-            authnotrequired => 0,
-            flagsrequired   => { borrowers     => 1,
-                                 updatecharges => 'remaining_permissions' },
-            debug           => 1,
-        }
-    );
-					  
-    if ( $patron->category->category_type eq 'C') {
-        my $patron_categories = Koha::Patron::Categories->search_limited({ category_type => 'A' }, {order_by => ['categorycode']});
-        $template->param( 'CATCODE_MULTI' => 1) if $patron_categories->count > 1;
-        $template->param( 'catcode' => $patron_categories->next )  if $patron_categories->count == 1;
+    my $description = $input->param('desc');
+    my $note        = $input->param('note');
+    my $amount      = $input->param('amount') || 0;
+    my $type        = $input->param('type');
+
+    my $library_id = C4::Context->userenv ? C4::Context->userenv->{'branch'} : undef;
+
+    $patron->account->add_credit({
+        amount      => $amount,
+        description => $description,
+        item_id     => $item_id,
+        library_id  => $library_id,
+        note        => $note,
+        type        => $type,
+        user_id     => $logged_in_user->id
+    });
+
+    if ( C4::Context->preference('AccountAutoReconcile') ) {
+        $patron->account->reconcile_balance;
     }
 
-    $template->param( adultborrower => 1 ) if ( $patron->category->category_type =~ /^(A|I)$/ );
-    $template->param( picture => 1 ) if $patron->image;
+    print $input->redirect("/cgi-bin/koha/members/boraccount.pl?borrowernumber=$borrowernumber");
+
+} else {
 
     if (C4::Context->preference('ExtendedPatronAttributes')) {
         my $attributes = GetBorrowerAttributes($borrowernumber);
@@ -90,14 +109,12 @@ if ($add){
         );
     }
 
-    $template->param(%{ $patron->unblessed});
-
     $template->param(
-        finesview      => 1,
-        borrowernumber => $borrowernumber,
-        categoryname   => $patron->category->description,
-        is_child       => ($patron->category->category_type eq 'C'), # FIXME is_child should be a Koha::Patron method
-        RoutingSerials => C4::Context->preference('RoutingSerials'),
-        );
+        patron     => $patron,
+        finesview  => 1,
+        csrf_token => Koha::Token->new->generate_csrf(
+            { session_id => scalar $input->cookie('CGISESSID') }
+        ),
+    );
     output_html_with_http_headers $input, $cookie, $template->output;
 }