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

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt (-79 / +100 lines)
Lines 251-337 Link Here
251
        <div class="container-fluid">
251
        <div class="container-fluid">
252
            <div class="row-fluid">
252
            <div class="row-fluid">
253
                    <div class="span12">
253
                    <div class="span12">
254
                        <div id="borrowerdetails">
254
                        <div class="tabbable">
255
                            [% IF ( issues_count ) %]
255
                            <ul class="nav nav-tabs">
256
                                <table id="loanTable" class="table table-bordered table-striped">
256
                                <li class="active"><a href="#checkouts-tab" data-toggle="tab">Checkouts</a></li>
257
                                    <caption>Checkouts for [% borrowername | html %] <span class="count">([% issues_count | html %] total)</span></caption>
257
                                <li><a href="#holds-tab" data-toggle="tab">Holds</a></li>
258
                                    <!-- ISSUES TABLE ROWS -->
258
                                <li><a href="#account-tab" data-toggle="tab">Fines and charges</a></li>
259
                                    <thead>
259
                            </ul>
260
                                        <tr>
260
                            <div class="tab-content">
261
                                            <th class="noshow">Checked out on</th>
261
                                <div id="checkouts-tab" class="tab-pane active">
262
                                            <th class="anti-the">Title</th>
262
                                    <div id="borrowerdetails">
263
                                            <th>Call no.</th>
263
                                        [% IF ( issues_count ) %]
264
                                            <th class="title-string">Due</th>
264
                                            <table id="loanTable" class="table table-bordered table-striped">
265
                                            <th class="nosort">Renew</th>
265
                                                <caption>Checkouts for [% borrowername | html %] <span class="count">([% issues_count | html %] total)</span></caption>
266
                                            [% UNLESS ( nofines ) %]
266
                                                <!-- ISSUES TABLE ROWS -->
267
                                                <th>Fines</th>
267
                                                <thead>
268
                                            [% END %]
268
                                                    <tr>
269
                                        </tr>
269
                                                        <th class="noshow">Checked out on</th>
270
                                    </thead>
270
                                                        <th class="anti-the">Title</th>
271
                                    <tbody>
271
                                                        <th>Call no.</th>
272
                                        [% FOREACH ISSUE IN ISSUES %]
272
                                                        <th class="title-string">Due</th>
273
                                            <tr>
273
                                                        <th class="nosort">Renew</th>
274
                                                <td>[% ISSUE.issuedate | html %]</td>
274
                                                        [% UNLESS ( nofines ) %]
275
                                                <td>
275
                                                            <th>Fines</th>
276
                                                    [% UNLESS ( noitemlinks ) %]
276
                                                        [% END %]
277
                                                        <a href="/cgi-bin/koha/opac-detail.pl?bib=[% ISSUE.  biblionumber | uri %]">[% ISSUE.title | html %]</a>
277
                                                    </tr>
278
                                                    [% ELSE %]
278
                                                </thead>
279
                                                        <strong>[% ISSUE.title | html %]</strong>
279
                                                <tbody>
280
                                                    [% END %]
280
                                                    [% FOREACH ISSUE IN ISSUES %]
281
                                                    [% IF ( newissues.match(ISSUE.barcode)) %]
281
                                                        <tr>
282
                                                        <span class="label label-info">NEW</span>
282
                                                            <td>[% ISSUE.issuedate | html %]</td>
283
                                                    [% END %]
283
                                                            <td>
284
                                                    <span class="item-details">[% ISSUE.author | html %]</span>
284
                                                                [% UNLESS ( noitemlinks ) %]
285
                                                    ([% ISSUE.barcode | html %])
285
                                                                    <a href="/cgi-bin/koha/opac-detail.pl?bib=[% ISSUE.  biblionumber | uri %]">[% ISSUE.title | html %]</a>
286
                                                </td>
286
                                                                [% ELSE %]
287
                                                <td>[% ISSUE.itemcallnumber | html %]</td>
287
                                                                    <strong>[% ISSUE.title | html %]</strong>
288
                                                [% IF ( ISSUE.overdue ) %]
288
                                                                [% END %]
289
                                                    <td class="overdue"><span title="[% ISSUE.date_due | html %]">[% ISSUE.date_due | $KohaDates  as_due_date => 1 %]</span></td>
289
                                                                [% IF ( newissues.match(ISSUE.barcode)) %]
290
                                                [% ELSE   %]
290
                                                                    <span class="label label-info">NEW</span>
291
                                                    <td><span title="[% ISSUE.date_due | html %]">[% ISSUE.date_due | $KohaDates  as_due_date => 1 %]</span></td>
291
                                                                [% END %]
292
                                                [% END %]
292
                                                                <span class="item-details">[% ISSUE.author | html %]</span>
293
                                                <td>
293
                                                                ([% ISSUE.barcode | html %])
294
                                                    <form action="/cgi-bin/koha/sco/sco-main.pl" method="post">
294
                                                            </td>
295
                                                        <input type="hidden" name="patronid" value="[% patronid | html %]" />
295
                                                            <td>[% ISSUE.itemcallnumber | html %]</td>
296
                                                        <input type="hidden" name="barcode" value="[% ISSUE.barcode | html %]" />
296
                                                            [% IF ( ISSUE.overdue ) %]
297
                                                        <input type="hidden" name="newissues" value="[% newissues | html %]" />
297
                                                                <td class="overdue"><span title="[% ISSUE.date_due | html %]">[% ISSUE.date_due | $KohaDates  as_due_date => 1 %]</span></td>
298
                                                        [% IF ISSUE.can_be_renewed %]
298
                                                            [% ELSE   %]
299
                                                            <input type="hidden" name="op" value="renew" />
299
                                                                <td><span title="[% ISSUE.date_due | html %]">[% ISSUE.date_due | $KohaDates  as_due_date => 1 %]</span></td>
300
                                                            <input type="hidden" name="confirmed" value="1" />
301
                                                            [% UNLESS ( ISSUE.renew ) %]
302
                                                                <input type="submit" value="Renew item"  name="confirm  " class="btn renew" />
303
                                                            [% ELSE %]
304
                                                                <input type="submit" value="Renew item" class="btn renew" />
305
                                                            [% END %]
306
                                                        [% ELSE %]
307
                                                            [% IF ISSUE.renew_error == 'auto_renew' OR ISSUE.renew_error == 'auto_too_soon' %]
308
                                                                <span>This item has been scheduled for automatic renewal and cannot be renewed</span>
309
                                                            [% ELSIF ISSUE.renew_error == 'onsite_checkout' %]
310
                                                                <span>This is a on-site checkout, it cannot be renewed.</span>
311
                                                            [% ELSE %]
312
                                                                <span>No renewals allowed</span>
313
                                                            [% END %]
300
                                                            [% END %]
314
                                                            [% IF Koha.Preference('AllowSelfCheckReturns') %]
301
                                                            <td>
315
                                                                <input type="submit" value="Check in item" name="confirm" class="btn return" />
302
                                                                <form action="/cgi-bin/koha/sco/sco-main.pl" method="post">
316
                                                                <input type="hidden" name="op" value="returnbook" />
303
                                                                    <input type="hidden" name="patronid" value="[% patronid | html %]" />
317
                                                                <input type="hidden" name="confirmed" value=""  />
304
                                                                    <input type="hidden" name="barcode" value="[% ISSUE.barcode | html %]" />
305
                                                                    <input type="hidden" name="newissues" value="[% newissues | html %]" />
306
                                                                    [% IF ISSUE.can_be_renewed %]
307
                                                                        <input type="hidden" name="op" value="checkout" />
308
                                                                        <input type="hidden" name="confirmed" value="1" />
309
                                                                        [% UNLESS ( ISSUE.renew ) %]
310
                                                                            <input type="submit" value="Renew item"  name="confirm  " class="btn renew" />
311
                                                                        [% ELSE %]
312
                                                                            <input type="submit" value="Renew item" class="btn renew" />
313
                                                                        [% END %]
314
                                                                    [% ELSE %]
315
                                                                        [% IF ISSUE.renew_error == 'auto_renew' OR ISSUE.renew_error == 'auto_too_soon' %]
316
                                                                            <span>This item has been scheduled for automatic renewal and cannot be renewed</span>
317
                                                                        [% ELSIF ISSUE.renew_error == 'onsite_checkout' %]
318
                                                                            <span>This is a on-site checkout, it cannot be renewed.</span>
319
                                                                        [% ELSE %]
320
                                                                            <span>No renewals allowed</span>
321
                                                                        [% END %]
322
                                                                        [% IF Koha.Preference('AllowSelfCheckReturns') %]
323
                                                                            <input type="submit" value="Check in item" name="confirm" class="btn return" />
324
                                                                            <input type="hidden" name="op" value="returnbook" />
325
                                                                            <input type="hidden" name="confirmed" value=""  />
326
                                                                        [% END %]
327
                                                                    [% END %]
328
                                                                </form>
329
                                                            </td>
330
                                                            [% UNLESS ( nofines ) %]
331
                                                                <td>
332
                                                                    [% IF ( ISSUE.charges ) %]Yes[% ELSE %]No[% END %]
333
                                                                </td>
318
                                                            [% END %]
334
                                                            [% END %]
319
                                                        [% END %]
335
                                                        </tr>
320
                                                    </form>
336
                                                    [% END # / FOREACH ISSUE %]
321
                                                </td>
337
                                                </tbody>
322
                                                [% UNLESS ( nofines ) %]
338
                                            </table>
323
                                                    <td>
339
                                        [% ELSE %]
324
                                                        [% IF ( ISSUE.charges ) %]Yes[% ELSE %]No[% END %]
340
                                            <h3>You currently have nothing checked out.</h3>
325
                                                    </td>
341
                                        [% END # / IF issues_count %]
326
                                                [% END %]
342
                                    </div> <!-- / #borrowerdetails -->
327
                                            </tr>
343
                                </div>
328
                                        [% END # / FOREACH ISSUE %]
344
                                <div id="holds-tab" class="tab-pane">
329
                                    </tbody>
345
                                    [% IF HOLDS.count > 0 %]
330
                                </table>
346
                                        [% PROCESS 'holds-table.inc' HOLDS = HOLDS, SuspendHoldsOpac = SuspendHoldsOpac, showpriority = showpriority, AutoResumeSuspendedHolds = AutoResumeSuspendedHolds, onlyinfo = 'true' %]
331
                            [% ELSE %]
347
                                    [% ELSE %]
332
                                <h3>You currently have nothing checked out.</h3>
348
                                        <h3>You currently have no pending holds.</h3>
333
                            [% END # / IF issues_count %]
349
                                    [% END %]
334
                        </div> <!-- / #borrowerdetails -->
350
                                </div>
351
                                <div id="account-tab" class="tab-pane">
352
                                    [% PROCESS 'account-table.inc' %]
353
                                </div>
354
                            </div>
355
                        </div>
335
                        [% ELSE # IF validuser %]
356
                        [% ELSE # IF validuser %]
336
                            <div class="sco_entry" >
357
                            <div class="sco_entry" >
337
                                <form id="mainform" action="/cgi-bin/koha/sco/sco-main.pl" name="mainform" method="post">
358
                                <form id="mainform" action="/cgi-bin/koha/sco/sco-main.pl" name="mainform" method="post">
(-)a/opac/sco/sco-main.pl (-1 / +35 lines)
Lines 272-288 if ($borrower) { Link Here
272
        push @checkouts, $checkout;
272
        push @checkouts, $checkout;
273
    }
273
    }
274
274
275
    my $show_priority;
276
    for ( C4::Context->preference("OPACShowHoldQueueDetails") ) {
277
        m/priority/ and $show_priority = 1;
278
    }
279
280
    my $patron = Koha::Patrons->find( $borrower->{borrowernumber} );
281
    my $total = $patron->account->balance;
282
    my $accts = Koha::Account::Lines->search(
283
        { borrowernumber => $borrower->{borrowernumber} },
284
        { order_by       => { -desc => 'accountlines_id' } }
285
    );
286
287
    my @accountlines;
288
    while ( my $line = $accts->next ) {
289
        my $accountline = $line->unblessed;
290
        $accountline->{'amount'} = sprintf( "%.2f", $accountline->{'amount'} || '0.00');
291
        if ( $accountline->{'amount'} >= 0 ) {
292
            $accountline->{'amountcredit'} = 1;
293
        }
294
        $accountline->{'amountoutstanding'} =
295
        sprintf( "%.2f", $accountline->{'amountoutstanding'} || '0.00' );
296
        if ( $accountline->{'amountoutstanding'} >= 0 ) {
297
            $accountline->{'amountoutstandingcredit'} = 1;
298
        }
299
        push @accountlines, $accountline;
300
    }
301
302
    my $holds = $patron->holds;
303
275
    $template->param(
304
    $template->param(
276
        validuser => 1,
305
        validuser => 1,
277
        borrowername => $borrowername,
306
        borrowername => $borrowername,
278
        issues_count => scalar(@checkouts),
307
        issues_count => scalar(@checkouts),
279
        ISSUES => \@checkouts,
308
        ISSUES => \@checkouts,
309
        HOLDS => $holds,
280
        newissues => join(',',@newissueslist),
310
        newissues => join(',',@newissueslist),
281
        patronid => $patronid,
311
        patronid => $patronid,
282
        patronlogin => $patronlogin,
312
        patronlogin => $patronlogin,
283
        patronpw => $patronpw,
313
        patronpw => $patronpw,
284
        noitemlinks => 1 ,
314
        noitemlinks => 1 ,
285
        borrowernumber => $borrower->{'borrowernumber'},
315
        borrowernumber => $borrower->{'borrowernumber'},
316
        SuspendHoldsOpac => C4::Context->preference('SuspendHoldsOpac'),
317
        AutoResumeSuspendedHolds => C4::Context->preference('AutoResumeSuspendedHolds'),
318
        showpriority   => $show_priority,
319
        ACCOUNT_LINES => \@accountlines,
320
        total => sprintf( "%.2f", $total ),
286
    );
321
    );
287
322
288
    my $patron_messages = Koha::Patron::Messages->search(
323
    my $patron_messages = Koha::Patron::Messages->search(
289
- 

Return to bug 21772