View | Details | Raw Unified | Return to bug 36197
Collapse All | Expand All

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-illrequests.tt (-74 lines)
Lines 64-73 Link Here
64
                <div class="col-lg-2">
64
                <div class="col-lg-2">
65
                    <div id="navigation"> [% INCLUDE 'navigation.inc' IsPatronPage=1 %] </div>
65
                    <div id="navigation"> [% INCLUDE 'navigation.inc' IsPatronPage=1 %] </div>
66
                </div>
66
                </div>
67
            [% ELSIF (!logged_in_user) %]
68
                <div class="col-lg-2">
69
                    <div id="navigation"> </div>
70
                </div>
71
            [% END %]
67
            [% END %]
72
68
73
            [% SET column_class = "col order-first order-md-first order-lg-2" %]
69
            [% SET column_class = "col order-first order-md-first order-lg-2" %]
Lines 252-327 Link Here
252
                                    </fieldset>
248
                                    </fieldset>
253
                                [% END %]
249
                                [% END %]
254
                            </form>
250
                            </form>
255
                        [% ELSIF op == 'unauth_view' %]
256
                            <div class="alert alert-success" role="alert">Your request has been placed. We'll contact you shortly.</div>
257
                            <h1>View interlibrary loan request</h1>
258
                            [% INCLUDE messages %]
259
                            [% status = request.status %]
260
                            <fieldset class="rows">
261
                                <legend id="library_legend">Details from library</legend>
262
                                <ol>
263
                                    [% type = request.get_type %]
264
                                    <li>
265
                                        <label for="request_id">Request ID:</label>
266
                                        [% request.id | html %]
267
                                    </li>
268
                                    <li>
269
                                        <label for="backend">Requested from:</label>
270
                                        [% request.backend | html %]
271
                                    </li>
272
                                    [% IF request.biblio_id %]
273
                                        <li>
274
                                            <label for="biblio">Requested item:</label>
275
                                            <a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% request.biblio_id | uri %]">View the requested item</a>
276
                                        </li>
277
                                    [% END %]
278
                                    <li>
279
                                        <label for="branchcode">Collection library:</label>
280
                                        [% Branches.GetName(request.branchcode) | html %]
281
                                    </li>
282
                                    <li>
283
                                        <label for="status">Status:</label>
284
                                        [% request.status_alias ? request.statusalias.lib_opac : request.capabilities.$status.name | html %]
285
                                    </li>
286
                                    <li>
287
                                        <label for="medium">Request type:</label>
288
                                        [% IF type %][% type | html %][% ELSE %]<span>N/A</span>[% END %]
289
                                    </li>
290
                                    <li>
291
                                        <label for="placed">Request placed:</label>
292
                                        [% request.placed | $KohaDates %]
293
                                    </li>
294
                                    <li>
295
                                        <label for="updated">Last updated:</label>
296
                                        [% request.updated | $KohaDates %]
297
                                    </li>
298
                                    <li>
299
                                        <label for="unauthenticated_first_name">Unauthenticated first name:</label>
300
                                        [% request.extended_attributes.find({'type'=>'unauthenticated_first_name'}).value | html %]
301
                                    </li>
302
                                    <li>
303
                                        <label for="unauthenticated_last_name">Unauthenticated last name:</label>
304
                                        [% request.extended_attributes.find({'type'=>'unauthenticated_last_name'}).value | html %]
305
                                    </li>
306
                                    <li>
307
                                        <label for="unauthenticated_email">Unauthenticated email:</label>
308
                                        [% request.extended_attributes.find({'type'=>'unauthenticated_email'}).value | html %]
309
                                    </li>
310
                                    <li>
311
                                        <label for="notesopac">Notes:</label>
312
                                        [% request.notesopac | html %]
313
                                    </li>
314
                                </ol>
315
                            </fieldset>
316
                            <div id="ill-supplier-metadata" class="rows">
317
                                <legend id="backend_legend">Details from [% request.backend | html %]</legend>
318
                                [% FOREACH meta IN request.metadata %]
319
                                    <div class="requestattr-[% meta.key | replace(' ', '_') | html %]">
320
                                        <span class="label">[% meta.key | html %]:</span>
321
                                        <span class="value">[% IF meta.value %][% meta.value | html %][% ELSE %]N/A[% END %]</span>
322
                                    </div>
323
                                [% END %]
324
                            </div>
325
                        [% ELSIF op == 'availability' %]
251
                        [% ELSIF op == 'availability' %]
326
                            <h1>Interlibrary loan item availability</h1>
252
                            <h1>Interlibrary loan item availability</h1>
327
                            <div id="results">
253
                            <div id="results">
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-illrequests_unauthenticated.tt (+115 lines)
Line 0 Link Here
1
[% USE raw %]
2
[% USE KohaDates %]
3
[% USE Branches %]
4
[% USE AdditionalContents %]
5
[% SET OpacNav = AdditionalContents.get( location => "OpacNav", lang => lang, library => logged_in_user.branchcode || default_branch, blocktitle => 0 ) %]
6
[% INCLUDE 'doc-head-open.inc' %]
7
<title>ILL requests</title>
8
[% INCLUDE 'doc-head-close.inc' %]
9
[% BLOCK cssinclude %]
10
[% END %]
11
[% INCLUDE 'bodytag.inc' bodyid='opac-illrequests' %]
12
13
[% INCLUDE 'masthead.inc' %]
14
<div class="main">
15
    [% WRAPPER breadcrumbs %]
16
        [% IF op != 'list' %]
17
            [% WRAPPER breadcrumb_item %]
18
                <a href="/cgi-bin/koha/opac-illrequests.pl">Interlibrary loan requests</a>
19
            [% END %]
20
        [% END %]
21
    [% END #/ WRAPPER breadcrumbs %]
22
23
    <div class="container-fluid">
24
        <div class="row">
25
            <div class="col-lg-2">
26
                [% IF op == 'list' %]
27
                    <h1>Interlibrary loan requests</h1>
28
                [% ELSIF op == 'view' %]
29
                    <h1>View interlibrary loan request</h1>
30
                [% ELSIF op == 'unauth_view' %]
31
                    <h1>View interlibrary loan request</h1>
32
                [% ELSIF op == 'availability' %]
33
                    <h1>Interlibrary loan item availability</h1>
34
                [% ELSIF op == 'typedisclaimer' %]
35
                    <h1>ILL request disclaimer</h1>
36
                [% ELSIF op == 'confirmautoill' %]
37
                    <h1>Confirming request</h1>
38
                [% END %]
39
            </div>
40
            [% SET column_class = "col order-first order-md-first order-lg-2" %]
41
            [% IF ( OpacNav||loggedinusername ) %]
42
                [% column_class = "col-lg-10 order-first order-md-first order-lg-2" %]
43
            [% END %]
44
            <div class="[% column_class | html %]">
45
                <div class="maincontent">
46
                    <div class="alert alert-success" role="alert">Your request has been placed. We'll contact you shortly.</div>
47
                    <h1>View interlibrary loan request</h1>
48
                    [% status = request.status %]
49
                    <fieldset class="rows">
50
                        <legend id="library_legend">Details from library</legend>
51
                        <ol>
52
                            [% type = request.get_type %]
53
                            <li>
54
                                <label for="request_id">Request ID:</label>
55
                                [% request.illrequest_id | html %]
56
                            </li>
57
                            <li>
58
                                <label for="backend">Requested from:</label>
59
                                [% request.backend | html %]
60
                            </li>
61
                            <li>
62
                                <label for="branchcode">Collection library:</label>
63
                                [% Branches.GetName(request.branchcode) | html %]
64
                            </li>
65
                            <li>
66
                                <label for="status">Status:</label>
67
                                [% request.status | html %]
68
                            </li>
69
                            <li>
70
                                <label for="medium">Request type:</label>
71
                                [% IF type %][% type | html %][% ELSE %]<span>N/A</span>[% END %]
72
                            </li>
73
                            <li>
74
                                <label for="placed">Request placed:</label>
75
                                [% request.placed | $KohaDates %]
76
                            </li>
77
                            <li>
78
                                <label for="updated">Last updated:</label>
79
                                [% request.updated | $KohaDates %]
80
                            </li>
81
                            <li>
82
                                <label for="unauthenticated_first_name">Unauthenticated first name:</label>
83
                                [% request.unauthenticated_first_name | html %]
84
                            </li>
85
                            <li>
86
                                <label for="unauthenticated_last_name">Unauthenticated last name:</label>
87
                                [% request.unauthenticated_last_name | html %]
88
                            </li>
89
                            <li>
90
                                <label for="unauthenticated_email">Unauthenticated email:</label>
91
                                [% request.unauthenticated_email| html %]
92
                            </li>
93
                        </ol>
94
                    </fieldset>
95
                    <div id="ill-supplier-metadata" class="rows">
96
                        <legend id="backend_legend">Request details</legend>
97
                        [% FOREACH meta IN request.metadata %]
98
                            [% IF meta.value %]
99
                                <div class="requestattr-[% meta.key | replace(' ', '_') | html %]">
100
                                    <span class="label">[% meta.key | html %]:</span>
101
                                    <span class="value">[% meta.value | html %]</span>
102
                                </div>
103
                            [% END %]
104
                        [% END %]
105
                    </div>
106
                </div>
107
            </div>
108
        </div>
109
    </div>
110
</div>
111
112
[% INCLUDE 'opac-bottom.inc' %]
113
114
[% BLOCK jsinclude %]
115
[% END %]
(-)a/opac/opac-illrequests-unauthenticated.pl (+30 lines)
Line 0 Link Here
1
#!/usr/bin/perl
2
3
use Modern::Perl;
4
5
use JSON qw( decode_json );
6
7
use CGI         qw ( -utf8 );
8
use C4::Auth    qw( get_template_and_user );
9
use C4::Output  qw( output_html_with_http_headers );
10
use URI::Escape qw( uri_unescape );
11
12
my $query = CGI->new;
13
14
my $sessionID = $query->cookie('CGISESSID');
15
my $session   = C4::Auth::get_session($sessionID);
16
my $request =
17
    eval { decode_json( uri_unescape( $session->param('ill_request_unauthenticated') ) ) };
18
19
my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
20
    {
21
        template_name   => "opac-illrequests_unauthenticated.tt",
22
        query           => $query,
23
        type            => "opac",
24
        authnotrequired => 1,
25
    }
26
);
27
28
$template->param( request => $request );
29
30
output_html_with_http_headers $query, $cookie, $template->output;
(-)a/opac/opac-illrequests.pl (-2 / +25 lines)
Lines 28-33 use C4::Output qw( output_html_with_http_headers ); Link Here
28
use Digest::MD5    qw( md5_base64 );
28
use Digest::MD5    qw( md5_base64 );
29
use POSIX          qw( strftime );
29
use POSIX          qw( strftime );
30
use String::Random qw( random_string );
30
use String::Random qw( random_string );
31
use URI::Escape    qw( uri_escape );
31
32
32
use Koha::ILL::Request::Config;
33
use Koha::ILL::Request::Config;
33
use Koha::ILL::Requests;
34
use Koha::ILL::Requests;
Lines 197-203 if ( $op eq 'list' ) { Link Here
197
                    $type_disclaimer->after_request_created( $params, $request );
198
                    $type_disclaimer->after_request_created( $params, $request );
198
                }
199
                }
199
                if ( C4::Context->preference('ILLOpacUnauthenticatedRequest') && !$patron ) {
200
                if ( C4::Context->preference('ILLOpacUnauthenticatedRequest') && !$patron ) {
200
                    $op = 'unauth_view';
201
                    my $sessionID = $query->cookie('CGISESSID');
202
                    my $session   = C4::Auth::get_session($sessionID);
203
204
                    my $request_unblessed = $request->unblessed;
205
                    $request_unblessed->{updated} = $request_unblessed->{updated}->ymd;
206
                    $request_unblessed->{placed}  = $request_unblessed->{placed}->ymd;
207
                    $request_unblessed->{unauthenticated_first_name} =
208
                        $request->extended_attributes->find( { 'type' => 'unauthenticated_first_name' } )->value;
209
                    $request_unblessed->{unauthenticated_last_name} =
210
                        $request->extended_attributes->find( { 'type' => 'unauthenticated_last_name' } )->value;
211
                    $request_unblessed->{unauthenticated_email} =
212
                        $request->extended_attributes->find( { 'type' => 'unauthenticated_email' } )->value;
213
                    $request_unblessed->{metadata} = $request->metadata;
214
215
                    my $capabilities = $request->capabilities;
216
                    $request_unblessed->{status} = $capabilities->{ $request->status }->{name};
217
                    $request_unblessed->{type}   = $request->get_type;
218
219
                    $session->param(
220
                        'ill_request_unauthenticated',
221
                        uri_escape( encode_json($request_unblessed) )
222
                    );
223
                    $session->flush;
224
                    print $query->redirect('/cgi-bin/koha/opac-illrequests-unauthenticated.pl');
201
                } else {
225
                } else {
202
                    print $query->redirect('/cgi-bin/koha/opac-illrequests.pl?message=2');
226
                    print $query->redirect('/cgi-bin/koha/opac-illrequests.pl?message=2');
203
                    exit;
227
                    exit;
204
- 

Return to bug 36197