use C4::Auth;
use C4::Output;
use Koha::AuthorisedValues;
+use Koha::Illcomment;
use Koha::Illrequests;
use Koha::Libraries;
+use Koha::Token;
use Try::Tiny;
} );
# Are we able to actually work?
-my $backends = Koha::Illrequest::Config->new->available_backends;
+my $cfg = Koha::Illrequest::Config->new;
+my $backends = $cfg->available_backends;
+my $has_branch = $cfg->has_branch;
my $backends_available = ( scalar @{$backends} > 0 );
-$template->param( backends_available => $backends_available );
+$template->param(
+ backends_available => $backends_available,
+ has_branch => $has_branch
+);
if ( $backends_available ) {
if ( $op eq 'illview' ) {
my $request = Koha::Illrequests->find($params->{illrequest_id});
$template->param(
- request => $request
+ request => $request,
+ csrf_token => Koha::Token->new->generate_csrf({
+ session_id => scalar $cgi->cookie('CGISESSID'),
+ }),
+ ( $params->{error} ? ( error => $params->{error} ) : () ),
);
} elsif ( $op eq 'create' ) {
);
handle_commit_maybe($backend_result, $request);
+ } elsif ( $op eq 'migrate' ) {
+ # We're in the process of migrating a request
+ my $request = Koha::Illrequests->find($params->{illrequest_id});
+ my $backend_result;
+ if ( $params->{backend} ) {
+ my $new_request = Koha::Illrequest->new->load_backend( $params->{backend} );
+ $backend_result = $new_request->backend_migrate($params);
+ if ($backend_result) {
+ $template->param(
+ whole => $backend_result,
+ request => $new_request
+ );
+ $request = $new_request;
+ } else {
+ # Backend failure, redirect back to illview
+ print $cgi->redirect( '/cgi-bin/koha/ill/ill-requests.pl'
+ . '?method=illview'
+ . '&illrequest_id='
+ . $request->id
+ . '&error=migrate_target' );
+ exit;
+ }
+ }
+ else {
+ $backend_result = $request->backend_migrate($params);
+ $template->param(
+ whole => $backend_result,
+ request => $request
+ );
+ }
+ handle_commit_maybe( $backend_result, $request );
+
} elsif ( $op eq 'confirm' ) {
# Backend 'confirm' method
# confirm requires a specific request, so first, find it.
value => {}
};
$template->param(
- whole => $backend_result,
- request => $request
+ whole => $backend_result,
+ request => $request
);
} else {
# Commit:
$request->borrowernumber($params->{borrowernumber});
$request->biblio_id($params->{biblio_id});
$request->branchcode($params->{branchcode});
+ $request->price_paid($params->{price_paid});
$request->notesopac($params->{notesopac});
$request->notesstaff($params->{notesstaff});
+ my $alias = (length $params->{status_alias} > 0) ?
+ $params->{status_alias} :
+ "-1";
+ $request->status_alias($alias);
$request->store;
my $backend_result = {
error => 0,
handle_commit_maybe($backend_result, $request);
} elsif ( $op eq 'generic_confirm' ) {
+ my $backend_result;
+ my $request;
try {
- my $request = Koha::Illrequests->find($params->{illrequest_id});
+ $request = Koha::Illrequests->find($params->{illrequest_id});
$params->{current_branchcode} = C4::Context->mybranch;
- my $backend_result = $request->generic_confirm($params);
+ $backend_result = $request->generic_confirm($params);
$template->param(
whole => $backend_result,
request => $request,
);
$template->param( error => $params->{error} )
if $params->{error};
-
- # handle special commit rules & update type
- handle_commit_maybe($backend_result, $request);
}
catch {
my $error;
- if ( $_->isa( 'Koha::Exceptions::Ill::NoTargetEmail' ) ) {
+ if ( ref($_) eq 'Koha::Exceptions::Ill::NoTargetEmail' ) {
$error = 'no_target_email';
}
- elsif ( $_->isa( 'Koha::Exceptions::Ill::NoLibraryEmail' ) ) {
+ elsif ( ref($_) eq 'Koha::Exceptions::Ill::NoLibraryEmail' ) {
$error = 'no_library_email';
}
else {
"&error=$error" );
exit;
};
- } elsif ( $op eq 'illlist') {
- # Display all current ILLs
- my $requests = $illRequests->search();
- $template->param(
- requests => $requests
- );
+ # handle special commit rules & update type
+ handle_commit_maybe($backend_result, $request);
+ } elsif ( $op eq 'illlist') {
# If we receive a pre-filter, make it available to the template
my $possible_filters = ['borrowernumber'];
my $active_filters = [];
foreach my $filter(@{$possible_filters}) {
if ($params->{$filter}) {
- push @{$active_filters},
- { name => $filter, value => $params->{$filter}};
+ push @{$active_filters}, "$filter=$params->{$filter}";
}
}
if (scalar @{$active_filters} > 0) {
$template->param(
- prefilters => $active_filters
+ prefilters => join(",", @{$active_filters})
);
}
+
+ } elsif ( $op eq "save_comment" ) {
+ die "Wrong CSRF token" unless Koha::Token->new->check_csrf({
+ session_id => scalar $cgi->cookie('CGISESSID'),
+ token => scalar $cgi->param('csrf_token'),
+ });
+ my $comment = Koha::Illcomment->new({
+ illrequest_id => scalar $params->{illrequest_id},
+ borrowernumber => $patronnumber,
+ comment => scalar $params->{comment},
+ });
+ $comment->store();
+ # Redirect to view the whole request
+ print $cgi->redirect("/cgi-bin/koha/ill/ill-requests.pl?method=illview&illrequest_id=".
+ scalar $params->{illrequest_id}
+ );
+ exit;
+
} else {
my $request = Koha::Illrequests->find($params->{illrequest_id});
my $backend_result = $request->custom_capability($op, $params);
$template->param(
backends => $backends,
- media => [ "Book", "Article", "Journal" ],
+ types => [ "Book", "Article", "Journal" ],
query_type => $op,
- branches => Koha::Libraries->search,
- here_link => "/cgi-bin/koha/ill/ill-requests.pl"
+ branches => scalar Koha::Libraries->search,
);
output_html_with_http_headers( $cgi, $cookie, $template->output );
sub handle_commit_maybe {
my ( $backend_result, $request ) = @_;
+
# We need to special case 'commit'
if ( $backend_result->{stage} eq 'commit' ) {
if ( $backend_result->{next} eq 'illview' ) {
+
# Redirect to a view of the newly created request
- print $cgi->redirect(
- '/cgi-bin/koha/ill/ill-requests.pl?method=illview&illrequest_id='.
- $request->id
- );
- } else {
+ print $cgi->redirect( '/cgi-bin/koha/ill/ill-requests.pl'
+ . '?method=illview'
+ . '&illrequest_id='
+ . $request->id );
+ exit;
+ }
+ elsif ( $backend_result->{next} eq 'emigrate' ) {
+
+ # Redirect to a view of the newly created request
+ print $cgi->redirect( '/cgi-bin/koha/ill/ill-requests.pl'
+ . '?method=migrate'
+ . '&stage=emigrate'
+ . '&illrequest_id='
+ . $request->id );
+ exit;
+ }
+ else {
# Redirect to a requests list view
redirect_to_list();
}
projects / koha.git / blobdiff