# along with Koha; if not, see <http://www.gnu.org/licenses>.
use Modern::Perl;
-use URI::Escape;
+use URI::Escape qw( uri_escape uri_unescape );
use CGI qw ( -utf8 );
use C4::Context;
-use C4::Auth;
-use C4::Output;
-use C4::Members;
+use C4::Auth qw( get_template_and_user );
+use C4::Output qw( output_and_exit_if_error output_and_exit output_html_with_http_headers );
use C4::Accounts;
use C4::Koha;
use Koha::AuthorisedValues;
use Koha::Account;
use Koha::Token;
+use Koha::DateUtils qw( output_pref );
my $input = CGI->new();
my $change_given = $input->param('change_given');
my $type = scalar $input->param('type') || 'PAYMENT';
-my $updatecharges_permissions = ($writeoff_individual || $type eq 'writeoff') ? 'writeoff' : 'remaining_permissions';
+my $updatecharges_permissions = ($writeoff_individual || $type eq 'WRITEOFF') ? 'writeoff' : 'remaining_permissions';
my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
{ template_name => 'members/paycollect.tt',
query => $input,
type => 'intranet',
- authnotrequired => 0,
flagsrequired => { borrowers => 'edit_borrowers', updatecharges => $updatecharges_permissions },
- debug => 1,
}
);
# get borrower details
my $borrowernumber = $input->param('borrowernumber');
-my $logged_in_user = Koha::Patrons->find( $loggedinuser ) or die "Not logged in";
+my $logged_in_user = Koha::Patrons->find( $loggedinuser );
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 $borrower = $patron->unblessed;
my $account = $patron->account;
my $category = $patron->category;
my $user = $input->remote_user;
my $library_id = C4::Context->userenv->{'branch'};
my $total_due = $account->outstanding_debits->total_outstanding;
-my $total_paid = $input->param('paid');
+my $total_paid = $input->param('paid');
+my $total_collected = $input->param('collected');
my $selected_lines = $input->param('selected'); # comes from pay.pl
my $pay_individual = $input->param('pay_individual');
my $payment_type = scalar $input->param('payment_type');
my $accountlines_id;
-my $registerid;
-if ( C4::Context->preference('UseCashRegisters') ) {
- $registerid = $input->param('registerid');
- my $registers = Koha::Cash::Registers->search(
- { branch => $library_id, archived => 0 },
- { order_by => { '-asc' => 'name' } }
- );
-
- if ( !$registers->count ) {
- $template->param( error_registers => 1 );
- }
- else {
-
- if ( !$registerid ) {
- my $default_register = Koha::Cash::Registers->find(
- { branch => $library_id, branch_default => 1 } );
- $registerid = $default_register->id if $default_register;
- }
- $registerid = $registers->next->id if !$registerid;
-
- $template->param(
- registerid => $registerid,
- registers => $registers,
- );
- }
-}
-
+my $cash_register_id = $input->param('cash_register');
if ( $pay_individual || $writeoff_individual ) {
if ($pay_individual) {
$template->param( pay_individual => 1 );
}
my @acc = split /,/, $selected_accts;
- @selected_accountlines = koha::account::lines->search(
- {
- borrowernumber => $borrowernumber,
+ my $search_params = {
+ borrowernumber => $borrowernumber,
amountoutstanding => { '<>' => 0 },
accountlines_id => { 'in' => \@acc },
- },
+ };
+
+ @selected_accountlines = Koha::Account::Lines->search(
+ $search_params,
{ order_by => 'date' }
- );
+ )->as_list;
- $total_due = 0; # Reset and recalculate total due
- map { $total_due += $_->amountoutstanding } @selected_accountlines;
+ my $sum = Koha::Account::Lines->search(
+ $search_params,
+ {
+ select => [ { sum => 'amountoutstanding' } ],
+ as => [ 'total_amountoutstanding'],
+ }
+ );
+ $total_due = $sum->_resultset->first->get_column('total_amountoutstanding');
}
-
if ( $total_paid and $total_paid ne '0.00' ) {
$total_paid = $total_due if (abs($total_paid - $total_due) < 0.01) && C4::Context->preference('RoundFinesAtPayment');
if ( $total_paid < 0 or $total_paid > $total_due ) {
error_over => 1,
total_due => $total_due
);
+ } elsif ( $total_collected < $total_paid && !( $writeoff_individual || $type eq 'WRITEOFF' ) ) {
+ $template->param(
+ error_under => 1,
+ total_paid => $total_paid
+ );
} else {
output_and_exit( $input, $cookie, $template, 'wrong_csrf_token' )
unless Koha::Token->new->check_csrf( {
token => scalar $input->param('csrf_token'),
});
+ my $url;
+ my $pay_result;
if ($pay_individual) {
my $line = Koha::Account::Lines->find($accountlines_id);
- $payment_id = $account->pay(
+ $pay_result = $account->pay(
{
lines => [$line],
amount => $total_paid,
note => $payment_note,
interface => C4::Context->interface,
payment_type => $payment_type,
- cash_register => $registerid
+ cash_register => $cash_register_id
}
);
- print $input->redirect(
- "/cgi-bin/koha/members/pay.pl?borrowernumber=$borrowernumber&payment_id=$payment_id&change_given=$change_given");
+ $payment_id = $pay_result->{payment_id};
+
+ $url = "/cgi-bin/koha/members/pay.pl";
} else {
if ($selected_accts) {
if ( $total_paid > $total_due ) {
} else {
my $note = $input->param('selected_accts_notes');
- $payment_id = $account->pay(
+ $pay_result = $account->pay(
{
type => $type,
amount => $total_paid,
note => $note,
interface => C4::Context->interface,
payment_type => $payment_type,
- cash_register => $registerid
+ cash_register => $cash_register_id
}
- );
+ );
}
+ $payment_id = $pay_result->{payment_id};
}
else {
my $note = $input->param('selected_accts_notes');
- $payment_id = $account->pay(
+ $pay_result = $account->pay(
{
amount => $total_paid,
library_id => $library_id,
payment_type => $payment_type,
interface => C4::Context->interface,
payment_type => $payment_type,
- cash_register => $registerid
+ cash_register => $cash_register_id
}
);
+ $payment_id = $pay_result->{payment_id};
}
+ $payment_id = $pay_result->{payment_id};
- print $input->redirect("/cgi-bin/koha/members/boraccount.pl?borrowernumber=$borrowernumber&payment_id=$payment_id&change_given=$change_given");
+ $url = "/cgi-bin/koha/members/boraccount.pl";
+ }
+ # It's possible renewals took place, parse any renew results
+ # and pass on
+ my @renew_result = ();
+ foreach my $ren( @{$pay_result->{renew_result}} ) {
+ my $str = "renew_result=$ren->{itemnumber},$ren->{success},";
+ my $app = $ren->{success} ?
+ uri_escape(
+ output_pref({ dt => $ren->{due_date}, as_due_date => 1 })
+ ) : $ren->{error};
+ push @renew_result, "${str}${app}";
}
+ my $append = scalar @renew_result ? '&' . join('&', @renew_result) : '';
+
+ $url .= "?borrowernumber=$borrowernumber&payment_id=$payment_id&change_given=${change_given}${append}";
+
+ print $input->redirect($url);
}
} else {
$total_paid = '0.00'; #TODO not right with pay_individual
}
-$template->param(%$borrower);
-
if ( $input->param('error_over') ) {
$template->param( error_over => 1, total_due => scalar $input->param('amountoutstanding') );
}
projects / srvgit / blobdiff