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

(-)a/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tt (-10 / +12 lines)
Lines 1-3 Link Here
1
[% USE KohaDates %]
2
1
[% INCLUDE 'doc-head-open.inc' %]
3
[% INCLUDE 'doc-head-open.inc' %]
2
[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha Online[% END %] Catalog › Your library home
4
[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha Online[% END %] Catalog › Your library home
3
[% INCLUDE 'doc-head-close.inc' %]
5
[% INCLUDE 'doc-head-close.inc' %]
Lines 62-68 $.tablesorter.addParser({ Link Here
62
	                       [% FOREACH bor_messages_loo IN bor_messages_loop %]
64
	                       [% FOREACH bor_messages_loo IN bor_messages_loop %]
63
					<li>
65
					<li>
64
						<strong>[% bor_messages_loo.message %]</strong><br>
66
						<strong>[% bor_messages_loo.message %]</strong><br>
65
	                        		&nbsp;&nbsp;&nbsp;<i>Written on [% bor_messages_loo.message_date_formatted %] by [% bor_messages_loo.branchname %]</i>
67
                            &nbsp;&nbsp;&nbsp;<i>Written on [% bor_messages_loo.message_date | $KohaDates %] by [% bor_messages_loo.branchname %]</i>
66
					</li>
68
					</li>
67
	                        [% END %]
69
	                        [% END %]
68
70
Lines 89-95 $.tablesorter.addParser({ Link Here
89
		<div class="dialog alert">
91
		<div class="dialog alert">
90
        <ul>
92
        <ul>
91
            [% IF ( userdebarred ) %]
93
            [% IF ( userdebarred ) %]
92
                <li><strong>Please note:</strong> Your account has been frozen[% IF ( BORROWER_INF.userdebarreddate ) %] until [% BORROWER_INF.userdebarreddate %][% END %][% IF ( BORROWER_INF.debarredcomment ) %] with the comment "[% BORROWER_INF.debarredcomment %]"[% END %]. Usually the reason for freezing an account is old overdues or damage fees. If <a href="/cgi-bin/koha/opac-user.pl">your account page</a> shows your account to be clear, please contact the library.</li>
94
                <li><strong>Please note:</strong> Your account has been frozen[% IF ( BORROWER_INF.userdebarreddate ) %] until [% BORROWER_INF.userdebarreddate | $KohaDates %][% END %][% IF ( BORROWER_INF.debarredcomment ) %] with the comment "[% BORROWER_INF.debarredcomment %]"[% END %]. Usually the reason for freezing an account is old overdues or damage fees. If <a href="/cgi-bin/koha/opac-user.pl">your account page</a> shows your account to be clear, please contact the library.</li>
93
            [% END %]
95
            [% END %]
94
            [% IF ( BORROWER_INF.gonenoaddress ) %]
96
            [% IF ( BORROWER_INF.gonenoaddress ) %]
95
                <li><strong>Please note:</strong> According to our records, we don't have up-to-date [% UNLESS ( BORROWER_INF.OPACPatronDetails ) %]<a href="/cgi-bin/koha/opac-userupdate.pl">contact information</a>[% ELSE %]contact information[% END %] on file.  Please contact the library[% IF ( BORROWER_INF.OPACPatronDetails ) %] or use the <a href="/cgi-bin/koha/opac-userupdate.pl">online update form</a> to submit current information (<em>Please note:</em> there may be a delay in restoring your account if you submit online)[% END %].</li>
97
                <li><strong>Please note:</strong> According to our records, we don't have up-to-date [% UNLESS ( BORROWER_INF.OPACPatronDetails ) %]<a href="/cgi-bin/koha/opac-userupdate.pl">contact information</a>[% ELSE %]contact information[% END %] on file.  Please contact the library[% IF ( BORROWER_INF.OPACPatronDetails ) %] or use the <a href="/cgi-bin/koha/opac-userupdate.pl">online update form</a> to submit current information (<em>Please note:</em> there may be a delay in restoring your account if you submit online)[% END %].</li>
Lines 169-175 $.tablesorter.addParser({ Link Here
169
                        </a><span class="item-details">
171
                        </a><span class="item-details">
170
                            [% WAITIN.author %]
172
                            [% WAITIN.author %]
171
                        </span></td>
173
                        </span></td>
172
                    <td>[% WAITIN.reservedate %]</td>
174
                    <td>[% WAITIN.reservedate | $KohaDates %]</td>
173
                    <td>[% IF ( WAITIN.atdestination ) %]<strong>Waiting</strong> at [% WAITIN.branch %]
175
                    <td>[% IF ( WAITIN.atdestination ) %]<strong>Waiting</strong> at [% WAITIN.branch %]
174
                        [% ELSE %]
176
                        [% ELSE %]
175
                        In transit from [% WAITIN.holdingbranch %] to [% WAITIN.branch %]
177
                        In transit from [% WAITIN.holdingbranch %] to [% WAITIN.branch %]
Lines 234-242 $.tablesorter.addParser({ Link Here
234
                        [% ISSUE.author %]
236
                        [% ISSUE.author %]
235
                    </span></td>
237
                    </span></td>
236
                [% IF ( ISSUE.overdue ) %]
238
                [% IF ( ISSUE.overdue ) %]
237
                    <td class="overdue">[% ISSUE.date_due %]</td>
239
                    <td class="overdue">[% ISSUE.date_due | $KohaDates %]</td>
238
                [% ELSE %]
240
                [% ELSE %]
239
                    <td>[% ISSUE.date_due %]</td>
241
                    <td>[% ISSUE.date_due | $KohaDates %]</td>
240
                [% END %]
242
                [% END %]
241
                [% UNLESS ( item_level_itypes ) %]<td>[% IF ( ISSUE.imageurl ) %]<img src="[% ISSUE.imageurl %]" title="[% ISSUE.description %]" alt="[% ISSUE.description %]" />[% END %] [% ISSUE.description %]</td>[% END %]
243
                [% UNLESS ( item_level_itypes ) %]<td>[% IF ( ISSUE.imageurl ) %]<img src="[% ISSUE.imageurl %]" title="[% ISSUE.description %]" alt="[% ISSUE.description %]" />[% END %] [% ISSUE.description %]</td>[% END %]
242
                [% IF ( show_barcode ) %]<td>[% ISSUE.barcode %]</td>[% END %]
244
                [% IF ( show_barcode ) %]<td>[% ISSUE.barcode %]</td>[% END %]
Lines 320-326 $.tablesorter.addParser({ Link Here
320
[% UNLESS ( item_level_itypes ) %]<td>[% IF ( OVERDUE.imageurl ) %]<img src="[% OVERDUE.imageurl %]" title="[% OVERDUE.description %]" alt="[% OVERDUE.description %]" />[% END %] [% OVERDUE.description %]</td>[% END %]
322
[% UNLESS ( item_level_itypes ) %]<td>[% IF ( OVERDUE.imageurl ) %]<img src="[% OVERDUE.imageurl %]" title="[% OVERDUE.description %]" alt="[% OVERDUE.description %]" />[% END %] [% OVERDUE.description %]</td>[% END %]
321
[% IF ( show_barcode ) %]<td>[% OVERDUE.barcode %]</td>[% END %]
323
[% IF ( show_barcode ) %]<td>[% OVERDUE.barcode %]</td>[% END %]
322
<td>[% OVERDUE.itemcallnumber %]</td>
324
<td>[% OVERDUE.itemcallnumber %]</td>
323
<td>[% OVERDUE.date_due %]</td>
325
<td>[% OVERDUE.date_due | $KohaDates %]</td>
324
                [% IF ( OpacRenewalAllowed ) %]
326
                [% IF ( OpacRenewalAllowed ) %]
325
<td>
327
<td>
326
[% IF ( OVERDUE.debarred ) %]Account Frozen
328
[% IF ( OVERDUE.debarred ) %]Account Frozen
Lines 373-380 $.tablesorter.addParser({ Link Here
373
                <td><a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% RESERVE.biblionumber %]">[% RESERVE.reserves_title %]</a>
375
                <td><a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% RESERVE.biblionumber %]">[% RESERVE.reserves_title %]</a>
374
                    [% RESERVE.author %]
376
                    [% RESERVE.author %]
375
                </td>
377
                </td>
376
                <td>[% RESERVE.reservedate %]</td>
378
                <td>[% RESERVE.reservedate | $KohaDates %]</td>
377
		<td>[% IF ( RESERVE.expirationdate ) %][% RESERVE.expirationdate %][% ELSE %]Never Expires[% END %]</td>
379
		<td>[% IF ( RESERVE.expirationdate ) %][% RESERVE.expirationdate | $KohaDates %][% ELSE %]Never Expires[% END %]</td>
378
                <td>[% RESERVE.branch %]</td>
380
                <td>[% RESERVE.branch %]</td>
379
				[% IF ( showpriority ) %]
381
				[% IF ( showpriority ) %]
380
				<td>[% RESERVE.priority %] </td>
382
				<td>[% RESERVE.priority %] </td>
Lines 383-389 $.tablesorter.addParser({ Link Here
383
                    [% IF ( RESERVE.wait ) %]
385
                    [% IF ( RESERVE.wait ) %]
384
                        [% IF ( RESERVE.atdestination ) %]
386
                        [% IF ( RESERVE.atdestination ) %]
385
                            [% IF ( RESERVE.found ) %]
387
                            [% IF ( RESERVE.found ) %]
386
                            Item waiting at <b> [% RESERVE.wbrname %]</b>[% IF ( RESERVE.formattedwaitingdate ) %] since [% RESERVE.formattedwaitingdate %][% END %]
388
                            Item waiting at <b> [% RESERVE.wbrname %]</b>[% IF ( RESERVE.formattedwaitingdate ) %] since [% RESERVE.waitingdate | $KohaDates %][% END %]
387
                            <input type="hidden" name="pickup" value="[% RESERVE.wbrcd %]" />
389
                            <input type="hidden" name="pickup" value="[% RESERVE.wbrcd %]" />
388
                            [% ELSE %]
390
                            [% ELSE %]
389
                            Item waiting to be pulled from <b> [% RESERVE.wbrname %]</b>
391
                            Item waiting to be pulled from <b> [% RESERVE.wbrname %]</b>
Lines 394-400 $.tablesorter.addParser({ Link Here
394
                    [% ELSE %]
396
                    [% ELSE %]
395
                            [% IF ( RESERVE.intransit ) %]
397
                            [% IF ( RESERVE.intransit ) %]
396
                                Item in transit from <b> [% RESERVE.frombranch %]</b> since 
398
                                Item in transit from <b> [% RESERVE.frombranch %]</b> since 
397
                                [% RESERVE.datesent %]
399
                                [% RESERVE.datesent | $KohaDates %]
398
                            [% ELSE %]
400
                            [% ELSE %]
399
                                Pending
401
                                Pending
400
                            [% END %]
402
                            [% END %]
(-)a/opac/opac-user.pl (-12 / +3 lines)
Lines 33-39 use C4::Output; Link Here
33
use C4::Overdues qw/CheckBorrowerDebarred/;
33
use C4::Overdues qw/CheckBorrowerDebarred/;
34
use C4::Biblio;
34
use C4::Biblio;
35
use C4::Items;
35
use C4::Items;
36
use C4::Dates qw/format_date/;
37
use C4::Letters;
36
use C4::Letters;
38
use C4::Branch; # GetBranches
37
use C4::Branch; # GetBranches
39
use Koha::DateUtils;
38
use Koha::DateUtils;
Lines 76-84 my ( $borr ) = GetMemberDetails( $borrowernumber ); Link Here
76
my (  $today_year,   $today_month,   $today_day) = Today();
75
my (  $today_year,   $today_month,   $today_day) = Today();
77
my ($warning_year, $warning_month, $warning_day) = split /-/, $borr->{'dateexpiry'};
76
my ($warning_year, $warning_month, $warning_day) = split /-/, $borr->{'dateexpiry'};
78
77
79
for (qw(dateenrolled dateexpiry dateofbirth)) {
80
    ($borr->{$_}) and $borr->{$_} = format_date($borr->{$_});
81
}
82
$borr->{'ethnicity'} = fixEthnicity( $borr->{'ethnicity'} );
78
$borr->{'ethnicity'} = fixEthnicity( $borr->{'ethnicity'} );
83
79
84
my $debar = CheckBorrowerDebarred($borrowernumber);
80
my $debar = CheckBorrowerDebarred($borrowernumber);
Lines 88-94 if ($debar) { Link Here
88
    $userdebarred = 1;
84
    $userdebarred = 1;
89
    $template->param( 'userdebarred' => $userdebarred );
85
    $template->param( 'userdebarred' => $userdebarred );
90
    if ( $debar ne "9999-12-31" ) {
86
    if ( $debar ne "9999-12-31" ) {
91
        $borr->{'userdebarreddate'} = C4::Dates::format_date($debar);
87
        $borr->{'userdebarreddate'} = $debar;
92
    }
88
    }
93
}
89
}
94
90
Lines 254-271 $template->param( branchloop => \@branch_loop ); Link Here
254
# now the reserved items....
250
# now the reserved items....
255
my @reserves  = GetReservesFromBorrowernumber( $borrowernumber );
251
my @reserves  = GetReservesFromBorrowernumber( $borrowernumber );
256
foreach my $res (@reserves) {
252
foreach my $res (@reserves) {
257
    $res->{'reservedate'} = format_date( $res->{'reservedate'} );
258
253
259
    if ( $res->{'expirationdate'} ne '0000-00-00' ) {
254
    if ( $res->{'expirationdate'} eq '0000-00-00' ) {
260
      $res->{'expirationdate'} = format_date( $res->{'expirationdate'} ) 
261
    } else {
262
      $res->{'expirationdate'} = '';
255
      $res->{'expirationdate'} = '';
263
    }
256
    }
264
    
257
    
265
    my $publictype = $res->{'publictype'};
258
    my $publictype = $res->{'publictype'};
266
    $res->{$publictype} = 1;
259
    $res->{$publictype} = 1;
267
    $res->{'waiting'} = 1 if $res->{'found'} eq 'W';
260
    $res->{'waiting'} = 1 if $res->{'found'} eq 'W';
268
    $res->{'formattedwaitingdate'} = format_date($res->{'waitingdate'});
269
    $res->{'branch'} = $branches->{ $res->{'branchcode'} }->{'branchname'};
261
    $res->{'branch'} = $branches->{ $res->{'branchcode'} }->{'branchname'};
270
    my $biblioData = GetBiblioData($res->{'biblionumber'});
262
    my $biblioData = GetBiblioData($res->{'biblionumber'});
271
    $res->{'reserves_title'} = $biblioData->{'title'};
263
    $res->{'reserves_title'} = $biblioData->{'title'};
Lines 311-317 foreach my $res (@reserves) { Link Here
311
            my ($transfertwhen, $transfertfrom, $transfertto) = GetTransfers( $res->{'itemnumber'} );
303
            my ($transfertwhen, $transfertfrom, $transfertto) = GetTransfers( $res->{'itemnumber'} );
312
            if ($transfertwhen) {
304
            if ($transfertwhen) {
313
                $res->{intransit} = 1;
305
                $res->{intransit} = 1;
314
                $res->{datesent}   = format_date($transfertwhen);
306
                $res->{datesent}   = $transfertwhen;
315
                $res->{frombranch} = GetBranchName($transfertfrom);
307
                $res->{frombranch} = GetBranchName($transfertfrom);
316
            }
308
            }
317
        }
309
        }
318
- 

Return to bug 7743