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

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/patron_messages.inc (-4 / +4 lines)
Lines 24-32 Link Here
24
                <span class="circ-hlt">Expiration:</span>
24
                <span class="circ-hlt">Expiration:</span>
25
                <span>Patron's card expires on [% patron.dateexpiry | $KohaDates %].</span>
25
                <span>Patron's card expires on [% patron.dateexpiry | $KohaDates %].</span>
26
                [% IF ( moremember ) %]
26
                [% IF ( moremember ) %]
27
                    <a href="/cgi-bin/koha/members/setstatus.pl?borrowernumber=[% patron.borrowernumber | uri %]&amp;destination=member&amp;reregistration=y">Renew</a> or <a href="/cgi-bin/koha/members/memberentry.pl?op=edit_form&amp;destination=member&amp;borrowernumber=[% patron.borrowernumber | html %]">Edit details</a>
27
                    <a href="/cgi-bin/koha/members/setstatus.pl?borrowernumber=[% patron.borrowernumber | uri %]&amp;destination=member&amp;reregistration=y">Renew</a> or <a href="/cgi-bin/koha/members/memberentry.pl?op=edit_form&amp;destination=member&amp;borrowernumber=[% patron.borrowernumber | uri %]">Edit details</a>
28
                [% ELSE %]
28
                [% ELSE %]
29
                    <a href="/cgi-bin/koha/members/setstatus.pl?borrowernumber=[% patron.borrowernumber | uri %]&amp;destination=circ&amp;reregistration=y">Renew</a> or <a href="/cgi-bin/koha/members/memberentry.pl?op=edit_form&amp;destination=circ&amp;borrowernumber=[% patron.borrowernumber | html %]">Edit details</a>
29
                    <a href="/cgi-bin/koha/members/setstatus.pl?borrowernumber=[% patron.borrowernumber | uri %]&amp;destination=circ&amp;reregistration=y">Renew</a> or <a href="/cgi-bin/koha/members/memberentry.pl?op=edit_form&amp;destination=circ&amp;borrowernumber=[% patron.borrowernumber | uri %]">Edit details</a>
30
                [% END %]
30
                [% END %]
31
            </li>
31
            </li>
32
        [% END %]
32
        [% END %]
Lines 45-53 Link Here
45
                    <span>Patron's card expired on [% expiry | $KohaDates %]</span>
45
                    <span>Patron's card expired on [% expiry | $KohaDates %]</span>
46
                [% END %]
46
                [% END %]
47
                [% IF ( moremember ) %]
47
                [% IF ( moremember ) %]
48
                    <a href="/cgi-bin/koha/members/setstatus.pl?borrowernumber=[% patron.borrowernumber | uri %]&amp;destination=member&amp;reregistration=y">Renew</a> or <a href="/cgi-bin/koha/members/memberentry.pl?op=edit_form&amp;destination=member&amp;borrowernumber=[% patron.borrowernumber | html %]">Edit details</a>
48
                    <a href="/cgi-bin/koha/members/setstatus.pl?borrowernumber=[% patron.borrowernumber | uri %]&amp;destination=member&amp;reregistration=y">Renew</a> or <a href="/cgi-bin/koha/members/memberentry.pl?op=edit_form&amp;destination=member&amp;borrowernumber=[% patron.borrowernumber | uri %]">Edit details</a>
49
                [% ELSE %]
49
                [% ELSE %]
50
                    <a href="/cgi-bin/koha/members/setstatus.pl?borrowernumber=[% patron.borrowernumber | uri %]&amp;destination=circ&amp;reregistration=y">Renew</a> or <a href="/cgi-bin/koha/members/memberentry.pl?op=edit_form&amp;destination=circ&amp;borrowernumber=[% patron.borrowernumber | html %]">Edit details</a>
50
                    <a href="/cgi-bin/koha/members/setstatus.pl?borrowernumber=[% patron.borrowernumber | uri %]&amp;destination=circ&amp;reregistration=y">Renew</a> or <a href="/cgi-bin/koha/members/memberentry.pl?op=edit_form&amp;destination=circ&amp;borrowernumber=[% patron.borrowernumber | uri %]">Edit details</a>
51
                [% END %]
51
                [% END %]
52
            </li>
52
            </li>
53
        [% END %]
53
        [% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/curbside_pickups.tt (-3 / +3 lines)
Lines 62-68 Link Here
62
[% BLOCK waiting_holds %]
62
[% BLOCK waiting_holds %]
63
    [% SET waiting_holds = cp.patron.holds.search( found => 'W', branchcode => Branches.GetLoggedInBranchcode ) %]
63
    [% SET waiting_holds = cp.patron.holds.search( found => 'W', branchcode => Branches.GetLoggedInBranchcode ) %]
64
    [% FOREACH h IN waiting_holds %]
64
    [% FOREACH h IN waiting_holds %]
65
       <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% h.biblionumber | uri %]">[% h.biblio.title | html %]</a> ([% h.biblio.author | html %], <a href="/cgi-bin/koha/catalogue/moredetail.pl?itemnumber=[% h.itemnumber | html %]&biblionumber=[% h.biblionumber | html %]#item[% h.itemnumber | html %]">[% h.item.barcode | html %]</a>)<br/>
65
       <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% h.biblionumber | uri %]">[% h.biblio.title | html %]</a> ([% h.biblio.author | html %], <a href="/cgi-bin/koha/catalogue/moredetail.pl?itemnumber=[% h.itemnumber | uri %]&biblionumber=[% h.biblionumber | uri %]#item[% h.itemnumber | uri %]">[% h.item.barcode | html %]</a>)<br/>
66
    [% END %]
66
    [% END %]
67
[% END %]
67
[% END %]
68
68
Lines 396-402 Link Here
396
                                                    <td>
396
                                                    <td>
397
                                                        [% FOREACH c IN cp.checkouts %]
397
                                                        [% FOREACH c IN cp.checkouts %]
398
                                                            [% IF date.format(c.issuedate, format = '%Y-%m-%d') == today_iso %]
398
                                                            [% IF date.format(c.issuedate, format = '%Y-%m-%d') == today_iso %]
399
                                                                <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% c.item.biblionumber | uri %]">[% c.item.biblio.title | html %]</a> ([% c.item.biblio.author | html %], <a href="/cgi-bin/koha/catalogue/moredetail.pl?itemnumber=[% c.itemnumber | html %]&biblionumber=[% c.item.biblionumber | html %]#item[% c.itemnumber | html %]">[% c.item.barcode | html %]</a>)<br/>
399
                                                                <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% c.item.biblionumber | uri %]">[% c.item.biblio.title | html %]</a> ([% c.item.biblio.author | html %], <a href="/cgi-bin/koha/catalogue/moredetail.pl?itemnumber=[% c.itemnumber | uri %]&biblionumber=[% c.item.biblionumber | uri %]#item[% c.itemnumber | uri %]">[% c.item.barcode | html %]</a>)<br/>
400
                                                            [% END %]
400
                                                            [% END %]
401
                                                        [% END %]
401
                                                        [% END %]
402
                                                    </td>
402
                                                    </td>
Lines 447-453 Link Here
447
                                                            [% IF waiting_holds.count %]
447
                                                            [% IF waiting_holds.count %]
448
                                                                [% FOREACH h IN waiting_holds %]
448
                                                                [% FOREACH h IN waiting_holds %]
449
                                                                    <li>
449
                                                                    <li>
450
                                                                        <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% h.biblionumber | uri %]">[% h.biblio.title | html %]</a> ([% h.biblio.author | html %], <a href="/cgi-bin/koha/catalogue/moredetail.pl?itemnumber=[% h.itemnumber | html %]&biblionumber=[% h.biblionumber | html %]#item[% h.itemnumber | html %]">[% h.item.barcode | html %]</a>)
450
                                                                        <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% h.biblionumber | uri %]">[% h.biblio.title | html %]</a> ([% h.biblio.author | html %], <a href="/cgi-bin/koha/catalogue/moredetail.pl?itemnumber=[% h.itemnumber | uri %]&biblionumber=[% h.biblionumber | uri %]#item[% h.itemnumber | uri %]">[% h.item.barcode | html %]</a>)
451
                                                                    </li>
451
                                                                    </li>
452
                                                                [% END %]
452
                                                                [% END %]
453
                                                            [% ELSE %]
453
                                                            [% ELSE %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt (-2 / +2 lines)
Lines 438-449 Link Here
438
                                                <span class="blocker">
438
                                                <span class="blocker">
439
                                                    [% patron.dateexpiry | $KohaDates %]
439
                                                    [% patron.dateexpiry | $KohaDates %]
440
                                                    <strong><em>Expired</em></strong>
440
                                                    <strong><em>Expired</em></strong>
441
                                                    <a href="/cgi-bin/koha/members/setstatus.pl?borrowernumber=[% patron.borrowernumber | uri %]&amp;reregistration=y">Renew</a> or <a href="/cgi-bin/koha/members/memberentry.pl?op=edit_form&amp;borrowernumber=[% patron.borrowernumber | html %]">Edit details</a>
441
                                                    <a href="/cgi-bin/koha/members/setstatus.pl?borrowernumber=[% patron.borrowernumber | uri %]&amp;reregistration=y">Renew</a> or <a href="/cgi-bin/koha/members/memberentry.pl?op=edit_form&amp;borrowernumber=[% patron.borrowernumber | uri %]">Edit details</a>
442
                                                </span>
442
                                                </span>
443
                                            [% ELSIF ( patron.is_going_to_expire ) %]
443
                                            [% ELSIF ( patron.is_going_to_expire ) %]
444
                                                [% patron.dateexpiry | $KohaDates %]
444
                                                [% patron.dateexpiry | $KohaDates %]
445
                                                <strong><em>Patron expires soon</em></strong>
445
                                                <strong><em>Patron expires soon</em></strong>
446
                                                <a href="/cgi-bin/koha/members/setstatus.pl?borrowernumber=[% patron.borrowernumber | uri %]&amp;reregistration=y">Renew</a> or <a href="/cgi-bin/koha/members/memberentry.pl?op=edit_form&amp;borrowernumber=[% patron.borrowernumber | html %]">Edit details</a>
446
                                                <a href="/cgi-bin/koha/members/setstatus.pl?borrowernumber=[% patron.borrowernumber | uri %]&amp;reregistration=y">Renew</a> or <a href="/cgi-bin/koha/members/memberentry.pl?op=edit_form&amp;borrowernumber=[% patron.borrowernumber | uri %]">Edit details</a>
447
                                            [% ELSE %]
447
                                            [% ELSE %]
448
                                                [% patron.dateexpiry | $KohaDates %]
448
                                                [% patron.dateexpiry | $KohaDates %]
449
                                            [% END %]
449
                                            [% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/process_koc.tt (-4 / +3 lines)
Lines 53-61 Link Here
53
	</div>
53
	</div>
54
	[% END %]
54
	[% END %]
55
	[% IF ( message.ERROR_no_borrower_from_item ) %]<p>Warning: Unable to determine patron from item barcode ([% message.badbarcode | html %]). Cannot check in.</p>[% END %]
55
	[% IF ( message.ERROR_no_borrower_from_item ) %]<p>Warning: Unable to determine patron from item barcode ([% message.badbarcode | html %]). Cannot check in.</p>[% END %]
56
    [% IF ( message.issue ) %]<p>Checked out <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% message.biblionumber | uri %]">[% message.title | html %]</a> ([% message.barcode | html %]) to <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% message.borrowernumber | html %]">[% message.firstname | html %] [% message.surname | html %]</a> ([% message.cardnumber | html %]): [% message.datetime | html %]</p>[% END %]
56
    [% IF ( message.issue ) %]<p>Checked out <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% message.biblionumber | uri %]">[% message.title | html %]</a> ([% message.barcode | html %]) to <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% message.borrowernumber | uri %]">[% message.firstname | html %] [% message.surname | html %]</a> ([% message.cardnumber | html %]): [% message.datetime | html %]</p>[% END %]
57
    [% IF ( message.renew ) %]<p>Renewed <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% message.biblionumber | uri %]">[% message.title | html %]</a>  ([% message.barcode | html %]) for <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% message.borrowernumber | html %]">[% message.firstname | html %] [% message.surname | html %]</a> ([% message.cardnumber | html %]): [% message.datetime | html %]</p>[% END %]
57
    [% IF ( message.renew ) %]<p>Renewed <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% message.biblionumber | uri %]">[% message.title | html %]</a>  ([% message.barcode | html %]) for <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% message.borrowernumber | uri %]">[% message.firstname | html %] [% message.surname | html %]</a> ([% message.cardnumber | html %]): [% message.datetime | html %]</p>[% END %]
58
    [% IF ( message.return ) %]<p>Checked in <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% message.biblionumber | uri %]">[% message.title | html %]</a> ([% message.barcode | html %]) from <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% message.borrowernumber | html %]">[% message.firstname | html %] [% message.surname | html %]</a> ([% message.cardnumber | html %]): [% message.datetime | html %]</p>[% END %]
58
    [% IF ( message.return ) %]<p>Checked in <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% message.biblionumber | uri %]">[% message.title | html %]</a> ([% message.barcode | html %]) from <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% message.borrowernumber | uri %]">[% message.firstname | html %] [% message.surname | html %]</a> ([% message.cardnumber | html %]): [% message.datetime | html %]</p>[% END %]
59
    [% IF ( message.payment ) %]<p>Accepted payment ([% message.amount | html %]) from <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% message.borrowernumber | uri %]">[% message.firstname | html %] [% message.surname | html %]</a> ([% message.cardnumber | html %]): [% message.datetime | html %]</p>[% END %]
59
    [% IF ( message.payment ) %]<p>Accepted payment ([% message.amount | html %]) from <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% message.borrowernumber | uri %]">[% message.firstname | html %] [% message.surname | html %]</a> ([% message.cardnumber | html %]): [% message.datetime | html %]</p>[% END %]
60
  [% END %]
60
  [% END %]
61
[% ELSE %]
61
[% ELSE %]
62
- 

Return to bug 38872