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

(-)a/acqui/acqui-home.pl (-4 / +1 lines)
Lines 72-81 foreach my $budget ( @{$budget_arr} ) { Link Here
72
72
73
    my $patron = Koha::Patrons->find( $budget->{budget_owner_id} );
73
    my $patron = Koha::Patrons->find( $budget->{budget_owner_id} );
74
    if ( $patron ) {
74
    if ( $patron ) {
75
        # FIXME should pass the entire object into budget_owner
75
        $budget->{budget_owner} = $patron;
76
        $budget->{budget_owner_firstname} = $patron->firstname;
77
        $budget->{budget_owner_surname} = $patron->surname;
78
        $budget->{budget_owner_borrowernumber} = $patron->borrowernumber;
79
    }
76
    }
80
77
81
    if ( !defined $budget->{budget_amount} ) {
78
    if ( !defined $budget->{budget_amount} ) {
(-)a/acqui/booksellers.pl (-2 / +1 lines)
Lines 138-145 for my $vendor (@suppliers) { Link Here
138
                $basket->{$_} ||= 0;
138
                $basket->{$_} ||= 0;
139
            }
139
            }
140
            if ( $patron ) {
140
            if ( $patron ) {
141
                $basket->{authorisedby_firstname} = $patron->firstname;
141
                $basket->{authorisedby} = $patron;
142
                $basket->{authorisedby_surname} = $patron->surname;
143
            }
142
            }
144
            if ($basket->{basketgroupid}) {
143
            if ($basket->{basketgroupid}) {
145
                my $basketgroup = C4::Acquisition::GetBasketgroup($basket->{basketgroupid});
144
                my $basketgroup = C4::Acquisition::GetBasketgroup($basket->{basketgroupid});
(-)a/admin/aqbudgets.pl (-2 / +1 lines)
Lines 117-124 if ($op eq 'add_form') { Link Here
117
            exit;
117
            exit;
118
        }
118
        }
119
        $dropbox_disabled = BudgetHasChildren($budget_id);
119
        $dropbox_disabled = BudgetHasChildren($budget_id);
120
        my $patron = Koha::Patrons->find( $budget->{budget_owner_id} );
120
        $budget->{budget_owner} = Koha::Patrons->find( $budget->{budget_owner_id} );
121
        $budget->{budget_owner_name} = ( $patron ? $patron->firstname . ' ' . $patron->surname : '' );
122
    }
121
    }
123
122
124
    # build budget hierarchy
123
    # build budget hierarchy
(-)a/circ/branchtransfers.pl (-4 / +1 lines)
Lines 210-219 foreach my $code ( keys %$messages ) { Link Here
210
            $err{borrowernumber} = $messages->{'WasReturned'};
210
            $err{borrowernumber} = $messages->{'WasReturned'};
211
            my $patron = Koha::Patrons->find( $messages->{'WasReturned'} );
211
            my $patron = Koha::Patrons->find( $messages->{'WasReturned'} );
212
            if ( $patron ) { # Just in case...
212
            if ( $patron ) { # Just in case...
213
                $err{title}      = $patron->title;
213
                $err{patron} = $patron;
214
                $err{firstname}  = $patron->firstname;
215
                $err{surname}    = $patron->surname;
216
                $err{cardnumber} = $patron->cardnumber;
217
            }
214
            }
218
        }
215
        }
219
        $err{errdesteqholding} = ( $code eq 'DestinationEqualsHolding' );
216
        $err{errdesteqholding} = ( $code eq 'DestinationEqualsHolding' );
(-)a/circ/overdue.pl (-15 lines)
Lines 300-326 if ($noreport) { Link Here
300
        push @overduedata, {
300
        push @overduedata, {
301
            patron                 => scalar Koha::Patrons->find( $data->{borrowernumber} ),
301
            patron                 => scalar Koha::Patrons->find( $data->{borrowernumber} ),
302
            duedate                => $data->{date_due},
302
            duedate                => $data->{date_due},
303
            borrowernumber         => $data->{borrowernumber},
304
            barcode                => $data->{barcode},
303
            barcode                => $data->{barcode},
305
            cardnumber             => $data->{cardnumber},
306
            itemnum                => $data->{itemnumber},
304
            itemnum                => $data->{itemnumber},
307
            issuedate              => output_pref({ dt => dt_from_string( $data->{issuedate} ), dateonly => 1 }),
305
            issuedate              => output_pref({ dt => dt_from_string( $data->{issuedate} ), dateonly => 1 }),
308
            borrowertitle          => $data->{borrowertitle},
309
            surname                => $data->{surname},
310
            firstname              => $data->{firstname},
311
            streetnumber           => $data->{streetnumber},                   
312
            streettype             => $data->{streettype},                     
313
            address                => $data->{address},                        
314
            address2               => $data->{address2},                       
315
            city                   => $data->{city},                   
316
            zipcode                => $data->{zipcode},                        
317
            country                => $data->{country},
318
            phone                  => $data->{phone},
319
            email                  => $data->{email},
320
            biblionumber           => $data->{biblionumber},
306
            biblionumber           => $data->{biblionumber},
321
            title                  => $data->{title},
307
            title                  => $data->{title},
322
            author                 => $data->{author},
308
            author                 => $data->{author},
323
            branchcode             => $data->{branchcode},
324
            homebranchcode         => $data->{homebranchcode},
309
            homebranchcode         => $data->{homebranchcode},
325
            holdingbranchcode      => $data->{holdingbranchcode},
310
            holdingbranchcode      => $data->{holdingbranchcode},
326
            itemcallnumber         => $data->{itemcallnumber},
311
            itemcallnumber         => $data->{itemcallnumber},
(-)a/circ/transferstoreceive.pl (-7 / +1 lines)
Lines 114-126 while ( my $library = $libraries->next ) { Link Here
114
            # we check if we have a reserv for this transfer
114
            # we check if we have a reserv for this transfer
115
            my $holds = $item->current_holds;
115
            my $holds = $item->current_holds;
116
            if ( my $first_hold = $holds->next ) {
116
            if ( my $first_hold = $holds->next ) {
117
                my $patron = Koha::Patrons->find( $first_hold->borrowernumber );
117
                $getransf{patron} = Koha::Patrons->find( $first_hold->borrowernumber );
118
                # FIXME The full patron object should be passed to the template
119
                $getransf{'borrowernum'}       = $patron->borrowernumber;
120
                $getransf{'borrowername'}      = $patron->surname;
121
                $getransf{'borrowerfirstname'} = $patron->firstname;
122
                $getransf{'borrowermail'}      = $patron->email if $patron->email;
123
                $getransf{'borrowerphone'}     = $patron->phone;
124
            }
118
            }
125
            push( @transferloop, \%getransf );
119
            push( @transferloop, \%getransf );
126
        }
120
        }
(-)a/circ/waitingreserves.pl (-5 / +1 lines)
Lines 130-140 while ( my $hold = $holds->next ) { Link Here
130
        $getreserv{'dotransfer'} = 1;
130
        $getreserv{'dotransfer'} = 1;
131
    }
131
    }
132
132
133
    my $borEmail = $patron->first_valid_email_address;
133
    $getreserv{patron} = $patron;
134
135
    if ( $borEmail ) {
136
        $getreserv{'borrowermail'}  = $borEmail;
137
    }
138
134
139
    if ($today > $calcDate) {
135
    if ($today > $calcDate) {
140
        if ($cancelall) {
136
        if ($cancelall) {
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/borrower_debarments.inc (-2 / +2 lines)
Lines 40-46 Link Here
40
                        <td>[% d.created | $KohaDates %]</td>
40
                        <td>[% d.created | $KohaDates %]</td>
41
                        [% IF CAN_user_borrowers_edit_borrowers && CAN_user_circulate_manage_restrictions %]
41
                        [% IF CAN_user_borrowers_edit_borrowers && CAN_user_circulate_manage_restrictions %]
42
                            <td>
42
                            <td>
43
                                <a class="remove_restriction btn btn-default btn-xs" href="/cgi-bin/koha/members/mod_debarment.pl?borrowernumber=[% borrowernumber %]&amp;borrower_debarment_id=[% d.borrower_debarment_id %]&amp;action=del">
43
                                <a class="remove_restriction btn btn-default btn-xs" href="/cgi-bin/koha/members/mod_debarment.pl?borrowernumber=[% patron.borrowernumber %]&amp;borrower_debarment_id=[% d.borrower_debarment_id %]&amp;action=del">
44
                                    <i class="fa fa-trash"></i> Remove
44
                                    <i class="fa fa-trash"></i> Remove
45
                                </a>
45
                                </a>
46
                            </td>
46
                            </td>
Lines 53-59 Link Here
53
    [% IF CAN_user_borrowers_edit_borrowers && CAN_user_circulate_manage_restrictions %]
53
    [% IF CAN_user_borrowers_edit_borrowers && CAN_user_circulate_manage_restrictions %]
54
        <p><a href="#" id="add_manual_restriction"><i class="fa fa-plus"></i> Add manual restriction</a></p>
54
        <p><a href="#" id="add_manual_restriction"><i class="fa fa-plus"></i> Add manual restriction</a></p>
55
        <form method="post" action="/cgi-bin/koha/members/mod_debarment.pl" class="clearfix">
55
        <form method="post" action="/cgi-bin/koha/members/mod_debarment.pl" class="clearfix">
56
            <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
56
            <input type="hidden" name="borrowernumber" value="[% patron.borrowernumber %]" />
57
            <input type="hidden" name="action" value="add" />
57
            <input type="hidden" name="action" value="add" />
58
            <fieldset class="rows" id="manual_restriction_form">
58
            <fieldset class="rows" id="manual_restriction_form">
59
                <legend>Add manual restriction</legend>
59
                <legend>Add manual restriction</legend>
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc (-33 / +33 lines)
Lines 1-5 Link Here
1
[% USE Koha %]
1
[% USE Koha %]
2
[% IF ( borrowernumber ) %]
2
[% IF ( patron.borrowernumber ) %]
3
<div class="patroninfo"><h5>[% INCLUDE 'patron-title.inc' %]</h5>
3
<div class="patroninfo"><h5>[% INCLUDE 'patron-title.inc' %]</h5>
4
<!--[if IE 6]>
4
<!--[if IE 6]>
5
<style type="tex/css">img { width: expression(this.width > 140 ? 140: true);
5
<style type="tex/css">img { width: expression(this.width > 140 ? 140: true);
Lines 9-15 Link Here
9
    [% IF ( patronimages ) %]
9
    [% IF ( patronimages ) %]
10
        [% IF ( picture ) %]
10
        [% IF ( picture ) %]
11
            <li>
11
            <li>
12
                <img src="/cgi-bin/koha/members/patronimage.pl?borrowernumber=[% borrowernumber | uri %]" id="patronimage" alt="[% firstname | html %] [% surname | html %] ([% cardnumber | html %])" />
12
                <img src="/cgi-bin/koha/members/patronimage.pl?borrowernumber=[% patron.borrowernumber | uri %]" id="patronimage" alt="[% patron.firstname | html %] [% patron.surname | html %] ([% patron.cardnumber | html %])" />
13
            </li>
13
            </li>
14
        [% ELSE %]
14
        [% ELSE %]
15
            <li id="patronbasics">
15
            <li id="patronbasics">
Lines 23-58 Link Here
23
        [% INCLUDE 'member-display-address-style-us.inc' %]
23
        [% INCLUDE 'member-display-address-style-us.inc' %]
24
    [% END %]
24
    [% END %]
25
25
26
    [% IF ( phone || mobile || phonepro ) %]<li class="patronphone">
26
    [% IF ( patron.phone || patron.mobile || patron.phonepro ) %]<li class="patronphone">
27
    [% IF ( phone ) %]
27
    [% IF ( patron.phone ) %]
28
        <a href="tel:[% phone | url %]">[% phone | html %]</a>
28
        <a href="tel:[% patron.phone | url %]">[% patron.phone | html %]</a>
29
    [% ELSE %]
29
    [% ELSE %]
30
        [% IF ( mobile ) %]
30
        [% IF ( patron.mobile ) %]
31
            <a href="tel:[% mobile | url %]">[% mobile | html %]</a>
31
            <a href="tel:[% patron.mobile | url %]">[% patron.mobile | html %]</a>
32
        [% ELSE %]
32
        [% ELSE %]
33
            [% IF ( phonepro ) %]
33
            [% IF ( patron.phonepro ) %]
34
                <a href="tel:[% phonepro | url %]">[% phonepro | html %]</a>
34
                <a href="tel:[% patron.phonepro | url %]">[% patron.phonepro | html %]</a>
35
            [% END %]
35
            [% END %]
36
        [% END %]
36
        [% END %]
37
    [% END %]</li>[% END %]
37
    [% END %]</li>[% END %]
38
    [% IF ( email ) %]
38
    [% IF ( patron.email ) %]
39
        <li class="email"> <a href="mailto:[% email | url %]" title="[% email | html %]">[% email | html %]</a></li>
39
        <li class="email"> <a href="mailto:[% patron.email | url %]" title="[% patron.email | html %]">[% patron.email | html %]</a></li>
40
    [% ELSE %]
40
    [% ELSE %]
41
        [% IF ( emailpro ) %]
41
        [% IF ( patron.emailpro ) %]
42
            <li class="email"> <a href="mailto:[% emailpro | url %]" title="[% emailpro | html %]">[% emailpro | html %]</a></li>
42
            <li class="email"> <a href="mailto:[% patron.emailpro | url %]" title="[% patron.emailpro | html %]">[% patron.emailpro | html %]</a></li>
43
        [% END %]
43
        [% END %]
44
    [% END %]
44
    [% END %]
45
45
46
    [% UNLESS ( address or address2 ) %]
46
    [% UNLESS ( patron.address or patron.address2 ) %]
47
        <li><span class="empty" id="noaddressstored">No address stored.</span></li>
47
        <li><span class="empty" id="noaddressstored">No address stored.</span></li>
48
    [% END %]
48
    [% END %]
49
    [% UNLESS ( city ) %]
49
    [% UNLESS ( patron.city ) %]
50
        <li><span class="empty" id="nocitystored">No city stored.</span></li>
50
        <li><span class="empty" id="nocitystored">No city stored.</span></li>
51
    [% END %]
51
    [% END %]
52
    [% UNLESS ( phone or mobile or phonepro) %]
52
    [% UNLESS ( patron.phone or patron.mobile or patron.phonepro) %]
53
        <li> <span class="empty">No phone stored.</span></li>
53
        <li> <span class="empty">No phone stored.</span></li>
54
    [% END %]
54
    [% END %]
55
    [% UNLESS ( email or emailpro) %]
55
    [% UNLESS ( patron.email or patron.emailpro) %]
56
        <li> <span class="empty">No email stored.</span></li>
56
        <li> <span class="empty">No email stored.</span></li>
57
    [% END %]
57
    [% END %]
58
58
Lines 63-91 Link Here
63
            [% END %]
63
            [% END %]
64
        [% END %]
64
        [% END %]
65
    [% END %][% END %]
65
    [% END %][% END %]
66
    <li class="patroncategory">Category: [% categoryname %] ([% categorycode %])</li>
66
    <li class="patroncategory">Category: [% patron.category.description %] ([% patron.categorycode %])</li>
67
    <li class="patronlibrary">Home library: [% Branches.GetName( branchcode ) %]</li>
67
    <li class="patronlibrary">Home library: [% Branches.GetName( patron.branchcode ) %]</li>
68
</ul></div>
68
</ul></div>
69
<div id="menu">
69
<div id="menu">
70
<ul>
70
<ul>
71
    [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
71
    [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
72
        [% IF ( circview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% borrowernumber %]">Check out</a></li>
72
        [% IF ( circview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% patron.borrowernumber %]">Check out</a></li>
73
        [% IF Koha.Preference('BatchCheckouts') && Koha.Preference('BatchCheckoutsValidCategories').split('\|').grep('^' _ categorycode _ '$').size > 0 %]
73
        [% IF Koha.Preference('BatchCheckouts') && Koha.Preference('BatchCheckoutsValidCategories').split('\|').grep('^' _ patron.categorycode _ '$').size > 0 %]
74
          [% IF ( batch_checkout_view ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% borrowernumber %]&amp;batch=1">Batch check out</a></li>
74
          [% IF ( batch_checkout_view ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% patron.borrowernumber %]&amp;batch=1">Batch check out</a></li>
75
        [% END %]
75
        [% END %]
76
    [% END %]
76
    [% END %]
77
    [% IF CAN_user_borrowers_edit_borrowers %]
77
    [% IF CAN_user_borrowers_edit_borrowers %]
78
        [% IF ( detailview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]">Details</a></li>
78
        [% IF ( detailview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber %]">Details</a></li>
79
    [% END %]
79
    [% END %]
80
    [% IF ( CAN_user_updatecharges ) %]
80
    [% IF ( CAN_user_updatecharges ) %]
81
        [% IF ( finesview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% borrowernumber %]">Fines</a></li>
81
        [% IF ( finesview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% patron.borrowernumber %]">Fines</a></li>
82
    [% END %]
82
    [% END %]
83
    [% IF ( CAN_user_circulate_circulate_remaining_permissions  )  %]
83
    [% IF ( CAN_user_circulate_circulate_remaining_permissions  )  %]
84
        [% IF Koha.Preference("RoutingSerials") %][% IF ( routinglistview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/routing-lists.pl?borrowernumber=[% borrowernumber %]">Routing lists</a></li>[% END %]
84
        [% IF Koha.Preference("RoutingSerials") %][% IF ( routinglistview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/routing-lists.pl?borrowernumber=[% patron.borrowernumber %]">Routing lists</a></li>[% END %]
85
    [% END %]
85
    [% END %]
86
    [% IF CAN_user_borrowers_edit_borrowers %]
86
    [% IF CAN_user_borrowers_edit_borrowers %]
87
        [% IF ( intranetreadinghistory ) %]
87
        [% IF ( intranetreadinghistory ) %]
88
            [% IF ( readingrecordview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/readingrec.pl?borrowernumber=[% borrowernumber %]">Circulation history</a></li>
88
            [% IF ( readingrecordview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/readingrec.pl?borrowernumber=[% patron.borrowernumber %]">Circulation history</a></li>
89
        [% END %]
89
        [% END %]
90
    [% END %]
90
    [% END %]
91
    [% IF CAN_user_borrowers_edit_borrowers %]
91
    [% IF CAN_user_borrowers_edit_borrowers %]
Lines 94-121 Link Here
94
        [% END %]
94
        [% END %]
95
    [% END %]
95
    [% END %]
96
    [% IF ( CAN_user_parameters ) %]
96
    [% IF ( CAN_user_parameters ) %]
97
        [% IF ( logview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/tools/viewlog.pl?do_it=1&amp;modules=MEMBERS&amp;modules=circulation&amp;object=[% borrowernumber %]&amp;src=circ">Modification log</a></li>
97
        [% IF ( logview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/tools/viewlog.pl?do_it=1&amp;modules=MEMBERS&amp;modules=circulation&amp;object=[% patron.borrowernumber %]&amp;src=circ">Modification log</a></li>
98
    [% END %]
98
    [% END %]
99
    [% IF CAN_user_borrowers_edit_borrowers %]
99
    [% IF CAN_user_borrowers_edit_borrowers %]
100
	[% IF ( sentnotices ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/notices.pl?borrowernumber=[% borrowernumber %]">Notices</a></li>
100
	[% IF ( sentnotices ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/notices.pl?borrowernumber=[% patron.borrowernumber %]">Notices</a></li>
101
    [% END %]
101
    [% END %]
102
    [% IF CAN_user_borrowers_edit_borrowers %]
102
    [% IF CAN_user_borrowers_edit_borrowers %]
103
        [% IF (  statisticsview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/statistics.pl?borrowernumber=[% borrowernumber %]">Statistics</a></li>
103
        [% IF (  statisticsview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/statistics.pl?borrowernumber=[% patron.borrowernumber %]">Statistics</a></li>
104
    [% END %]
104
    [% END %]
105
    [% IF CAN_user_borrowers_edit_borrowers %]
105
    [% IF CAN_user_borrowers_edit_borrowers %]
106
        [% IF ( EnableBorrowerFiles ) %]
106
        [% IF ( EnableBorrowerFiles ) %]
107
            [% IF ( borrower_files ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/files.pl?borrowernumber=[% borrowernumber %]">Files</a></li>
107
            [% IF ( borrower_files ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/files.pl?borrowernumber=[% patron.borrowernumber %]">Files</a></li>
108
        [% END %]
108
        [% END %]
109
    [% END %]
109
    [% END %]
110
110
111
    [% IF CAN_user_borrowers_edit_borrowers %]
111
    [% IF CAN_user_borrowers_edit_borrowers %]
112
        [% IF ( suggestionsview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/purchase-suggestions.pl?borrowernumber=[% borrowernumber %]">Purchase suggestions</a></li>
112
        [% IF ( suggestionsview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/purchase-suggestions.pl?borrowernumber=[% patron.borrowernumber %]">Purchase suggestions</a></li>
113
    [% END %]
113
    [% END %]
114
    [% IF CAN_user_borrowers_edit_borrowers && useDischarge %]
114
    [% IF CAN_user_borrowers_edit_borrowers && useDischarge %]
115
        [% IF dischargeview %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/discharge.pl?borrowernumber=[% borrowernumber %]">Discharges</a></li>
115
        [% IF dischargeview %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/discharge.pl?borrowernumber=[% patron.borrowernumber %]">Discharges</a></li>
116
    [% END %]
116
    [% END %]
117
    [% IF Koha.Preference('HouseboundModule') %]
117
    [% IF Koha.Preference('HouseboundModule') %]
118
        [% IF houseboundview %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/housebound.pl?borrowernumber=[% borrowernumber %]">Housebound</a></li>
118
        [% IF houseboundview %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/housebound.pl?borrowernumber=[% patron.borrowernumber %]">Housebound</a></li>
119
    [% END %]
119
    [% END %]
120
    [% IF Koha.Preference('ILLModule') %]
120
    [% IF Koha.Preference('ILLModule') %]
121
        <li><a href="/cgi-bin/koha/ill/ill-requests.pl?borrowernumber=[% borrowernumber %]">Interlibrary loans</a></li>
121
        <li><a href="/cgi-bin/koha/ill/ill-requests.pl?borrowernumber=[% borrowernumber %]">Interlibrary loans</a></li>
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-address-style-de.inc (-11 / +11 lines)
Lines 8-14 Link Here
8
                    <label for="B_address">
8
                    <label for="B_address">
9
                [% END %]
9
                [% END %]
10
                Address: </label>
10
                Address: </label>
11
                    <input type="text" id="B_address" name="B_address" size="40" value="[% B_address %]" />
11
                    <input type="text" id="B_address" name="B_address" size="40" value="[% patron.B_address %]" />
12
      [% IF ( mandatoryB_address ) %]<span class="required">Required</span>[% END %]
12
      [% IF ( mandatoryB_address ) %]<span class="required">Required</span>[% END %]
13
            </li>
13
            </li>
14
        [% END %]
14
        [% END %]
Lines 24-30 Link Here
24
            <select name="B_streettype">
24
            <select name="B_streettype">
25
            <option value=""></option>
25
            <option value=""></option>
26
            [% FOR roadtype IN roadtypes %]
26
            [% FOR roadtype IN roadtypes %]
27
                [% IF roadtype.authorised_value == B_streettype %]
27
                [% IF roadtype.authorised_value == patron.B_streettype %]
28
                    <option value="[% roadtype.authorised_value %]" selected="selected">[% roadtype.lib %]</option>
28
                    <option value="[% roadtype.authorised_value %]" selected="selected">[% roadtype.lib %]</option>
29
                [% ELSE %]
29
                [% ELSE %]
30
                    <option value="[% roadtype.authorised_value %]">[% roadtype.lib %]</option>
30
                    <option value="[% roadtype.authorised_value %]">[% roadtype.lib %]</option>
Lines 43-49 Link Here
43
                    <label for="B_streetnumber">
43
                    <label for="B_streetnumber">
44
                [% END %]
44
                [% END %]
45
                Street Number: </label>
45
                Street Number: </label>
46
                    <input type="text" id="B_streetnumber" name="B_streetnumber" size="5" value="[% B_streetnumber %]" />
46
                    <input type="text" id="B_streetnumber" name="B_streetnumber" size="5" value="[% patron.B_streetnumber %]" />
47
                [% IF ( mandatoryB_streetnumber ) %]<span class="required">Required</span>[% END %]
47
                [% IF ( mandatoryB_streetnumber ) %]<span class="required">Required</span>[% END %]
48
            </li>
48
            </li>
49
        [% END %]
49
        [% END %]
Lines 56-62 Link Here
56
                    <label for="B_address2">
56
                    <label for="B_address2">
57
                [% END %]
57
                [% END %]
58
                Address 2: </label>
58
                Address 2: </label>
59
                    <input type="text" id="B_address2" name="B_address2" size="40" value="[% B_address2 %]" />
59
                    <input type="text" id="B_address2" name="B_address2" size="40" value="[% patron.B_address2 %]" />
60
      [% IF ( mandatoryB_address2 ) %]<span class="required">Required</span>[% END %]
60
      [% IF ( mandatoryB_address2 ) %]<span class="required">Required</span>[% END %]
61
            </li>
61
            </li>
62
        [% END %]
62
        [% END %]
Lines 68-74 Link Here
68
                                        <label for="B_zipcode">
68
                                        <label for="B_zipcode">
69
                                [% END %]
69
                                [% END %]
70
                                ZIP/Postal code: </label>
70
                                ZIP/Postal code: </label>
71
                    <input type="text" id="B_zipcode" name="B_zipcode" maxlength="10" size="10" value="[% B_zipcode %]" />
71
                    <input type="text" id="B_zipcode" name="B_zipcode" maxlength="10" size="10" value="[% patron.B_zipcode %]" />
72
          [% IF ( mandatoryB_zipcode ) %]<span class="required">Required</span>[% END %]
72
          [% IF ( mandatoryB_zipcode ) %]<span class="required">Required</span>[% END %]
73
                        </li>
73
                        </li>
74
        [% END %]
74
        [% END %]
Lines 80-86 Link Here
80
                    <label for="B_city">
80
                    <label for="B_city">
81
                [% END %]
81
                [% END %]
82
                City: </label>
82
                City: </label>
83
                <input type="text" id="B_city" name="B_city" size="20" value="[% B_city %]" />
83
                <input type="text" id="B_city" name="B_city" size="20" value="[% patron.B_city %]" />
84
      [% IF ( mandatoryB_city ) %]<span class="required">Required</span>[% END %]
84
      [% IF ( mandatoryB_city ) %]<span class="required">Required</span>[% END %]
85
            </li>
85
            </li>
86
        [% END %]
86
        [% END %]
Lines 92-98 Link Here
92
                    <label for="B_state">
92
                    <label for="B_state">
93
                [% END %]
93
                [% END %]
94
                State: </label>
94
                State: </label>
95
                <input type="text" id="B_state" name="B_state" size="20" value="[% B_state %]" />
95
                <input type="text" id="B_state" name="B_state" size="20" value="[% patron.B_state %]" />
96
      [% IF ( mandatoryB_state ) %]<span class="required">Required</span>[% END %]
96
      [% IF ( mandatoryB_state ) %]<span class="required">Required</span>[% END %]
97
            </li>
97
            </li>
98
        [% END %]
98
        [% END %]
Lines 104-110 Link Here
104
                    <label for="B_country">
104
                    <label for="B_country">
105
                [% END %]
105
                [% END %]
106
                Country: </label>
106
                Country: </label>
107
                    <input type="text" id="B_country" name="B_country" size="20" value="[% B_country %]" />
107
                    <input type="text" id="B_country" name="B_country" size="20" value="[% patron.B_country %]" />
108
      [% IF ( mandatoryB_country ) %]<span class="required">Required</span>[% END %]
108
      [% IF ( mandatoryB_country ) %]<span class="required">Required</span>[% END %]
109
            </li>
109
            </li>
110
        [% END %]
110
        [% END %]
Lines 116-122 Link Here
116
                <label for="B_phone">
116
                <label for="B_phone">
117
                [% END %]
117
                [% END %]
118
                Phone: </label>
118
                Phone: </label>
119
                    <input type="text" id="B_phone" name="B_phone" value="[% B_phone %]" />
119
                    <input type="text" id="B_phone" name="B_phone" value="[% patron.B_phone %]" />
120
                [% IF ( mandatoryB_phone ) %]<span class="required">Required</span>[% END %]
120
                [% IF ( mandatoryB_phone ) %]<span class="required">Required</span>[% END %]
121
            </li>
121
            </li>
122
        [% END %]
122
        [% END %]
Lines 128-134 Link Here
128
          <label for="B_email">
128
          <label for="B_email">
129
        [% END %]
129
        [% END %]
130
        Email: </label>
130
        Email: </label>
131
            <input type="text" id="B_email" name="B_email" size="45" value="[% B_email %]" />
131
            <input type="text" id="B_email" name="B_email" size="45" value="[% patron.B_email %]" />
132
        [% IF ( mandatoryB_email ) %]<span class="required">Required</span>[% END %] </li>
132
        [% IF ( mandatoryB_email ) %]<span class="required">Required</span>[% END %] </li>
133
        [% END %]
133
        [% END %]
134
        [% UNLESS nocontactnote %]
134
        [% UNLESS nocontactnote %]
Lines 139-145 Link Here
139
                <label for="contactnote">
139
                <label for="contactnote">
140
                [% END %]
140
                [% END %]
141
                Contact note: </label>
141
                Contact note: </label>
142
                <textarea id="contactnote" name="contactnote" cols="40" rows="2">[% contactnote %]</textarea>
142
                <textarea id="contactnote" name="contactnote" cols="40" rows="2">[% patron.contactnote %]</textarea>
143
        [% IF ( mandatorycontactnote ) %]<span class="required">Required</span>[% END %]
143
        [% IF ( mandatorycontactnote ) %]<span class="required">Required</span>[% END %]
144
            </li>
144
            </li>
145
        [% END %]
145
        [% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-address-style-fr.inc (-11 / +11 lines)
Lines 9-15 Link Here
9
         <label for="B_streetnumber">
9
         <label for="B_streetnumber">
10
    [% END %]
10
    [% END %]
11
    Street Number: </label>
11
    Street Number: </label>
12
    <input type="text" id="B_streetnumber" name="B_streetnumber" size="5" value="[% B_streetnumber %]" />
12
    <input type="text" id="B_streetnumber" name="B_streetnumber" size="5" value="[% patron.B_streetnumber %]" />
13
    [% IF ( mandatoryB_streetnumber ) %]<span class="required">Required</span>[% END %]
13
    [% IF ( mandatoryB_streetnumber ) %]<span class="required">Required</span>[% END %]
14
    </li>
14
    </li>
15
[% END %]
15
[% END %]
Lines 25-31 Link Here
25
    <select name="B_streettype">
25
    <select name="B_streettype">
26
    <option value=""></option>
26
    <option value=""></option>
27
    [% FOR roadtype IN roadtypes %]
27
    [% FOR roadtype IN roadtypes %]
28
        [% IF roadtype.authorised_value == B_streettype %]
28
        [% IF roadtype.authorised_value == patron.B_streettype %]
29
            <option value="[% roadtype.authorised_value %]" selected="selected">[% roadtype.lib %]</option>
29
            <option value="[% roadtype.authorised_value %]" selected="selected">[% roadtype.lib %]</option>
30
        [% ELSE %]
30
        [% ELSE %]
31
            <option value="[% roadtype.authorised_value %]">[% roadtype.lib %]</option>
31
            <option value="[% roadtype.authorised_value %]">[% roadtype.lib %]</option>
Lines 44-50 Link Here
44
        <label for="B_address">
44
        <label for="B_address">
45
    [% END %]
45
    [% END %]
46
        Address: </label>
46
        Address: </label>
47
        <input type="text" id="B_address" name="B_address" size="40" value="[% B_address %]" />
47
        <input type="text" id="B_address" name="B_address" size="40" value="[% patron.B_address %]" />
48
    [% IF ( mandatoryB_address ) %]<span class="required">Required</span>[% END %]
48
    [% IF ( mandatoryB_address ) %]<span class="required">Required</span>[% END %]
49
        </li>
49
        </li>
50
[% END %]
50
[% END %]
Lines 57-63 Link Here
57
        <label for="B_address2">
57
        <label for="B_address2">
58
    [% END %]
58
    [% END %]
59
    Address 2: </label>
59
    Address 2: </label>
60
    <input type="text" id="B_address2" name="B_address2" size="40" value="[% B_address2 %]" />
60
    <input type="text" id="B_address2" name="B_address2" size="40" value="[% patron.B_address2 %]" />
61
    [% IF ( mandatoryB_address2 ) %]<span class="required">Required</span>[% END %]
61
    [% IF ( mandatoryB_address2 ) %]<span class="required">Required</span>[% END %]
62
    </li>
62
    </li>
63
[% END %]
63
[% END %]
Lines 69-75 Link Here
69
        <label for="B_zipcode">
69
        <label for="B_zipcode">
70
    [% END %]
70
    [% END %]
71
    ZIP/Postal code: </label>
71
    ZIP/Postal code: </label>
72
    <input type="text" id="B_zipcode" name="B_zipcode" maxlength="10" size="10" value="[% B_zipcode %]" />
72
    <input type="text" id="B_zipcode" name="B_zipcode" maxlength="10" size="10" value="[% patron.B_zipcode %]" />
73
    [% IF ( mandatoryB_zipcode ) %]<span class="required">Required</span>[% END %]
73
    [% IF ( mandatoryB_zipcode ) %]<span class="required">Required</span>[% END %]
74
    </li>
74
    </li>
75
[% END %]
75
[% END %]
Lines 81-87 Link Here
81
        <label for="B_city">
81
        <label for="B_city">
82
    [% END %]
82
    [% END %]
83
    City: </label>
83
    City: </label>
84
    <input type="text" id="B_city" name="B_city" size="20" value="[% B_city %]" />
84
    <input type="text" id="B_city" name="B_city" size="20" value="[% patron.B_city %]" />
85
    [% IF ( mandatoryB_city ) %]<span class="required">Required</span>[% END %]
85
    [% IF ( mandatoryB_city ) %]<span class="required">Required</span>[% END %]
86
    </li>
86
    </li>
87
[% END %]
87
[% END %]
Lines 93-99 Link Here
93
        <label for="B_state">
93
        <label for="B_state">
94
    [% END %]
94
    [% END %]
95
        State: </label>
95
        State: </label>
96
        <input type="text" id="B_state" name="B_state" size="20" value="[% B_state %]" />
96
        <input type="text" id="B_state" name="B_state" size="20" value="[% patron.B_state %]" />
97
    [% IF ( mandatoryB_state ) %]<span class="required">Required</span>[% END %]
97
    [% IF ( mandatoryB_state ) %]<span class="required">Required</span>[% END %]
98
    </li>
98
    </li>
99
[% END %]
99
[% END %]
Lines 105-111 Link Here
105
        <label for="B_country">
105
        <label for="B_country">
106
    [% END %]
106
    [% END %]
107
        Country: </label>
107
        Country: </label>
108
        <input type="text" id="B_country" name="B_country" size="20" value="[% B_country %]" />
108
        <input type="text" id="B_country" name="B_country" size="20" value="[% patron.B_country %]" />
109
    [% IF ( mandatoryB_country ) %]<span class="required">Required</span>[% END %]
109
    [% IF ( mandatoryB_country ) %]<span class="required">Required</span>[% END %]
110
    </li>
110
    </li>
111
[% END %]
111
[% END %]
Lines 117-123 Link Here
117
       <label for="B_phone">
117
       <label for="B_phone">
118
   [% END %]
118
   [% END %]
119
   Phone: </label>
119
   Phone: </label>
120
   <input type="text" id="B_phone" name="B_phone" value="[% B_phone %]" />
120
   <input type="text" id="B_phone" name="B_phone" value="[% patron.B_phone %]" />
121
   [% IF ( mandatoryB_phone ) %]<span class="required">Required</span>[% END %]
121
   [% IF ( mandatoryB_phone ) %]<span class="required">Required</span>[% END %]
122
   </li>
122
   </li>
123
[% END %]
123
[% END %]
Lines 129-135 Link Here
129
       <label for="B_email">
129
       <label for="B_email">
130
   [% END %]
130
   [% END %]
131
       Email: </label>
131
       Email: </label>
132
       <input type="text" id="B_email" name="B_email" size="45" value="[% B_email %]" />
132
       <input type="text" id="B_email" name="B_email" size="45" value="[% patron.B_email %]" />
133
   [% IF ( mandatoryB_email ) %]<span class="required">Required</span>[% END %] </li>
133
   [% IF ( mandatoryB_email ) %]<span class="required">Required</span>[% END %] </li>
134
[% END %]
134
[% END %]
135
[% UNLESS nocontactnote %]
135
[% UNLESS nocontactnote %]
Lines 140-146 Link Here
140
        <label for="contactnote">
140
        <label for="contactnote">
141
    [% END %]
141
    [% END %]
142
        Contact note: </label>
142
        Contact note: </label>
143
        <textarea id="contactnote" name="contactnote" cols="40" rows="2">[% contactnote %]</textarea>
143
        <textarea id="contactnote" name="contactnote" cols="40" rows="2">[% patron.contactnote %]</textarea>
144
    [% IF ( mandatorycontactnote ) %]<span class="required">Required</span>[% END %]
144
    [% IF ( mandatorycontactnote ) %]<span class="required">Required</span>[% END %]
145
        </li>
145
        </li>
146
    [% END %]
146
    [% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-address-style-us.inc (-10 / +10 lines)
Lines 8-14 Link Here
8
                    <label for="B_streetnumber">
8
                    <label for="B_streetnumber">
9
                [% END %]
9
                [% END %]
10
                Street Number: </label>
10
                Street Number: </label>
11
                <input type="text" id="B_streetnumber" name="B_streetnumber" size="5" value="[% B_streetnumber %]" />
11
                <input type="text" id="B_streetnumber" name="B_streetnumber" size="5" value="[% patron.B_streetnumber %]" />
12
               [% IF ( mandatoryB_streetnumber ) %]<span class="required">Required</span>[% END %]
12
               [% IF ( mandatoryB_streetnumber ) %]<span class="required">Required</span>[% END %]
13
            </li>
13
            </li>
14
        [% END %]
14
        [% END %]
Lines 24-30 Link Here
24
        <select name="B_streettype">
24
        <select name="B_streettype">
25
        <option value=""></option>
25
        <option value=""></option>
26
        [% FOR roadtype IN roadtypes %]
26
        [% FOR roadtype IN roadtypes %]
27
            [% IF roadtype.authorised_value == B_streettype %]
27
            [% IF roadtype.authorised_value == patron.B_streettype %]
28
                <option value="[% roadtype.authorised_value %]" selected="selected">[% roadtype.lib %]</option>
28
                <option value="[% roadtype.authorised_value %]" selected="selected">[% roadtype.lib %]</option>
29
            [% ELSE %]
29
            [% ELSE %]
30
                <option value="[% roadtype.authorised_value %]">[% roadtype.lib %]</option>
30
                <option value="[% roadtype.authorised_value %]">[% roadtype.lib %]</option>
Lines 43-49 Link Here
43
                    <label for="B_address">
43
                    <label for="B_address">
44
                [% END %]
44
                [% END %]
45
                Address: </label>
45
                Address: </label>
46
                    <input type="text" id="B_address" name="B_address" size="40" value="[% B_address %]" />
46
                    <input type="text" id="B_address" name="B_address" size="40" value="[% patron.B_address %]" />
47
      [% IF ( mandatoryB_address ) %]<span class="required">Required</span>[% END %]
47
      [% IF ( mandatoryB_address ) %]<span class="required">Required</span>[% END %]
48
            </li>
48
            </li>
49
        [% END %]
49
        [% END %]
Lines 55-61 Link Here
55
                    <label for="B_address2">
55
                    <label for="B_address2">
56
                [% END %]
56
                [% END %]
57
                Address 2: </label>
57
                Address 2: </label>
58
                    <input type="text" id="B_address2" name="B_address2" size="40" value="[% B_address2 %]" />
58
                    <input type="text" id="B_address2" name="B_address2" size="40" value="[% patron.B_address2 %]" />
59
      [% IF ( mandatoryB_address2 ) %]<span class="required">Required</span>[% END %]
59
      [% IF ( mandatoryB_address2 ) %]<span class="required">Required</span>[% END %]
60
            </li>
60
            </li>
61
        [% END %]
61
        [% END %]
Lines 67-73 Link Here
67
                    <label for="B_city">
67
                    <label for="B_city">
68
                [% END %]
68
                [% END %]
69
                City: </label>
69
                City: </label>
70
                <input type="text" id="B_city" name="B_city" size="20" value="[% B_city %]" />
70
                <input type="text" id="B_city" name="B_city" size="20" value="[% patron.B_city %]" />
71
      [% IF ( mandatoryB_city ) %]<span class="required">Required</span>[% END %]
71
      [% IF ( mandatoryB_city ) %]<span class="required">Required</span>[% END %]
72
            </li>
72
            </li>
73
        [% END %]
73
        [% END %]
Lines 79-85 Link Here
79
                    <label for="B_state">
79
                    <label for="B_state">
80
                [% END %]
80
                [% END %]
81
                State: </label>
81
                State: </label>
82
                <input type="text" id="B_state" name="B_state" size="20" value="[% B_state %]" />
82
                <input type="text" id="B_state" name="B_state" size="20" value="[% patron.B_state %]" />
83
      [% IF ( mandatoryB_state ) %]<span class="required">Required</span>[% END %]
83
      [% IF ( mandatoryB_state ) %]<span class="required">Required</span>[% END %]
84
            </li>
84
            </li>
85
        [% END %]
85
        [% END %]
Lines 91-97 Link Here
91
                    <label for="B_zipcode">
91
                    <label for="B_zipcode">
92
                [% END %]
92
                [% END %]
93
                ZIP/Postal code: </label>
93
                ZIP/Postal code: </label>
94
                    <input type="text" id="B_zipcode" name="B_zipcode" maxlength="10" size="10" value="[% B_zipcode %]" />
94
                    <input type="text" id="B_zipcode" name="B_zipcode" maxlength="10" size="10" value="[% patron.B_zipcode %]" />
95
      [% IF ( mandatoryB_zipcode ) %]<span class="required">Required</span>[% END %]
95
      [% IF ( mandatoryB_zipcode ) %]<span class="required">Required</span>[% END %]
96
            </li>
96
            </li>
97
        [% END %]
97
        [% END %]
Lines 103-109 Link Here
103
                    <label for="B_country">
103
                    <label for="B_country">
104
                [% END %]
104
                [% END %]
105
                Country: </label>
105
                Country: </label>
106
                    <input type="text" id="B_country" name="B_country" size="20" value="[% B_country %]" />
106
                    <input type="text" id="B_country" name="B_country" size="20" value="[% patron.B_country %]" />
107
      [% IF ( mandatoryB_country ) %]<span class="required">Required</span>[% END %]
107
      [% IF ( mandatoryB_country ) %]<span class="required">Required</span>[% END %]
108
            </li>
108
            </li>
109
        [% END %]
109
        [% END %]
Lines 115-121 Link Here
115
                <label for="B_phone">
115
                <label for="B_phone">
116
                [% END %]
116
                [% END %]
117
                Phone: </label>
117
                Phone: </label>
118
                    <input type="text" id="B_phone" name="B_phone" value="[% B_phone %]" />
118
                    <input type="text" id="B_phone" name="B_phone" value="[% patron.B_phone %]" />
119
                [% IF ( mandatoryB_phone ) %]<span class="required">Required</span>[% END %]
119
                [% IF ( mandatoryB_phone ) %]<span class="required">Required</span>[% END %]
120
            </li>
120
            </li>
121
        [% END %]
121
        [% END %]
Lines 127-133 Link Here
127
          <label for="B_email">
127
          <label for="B_email">
128
        [% END %]
128
        [% END %]
129
        Email: </label>
129
        Email: </label>
130
            <input type="text" id="B_email" name="B_email" size="45" value="[% B_email %]" />
130
            <input type="text" id="B_email" name="B_email" size="45" value="[% patron.B_email %]" />
131
        [% IF ( mandatoryB_email ) %]<span class="required">Required</span>[% END %] </li>
131
        [% IF ( mandatoryB_email ) %]<span class="required">Required</span>[% END %] </li>
132
        [% END %]
132
        [% END %]
133
        [% UNLESS nocontactnote %]
133
        [% UNLESS nocontactnote %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-contact-style-de.inc (-9 / +9 lines)
Lines 8-14 Link Here
8
                <label for="altcontactsurname">
8
                <label for="altcontactsurname">
9
                [% END %]
9
                [% END %]
10
                Surname:</label>
10
                Surname:</label>
11
                    <input type="text" name="altcontactsurname" id="altcontactsurname" value="[% altcontactsurname %]" />
11
                    <input type="text" name="altcontactsurname" id="altcontactsurname" value="[% patron.altcontactsurname %]" />
12
                [% IF ( mandatoryaltcontactsurname ) %]<span class="required">Required</span>[% END %]
12
                [% IF ( mandatoryaltcontactsurname ) %]<span class="required">Required</span>[% END %]
13
            </li>
13
            </li>
14
        [% END %]
14
        [% END %]
Lines 20-26 Link Here
20
                <label for="altcontactfirstname">
20
                <label for="altcontactfirstname">
21
                [% END %]
21
                [% END %]
22
                First name:</label>
22
                First name:</label>
23
                    <input type="text" name="altcontactfirstname" id="altcontactfirstname" value="[% altcontactfirstname %]" />
23
                    <input type="text" name="altcontactfirstname" id="altcontactfirstname" value="[% patron.altcontactfirstname %]" />
24
                [% IF ( mandatoryaltcontactfirstname ) %]<span class="required">Required</span>[% END %]
24
                [% IF ( mandatoryaltcontactfirstname ) %]<span class="required">Required</span>[% END %]
25
            </li>
25
            </li>
26
        [% END %]
26
        [% END %]
Lines 32-38 Link Here
32
                <label for="altcontactaddress1">
32
                <label for="altcontactaddress1">
33
                [% END %]
33
                [% END %]
34
                Address:</label>
34
                Address:</label>
35
                    <input type="text" name="altcontactaddress1" id="altcontactaddress1" value="[% altcontactaddress1 %]" size="40" />
35
                    <input type="text" name="altcontactaddress1" id="altcontactaddress1" value="[% patron.altcontactaddress1 %]" size="40" />
36
                [% IF ( mandatoryaltcontactaddress1 ) %]<span class="required">Required</span>[% END %]
36
                [% IF ( mandatoryaltcontactaddress1 ) %]<span class="required">Required</span>[% END %]
37
            </li>
37
            </li>
38
        [% END %]
38
        [% END %]
Lines 44-50 Link Here
44
                <label for="altcontactaddress2">
44
                <label for="altcontactaddress2">
45
                [% END %]
45
                [% END %]
46
                Address 2:</label>
46
                Address 2:</label>
47
                <input type="text" name="altcontactaddress2" id="altcontactaddress2" value="[% altcontactaddress2 %]" size="40" />
47
                <input type="text" name="altcontactaddress2" id="altcontactaddress2" value="[% patron.altcontactaddress2 %]" size="40" />
48
                [% IF ( mandatoryaltcontactaddress2 ) %]<span class="required">Required</span>[% END %]
48
                [% IF ( mandatoryaltcontactaddress2 ) %]<span class="required">Required</span>[% END %]
49
            </li>
49
            </li>
50
        [% END %]
50
        [% END %]
Lines 56-62 Link Here
56
                                <label for="altcontactzipcode">
56
                                <label for="altcontactzipcode">
57
                                [% END %]
57
                                [% END %]
58
                                ZIP/Postal code:</label>
58
                                ZIP/Postal code:</label>
59
                    <input type="text" name="altcontactzipcode" id="altcontactzipcode" value="[% altcontactzipcode %]" size="5" />
59
                    <input type="text" name="altcontactzipcode" id="altcontactzipcode" value="[% patron.altcontactzipcode %]" size="5" />
60
                                [% IF ( mandatoryaltcontactzipcode ) %]<span class="required">Required</span>[% END %]
60
                                [% IF ( mandatoryaltcontactzipcode ) %]<span class="required">Required</span>[% END %]
61
                        </li>
61
                        </li>
62
        [% END %]
62
        [% END %]
Lines 68-74 Link Here
68
                <label for="altcontactaddress3">
68
                <label for="altcontactaddress3">
69
                [% END %]
69
                [% END %]
70
                City:</label>
70
                City:</label>
71
                <input type="text" name="altcontactaddress3" id="altcontactaddress3" value="[% altcontactaddress3 %]" size="20" />
71
                <input type="text" name="altcontactaddress3" id="altcontactaddress3" value="[% patron.altcontactaddress3 %]" size="20" />
72
                [% IF ( mandatoryaltcontactaddress3 ) %]<span class="required">Required</span>[% END %]
72
                [% IF ( mandatoryaltcontactaddress3 ) %]<span class="required">Required</span>[% END %]
73
            </li>
73
            </li>
74
        [% END %]
74
        [% END %]
Lines 80-86 Link Here
80
                <label for="altcontactstate">
80
                <label for="altcontactstate">
81
                [% END %]
81
                [% END %]
82
                State:</label>
82
                State:</label>
83
                <input type="text" name="altcontactstate" id="altcontactstate" value="[% altcontactstate %]" size="20" />
83
                <input type="text" name="altcontactstate" id="altcontactstate" value="[% patron.altcontactstate %]" size="20" />
84
                [% IF ( mandatoryaltcontactstate ) %]<span class="required">Required</span>[% END %]
84
                [% IF ( mandatoryaltcontactstate ) %]<span class="required">Required</span>[% END %]
85
            </li>
85
            </li>
86
        [% END %]
86
        [% END %]
Lines 92-98 Link Here
92
                <label for="altcontactcountry">
92
                <label for="altcontactcountry">
93
                [% END %]
93
                [% END %]
94
                Country:</label>
94
                Country:</label>
95
                    <input type="text" name="altcontactcountry" id="altcontactcountry" value="[% altcontactcountry %]" size="20" />
95
                    <input type="text" name="altcontactcountry" id="altcontactcountry" value="[% patron.altcontactcountry %]" size="20" />
96
                [% IF ( mandatoryaltcontactcountry ) %]<span class="required">Required</span>[% END %]
96
                [% IF ( mandatoryaltcontactcountry ) %]<span class="required">Required</span>[% END %]
97
            </li>
97
            </li>
98
        [% END %]
98
        [% END %]
Lines 104-110 Link Here
104
                <label for="altcontactphone">
104
                <label for="altcontactphone">
105
                [% END %]
105
                [% END %]
106
                Phone:</label>
106
                Phone:</label>
107
                    <input type="text" name="altcontactphone" id="altcontactphone" value="[% altcontactphone %]" />
107
                    <input type="text" name="altcontactphone" id="altcontactphone" value="[% patron.altcontactphone %]" />
108
                [% IF ( mandatoryaltcontactphone ) %]<span class="required">Required</span>[% END %]
108
                [% IF ( mandatoryaltcontactphone ) %]<span class="required">Required</span>[% END %]
109
            </li>
109
            </li>
110
        [% END %]
110
        [% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-contact-style-fr.inc (-9 / +9 lines)
Lines 8-14 Link Here
8
        <label for="altcontactsurname">
8
        <label for="altcontactsurname">
9
    [% END %]
9
    [% END %]
10
    Surname:</label>
10
    Surname:</label>
11
    <input type="text" name="altcontactsurname" id="altcontactsurname" value="[% altcontactsurname %]" />
11
    <input type="text" name="altcontactsurname" id="altcontactsurname" value="[% patron.altcontactsurname %]" />
12
    [% IF ( mandatoryaltcontactsurname ) %]<span class="required">Required</span>[% END %]
12
    [% IF ( mandatoryaltcontactsurname ) %]<span class="required">Required</span>[% END %]
13
    </li>
13
    </li>
14
[% END %]
14
[% END %]
Lines 20-26 Link Here
20
        <label for="altcontactfirstname">
20
        <label for="altcontactfirstname">
21
    [% END %]
21
    [% END %]
22
        First name:</label>
22
        First name:</label>
23
        <input type="text" name="altcontactfirstname" id="altcontactfirstname" value="[% altcontactfirstname %]" />
23
        <input type="text" name="altcontactfirstname" id="altcontactfirstname" value="[% patron.altcontactfirstname %]" />
24
    [% IF ( mandatoryaltcontactfirstname ) %]<span class="required">Required</span>[% END %]
24
    [% IF ( mandatoryaltcontactfirstname ) %]<span class="required">Required</span>[% END %]
25
    </li>
25
    </li>
26
[% END %]
26
[% END %]
Lines 32-38 Link Here
32
        <label for="altcontactaddress1">
32
        <label for="altcontactaddress1">
33
    [% END %]
33
    [% END %]
34
    Address:</label>
34
    Address:</label>
35
    <input type="text" name="altcontactaddress1" id="altcontactaddress1" value="[% altcontactaddress1 %]" size="40" />
35
    <input type="text" name="altcontactaddress1" id="altcontactaddress1" value="[% patron.altcontactaddress1 %]" size="40" />
36
    [% IF ( mandatoryaltcontactaddress1 ) %]<span class="required">Required</span>[% END %]
36
    [% IF ( mandatoryaltcontactaddress1 ) %]<span class="required">Required</span>[% END %]
37
    </li>
37
    </li>
38
[% END %]
38
[% END %]
Lines 44-50 Link Here
44
        <label for="altcontactaddress2">
44
        <label for="altcontactaddress2">
45
    [% END %]
45
    [% END %]
46
    Address 2:</label>
46
    Address 2:</label>
47
    <input type="text" name="altcontactaddress2" id="altcontactaddress2" value="[% altcontactaddress2 %]" size="40" />
47
    <input type="text" name="altcontactaddress2" id="altcontactaddress2" value="[% patron.altcontactaddress2 %]" size="40" />
48
    [% IF ( mandatoryaltcontactaddress2 ) %]<span class="required">Required</span>[% END %]
48
    [% IF ( mandatoryaltcontactaddress2 ) %]<span class="required">Required</span>[% END %]
49
    </li>
49
    </li>
50
[% END %]
50
[% END %]
Lines 56-62 Link Here
56
        <label for="altcontactzipcode">
56
        <label for="altcontactzipcode">
57
    [% END %]
57
    [% END %]
58
    ZIP/Postal code:</label>
58
    ZIP/Postal code:</label>
59
    <input type="text" name="altcontactzipcode" id="altcontactzipcode" value="[% altcontactzipcode %]" size="5" />
59
    <input type="text" name="altcontactzipcode" id="altcontactzipcode" value="[% patron.altcontactzipcode %]" size="5" />
60
    [% IF ( mandatoryaltcontactzipcode ) %]<span class="required">Required</span>[% END %]
60
    [% IF ( mandatoryaltcontactzipcode ) %]<span class="required">Required</span>[% END %]
61
    </li>
61
    </li>
62
[% END %]
62
[% END %]
Lines 68-74 Link Here
68
        <label for="altcontactaddress3">
68
        <label for="altcontactaddress3">
69
    [% END %]
69
    [% END %]
70
    City:</label>
70
    City:</label>
71
    <input type="text" name="altcontactaddress3" id="altcontactaddress3" value="[% altcontactaddress3 %]" size="20" />
71
    <input type="text" name="altcontactaddress3" id="altcontactaddress3" value="[% patron.altcontactaddress3 %]" size="20" />
72
    [% IF ( mandatoryaltcontactaddress3 ) %]<span class="required">Required</span>[% END %]
72
    [% IF ( mandatoryaltcontactaddress3 ) %]<span class="required">Required</span>[% END %]
73
    </li>
73
    </li>
74
[% END %]
74
[% END %]
Lines 80-86 Link Here
80
        <label for="altcontactstate">
80
        <label for="altcontactstate">
81
    [% END %]
81
    [% END %]
82
    State:</label>
82
    State:</label>
83
    <input type="text" name="altcontactstate" id="altcontactstate" value="[% altcontactstate %]" size="20" />
83
    <input type="text" name="altcontactstate" id="altcontactstate" value="[% patron.altcontactstate %]" size="20" />
84
    [% IF ( mandatoryaltcontactstate ) %]<span class="required">Required</span>[% END %]
84
    [% IF ( mandatoryaltcontactstate ) %]<span class="required">Required</span>[% END %]
85
    </li>
85
    </li>
86
[% END %]
86
[% END %]
Lines 92-98 Link Here
92
        <label for="altcontactcountry">
92
        <label for="altcontactcountry">
93
    [% END %]
93
    [% END %]
94
    Country:</label>
94
    Country:</label>
95
    <input type="text" name="altcontactcountry" id="altcontactcountry" value="[% altcontactcountry %]" size="20" />
95
    <input type="text" name="altcontactcountry" id="altcontactcountry" value="[% patron.altcontactcountry %]" size="20" />
96
    [% IF ( mandatoryaltcontactcountry ) %]<span class="required">Required</span>[% END %]
96
    [% IF ( mandatoryaltcontactcountry ) %]<span class="required">Required</span>[% END %]
97
</li>
97
</li>
98
[% END %]
98
[% END %]
Lines 104-110 Link Here
104
        <label for="altcontactphone">
104
        <label for="altcontactphone">
105
    [% END %]
105
    [% END %]
106
    Phone:</label>
106
    Phone:</label>
107
    <input type="text" name="altcontactphone" id="altcontactphone" value="[% altcontactphone %]" />
107
    <input type="text" name="altcontactphone" id="altcontactphone" value="[% patron.altcontactphone %]" />
108
    [% IF ( mandatoryaltcontactphone ) %]<span class="required">Required</span>[% END %]
108
    [% IF ( mandatoryaltcontactphone ) %]<span class="required">Required</span>[% END %]
109
    </li>
109
    </li>
110
[% END %]
110
[% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-contact-style-us.inc (-9 / +9 lines)
Lines 8-14 Link Here
8
                <label for="altcontactsurname">
8
                <label for="altcontactsurname">
9
                [% END %]
9
                [% END %]
10
                Surname:</label>
10
                Surname:</label>
11
                    <input type="text" name="altcontactsurname" id="altcontactsurname" value="[% altcontactsurname %]" />
11
                    <input type="text" name="altcontactsurname" id="altcontactsurname" value="[% patron.altcontactsurname %]" />
12
                [% IF ( mandatoryaltcontactsurname ) %]<span class="required">Required</span>[% END %]
12
                [% IF ( mandatoryaltcontactsurname ) %]<span class="required">Required</span>[% END %]
13
            </li>
13
            </li>
14
        [% END %]
14
        [% END %]
Lines 20-26 Link Here
20
                <label for="altcontactfirstname">
20
                <label for="altcontactfirstname">
21
                [% END %]
21
                [% END %]
22
                First name:</label>
22
                First name:</label>
23
                    <input type="text" name="altcontactfirstname" id="altcontactfirstname" value="[% altcontactfirstname %]" />
23
                    <input type="text" name="altcontactfirstname" id="altcontactfirstname" value="[% patron.altcontactfirstname %]" />
24
                [% IF ( mandatoryaltcontactfirstname ) %]<span class="required">Required</span>[% END %]
24
                [% IF ( mandatoryaltcontactfirstname ) %]<span class="required">Required</span>[% END %]
25
            </li>
25
            </li>
26
        [% END %]
26
        [% END %]
Lines 32-38 Link Here
32
                <label for="altcontactaddress1">
32
                <label for="altcontactaddress1">
33
                [% END %]
33
                [% END %]
34
                Address:</label>
34
                Address:</label>
35
                    <input type="text" name="altcontactaddress1" id="altcontactaddress1" value="[% altcontactaddress1 %]" size="40" />
35
                    <input type="text" name="altcontactaddress1" id="altcontactaddress1" value="[% patron.altcontactaddress1 %]" size="40" />
36
                [% IF ( mandatoryaltcontactaddress1 ) %]<span class="required">Required</span>[% END %]
36
                [% IF ( mandatoryaltcontactaddress1 ) %]<span class="required">Required</span>[% END %]
37
            </li>
37
            </li>
38
        [% END %]
38
        [% END %]
Lines 44-50 Link Here
44
                <label for="altcontactaddress2">
44
                <label for="altcontactaddress2">
45
                [% END %]
45
                [% END %]
46
                Address 2:</label>
46
                Address 2:</label>
47
                <input type="text" name="altcontactaddress2" id="altcontactaddress2" value="[% altcontactaddress2 %]" size="40" />
47
                <input type="text" name="altcontactaddress2" id="altcontactaddress2" value="[% patron.altcontactaddress2 %]" size="40" />
48
                [% IF ( mandatoryaltcontactaddress2 ) %]<span class="required">Required</span>[% END %]
48
                [% IF ( mandatoryaltcontactaddress2 ) %]<span class="required">Required</span>[% END %]
49
            </li>
49
            </li>
50
        [% END %]
50
        [% END %]
Lines 56-62 Link Here
56
                <label for="altcontactaddress3">
56
                <label for="altcontactaddress3">
57
                [% END %]
57
                [% END %]
58
                City:</label>
58
                City:</label>
59
                <input type="text" name="altcontactaddress3" id="altcontactaddress3" value="[% altcontactaddress3 %]" size="20" />
59
                <input type="text" name="altcontactaddress3" id="altcontactaddress3" value="[% patron.altcontactaddress3 %]" size="20" />
60
                [% IF ( mandatoryaltcontactaddress3 ) %]<span class="required">Required</span>[% END %]
60
                [% IF ( mandatoryaltcontactaddress3 ) %]<span class="required">Required</span>[% END %]
61
            </li>
61
            </li>
62
        [% END %]
62
        [% END %]
Lines 68-74 Link Here
68
                <label for="altcontactstate">
68
                <label for="altcontactstate">
69
                [% END %]
69
                [% END %]
70
                State:</label>
70
                State:</label>
71
                <input type="text" name="altcontactstate" id="altcontactstate" value="[% altcontactstate %]" size="20" />
71
                <input type="text" name="altcontactstate" id="altcontactstate" value="[% patron.altcontactstate %]" size="20" />
72
                [% IF ( mandatoryaltcontactstate ) %]<span class="required">Required</span>[% END %]
72
                [% IF ( mandatoryaltcontactstate ) %]<span class="required">Required</span>[% END %]
73
            </li>
73
            </li>
74
        [% END %]
74
        [% END %]
Lines 80-86 Link Here
80
                <label for="altcontactzipcode">
80
                <label for="altcontactzipcode">
81
                [% END %]
81
                [% END %]
82
                ZIP/Postal code:</label>
82
                ZIP/Postal code:</label>
83
                    <input type="text" name="altcontactzipcode" id="altcontactzipcode" value="[% altcontactzipcode %]" size="5" />
83
                    <input type="text" name="altcontactzipcode" id="altcontactzipcode" value="[% patron.altcontactzipcode %]" size="5" />
84
                [% IF ( mandatoryaltcontactzipcode ) %]<span class="required">Required</span>[% END %]
84
                [% IF ( mandatoryaltcontactzipcode ) %]<span class="required">Required</span>[% END %]
85
            </li>
85
            </li>
86
        [% END %]
86
        [% END %]
Lines 92-98 Link Here
92
                <label for="altcontactcountry">
92
                <label for="altcontactcountry">
93
                [% END %]
93
                [% END %]
94
                Country:</label>
94
                Country:</label>
95
                    <input type="text" name="altcontactcountry" id="altcontactcountry" value="[% altcontactcountry %]" size="20" />
95
                    <input type="text" name="altcontactcountry" id="altcontactcountry" value="[% patron.altcontactcountry %]" size="20" />
96
                [% IF ( mandatoryaltcontactcountry ) %]<span class="required">Required</span>[% END %]
96
                [% IF ( mandatoryaltcontactcountry ) %]<span class="required">Required</span>[% END %]
97
            </li>
97
            </li>
98
        [% END %]
98
        [% END %]
Lines 104-110 Link Here
104
                <label for="altcontactphone">
104
                <label for="altcontactphone">
105
                [% END %]
105
                [% END %]
106
                Phone:</label>
106
                Phone:</label>
107
                    <input type="text" name="altcontactphone" id="altcontactphone" value="[% altcontactphone %]" />
107
                    <input type="text" name="altcontactphone" id="altcontactphone" value="[% patron.altcontactphone %]" />
108
                [% IF ( mandatoryaltcontactphone ) %]<span class="required">Required</span>[% END %]
108
                [% IF ( mandatoryaltcontactphone ) %]<span class="required">Required</span>[% END %]
109
            </li>
109
            </li>
110
        [% END %]
110
        [% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/member-display-address-style-de.inc (-10 / +10 lines)
Lines 1-16 Link Here
1
[% IF ( address or address2 ) %]
1
[% IF ( patron.address or patron.address2 ) %]
2
    [% IF ( address ) %]
2
    [% IF ( patron.address ) %]
3
        [% SET roadtype_desc = '' %]
3
        [% SET roadtype_desc = '' %]
4
        [% IF streettype %]
4
        [% IF patron.streettype %]
5
            [% SET roadtype_desc = AuthorisedValues.GetByCode('ROADTYPE', streettype) %]
5
            [% SET roadtype_desc = AuthorisedValues.GetByCode('ROADTYPE', patron.streettype) %]
6
        [% END %]
6
        [% END %]
7
        <li class="patronaddress1">[% address %][%IF roadtype_desc %] [% roadtype_desc %][% END %][% IF streetnumber %] [% streetnumber %][% END %]</li>
7
        <li class="patronaddress1">[% patron.address %][%IF roadtype_desc %] [% roadtype_desc %][% END %][% IF patron.streetnumber %] [% patron.streetnumber %][% END %]</li>
8
    [% END %]
8
    [% END %]
9
    [% IF ( address2 ) %]
9
    [% IF ( patron.address2 ) %]
10
        <li class="patronaddress2">[% address2 %]</li>
10
        <li class="patronaddress2">[% patron.address2 %]</li>
11
    [% END %]
11
    [% END %]
12
[% END %]
12
[% END %]
13
[% IF ( city ) %]<li class="patroncity">
13
[% IF ( patron.city ) %]<li class="patroncity">
14
    [%IF (zipcode ) %][% zipcode %] [% END %][% city %][% IF ( state ) %]</br>[% state %][% END %]
14
    [%IF ( patron.zipcode ) %][% patron.zipcode %] [% END %][% patron.city %][% IF ( patron.state ) %]</br>[% patron.state %][% END %]
15
    [% IF ( country ) %]<br />[% country %][% END %]</li>
15
    [% IF ( patron.country ) %]<br />[% patron.country %][% END %]</li>
16
[% END %]
16
[% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/member-display-address-style-fr.inc (-11 / +11 lines)
Lines 1-19 Link Here
1
[% IF ( address or address2 ) %]
1
[% IF ( patron.address or patron.address2 ) %]
2
    [% IF ( address ) %]
2
    [% IF ( patron.address ) %]
3
        [% SET roadtype_desc = '' %]
3
        [% SET roadtype_desc = '' %]
4
        [% IF streettype %]
4
        [% IF patron.streettype %]
5
            [% SET roadtype_desc = AuthorisedValues.GetByCode('ROADTYPE', streettype) %]
5
            [% SET roadtype_desc = AuthorisedValues.GetByCode('ROADTYPE', patron.streettype) %]
6
        [% END %]
6
        [% END %]
7
        <li class="patronaddress1">[% IF streetnumber %][% streetnumber %] [% END %]
7
        <li class="patronaddress1">[% IF patron.streetnumber %][% patron.streetnumber %] [% END %]
8
        [%IF roadtype_desc %][% roadtype_desc %] [% END %]
8
        [%IF roadtype_desc %][% roadtype_desc %] [% END %]
9
            [% address %]
9
            [% patron.address %]
10
        </li>
10
        </li>
11
    [% END %]
11
    [% END %]
12
    [% IF ( address2 ) %]
12
    [% IF ( patron.address2 ) %]
13
        <li class="patronaddress2">[% address2 %]</li>
13
        <li class="patronaddress2">[% patron.address2 %]</li>
14
    [% END %]
14
    [% END %]
15
[% END %]
15
[% END %]
16
[% IF ( city ) %]
16
[% IF ( patron.city ) %]
17
    <li class="patroncity">[%IF (zipcode ) %][% zipcode %] [% END %][% city %][% IF ( state ) %]</br>[% state %][% END %]
17
    <li class="patroncity">[%IF ( patron.zipcode ) %][% patron.zipcode %] [% END %][% patron.city %][% IF ( patron.state ) %]</br>[% patron.state %][% END %]
18
    [% IF ( country ) %]<br />[% country %][% END %]</li>
18
    [% IF ( patron.country ) %]<br />[% patron.country %][% END %]</li>
19
[% END %]
19
[% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/member-display-address-style-us.inc (-10 / +10 lines)
Lines 1-16 Link Here
1
[% IF ( address or address2 ) %]
1
[% IF ( patron.address or patron.address2 ) %]
2
    [% IF ( address ) %]
2
    [% IF ( patron.address ) %]
3
        [% SET roadtype_desc = '' %]
3
        [% SET roadtype_desc = '' %]
4
        [% IF streettype %]
4
        [% IF patron.streettype %]
5
            [% SET roadtype_desc = AuthorisedValues.GetByCode('ROADTYPE', streettype) %]
5
            [% SET roadtype_desc = AuthorisedValues.GetByCode('ROADTYPE', patron.streettype) %]
6
        [% END %]
6
        [% END %]
7
        <li class="patronaddress1">[% if (streetnumber) %][% streetnumber |html  %][% end %] [% address |html %] [% IF roadtype_desc %][% roadtype_desc |html  %] [% END %][% end %]</li>
7
        <li class="patronaddress1">[% if (patron.streetnumber) %][% patron.streetnumber |html  %][% end %] [% patron.address |html %] [% IF roadtype_desc %][% roadtype_desc |html  %] [% END %][% end %]</li>
8
    [% END %]
8
    [% END %]
9
    [% IF ( address2 ) %]
9
    [% IF ( patron.address2 ) %]
10
        <li class="patronaddress2">[% address2 |html  %]</li>
10
        <li class="patronaddress2">[% patron.address2 |html  %]</li>
11
    [% END %]
11
    [% END %]
12
[% END %]
12
[% END %]
13
[% IF ( city ) %]<li class="patroncity">
13
[% IF ( patron.city ) %]<li class="patroncity">
14
        [% city |html  %][% IF ( state ) %], [% state |html  %][% END %]
14
        [% patron.city |html  %][% IF ( patron.state ) %], [% patron.state |html  %][% END %]
15
        [% zipcode |html  %][% IF ( country ) %], [% country |html  %][% END %]</li>
15
        [% patron.zipcode |html  %][% IF ( patron.country ) %], [% patron.country |html  %][% END %]</li>
16
[% END %]
16
[% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/member-display-alt-address-style-de.inc (-10 / +10 lines)
Lines 1-16 Link Here
1
[% IF ( B_address or B_address2 ) %]
1
[% IF ( patron.B_address or patron.B_address2 ) %]
2
    [% IF ( B_address ) %]
2
    [% IF ( patron.B_address ) %]
3
        [% SET roadtype_desc = '' %]
3
        [% SET roadtype_desc = '' %]
4
        [% IF B_streettype %]
4
        [% IF patron.B_streettype %]
5
            [% SET roadtype_desc = AuthorisedValues.GetByCode('ROADTYPE', B_streettype) %]
5
            [% SET roadtype_desc = AuthorisedValues.GetByCode('ROADTYPE', patron.B_streettype) %]
6
        [% END %]
6
        [% END %]
7
        <li class="patronaddress1">[% B_address %][%IF roadtype_desc %] [% roadtype_desc %][% END %][% IF B_streetnumber %] [% B_streetnumber %][% END %]</li>
7
        <li class="patronaddress1">[% patron.B_address %][%IF roadtype_desc %] [% roadtype_desc %][% END %][% IF patron.B_streetnumber %] [% patron.B_streetnumber %][% END %]</li>
8
    [% END %]
8
    [% END %]
9
    [% IF ( B_address2 ) %]
9
    [% IF ( patron.B_address2 ) %]
10
        <li class="patronaddress2">[% B_address2 %]</li>
10
        <li class="patronaddress2">[% patron.B_address2 %]</li>
11
    [% END %]
11
    [% END %]
12
[% END %]
12
[% END %]
13
[% IF ( B_city ) %]<li class="patroncity">
13
[% IF ( patron.B_city ) %]<li class="patroncity">
14
    [%IF ( B_zipcode ) %][% B_zipcode %] [% END %][% B_city %][% IF ( B_state ) %]</br>[% B_state %][% END %]
14
    [%IF ( patron.B_zipcode ) %][% patron.B_zipcode %] [% END %][% patron.B_city %][% IF ( patron.B_state ) %]</br>[% patron.B_state %][% END %]
15
    [% IF ( B_country ) %]<br />[% B_country %][% END %]</li>
15
    [% IF ( patron.B_country ) %]<br />[% patron.B_country %][% END %]</li>
16
[% END %]
16
[% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/member-display-alt-address-style-fr.inc (-13 / +13 lines)
Lines 1-21 Link Here
1
[% IF ( B_address or B_address2 ) %]
1
[% IF ( patron.B_address or patron.B_address2 ) %]
2
    [% IF ( B_address ) %]
2
    [% IF ( patron.B_address ) %]
3
        [% SET roadtype_desc = '' %]
3
        [% SET roadtype_desc = '' %]
4
        [% IF B_streettype %]
4
        [% IF patron.B_streettype %]
5
            [% SET roadtype_desc = AuthorisedValues.GetByCode('ROADTYPE', B_streettype) %]
5
            [% SET roadtype_desc = AuthorisedValues.GetByCode('ROADTYPE', patron.B_streettype) %]
6
        [% END %]
6
        [% END %]
7
        <li class="patronaddress1">[% IF B_streetnumber %][% B_streetnumber %][% END %]
7
        <li class="patronaddress1">[% IF patron.B_streetnumber %][% patron.B_streetnumber %][% END %]
8
        [%IF roadtype_desc %][% roadtype_desc %] [% END %]
8
        [%IF roadtype_desc %][% roadtype_desc %] [% END %]
9
            [% B_address %]
9
            [% patron.B_address %]
10
        </li>
10
        </li>
11
    [% END %]
11
    [% END %]
12
    [% IF ( B_address2 ) %]
12
    [% IF ( patron.B_address2 ) %]
13
        <li class="patronaddress2">[% B_address2 %]</li>
13
        <li class="patronaddress2">[% patron.B_address2 %]</li>
14
    [% END %]
14
    [% END %]
15
[% END %]
15
[% END %]
16
[% IF ( B_city ) %]
16
[% IF ( patron.B_city ) %]
17
    <li class="patroncity">[%IF ( B_zipcode ) %][% B_zipcode %] [% END %]
17
    <li class="patroncity">[%IF ( patron.B_zipcode ) %][% patron.B_zipcode %] [% END %]
18
    [% B_city %]
18
    [% patron.B_city %]
19
    [% IF ( B_state ) %]</br>[% B_state %][% END %]
19
    [% IF ( patron.B_state ) %]</br>[% patron.B_state %][% END %]
20
    [% IF ( B_country ) %]<br />[% B_country %][% END %]</li>
20
    [% IF ( patron.B_country ) %]<br />[% patron.B_country %][% END %]</li>
21
[% END %]
21
[% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/member-display-alt-address-style-us.inc (-10 / +10 lines)
Lines 1-16 Link Here
1
[% IF ( B_address or B_address2 ) %]
1
[% IF ( patron.B_address or patron.B_address2 ) %]
2
    [% IF ( B_address ) %]
2
    [% IF ( patron.B_address ) %]
3
        [% SET roadtype_desc = '' %]
3
        [% SET roadtype_desc = '' %]
4
        [% IF B_streettype %]
4
        [% IF patron.B_streettype %]
5
            [% SET roadtype_desc = AuthorisedValues.GetByCode('ROADTYPE', B_streettype) %]
5
            [% SET roadtype_desc = AuthorisedValues.GetByCode('ROADTYPE', patron.B_streettype) %]
6
        [% END %]
6
        [% END %]
7
        <li class="patronaddress1">[% if (B_streetnumber) %][% B_streetnumber |html %][% end %] [% B_address |html %] [% IF roadtype_desc %][% roadtype_desc |html %] [% END %][% end %]</li>
7
        <li class="patronaddress1">[% if (patron.B_streetnumber) %][% patron.B_streetnumber |html %][% end %] [% patron.B_address |html %] [% IF roadtype_desc %][% roadtype_desc |html %] [% END %][% end %]</li>
8
    [% END %]
8
    [% END %]
9
    [% IF ( B_address2 ) %]
9
    [% IF ( patron.B_address2 ) %]
10
        <li class="patronaddress2">[% B_address2 |html %]</li>
10
        <li class="patronaddress2">[% patron.B_address2 |html %]</li>
11
    [% END %]
11
    [% END %]
12
[% END %]
12
[% END %]
13
[% IF ( B_city ) %]<li class="patroncity">
13
[% IF ( patron.B_city ) %]<li class="patroncity">
14
        [% B_city |html %][% IF ( B_state ) %], [% B_state |html %][% END %]
14
        [% patron.B_city |html %][% IF ( patron.B_state ) %], [% patron.B_state |html %][% END %]
15
        [% B_zipcode |html %][% IF ( B_country ) %], [% B_country |html %][% END %]</li>
15
        [% patron.B_zipcode |html %][% IF ( patron.B_country ) %], [% patron.B_country |html %][% END %]</li>
16
[% END %]
16
[% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/member-main-address-style-de.inc (-9 / +9 lines)
Lines 12-18 Link Here
12
      <select name="streettype">
12
      <select name="streettype">
13
        <option value=""></option>
13
        <option value=""></option>
14
        [% FOR roadtype IN roadtypes %]
14
        [% FOR roadtype IN roadtypes %]
15
          [% IF roadtype.authorised_value == streettype %]
15
          [% IF roadtype.authorised_value == patron.streettype %]
16
            <option value="[% roadtype.authorised_value %]" selected="selected">[% roadtype.lib %]</option>
16
            <option value="[% roadtype.authorised_value %]" selected="selected">[% roadtype.lib %]</option>
17
          [% ELSE %]
17
          [% ELSE %]
18
            <option value="[% roadtype.authorised_value %]">[% roadtype.lib %]</option>
18
            <option value="[% roadtype.authorised_value %]">[% roadtype.lib %]</option>
Lines 31-37 Link Here
31
      <label for="address">
31
      <label for="address">
32
      [% END %]
32
      [% END %]
33
      Address: </label>
33
      Address: </label>
34
            <input type="text" id="address" name="address" size="35" value="[% address %]" />
34
            <input type="text" id="address" name="address" size="35" value="[% patron.address %]" />
35
      [% IF ( mandatoryaddress ) %]<span class="required">Required</span>[% END %]
35
      [% IF ( mandatoryaddress ) %]<span class="required">Required</span>[% END %]
36
    </li>
36
    </li>
37
        [% END %]
37
        [% END %]
Lines 43-49 Link Here
43
      <label for="streetnumber">
43
      <label for="streetnumber">
44
      [% END %]
44
      [% END %]
45
      Street number: </label>
45
      Street number: </label>
46
        <input type="text" id="streetnumber" name="streetnumber" size="5" value="[% streetnumber %]" />
46
        <input type="text" id="streetnumber" name="streetnumber" size="5" value="[% patron.streetnumber %]" />
47
[% IF ( mandatorystreetnumber ) %]<span class="required">Required</span>[% END %]
47
[% IF ( mandatorystreetnumber ) %]<span class="required">Required</span>[% END %]
48
    </li>
48
    </li>
49
        [% END %]
49
        [% END %]
Lines 55-61 Link Here
55
      <label for="address2">
55
      <label for="address2">
56
      [% END %]
56
      [% END %]
57
      Address 2: </label>
57
      Address 2: </label>
58
            <input type="text" id="address2" name="address2" size="35" value="[% address2 %]" />
58
            <input type="text" id="address2" name="address2" size="35" value="[% patron.address2 %]" />
59
      [% IF ( mandatoryaddress2 ) %]<span class="required">Required</span>[% END %]
59
      [% IF ( mandatoryaddress2 ) %]<span class="required">Required</span>[% END %]
60
    </li>
60
    </li>
61
        [% END %]
61
        [% END %]
Lines 67-73 Link Here
67
        <label for="zipcode">
67
        <label for="zipcode">
68
      [% END %]
68
      [% END %]
69
      ZIP/Postal code: </label>
69
      ZIP/Postal code: </label>
70
            <input type="text" name="zipcode" id="zipcode" size="10" value="[% zipcode %]" />
70
            <input type="text" name="zipcode" id="zipcode" size="10" value="[% patron.zipcode %]" />
71
          [% IF ( mandatoryzipcode ) %]<span class="required">Required</span>[% END %]
71
          [% IF ( mandatoryzipcode ) %]<span class="required">Required</span>[% END %]
72
    </li>
72
    </li>
73
        [% END %]
73
        [% END %]
Lines 79-90 Link Here
79
        <label for="city">
79
        <label for="city">
80
      [% END %]
80
      [% END %]
81
      City: </label>
81
      City: </label>
82
        <input type="text" id="city" name="city" size="20" value="[% city %]" />
82
        <input type="text" id="city" name="city" size="20" value="[% patron.city %]" />
83
        [% IF cities.count %]or choose
83
        [% IF cities.count %]or choose
84
        <select id="select_city" name="select_city">
84
        <select id="select_city" name="select_city">
85
            <option value="|||"></option>
85
            <option value="|||"></option>
86
            [% FOREACH c IN cities %]
86
            [% FOREACH c IN cities %]
87
                [% IF c.city_name == city && c.city_state == state && c.city_zipcode == zipcode %]
87
                [% IF c.city_name == patron.city && c.city_state == patron.state && c.city_zipcode == patron.zipcode %]
88
                <option value="[% c.city_zipcode %]|[% c.city_name %]|[% c.city_state %]|[% c.city_country %]" selected="selected">
88
                <option value="[% c.city_zipcode %]|[% c.city_name %]|[% c.city_state %]|[% c.city_country %]" selected="selected">
89
                [% ELSE %]
89
                [% ELSE %]
90
                <option value="[% c.city_zipcode %]|[% c.city_name %]|[% c.city_state %]|[% c.city_country %]">
90
                <option value="[% c.city_zipcode %]|[% c.city_name %]|[% c.city_state %]|[% c.city_country %]">
Lines 105-111 Link Here
105
        <label for="state">
105
        <label for="state">
106
      [% END %]
106
      [% END %]
107
      State: </label>
107
      State: </label>
108
      <input type="text" name="state" id="state" size="20" value="[% state %]" />
108
      <input type="text" name="state" id="state" size="20" value="[% patron.state %]" />
109
      [% IF ( mandatorystate ) %]<span class="required">Required</span>[% END %]
109
      [% IF ( mandatorystate ) %]<span class="required">Required</span>[% END %]
110
    </li>
110
    </li>
111
        [% END %]
111
        [% END %]
Lines 117-123 Link Here
117
        <label for="country">
117
        <label for="country">
118
      [% END %]
118
      [% END %]
119
      Country: </label>
119
      Country: </label>
120
        <input type="text" name="country" id="country" size="20" value="[% country %]" />
120
        <input type="text" name="country" id="country" size="20" value="[% patron.country %]" />
121
      [% IF ( mandatorycountry ) %]<span class="required">Required</span>[% END %]
121
      [% IF ( mandatorycountry ) %]<span class="required">Required</span>[% END %]
122
    </li>
122
    </li>
123
        [% END %]
123
        [% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/member-main-address-style-fr.inc (-9 / +9 lines)
Lines 8-14 Link Here
8
            <label for="streetnumber">
8
            <label for="streetnumber">
9
        [% END %]
9
        [% END %]
10
            Street number: </label>
10
            Street number: </label>
11
            <input type="text" id="streetnumber" name="streetnumber" size="5" value="[% streetnumber %]" />
11
            <input type="text" id="streetnumber" name="streetnumber" size="5" value="[% patron.streetnumber %]" />
12
        [% IF ( mandatorystreetnumber ) %]<span class="required">Required</span>[% END %]
12
        [% IF ( mandatorystreetnumber ) %]<span class="required">Required</span>[% END %]
13
    [% END %]
13
    [% END %]
14
14
Lines 23-29 Link Here
23
        <select name="streettype">
23
        <select name="streettype">
24
           <option value=""></option>
24
           <option value=""></option>
25
        [% FOR roadtype IN roadtypes %]
25
        [% FOR roadtype IN roadtypes %]
26
            [% IF roadtype.authorised_value == streettype %]
26
            [% IF roadtype.authorised_value == patron.streettype %]
27
                <option value="[% roadtype.authorised_value %]" selected="selected">[% roadtype.lib %]</option>
27
                <option value="[% roadtype.authorised_value %]" selected="selected">[% roadtype.lib %]</option>
28
            [% ELSE %]
28
            [% ELSE %]
29
                <option value="[% roadtype.authorised_value %]">[% roadtype.lib %]</option>
29
                <option value="[% roadtype.authorised_value %]">[% roadtype.lib %]</option>
Lines 42-48 Link Here
42
        <label for="address">
42
        <label for="address">
43
    [% END %]
43
    [% END %]
44
    Address: </label>
44
    Address: </label>
45
        <input type="text" id="address" name="address" size="35" value="[% address %]" />
45
        <input type="text" id="address" name="address" size="35" value="[% patron.address %]" />
46
    [% IF ( mandatoryaddress ) %]<span class="required">Required</span>[% END %]
46
    [% IF ( mandatoryaddress ) %]<span class="required">Required</span>[% END %]
47
      </li>
47
      </li>
48
[% END %]
48
[% END %]
Lines 54-60 Link Here
54
        <label for="address2">
54
        <label for="address2">
55
    [% END %]
55
    [% END %]
56
        Address 2: </label>
56
        Address 2: </label>
57
        <input type="text" id="address2" name="address2" size="35" value="[% address2 %]" />
57
        <input type="text" id="address2" name="address2" size="35" value="[% patron.address2 %]" />
58
    [% IF ( mandatoryaddress2 ) %]<span class="required">Required</span>[% END %]
58
    [% IF ( mandatoryaddress2 ) %]<span class="required">Required</span>[% END %]
59
    </li>
59
    </li>
60
[% END %]
60
[% END %]
Lines 66-72 Link Here
66
        <label for="zipcode">
66
        <label for="zipcode">
67
    [% END %]
67
    [% END %]
68
    ZIP/Postal code: </label>
68
    ZIP/Postal code: </label>
69
    <input type="text" name="zipcode" id="zipcode" size="10" value="[% zipcode %]" />
69
    <input type="text" name="zipcode" id="zipcode" size="10" value="[% patron.zipcode %]" />
70
    [% IF ( mandatoryzipcode ) %]<span class="required">Required</span>[% END %]
70
    [% IF ( mandatoryzipcode ) %]<span class="required">Required</span>[% END %]
71
    </li>
71
    </li>
72
[% END %]
72
[% END %]
Lines 78-89 Link Here
78
        <label for="city">
78
        <label for="city">
79
    [% END %]
79
    [% END %]
80
    City: </label>
80
    City: </label>
81
    <input type="text" id="city" name="city" size="20" value="[% city %]" />
81
    <input type="text" id="city" name="city" size="20" value="[% patron.city %]" />
82
    [% IF cities.count %]or choose
82
    [% IF cities.count %]or choose
83
        <select id="select_city" name="select_city">
83
        <select id="select_city" name="select_city">
84
            <option value="|||"></option>
84
            <option value="|||"></option>
85
        [% FOREACH c IN cities %]
85
        [% FOREACH c IN cities %]
86
            [% IF c.city_name == city && c.city_state == state && c.city_zipcode == zipcode %]
86
            [% IF c.city_name == patron.city && c.city_state == patron.state && c.city_zipcode == patron.zipcode %]
87
                <option value="[% c.city_zipcode %]|[% c.city_name %]|[% c.city_state %]|[% c.city_country %]" selected="selected">
87
                <option value="[% c.city_zipcode %]|[% c.city_name %]|[% c.city_state %]|[% c.city_country %]" selected="selected">
88
            [% ELSE %]
88
            [% ELSE %]
89
                 <option value="[% c.city_zipcode %]|[% c.city_name %]|[% c.city_state %]|[% c.city_country %]">
89
                 <option value="[% c.city_zipcode %]|[% c.city_name %]|[% c.city_state %]|[% c.city_country %]">
Lines 104-110 Link Here
104
        <label for="state">
104
        <label for="state">
105
    [% END %]
105
    [% END %]
106
        State: </label>
106
        State: </label>
107
        <input type="text" name="state" id="state" size="20" value="[% state %]" />
107
        <input type="text" name="state" id="state" size="20" value="[% patron.state %]" />
108
    [% IF ( mandatorystate ) %]<span class="required">Required</span>[% END %]
108
    [% IF ( mandatorystate ) %]<span class="required">Required</span>[% END %]
109
    </li>
109
    </li>
110
[% END %]
110
[% END %]
Lines 116-122 Link Here
116
      <label for="country">
116
      <label for="country">
117
    [% END %]
117
    [% END %]
118
    Country: </label>
118
    Country: </label>
119
      <input type="text" name="country" id="country" size="20" value="[% country %]" />
119
      <input type="text" name="country" id="country" size="20" value="[% patron.country %]" />
120
    [% IF ( mandatorycountry ) %]<span class="required">Required</span>[% END %]
120
    [% IF ( mandatorycountry ) %]<span class="required">Required</span>[% END %]
121
    </li>
121
    </li>
122
[% END %]
122
[% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/member-main-address-style-us.inc (-9 / +9 lines)
Lines 8-14 Link Here
8
      <label for="streetnumber">
8
      <label for="streetnumber">
9
      [% END %]
9
      [% END %]
10
      Street number: </label>
10
      Street number: </label>
11
        <input type="text" id="streetnumber" name="streetnumber" size="5" value="[% streetnumber %]" />
11
        <input type="text" id="streetnumber" name="streetnumber" size="5" value="[% patron.streetnumber %]" />
12
[% IF ( mandatorystreetnumber ) %]<span class="required">Required</span>[% END %]
12
[% IF ( mandatorystreetnumber ) %]<span class="required">Required</span>[% END %]
13
    </li>
13
    </li>
14
        [% END %]
14
        [% END %]
Lines 24-30 Link Here
24
      <select name="streettype">
24
      <select name="streettype">
25
        <option value=""></option>
25
        <option value=""></option>
26
        [% FOR roadtype IN roadtypes %]
26
        [% FOR roadtype IN roadtypes %]
27
          [% IF roadtype.authorised_value == streettype%]
27
          [% IF roadtype.authorised_value == patron.streettype %]
28
            <option value="[% roadtype.authorised_value %]" selected="selected">[% roadtype.lib %]</option>
28
            <option value="[% roadtype.authorised_value %]" selected="selected">[% roadtype.lib %]</option>
29
          [% ELSE %]
29
          [% ELSE %]
30
            <option value="[% roadtype.authorised_value %]">[% roadtype.lib %]</option>
30
            <option value="[% roadtype.authorised_value %]">[% roadtype.lib %]</option>
Lines 43-49 Link Here
43
      <label for="address">
43
      <label for="address">
44
      [% END %]
44
      [% END %]
45
      Address: </label>
45
      Address: </label>
46
            <input type="text" id="address" name="address" size="35" value="[% address %]" />
46
            <input type="text" id="address" name="address" size="35" value="[% patron.address %]" />
47
      [% IF ( mandatoryaddress ) %]<span class="required">Required</span>[% END %]
47
      [% IF ( mandatoryaddress ) %]<span class="required">Required</span>[% END %]
48
    </li>
48
    </li>
49
        [% END %]
49
        [% END %]
Lines 55-61 Link Here
55
      <label for="address2">
55
      <label for="address2">
56
      [% END %]
56
      [% END %]
57
      Address 2: </label>
57
      Address 2: </label>
58
            <input type="text" id="address2" name="address2" size="35" value="[% address2 %]" />
58
            <input type="text" id="address2" name="address2" size="35" value="[% patron.address2 %]" />
59
      [% IF ( mandatoryaddress2 ) %]<span class="required">Required</span>[% END %]
59
      [% IF ( mandatoryaddress2 ) %]<span class="required">Required</span>[% END %]
60
    </li>
60
    </li>
61
        [% END %]
61
        [% END %]
Lines 67-78 Link Here
67
        <label for="city">
67
        <label for="city">
68
      [% END %]
68
      [% END %]
69
      City: </label>
69
      City: </label>
70
        <input type="text" id="city" name="city" size="20" value="[% city %]" />
70
        <input type="text" id="city" name="city" size="20" value="[% patron.city %]" />
71
        [% IF cities.count %]or choose
71
        [% IF cities.count %]or choose
72
        <select id="select_city" name="select_city">
72
        <select id="select_city" name="select_city">
73
            <option value="|||"></option>
73
            <option value="|||"></option>
74
            [% FOREACH c IN cities %]
74
            [% FOREACH c IN cities %]
75
                [% IF c.city_name == city && c.city_state == state && c.city_zipcode == zipcode %]
75
                [% IF c.city_name == patron.city && c.city_state == patron.state && c.city_zipcode == patron.zipcode %]
76
                <option value="[% c.city_zipcode %]|[% c.city_name %]|[% c.city_state %]|[% c.city_country %]" selected="selected">
76
                <option value="[% c.city_zipcode %]|[% c.city_name %]|[% c.city_state %]|[% c.city_country %]" selected="selected">
77
                [% ELSE %]
77
                [% ELSE %]
78
                <option value="[% c.city_zipcode %]|[% c.city_name %]|[% c.city_state %]|[% c.city_country %]">
78
                <option value="[% c.city_zipcode %]|[% c.city_name %]|[% c.city_state %]|[% c.city_country %]">
Lines 93-99 Link Here
93
        <label for="state">
93
        <label for="state">
94
      [% END %]
94
      [% END %]
95
      State: </label>
95
      State: </label>
96
      <input type="text" name="state" id="state" size="20" value="[% state %]" />
96
      <input type="text" name="state" id="state" size="20" value="[% patron.state %]" />
97
      [% IF ( mandatorystate ) %]<span class="required">Required</span>[% END %]
97
      [% IF ( mandatorystate ) %]<span class="required">Required</span>[% END %]
98
    </li>
98
    </li>
99
        [% END %]
99
        [% END %]
Lines 105-111 Link Here
105
        <label for="zipcode">
105
        <label for="zipcode">
106
      [% END %]
106
      [% END %]
107
      ZIP/Postal code: </label>
107
      ZIP/Postal code: </label>
108
            <input type="text" name="zipcode" id="zipcode" size="10" value="[% zipcode %]" />
108
            <input type="text" name="zipcode" id="zipcode" size="10" value="[% patron.zipcode %]" />
109
      [% IF ( mandatoryzipcode ) %]<span class="required">Required</span>[% END %]
109
      [% IF ( mandatoryzipcode ) %]<span class="required">Required</span>[% END %]
110
    </li>
110
    </li>
111
        [% END %]
111
        [% END %]
Lines 117-123 Link Here
117
        <label for="country">
117
        <label for="country">
118
      [% END %]
118
      [% END %]
119
      Country: </label>
119
      Country: </label>
120
        <input type="text" name="country" id="country" size="20" value="[% country %]" />
120
        <input type="text" name="country" id="country" size="20" value="[% patron.country %]" />
121
      [% IF ( mandatorycountry ) %]<span class="required">Required</span>[% END %]
121
      [% IF ( mandatorycountry ) %]<span class="required">Required</span>[% END %]
122
    </li>
122
    </li>
123
        [% END %]
123
        [% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc (-11 / +11 lines)
Lines 7-27 Link Here
7
<div id="toolbar" class="btn-toolbar">
7
<div id="toolbar" class="btn-toolbar">
8
    [% IF CAN_user_borrowers_edit_borrowers %]
8
    [% IF CAN_user_borrowers_edit_borrowers %]
9
        [% IF ( guarantor ) %]
9
        [% IF ( guarantor ) %]
10
            <a id="editpatron" class="btn btn-default btn-sm" href="/cgi-bin/koha/members/memberentry.pl?op=modify&amp;destination=circ&amp;borrowernumber=[% borrowernumber %]&amp;guarantorid=[% guarantor.borrowernumber %]&amp;categorycode=[% categorycode %]">
10
            <a id="editpatron" class="btn btn-default btn-sm" href="/cgi-bin/koha/members/memberentry.pl?op=modify&amp;destination=circ&amp;borrowernumber=[% patron.borrowernumber %]&amp;guarantorid=[% guarantor.borrowernumber %]&amp;categorycode=[% patron.categorycode %]">
11
        [% ELSE %]
11
        [% ELSE %]
12
            <a id="editpatron" class="btn btn-default btn-sm" href="/cgi-bin/koha/members/memberentry.pl?op=modify&amp;destination=circ&amp;borrowernumber=[% borrowernumber %]&amp;categorycode=[% categorycode %]">
12
            <a id="editpatron" class="btn btn-default btn-sm" href="/cgi-bin/koha/members/memberentry.pl?op=modify&amp;destination=circ&amp;borrowernumber=[% patron.borrowernumber %]&amp;categorycode=[% patron.categorycode %]">
13
        [% END %]
13
        [% END %]
14
        <i class="fa fa-pencil"></i> Edit</a>
14
        <i class="fa fa-pencil"></i> Edit</a>
15
    [% END %]
15
    [% END %]
16
16
17
    [% IF CAN_user_borrowers_edit_borrowers %]
17
    [% IF CAN_user_borrowers_edit_borrowers %]
18
        [% IF adultborrower AND Koha.Preference("borrowerRelationship") %]
18
        [% IF adultborrower AND Koha.Preference("borrowerRelationship") %]
19
            <a id="addchild" class="btn btn-default btn-sm" href="/cgi-bin/koha/members/memberentry.pl?op=add&amp;guarantorid=[% borrowernumber %]"><i class="fa fa-plus"></i> Add child</a>
19
            <a id="addchild" class="btn btn-default btn-sm" href="/cgi-bin/koha/members/memberentry.pl?op=add&amp;guarantorid=[% patron.borrowernumber %]"><i class="fa fa-plus"></i> Add child</a>
20
        [% END %]
20
        [% END %]
21
        [% IF CAN_user_borrowers_edit_borrowers %]
21
        [% IF CAN_user_borrowers_edit_borrowers %]
22
            <a id="changepassword" class="btn btn-default btn-sm" href="/cgi-bin/koha/members/member-password.pl?member=[% borrowernumber %]"><i class="fa fa-lock"></i> Change password</a>
22
            <a id="changepassword" class="btn btn-default btn-sm" href="/cgi-bin/koha/members/member-password.pl?member=[% patron.borrowernumber %]"><i class="fa fa-lock"></i> Change password</a>
23
        [% END %]
23
        [% END %]
24
        <a id="duplicate" class="btn btn-default btn-sm" href="/cgi-bin/koha/members/memberentry.pl?op=duplicate&amp;borrowernumber=[% borrowernumber %]&amp;categorycode=[% categorycode %]"><i class="fa fa-copy"></i> Duplicate</a>
24
        <a id="duplicate" class="btn btn-default btn-sm" href="/cgi-bin/koha/members/memberentry.pl?op=duplicate&amp;borrowernumber=[% patron.borrowernumber %]&amp;categorycode=[% patron.categorycode %]"><i class="fa fa-copy"></i> Duplicate</a>
25
    [% END %]
25
    [% END %]
26
26
27
    <div class="btn-group">
27
    <div class="btn-group">
Lines 30-36 Link Here
30
                [% IF CAN_user_borrowers_edit_borrowers %]<li><a id="printsummary" href="#">Print summary</a></li>[% END %]
30
                [% IF CAN_user_borrowers_edit_borrowers %]<li><a id="printsummary" href="#">Print summary</a></li>[% END %]
31
                <li><a id="printslip" href="#">Print slip</a></li>
31
                <li><a id="printslip" href="#">Print slip</a></li>
32
                <li><a id="printquickslip" href="#">Print quick slip</a></li>
32
                <li><a id="printquickslip" href="#">Print quick slip</a></li>
33
                [% IF Borrowers.HasOverdues( borrowernumber ) %]
33
                [% IF Borrowers.HasOverdues( patron.borrowernumber ) %]
34
                    <li><a id="print_overdues" href="#">Print overdues</a></li>
34
                    <li><a id="print_overdues" href="#">Print overdues</a></li>
35
                [% END %]
35
                [% END %]
36
            </ul>
36
            </ul>
Lines 46-62 Link Here
46
        <button class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown">More <span class="caret"></span></button>
46
        <button class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown">More <span class="caret"></span></button>
47
            <ul class="dropdown-menu">
47
            <ul class="dropdown-menu">
48
                [% IF CAN_user_borrowers_edit_borrowers %]
48
                [% IF CAN_user_borrowers_edit_borrowers %]
49
                    <li><a id="renewpatron" href="/cgi-bin/koha/members/setstatus.pl?borrowernumber=[% borrowernumber %]&amp;destination=[% destination %]&amp;reregistration=y">Renew patron</a></li>
49
                    <li><a id="renewpatron" href="/cgi-bin/koha/members/setstatus.pl?borrowernumber=[% patron.borrowernumber %]&amp;destination=[% destination %]&amp;reregistration=y">Renew patron</a></li>
50
                [% ELSE %]
50
                [% ELSE %]
51
                    <li class="disabled"><a data-toggle="tooltip" data-placement="left" title="You are not authorized to renew patrons" id="renewpatron" href="#">Renew patron</a></li>
51
                    <li class="disabled"><a data-toggle="tooltip" data-placement="left" title="You are not authorized to renew patrons" id="renewpatron" href="#">Renew patron</a></li>
52
                [% END %]
52
                [% END %]
53
                [% IF ( CAN_user_permissions ) %]
53
                [% IF ( CAN_user_permissions ) %]
54
                    <li><a id="patronflags" href="/cgi-bin/koha/members/member-flags.pl?member=[% borrowernumber %]">Set permissions</a></li>
54
                    <li><a id="patronflags" href="/cgi-bin/koha/members/member-flags.pl?member=[% patron.borrowernumber %]">Set permissions</a></li>
55
                [% ELSE %]
55
                [% ELSE %]
56
                    <li class="disabled"><a data-toggle="tooltip" data-placement="left" title="You are not authorized to set permissions" id="patronflags" href="#">Set permissions</a></li>
56
                    <li class="disabled"><a data-toggle="tooltip" data-placement="left" title="You are not authorized to set permissions" id="patronflags" href="#">Set permissions</a></li>
57
                [% END %]
57
                [% END %]
58
                [% IF CAN_user_borrowers_edit_borrowers && useDischarge %]
58
                [% IF CAN_user_borrowers_edit_borrowers && useDischarge %]
59
                    <li><a href="/cgi-bin/koha/members/discharge.pl?borrowernumber=[% borrowernumber %]">Discharge</a></li>
59
                    <li><a href="/cgi-bin/koha/members/discharge.pl?borrowernumber=[% patron.borrowernumber %]">Discharge</a></li>
60
                [% END %]
60
                [% END %]
61
                [% IF CAN_user_borrowers_edit_borrowers %]
61
                [% IF CAN_user_borrowers_edit_borrowers %]
62
                    [% IF ( NorwegianPatronDBEnable == 1 ) %]
62
                    [% IF ( NorwegianPatronDBEnable == 1 ) %]
Lines 98-104 Link Here
98
                        <label for="message_type">Add a message for:</label>
98
                        <label for="message_type">Add a message for:</label>
99
                        <select name="message_type" id="message_type">
99
                        <select name="message_type" id="message_type">
100
                            <option value="L">Staff - Internal note</option>
100
                            <option value="L">Staff - Internal note</option>
101
                            <option value="B">OPAC - [% firstname | html %] [% surname | html %]</option>
101
                            <option value="B">OPAC - [% patron.firstname | html %] [% patron.surname | html %]</option>
102
                        </select>
102
                        </select>
103
                    </div>
103
                    </div>
104
                    [% bor_notes = AuthorisedValues.Get( 'BOR_NOTES' ) %]
104
                    [% bor_notes = AuthorisedValues.Get( 'BOR_NOTES' ) %]
Lines 116-122 Link Here
116
                    <div class="form-group">
116
                    <div class="form-group">
117
                        <textarea rows="3" class="modal-textarea" name="borrower_message" id="borrower_message" ></textarea>
117
                        <textarea rows="3" class="modal-textarea" name="borrower_message" id="borrower_message" ></textarea>
118
                    </div>
118
                    </div>
119
                    <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
119
                    <input type="hidden" name="borrowernumber" value="[% patron.borrowernumber %]" />
120
                    <input type="hidden" name="batch" value="[% batch %]" />
120
                    <input type="hidden" name="batch" value="[% batch %]" />
121
                    <input type="hidden" name="branchcode" value="[% LoginBranchcode %]" />
121
                    <input type="hidden" name="branchcode" value="[% LoginBranchcode %]" />
122
                </div>
122
                </div>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt (-2 / +2 lines)
Lines 114-121 Link Here
114
                    [% END %]
114
                    [% END %]
115
                </td>
115
                </td>
116
                <td>[% loop_budge.budget_name %]</td>
116
                <td>[% loop_budge.budget_name %]</td>
117
                <td>[% IF ( loop_budge.budget_owner_borrowernumber ) %]
117
                <td>[% IF ( loop_budge.budget_owner ) %]
118
                        <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% loop_budge.budget_owner_borrowernumber %]">[% loop_budge.budget_owner_surname %], [% loop_budge.budget_owner_firstname %]</a>
118
                        <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% loop_budge.budget_owner.borrowernumber %]">[% loop_budge.budget_owner.surname %], [% loop_budge.budget_owner.firstname %]</a>
119
                    [% ELSE %]
119
                    [% ELSE %]
120
                        &nbsp;
120
                        &nbsp;
121
                    [% END %]
121
                    [% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt (-2 / +4 lines)
Lines 119-126 Link Here
119
                                        </td>
119
                                        </td>
120
                                        <td>[% basket.expected_items %]</td>
120
                                        <td>[% basket.expected_items %]</td>
121
                                        <td>
121
                                        <td>
122
                                            [% basket.authorisedby_firstname %]
122
                                            [% IF basket.authorisedby %]
123
                                            [% basket.authorisedby_surname %]
123
                                                [% basket.authorisedby.firstname %]
124
                                                [% basket.authorisedbysurname %]
125
                                            [% END %]
124
                                        </td>
126
                                        </td>
125
                                        <td><span title="[% basket.creationdate %]">[% basket.creationdate | $KohaDates %]</span></td>
127
                                        <td><span title="[% basket.creationdate %]">[% basket.creationdate | $KohaDates %]</span></td>
126
                                        <td>
128
                                        <td>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt (-4 / +4 lines)
Lines 248-264 Link Here
248
248
249
    <li>
249
    <li>
250
        <span class="label">Owner: </span>
250
        <span class="label">Owner: </span>
251
        [% IF ( budget_owner_name ) %]
251
        [% IF  budget_owner %]
252
            <span  id="budget_owner_name">
252
            <span  id="budget_owner_name">
253
                <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% budget_owner_id %]">
253
                <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% budget_owner.borrowernumber %]">
254
                    [% budget_owner_name %]
254
                    [% budget_owner.firstname %] [% budget_owner.surname %]
255
                </a> |
255
                </a> |
256
            </span>
256
            </span>
257
        [% END %]
257
        [% END %]
258
        <a id="edit_owner" class="new_window" href="#"><i class="fa fa-search"></i> Select owner</a>
258
        <a id="edit_owner" class="new_window" href="#"><i class="fa fa-search"></i> Select owner</a>
259
        <a id="remove_owner" href="#"><i class="fa fa-trash"></i> Remove owner</a>
259
        <a id="remove_owner" href="#"><i class="fa fa-trash"></i> Remove owner</a>
260
        <input type="hidden" name="budget_owner_id" id="budget_owner_id"
260
        <input type="hidden" name="budget_owner_id" id="budget_owner_id"
261
            value="[% budget_owner_id %]" />
261
            value="[% budget_owner.borrowernumber %]" />
262
    </li>
262
    </li>
263
263
264
264
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tt (-3 / +3 lines)
Lines 130-138 Link Here
130
                                  <li>Item is already at destination library.</li>
130
                                  <li>Item is already at destination library.</li>
131
                              [% END %]
131
                              [% END %]
132
                              [% IF ( errmsgloo.errwasreturned ) %]
132
                              [% IF ( errmsgloo.errwasreturned ) %]
133
                                  <li>Item was on loan to <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% errmsgloo.borrowernumber %]">
133
                                  <li>Item was on loan to <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% errmsgloo.patron.borrowernumber %]">
134
                                  [% errmsgloo.firstname %] [% errmsgloo.surname %]
134
                                  [% errmsgloo.patron.firstname %] [% errmsgloo.patron.surname %]
135
                                  ([% errmsgloo.cardnumber %])</a> and has been returned.</li>
135
                                  ([% errmsgloo.patron.cardnumber %])</a> and has been returned.</li>
136
                              [% END %]
136
                              [% END %]
137
                          [% END %]
137
                          [% END %]
138
                          </ul>
138
                          </ul>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/printslip.tt (-1 / +1 lines)
Lines 6-12 Link Here
6
<title>Koha &rsaquo; Circulation &rsaquo; Transfers print receipt</title>
6
<title>Koha &rsaquo; Circulation &rsaquo; Transfers print receipt</title>
7
[% ELSIF ( caller == 'members' ) %]
7
[% ELSIF ( caller == 'members' ) %]
8
<title>Koha &rsaquo; Patrons &rsaquo; Print receipt for [% borrowernumber %]</title>
8
<title>Koha &rsaquo; Patrons &rsaquo; Print receipt for [% borrowernumber %]</title>
9
[% ELSIF ( title ) %]
9
[% ELSIF ( title ) %][%# FIXME title is never defined %]
10
<title>Koha &rsaquo; Patrons &rsaquo; [% title %]</title>
10
<title>Koha &rsaquo; Patrons &rsaquo; [% title %]</title>
11
[% END %]
11
[% END %]
12
[% INCLUDE 'doc-head-close.inc' %]
12
[% INCLUDE 'doc-head-close.inc' %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tt (-7 / +7 lines)
Lines 50-65 Link Here
50
                            [% IF ( reser.itemtype ) %] (<b>[% reser.itemtype %]</b>)[% END %]
50
                            [% IF ( reser.itemtype ) %] (<b>[% reser.itemtype %]</b>)[% END %]
51
                            <br />Barcode: [% reser.barcode %]
51
                            <br />Barcode: [% reser.barcode %]
52
                    </td>
52
                    </td>
53
                    <td>[% IF ( reser.borrowername ) %]
53
                    <td>[% IF ( reser.patron ) %]
54
                        <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% reser.borrowernum %]">
54
                        <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% reser.patron.borrowernumber %]">
55
                            [% reser.borrowername %][%IF ( reser.borrowerfirstname ) %], [% reser.borrowerfirstname %][% END %]
55
                            [% reser.patron.surname %][%IF ( reser.patron.firstname ) %], [% reser.patron.firstname %][% END %]
56
                        </a>
56
                        </a>
57
                        [% IF ( reser.borrowerphone ) %]<br />[% reser.borrowerphone %][% END %]
57
                        [% IF ( reser.patron.phone ) %]<br />[% reser.patron.phone %][% END %]
58
                            [% IF ( reser.borrowermail ) %]
58
                            [% IF ( reser.patron.email ) %]
59
                                <br />
59
                                <br />
60
                                [% BLOCK subject %]Hold:[% END %]
60
                                [% BLOCK subject %]Hold:[% END %]
61
                                <a href="mailto:[% reser.borrowermail %]?subject=[% INCLUDE subject %] [% reser.title |html %]">
61
                                <a href="mailto:[% reser.patron.email %]?subject=[% INCLUDE subject %] [% reser.title |html %]">
62
                                    [% reser.borrowermail %]
62
                                    [% reser.patron.email %]
63
                                </a>
63
                                </a>
64
                            [% END %]
64
                            [% END %]
65
                        [% ELSE %]
65
                        [% ELSE %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt (-7 / +7 lines)
Lines 90-99 Link Here
90
                            [% UNLESS ( item_level_itypes ) %][% IF ( reserveloo.itemtype ) %]&nbsp; (<b>[% reserveloo.itemtype %]</b>)[% END %][% END %]
90
                            [% UNLESS ( item_level_itypes ) %][% IF ( reserveloo.itemtype ) %]&nbsp; (<b>[% reserveloo.itemtype %]</b>)[% END %][% END %]
91
                            <br />Barcode: [% reserveloo.barcode %]
91
                            <br />Barcode: [% reserveloo.barcode %]
92
                    </td>
92
                    </td>
93
                    <td><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% reserveloo.borrowernum %]">[% reserveloo.borrowername %], [% reserveloo.borrowerfirstname %]</a>
93
                    <td><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% reserveloo.patron.borrowernumber %]">[% reserveloo.patron.surname%], [% reserveloo.patron.firstname %]</a>
94
                        [% IF ( reserveloo.borrowerphone ) %]<br />[% reserveloo.borrowerphone %][% END %]
94
                        [% IF ( reserveloo.patron.phone ) %]<br />[% reserveloo.patron.phone %][% END %]
95
                        [% IF ( reserveloo.borrowermail ) %]<br /><a href="mailto:[% reserveloo.borrowermail %]?subject=Hold waiting: [% reserveloo.title %]">
95
                        [% IF ( reserveloo.patron.first_valid_email_address ) %]<br /><a href="mailto:[% reserveloo.patron.first_valid_email_address %]?subject=Hold waiting: [% reserveloo.title %]">
96
                        [% reserveloo.borrowermail %]</a>[% END %]
96
                        [% reserveloo.patron.first_valid_email_address %]</a>[% END %]
97
                    </td>
97
                    </td>
98
                    <td>[% Branches.GetName( reserveloo.homebranch ) %]</td>
98
                    <td>[% Branches.GetName( reserveloo.homebranch ) %]</td>
99
                    <td>[% Branches.GetName( reserveloo.holdingbranch ) %]</td>
99
                    <td>[% Branches.GetName( reserveloo.holdingbranch ) %]</td>
Lines 161-169 Link Here
161
                            [% UNLESS ( item_level_itypes ) %][% IF ( overloo.itemtype ) %]&nbsp; (<b>[% overloo.itemtype %]</b>)[% END %][% END %]
161
                            [% UNLESS ( item_level_itypes ) %][% IF ( overloo.itemtype ) %]&nbsp; (<b>[% overloo.itemtype %]</b>)[% END %][% END %]
162
                        <br />Barcode: [% overloo.barcode %]
162
                        <br />Barcode: [% overloo.barcode %]
163
                    </td>
163
                    </td>
164
                    <td><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% overloo.borrowernum %]">[% overloo.borrowername %], [% overloo.borrowerfirstname %]</a><br />[% overloo.borrowerphone %]<br />
164
                    <td><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% overloo.patron.borrowernumber %]">[% overloo.patron.surname %], [% overloo.patron.firstname %]</a><br />[% overloo.patron.phone %]<br />
165
                        [% IF ( overloo.borrowermail ) %]<a href="mailto:[% overloo.borrowermail %]?subject=Reservation: [% overloo.title |url %]">
165
                        [% IF ( overloo.patron.first_valid_email_address ) %]<a href="mailto:[% overloo.patron.first_valid_email_address %]?subject=Reservation: [% overloo.title |url %]">
166
        [% overloo.borrowermail %]</a>[% END %]
166
        [% overloo.patron.first_valid_email_address %]</a>[% END %]
167
                    </td>
167
                    </td>
168
                    <td>[% Branches.GetName( overloo.homebranch ) %]</td>
168
                    <td>[% Branches.GetName( overloo.homebranch ) %]</td>
169
                    <td>[% Branches.GetName( overloo.holdingbranch ) %]</td>
169
                    <td>[% Branches.GetName( overloo.holdingbranch ) %]</td>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt (-5 / +5 lines)
Lines 20-34 Link Here
20
	<div id="yui-main">
20
	<div id="yui-main">
21
	<div class="yui-b">
21
	<div class="yui-b">
22
[% INCLUDE 'members-toolbar.inc' %]
22
[% INCLUDE 'members-toolbar.inc' %]
23
<form action="/cgi-bin/koha/members/boraccount.pl" method="get"><input type="hidden" name="borrowernumber" id="borrowernumber" value="[% borrowernumber %]" /></form>
23
<form action="/cgi-bin/koha/members/boraccount.pl" method="get"><input type="hidden" name="borrowernumber" id="borrowernumber" value="[% patron.borrowernumber %]" /></form>
24
24
25
<!-- The manual invoice and credit buttons -->
25
<!-- The manual invoice and credit buttons -->
26
<div class="statictabs">
26
<div class="statictabs">
27
<ul>
27
<ul>
28
    <li class="active"><a href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=[% borrowernumber %]">Account</a></li>
28
    <li class="active"><a href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=[% patron.borrowernumber %]">Account</a></li>
29
	<li><a href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% borrowernumber %]" >Pay fines</a></li>
29
    <li><a href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% patron.borrowernumber %]" >Pay fines</a></li>
30
	<li><a href="/cgi-bin/koha/members/maninvoice.pl?borrowernumber=[% borrowernumber %]" >Create manual invoice</a></li>
30
    <li><a href="/cgi-bin/koha/members/maninvoice.pl?borrowernumber=[% patron.borrowernumber %]" >Create manual invoice</a></li>
31
	<li><a href="/cgi-bin/koha/members/mancredit.pl?borrowernumber=[% borrowernumber %]" >Create manual credit</a></li>
31
    <li><a href="/cgi-bin/koha/members/mancredit.pl?borrowernumber=[% patron.borrowernumber %]" >Create manual credit</a></li>
32
</ul>
32
</ul>
33
<div class="tabs-container">
33
<div class="tabs-container">
34
<!-- The table with the account items -->
34
<!-- The table with the account items -->
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/deletemem.tt (-7 / +7 lines)
Lines 1-13 Link Here
1
[% SET footerjs = 1 %]
1
[% SET footerjs = 1 %]
2
[% INCLUDE 'doc-head-open.inc' %]
2
[% INCLUDE 'doc-head-open.inc' %]
3
<title>Koha &rsaquo; Delete patron [% firstname %] [% surname %]</title>
3
<title>Koha &rsaquo; Delete patron [% patron.firstname %] [% patron.surname %]</title>
4
[% INCLUDE 'doc-head-close.inc' %]
4
[% INCLUDE 'doc-head-close.inc' %]
5
</head>
5
</head>
6
<body id="pat_deletemem" class="pat">
6
<body id="pat_deletemem" class="pat">
7
[% INCLUDE 'header.inc' %]
7
[% INCLUDE 'header.inc' %]
8
[% INCLUDE 'patron-search.inc' %]
8
[% INCLUDE 'patron-search.inc' %]
9
9
10
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/members/members-home.pl">Patrons</a> &rsaquo; Delete patron [% firstname %] [% surname %]</div>
10
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/members/members-home.pl">Patrons</a> &rsaquo; Delete patron [% patron.firstname %] [% patron.surname %]</div>
11
<div id="doc3" class="yui-t2">
11
<div id="doc3" class="yui-t2">
12
   
12
   
13
   <div id="bd">
13
   <div id="bd">
Lines 29-46 Link Here
29
            [% END %]
29
            [% END %]
30
            </ul>
30
            </ul>
31
    </div>
31
    </div>
32
    [% ELSIF op == 'delete_confirm' and borrowernumber %]
32
    [% ELSIF op == 'delete_confirm' and patron %]
33
        [%# TODO add "patron does not exist" unless borrowernumber %]
33
        [%# TODO add "patron does not exist" unless patron %]
34
        <div class="dialog alert">
34
        <div class="dialog alert">
35
            <h3>Are you sure you want to delete the patron [% firstname %] [% surname %]? This cannot be undone.</h3>
35
            <h3>Are you sure you want to delete the patron [% patron.firstname %] [% patron.surname %]? This cannot be undone.</h3>
36
            <form action="/cgi-bin/koha/members/deletemem.pl">
36
            <form action="/cgi-bin/koha/members/deletemem.pl">
37
                <input type="hidden" name="csrf_token" value="[% csrf_token %]" />
37
                <input type="hidden" name="csrf_token" value="[% csrf_token %]" />
38
                <input type="hidden" name="member" value="[% borrowernumber %]"/>
38
                <input type="hidden" name="member" value="[% patron.borrowernumber %]"/>
39
                <input type="hidden" name="op" value="delete_confirmed" />
39
                <input type="hidden" name="op" value="delete_confirmed" />
40
                <button type="submit" class="approve"><i class="fa fa-fw fa-check"></i> Yes, delete</button>
40
                <button type="submit" class="approve"><i class="fa fa-fw fa-check"></i> Yes, delete</button>
41
            </form>
41
            </form>
42
            <form action="/cgi-bin/koha/members/moremember.pl">
42
            <form action="/cgi-bin/koha/members/moremember.pl">
43
                <input type="hidden" name="borrowernumber" value="[% borrowernumber %]"/>
43
                <input type="hidden" name="borrowernumber" value="[% patron.borrowernumber %]"/>
44
                <button type="submit" class="deny"><i class="fa fa-fw fa-remove"></i> No, do not delete</button>
44
                <button type="submit" class="deny"><i class="fa fa-fw fa-remove"></i> No, do not delete</button>
45
            </form>
45
            </form>
46
        </div>
46
        </div>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/discharge.tt (-4 / +4 lines)
Lines 3-9 Link Here
3
[% USE Branches %]
3
[% USE Branches %]
4
[% SET footerjs = 1 %]
4
[% SET footerjs = 1 %]
5
[% INCLUDE 'doc-head-open.inc' %]
5
[% INCLUDE 'doc-head-open.inc' %]
6
<title>Koha &rsaquo; Patrons &rsaquo; [% UNLESS blocking_error  %]Discharge for [% firstname %] [% surname %] ([% cardnumber %])[% END %]</title>
6
<title>Koha &rsaquo; Patrons &rsaquo; [% UNLESS blocking_error  %]Discharge for [% patron.firstname %] [% patron.surname %] ([% patron.cardnumber %])[% END %]</title>
7
[% INCLUDE 'doc-head-close.inc' %]
7
[% INCLUDE 'doc-head-close.inc' %]
8
</head>
8
</head>
9
<body id="discharge" class="discharge">
9
<body id="discharge" class="discharge">
Lines 13-19 Link Here
13
<div id="breadcrumbs">
13
<div id="breadcrumbs">
14
         <a href="/cgi-bin/koha/mainpage.pl">Home</a>
14
         <a href="/cgi-bin/koha/mainpage.pl">Home</a>
15
&rsaquo; <a href="/cgi-bin/koha/members/members-home.pl">Patrons</a>
15
&rsaquo; <a href="/cgi-bin/koha/members/members-home.pl">Patrons</a>
16
&rsaquo; [% UNLESS blocking_error  %]Discharge for [% firstname %] [% surname %] ([% cardnumber %])[% END %]
16
&rsaquo; [% UNLESS blocking_error  %]Discharge for [% patron.firstname %] [% patron.surname %] ([% patron.cardnumber %])[% END %]
17
</div>
17
</div>
18
18
19
<div id="doc3" class="yui-t1">
19
<div id="doc3" class="yui-t1">
Lines 33-44 Link Here
33
[% UNLESS can_be_discharged %]
33
[% UNLESS can_be_discharged %]
34
    <p>Cannot edit discharge: the patron has checked out items.</p>
34
    <p>Cannot edit discharge: the patron has checked out items.</p>
35
[% ELSE %]
35
[% ELSE %]
36
    [% IF has_reserves %]
36
    [% IF patron.holds.count %]
37
        <p>Borrower has reserves: they will be canceled if the discharge is generated.</p>
37
        <p>Borrower has reserves: they will be canceled if the discharge is generated.</p>
38
    [% END %]
38
    [% END %]
39
    <form method="post">
39
    <form method="post">
40
        <input type="submit" value="Generate discharge" name="discharge" />
40
        <input type="submit" value="Generate discharge" name="discharge" />
41
        <input type="hidden" value="[% borrowernumber %]" name="borrowernumber" />
41
        <input type="hidden" value="[% patron.borrowernumber %]" name="borrowernumber" />
42
    </form>
42
    </form>
43
[% END %]
43
[% END %]
44
44
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/housebound.tt (-8 / +8 lines)
Lines 57-63 Link Here
57
              <h4>Manage housebound profile</h4>
57
              <h4>Manage housebound profile</h4>
58
              <form id="editform" method="post" name="editform"
58
              <form id="editform" method="post" name="editform"
59
                    action="/cgi-bin/koha/members/housebound.pl">
59
                    action="/cgi-bin/koha/members/housebound.pl">
60
                <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
60
                <input type="hidden" name="borrowernumber" value="[% patron.borrowernumber %]" />
61
                [% IF ( housebound_profile ) %]
61
                [% IF ( housebound_profile ) %]
62
                  <input type="hidden" name="method" value="updateconfirm" />
62
                  <input type="hidden" name="method" value="updateconfirm" />
63
                [% ELSE %]
63
                [% ELSE %]
Lines 188-194 Link Here
188
                <fieldset class="action">
188
                <fieldset class="action">
189
                  <button type="submit" class="btn btn-default btn-sm"><i class="fa fa-save"></i> Save changes</button>
189
                  <button type="submit" class="btn btn-default btn-sm"><i class="fa fa-save"></i> Save changes</button>
190
                  <a class="cancel btn btn-link btn-sm"
190
                  <a class="cancel btn btn-link btn-sm"
191
                     href="/cgi-bin/koha/members/housebound.pl?borrowernumber=[% borrowernumber %]">
191
                     href="/cgi-bin/koha/members/housebound.pl?borrowernumber=[% patron.borrowernumber %]">
192
                    Cancel
192
                    Cancel
193
                  </a>
193
                  </a>
194
                </fieldset>
194
                </fieldset>
Lines 205-211 Link Here
205
                [% ELSE %]
205
                [% ELSE %]
206
                  <input type="hidden" name="method" value="addvisitconfirm" />
206
                  <input type="hidden" name="method" value="addvisitconfirm" />
207
                [% END %]
207
                [% END %]
208
                <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
208
                <input type="hidden" name="borrowernumber" value="[% patron.borrowernumber %]" />
209
                <fieldset class="rows" id="instance">
209
                <fieldset class="rows" id="instance">
210
                  <legend>Delivery details</legend>
210
                  <legend>Delivery details</legend>
211
                  <ol>
211
                  <ol>
Lines 314-320 Link Here
314
                <fieldset class="action">
314
                <fieldset class="action">
315
                  <button type="submit" class="btn btn-default btn-sm"><i class="fa fa-save"></i> Save</button>
315
                  <button type="submit" class="btn btn-default btn-sm"><i class="fa fa-save"></i> Save</button>
316
                  <a class="cancel"
316
                  <a class="cancel"
317
                     href="/cgi-bin/koha/members/housebound.pl?borrowernumber=[% borrowernumber %]">
317
                     href="/cgi-bin/koha/members/housebound.pl?borrowernumber=[% patron.borrowernumber %]">
318
                    Cancel
318
                    Cancel
319
                  </a>
319
                  </a>
320
                </fieldset>
320
                </fieldset>
Lines 371-377 Link Here
371
                  </li>
371
                  </li>
372
                </ol>
372
                </ol>
373
                <div class="action">
373
                <div class="action">
374
                  <a class="btn btn-default btn-xs" href="/cgi-bin/koha/members/housebound.pl?borrowernumber=[% borrowernumber %]&method=update_or_create"><i class="fa fa-pencil"></i> Edit</a>
374
                  <a class="btn btn-default btn-xs" href="/cgi-bin/koha/members/housebound.pl?borrowernumber=[% patron.borrowernumber %]&method=update_or_create"><i class="fa fa-pencil"></i> Edit</a>
375
                </div>
375
                </div>
376
              </div>
376
              </div>
377
              <div>
377
              <div>
Lines 397-411 Link Here
397
                        </a>
397
                        </a>
398
                      </td>
398
                      </td>
399
                      <td class="actions">
399
                      <td class="actions">
400
                        <a class="btn btn-default btn-xs" href="/cgi-bin/koha/members/housebound.pl?method=visit_update_or_create&visit_id=[% entry.id %]&borrowernumber=[% borrowernumber %]"><i class="fa fa-pencil"></i> Edit</a>
400
                        <a class="btn btn-default btn-xs" href="/cgi-bin/koha/members/housebound.pl?method=visit_update_or_create&visit_id=[% entry.id %]&borrowernumber=[% patron.borrowernumber %]"><i class="fa fa-pencil"></i> Edit</a>
401
                        <a class="delete btn btn-default btn-xs" href="/cgi-bin/koha/members/housebound.pl?method=visit_delete&visit_id=[% entry.id %]&borrowernumber=[% borrowernumber %]"><i class="fa fa-trash"></i> Delete</a>
401
                        <a class="delete btn btn-default btn-xs" href="/cgi-bin/koha/members/housebound.pl?method=visit_delete&visit_id=[% entry.id %]&borrowernumber=[% patron.borrowernumber %]"><i class="fa fa-trash"></i> Delete</a>
402
                      </td>
402
                      </td>
403
                    </tr>
403
                    </tr>
404
                    [% END %]
404
                    [% END %]
405
                </table>
405
                </table>
406
                [% END %]
406
                [% END %]
407
                <div class="action">
407
                <div class="action">
408
                  <a href="/cgi-bin/koha/members/housebound.pl?method=visit_update_or_create&borrowernumber=[% borrowernumber %]"
408
                  <a href="/cgi-bin/koha/members/housebound.pl?method=visit_update_or_create&borrowernumber=[% patron.borrowernumber %]"
409
                    class="btn btn-default btn-sm">
409
                    class="btn btn-default btn-sm">
410
                    <i class="fa fa-plus"></i> Add a new delivery
410
                    <i class="fa fa-plus"></i> Add a new delivery
411
                  </a>
411
                  </a>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tt (-6 / +6 lines)
Lines 21-35 Link Here
21
<!-- The manual invoice and credit buttons -->
21
<!-- The manual invoice and credit buttons -->
22
<div class="statictabs">
22
<div class="statictabs">
23
<ul>
23
<ul>
24
	<li><a href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=[% borrowernumber %]">Account</a></li>
24
    <li><a href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=[% patron.borrowernumber %]">Account</a></li>
25
	<li><a href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% borrowernumber %]" >Pay fines</a></li>
25
    <li><a href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% patron.borrowernumber %]" >Pay fines</a></li>
26
	<li><a href="/cgi-bin/koha/members/maninvoice.pl?borrowernumber=[% borrowernumber %]" >Create manual invoice</a></li>
26
    <li><a href="/cgi-bin/koha/members/maninvoice.pl?borrowernumber=[% patron.borrowernumber %]" >Create manual invoice</a></li>
27
    <li class="active"><a href="/cgi-bin/koha/members/mancredit.pl?borrowernumber=[% borrowernumber %]" >Create manual credit</a></li>
27
    <li class="active"><a href="/cgi-bin/koha/members/mancredit.pl?borrowernumber=[% patron.borrowernumber %]" >Create manual credit</a></li>
28
</ul>
28
</ul>
29
<div class="tabs-container">
29
<div class="tabs-container">
30
30
31
<form action="/cgi-bin/koha/members/mancredit.pl" method="post" id="mancredit">
31
<form action="/cgi-bin/koha/members/mancredit.pl" method="post" id="mancredit">
32
<input type="hidden" name="borrowernumber" id="borrowernumber" value="[% borrowernumber %]" />
32
<input type="hidden" name="borrowernumber" id="borrowernumber" value="[% patron.borrowernumber %]" />
33
33
34
<fieldset class="rows">
34
<fieldset class="rows">
35
<legend>Manual credit</legend><ol>
35
<legend>Manual credit</legend><ol>
Lines 43-49 Link Here
43
    <li><label for="amount">Amount: </label><input type="number" name="amount" id="amount" required="required" value="" step="any" min="0" /> Example: 5.00</li>
43
    <li><label for="amount">Amount: </label><input type="number" name="amount" id="amount" required="required" value="" step="any" min="0" /> Example: 5.00</li>
44
</ol></fieldset>
44
</ol></fieldset>
45
45
46
<fieldset class="action"><input type="submit" name="add" value="Add credit" /> <a class="cancel" href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=[% borrowernumber %]">Cancel</a></fieldset>
46
<fieldset class="action"><input type="submit" name="add" value="Add credit" /> <a class="cancel" href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=[% patron.borrowernumber %]">Cancel</a></fieldset>
47
</form>
47
</form>
48
48
49
</div></div>
49
</div></div>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tt (-6 / +6 lines)
Lines 21-30 Link Here
21
<!-- The manual invoice and credit buttons -->
21
<!-- The manual invoice and credit buttons -->
22
<div class="statictabs">
22
<div class="statictabs">
23
<ul>
23
<ul>
24
	<li><a href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=[% borrowernumber %]">Account</a></li>
24
    <li><a href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=[% patron.borrowernumber %]">Account</a></li>
25
	<li><a href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% borrowernumber %]" >Pay fines</a></li>
25
    <li><a href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% patron.borrowernumber %]" >Pay fines</a></li>
26
    <li class="active"><a href="/cgi-bin/koha/members/maninvoice.pl?borrowernumber=[% borrowernumber %]" >Create manual invoice</a></li>
26
    <li class="active"><a href="/cgi-bin/koha/members/maninvoice.pl?borrowernumber=[% patron.borrowernumber %]" >Create manual invoice</a></li>
27
	<li><a href="/cgi-bin/koha/members/mancredit.pl?borrowernumber=[% borrowernumber %]" >Create manual credit</a></li>
27
    <li><a href="/cgi-bin/koha/members/mancredit.pl?borrowernumber=[% patron.borrowernumber %]" >Create manual credit</a></li>
28
</ul>
28
</ul>
29
<div class="tabs-container">
29
<div class="tabs-container">
30
30
Lines 33-39 Link Here
33
  ERROR an invalid itemnumber was entered, please hit back and try again
33
  ERROR an invalid itemnumber was entered, please hit back and try again
34
[% END %]
34
[% END %]
35
[% ELSE %]
35
[% ELSE %]
36
<form action="/cgi-bin/koha/members/maninvoice.pl" method="post" id="maninvoice"><input type="hidden" name="borrowernumber" id="borrowernumber" value="[% borrowernumber %]" />
36
<form action="/cgi-bin/koha/members/maninvoice.pl" method="post" id="maninvoice"><input type="hidden" name="borrowernumber" id="borrowernumber" value="[% patron.borrowernumber %]" />
37
	<fieldset class="rows">
37
	<fieldset class="rows">
38
	<legend>Manual invoice</legend>
38
	<legend>Manual invoice</legend>
39
	<ol>
39
	<ol>
Lines 55-61 Link Here
55
    <li><label for="note">Note: </label><input type="text" name="note" size="50" id="note" /></li>
55
    <li><label for="note">Note: </label><input type="text" name="note" size="50" id="note" /></li>
56
    <li><label for="amount">Amount: </label><input type="number" name="amount" id="amount" required="required" value="" step="any" min="0" /> Example: 5.00</li>
56
    <li><label for="amount">Amount: </label><input type="number" name="amount" id="amount" required="required" value="" step="any" min="0" /> Example: 5.00</li>
57
	</ol></fieldset>
57
	</ol></fieldset>
58
<fieldset class="action"><input type="submit" name="add" value="Save" /> <a class="cancel" href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=[% borrowernumber %]">Cancel</a></fieldset>
58
<fieldset class="action"><input type="submit" name="add" value="Save" /> <a class="cancel" href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=[% patron.borrowernumber %]">Cancel</a></fieldset>
59
</form>
59
</form>
60
60
61
[% END %]
61
[% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-flags.tt (-5 / +5 lines)
Lines 2-8 Link Here
2
[% SET footerjs = 1 %]
2
[% SET footerjs = 1 %]
3
[% PROCESS 'permissions.inc' %]
3
[% PROCESS 'permissions.inc' %]
4
[% INCLUDE 'doc-head-open.inc' %]
4
[% INCLUDE 'doc-head-open.inc' %]
5
<title>Koha &rsaquo; Patrons &rsaquo; Set permissions for [% surname %], [% firstname %]</title>
5
<title>Koha &rsaquo; Patrons &rsaquo; Set permissions for [% patron.surname %], [% patron.firstname %]</title>
6
<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/treeview/jquery.treeview_[% KOHA_VERSION %].css"/>
6
<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/treeview/jquery.treeview_[% KOHA_VERSION %].css"/>
7
[% INCLUDE 'doc-head-close.inc' %]
7
[% INCLUDE 'doc-head-close.inc' %]
8
</head>
8
</head>
Lines 11-17 Link Here
11
[% INCLUDE 'header.inc' %]
11
[% INCLUDE 'header.inc' %]
12
[% INCLUDE 'patron-search.inc' %]
12
[% INCLUDE 'patron-search.inc' %]
13
13
14
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/members/members-home.pl">Patrons</a>  &rsaquo; Set permissions for [% surname %], [% firstname %]</div>
14
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/members/members-home.pl">Patrons</a>  &rsaquo; Set permissions for [% patron.surname %], [% patron.firstname %]</div>
15
15
16
<div id="doc3" class="yui-t2">
16
<div id="doc3" class="yui-t2">
17
   
17
   
Lines 22-30 Link Here
22
22
23
<form method="post" action="/cgi-bin/koha/members/member-flags.pl">
23
<form method="post" action="/cgi-bin/koha/members/member-flags.pl">
24
    <input type="hidden" name="csrf_token" value="[% csrf_token %]" />
24
    <input type="hidden" name="csrf_token" value="[% csrf_token %]" />
25
    <input type="hidden" name="member" id="borrowernumber" value="[% borrowernumber %]" />
25
    <input type="hidden" name="member" id="borrowernumber" value="[% patron.borrowernumber %]" />
26
    <input type="hidden" name="newflags" value="1" />
26
    <input type="hidden" name="newflags" value="1" />
27
    <h1>Set permissions for [% surname %], [% firstname %]</h1>
27
    <h1>Set permissions for [% patron.surname %], [% patron.firstname %]</h1>
28
    <!-- <ul id="permissionstree"><li class="root">All privileges<ul> -->
28
    <!-- <ul id="permissionstree"><li class="root">All privileges<ul> -->
29
    <ul id="permissionstree" class="treeview-grey">
29
    <ul id="permissionstree" class="treeview-grey">
30
        <!-- <li class="folder-close">One level down<ul> -->
30
        <!-- <li class="folder-close">One level down<ul> -->
Lines 64-70 Link Here
64
    <!-- </ul></li></ul> -->
64
    <!-- </ul></li></ul> -->
65
    </ul>
65
    </ul>
66
66
67
<fieldset class="action"><input type="submit" value="Save" /> <a class="cancel" href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]">Cancel</a></fieldset>
67
<fieldset class="action"><input type="submit" value="Save" /> <a class="cancel" href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber %]">Cancel</a></fieldset>
68
68
69
</form>
69
</form>
70
</div>
70
</div>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-password.tt (-7 / +7 lines)
Lines 2-8 Link Here
2
[% USE Branches %]
2
[% USE Branches %]
3
[% SET footerjs = 1 %]
3
[% SET footerjs = 1 %]
4
[% INCLUDE 'doc-head-open.inc' %]
4
[% INCLUDE 'doc-head-open.inc' %]
5
<title>Koha &rsaquo; Patrons &rsaquo; [% IF ( newpassword ) %]Password updated [% ELSE %]Update password for [% surname %], [% firstname %][% END %]</title>
5
<title>Koha &rsaquo; Patrons &rsaquo; [% IF ( newpassword ) %]Password updated [% ELSE %]Update password for [% patron.surname %], [% patron.firstname %][% END %]</title>
6
[% INCLUDE 'doc-head-close.inc' %]
6
[% INCLUDE 'doc-head-close.inc' %]
7
</head>
7
</head>
8
8
Lines 10-16 Link Here
10
[% INCLUDE 'header.inc' %]
10
[% INCLUDE 'header.inc' %]
11
[% INCLUDE 'patron-search.inc' %]
11
[% INCLUDE 'patron-search.inc' %]
12
12
13
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/members/members-home.pl">Patrons</a>  &rsaquo; <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]">[% firstname %] [% surname %]</a> &rsaquo; [% IF ( newpassword ) %]Password Updated[% ELSE %]Change username and/or password[% END %]</div>
13
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/members/members-home.pl">Patrons</a>  &rsaquo; <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber %]">[% patron.firstname %] [% patron.surname %]</a> &rsaquo; [% IF ( newpassword ) %]Password Updated[% ELSE %]Change username and/or password[% END %]</div>
14
14
15
<div id="doc3" class="yui-t2">
15
<div id="doc3" class="yui-t2">
16
16
Lines 26-33 Link Here
26
26
27
<form method="post" id="changepasswordf" action="/cgi-bin/koha/members/member-password.pl">
27
<form method="post" id="changepasswordf" action="/cgi-bin/koha/members/member-password.pl">
28
<input type="hidden" name="destination" value="[% destination %]" />
28
<input type="hidden" name="destination" value="[% destination %]" />
29
<input type="hidden" name="cardnumber" value="[% cardnumber %]" />
29
<input type="hidden" name="cardnumber" value="[% patron.cardnumber %]" />
30
<input type="hidden" name="borrowernumber" id="borrowernumber" value="[% borrowernumber %]" />
30
<input type="hidden" name="borrowernumber" id="borrowernumber" value="[% patron.borrowernumber %]" />
31
	[% IF ( errormsg ) %]
31
	[% IF ( errormsg ) %]
32
		<div class="dialog alert">
32
		<div class="dialog alert">
33
		<h4>The following errors have occurred:</h4>
33
		<h4>The following errors have occurred:</h4>
Lines 55-64 Link Here
55
	[% END %]
55
	[% END %]
56
56
57
57
58
    <fieldset class="brief"><legend>Change username and/or password for [% firstname %] [% surname %]</legend>
58
    <fieldset class="brief"><legend>Change username and/or password for [% patron.firstname %] [% patron.surname %]</legend>
59
	<ol>
59
	<ol>
60
    <li><label for="newuserid">New username:</label>
60
    <li><label for="newuserid">New username:</label>
61
	<input type="hidden" name="member" value="[% borrowernumber %]" /><input type="text" id="newuserid" name="newuserid" size="20" value="[% userid %]" /></li>
61
	<input type="hidden" name="member" value="[% patron.borrowernumber %]" /><input type="text" id="newuserid" name="newuserid" size="20" value="[% patron.userid %]" /></li>
62
    [% SET password_pattern = ".{" _ Koha.Preference('minPasswordLength') _ ",}" %]
62
    [% SET password_pattern = ".{" _ Koha.Preference('minPasswordLength') _ ",}" %]
63
    [% IF Koha.Preference('RequireStrongPassword') %]
63
    [% IF Koha.Preference('RequireStrongPassword') %]
64
        [% SET password_pattern = '(?=.*\d)(?=.*[a-z])(?=.*[A-Z]).{' _ Koha.Preference('minPasswordLength') _ ',}' %]
64
        [% SET password_pattern = '(?=.*\d)(?=.*[a-z])(?=.*[A-Z]).{' _ Koha.Preference('minPasswordLength') _ ',}' %]
Lines 77-83 Link Here
77
    <fieldset class="action">
77
    <fieldset class="action">
78
        <input type="hidden" name="csrf_token" value="[% csrf_token %]" />
78
        <input type="hidden" name="csrf_token" value="[% csrf_token %]" />
79
        <input type="submit" value="Save" />
79
        <input type="submit" value="Save" />
80
        <a class="cancel" href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]">Cancel</a>
80
        <a class="cancel" href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber %]">Cancel</a>
81
    </fieldset>
81
    </fieldset>
82
</form>[% END %]
82
</form>[% END %]
83
83
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt (-1 / +1 lines)
Lines 3-9 Link Here
3
[% USE Branches %]
3
[% USE Branches %]
4
[% SET footerjs = 1 %]
4
[% SET footerjs = 1 %]
5
[% INCLUDE 'doc-head-open.inc' %]
5
[% INCLUDE 'doc-head-open.inc' %]
6
<title>Koha &rsaquo; Patrons &rsaquo; [% IF ( opadd ) %]Add[% ELSIF ( opduplicate ) %]Duplicate[% ELSE %] Modify[% END %] patron [% IF (firstname) %][% firstname %] [% END %][% IF (surname) %][% surname %] [% END %]([%IF ( categoryname ) %][% categoryname %][% ELSE %][% IF ( I ) %]Organization[% END %][% IF ( A ) %]Adult[% END %][% IF ( C ) %]Child[% END %][% IF ( P ) %]Professional[% END %][% IF ( S ) %]Staff[% END %][% END %])</title>
6
<title>Koha &rsaquo; Patrons &rsaquo; [% IF ( opadd ) %]Add[% ELSIF ( opduplicate ) %]Duplicate[% ELSE %] Modify[% END %] patron [% IF (firstname) %][% firstname %] [% END %][% IF (surname) %][% surname %] [% END %]([%IF patron %][% patron.category.description %][% ELSE %][% IF ( I ) %]Organization[% END %][% IF ( A ) %]Adult[% END %][% IF ( C ) %]Child[% END %][% IF ( P ) %]Professional[% END %][% IF ( S ) %]Staff[% END %][% END %])</title>
7
[% INCLUDE 'doc-head-close.inc' %]
7
[% INCLUDE 'doc-head-close.inc' %]
8
</head>
8
</head>
9
9
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tt (-10 / +10 lines)
Lines 4-16 Link Here
4
[% USE Price %]
4
[% USE Price %]
5
[% SET footerjs = 1 %]
5
[% SET footerjs = 1 %]
6
[% INCLUDE 'doc-head-open.inc' %]
6
[% INCLUDE 'doc-head-open.inc' %]
7
    <title>Summary for [% firstname %] [% surname %] ([% cardnumber %])</title>
7
    <title>Summary for [% patron.firstname %] [% patron.surname %] ([% patron.cardnumber %])</title>
8
    [% INCLUDE 'doc-head-close.inc' %]
8
    [% INCLUDE 'doc-head-close.inc' %]
9
</head>
9
</head>
10
10
11
<body id="pat_moremember-print" class="pat">
11
<body id="pat_moremember-print" class="pat">
12
    <div id="main">
12
    <div id="main">
13
        <h3><a href="/cgi-bin/koha/circ/circulation.pl?findborrower=[% cardnumber %]">Account summary: [% firstname %] [% surname %] ([% cardnumber %])</a></h3>
13
        <h3><a href="/cgi-bin/koha/circ/circulation.pl?findborrower=[% patron.cardnumber %]">Account summary: [% patron.firstname %] [% patron.surname %] ([% patron.cardnumber %])</a></h3>
14
14
15
        <ul>
15
        <ul>
16
            [% IF Koha.Preference( 'AddressFormat' ) %]
16
            [% IF Koha.Preference( 'AddressFormat' ) %]
Lines 18-32 Link Here
18
            [% ELSE %]
18
            [% ELSE %]
19
                [% INCLUDE 'member-display-address-style-us.inc' %]
19
                [% INCLUDE 'member-display-address-style-us.inc' %]
20
            [% END %]
20
            [% END %]
21
            <li>[% IF ( phone ) %][% phone %][% ELSE %](no phone number on file)[% END %]</li>
21
            <li>[% IF ( patron.phone ) %][% patron.phone %][% ELSE %](no phone number on file)[% END %]</li>
22
            <li>[% IF ( email ) %][% email %][% ELSE %](no primary email on file)[% END %]</li>
22
            <li>[% IF ( patron.email ) %][% patron.email %][% ELSE %](no primary email on file)[% END %]</li>
23
            [% IF ( emailpro ) %]
23
            [% IF ( patron.emailpro ) %]
24
                <li>[% emailpro %]</li>
24
                <li>[% patron.emailpro %]</li>
25
            [% END %]
25
            [% END %]
26
            <li>Registration date: [% dateenrolled | $KohaDates %]</li>
26
            <li>Registration date: [% patron.dateenrolled | $KohaDates %]</li>
27
            <li>Expiration date: [% dateexpiry | $KohaDates %]</li>
27
            <li>Expiration date: [% patron.dateexpiry | $KohaDates %]</li>
28
            <li>Library: [% Branches.GetName( branchcode ) %]</li>
28
            <li>Library: [% Branches.GetName( patron.branchcode ) %]</li>
29
            <li>Category: [% description %]</li>
29
            <li>Category: [% patron.category.description %]</li>
30
        </ul>
30
        </ul>
31
31
32
        [% IF ( issues ) %]
32
        [% IF ( issues ) %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt (-59 / +59 lines)
Lines 54-60 Link Here
54
[% END %]
54
[% END %]
55
<div class="yui-g">
55
<div class="yui-g">
56
56
57
    [% IF ( was_renewed ) %]<div class="dialog message">Patron's account has been renewed until [% dateexpiry | $KohaDates %]</div>[% END %]
57
    [% IF ( was_renewed ) %]<div class="dialog message">Patron's account has been renewed until [% patron.dateexpiry | $KohaDates %]</div>[% END %]
58
58
59
    [% IF fines %]
59
    [% IF fines %]
60
    <div id="circmessages" class="circmessage attention">
60
    <div id="circmessages" class="circmessage attention">
Lines 110-126 Link Here
110
                <a href="#reldebarments" id="view_restrictions">View restrictions</a>
110
                <a href="#reldebarments" id="view_restrictions">View restrictions</a>
111
            </li>
111
            </li>
112
        [% END %]
112
        [% END %]
113
        [% IF ( gonenoaddress ) %]<li class="blocker">Patron's address is in doubt.</li>[% END %]
113
        [% IF ( patron.gonenoaddress ) %]<li class="blocker">Patron's address is in doubt.</li>[% END %]
114
        [% IF ( lost ) %]<li class="blocker">Patron's card has been reported lost.</li>[% END %]
114
        [% IF ( lost ) %]<li class="blocker">Patron's card has been reported lost.</li>[% END %]
115
        </ul>
115
        </ul>
116
    </div>
116
    </div>
117
    [% END %]
117
    [% END %]
118
<h3>[% UNLESS ( I ) %]
118
<h3>[% UNLESS ( I ) %]
119
   [% title | html %] [% firstname | html %] [% END %] [% surname | html %] ([% cardnumber | html %])</h3>
119
   [% patron.title | html %] [% patron.firstname | html %] [% END %] [% patron.surname | html %] ([% patron.cardnumber | html %])</h3>
120
 <div class="yui-u first">
120
 <div class="yui-u first">
121
<div id="patron-information" style="padding : .5em;">
121
<div id="patron-information" style="padding : .5em;">
122
122
123
    [% IF ( othernames ) %]&ldquo;[% othernames | html %]&rdquo;[% END %]
123
    [% IF ( patron.othernames ) %]&ldquo;[% patron.othernames | html %]&rdquo;[% END %]
124
124
125
    <div class = "address">
125
    <div class = "address">
126
        [% IF Koha.Preference( 'AddressFormat' ) %]
126
        [% IF Koha.Preference( 'AddressFormat' ) %]
Lines 132-148 Link Here
132
		    
132
		    
133
	<div class="rows">
133
	<div class="rows">
134
    <ol>
134
    <ol>
135
        [% IF ( phone ) %]<li><span class="label">Primary phone: </span><a href="tel:[% phone %]">[% phone | html %]</a></li>[% END %]
135
        [% IF ( patron.phone ) %]<li><span class="label">Primary phone: </span><a href="tel:[% patron.phone %]">[% patron.phone | html %]</a></li>[% END %]
136
        [% IF ( phonepro ) %]<li><span class="label">Secondary phone: </span><a href="tel:[% phonepro %]">[% phonepro | html %]</a></li>[% END %]
136
        [% IF ( patron.phonepro ) %]<li><span class="label">Secondary phone: </span><a href="tel:[% patron.phonepro %]">[% patron.phonepro | html %]</a></li>[% END %]
137
        [% IF ( mobile ) %]<li><span class="label">Other phone: </span><a href="tel:[% mobile %]">[% mobile | html %]</a></li>[% END %]
137
        [% IF ( patron.mobile ) %]<li><span class="label">Other phone: </span><a href="tel:[% patron.mobile %]">[% patron.mobile | html %]</a></li>[% END %]
138
        [% IF ( fax ) %]<li><span class="label">Fax: </span>[% fax |html %]</li>[% END %]
138
        [% IF ( patron.fax ) %]<li><span class="label">Fax: </span>[% patron.fax |html %]</li>[% END %]
139
        [% IF ( email ) %]<li class="email"><span class="label">Primary email:</span><a title="[% email %]" href="mailto:[% email | url %]">[% email | html %]</a></li>[% END %]
139
        [% IF ( patron.email ) %]<li class="email"><span class="label">Primary email:</span><a title="[% patron.email %]" href="mailto:[% patron.email | url %]">[% patron.email | html %]</a></li>[% END %]
140
        [% IF ( emailpro ) %]<li class="email"><span class="label">Secondary email: </span><a title="[% emailpro %]" href="mailto:[% emailpro | url %]">[% emailpro | html %]</a></li>[% END %]
140
        [% IF ( patron.emailpro ) %]<li class="email"><span class="label">Secondary email: </span><a title="[% patron.emailpro %]" href="mailto:[% patron.emailpro | url %]">[% patron.emailpro | html %]</a></li>[% END %]
141
        [% UNLESS ( I ) %]
141
        [% UNLESS ( I ) %]
142
            [% IF ( initials ) %]<li><span class="label">Initials: </span>[% initials | html %]</li>[% END %]
142
            [% IF ( patron.initials ) %]<li><span class="label">Initials: </span>[% patron.initials | html %]</li>[% END %]
143
            [% IF ( dateofbirth ) %]<li><span class="label">Date of birth:</span>[% dateofbirth | $KohaDates %] ([% age %] years)</li>[% END %]
143
            [% IF ( patron.dateofbirth ) %]<li><span class="label">Date of birth:</span>[% patron.dateofbirth | $KohaDates %] ([% age %] years)</li>[% END %]
144
            [% IF ( sex ) %]<li><span class="label">Gender:</span>
144
            [% IF ( patron.sex ) %]<li><span class="label">Gender:</span>
145
                [% IF ( sex == 'F' ) %]Female[% ELSIF ( sex == 'M' ) %]Male[% ELSE %][% sex %][% END %]
145
                [% IF ( patron.sex == 'F' ) %]Female[% ELSIF ( patron.sex == 'M' ) %]Male[% ELSE %][% patron.sex %][% END %]
146
            </li>[% END %]
146
            </li>[% END %]
147
        [% END %]
147
        [% END %]
148
        [% IF guarantees %]
148
        [% IF guarantees %]
Lines 172-180 Link Here
172
</div>
172
</div>
173
      <div class="action">
173
      <div class="action">
174
        [% IF ( guarantor.borrowernumber ) %]
174
        [% IF ( guarantor.borrowernumber ) %]
175
        <a href="memberentry.pl?op=modify&amp;borrowernumber=[% borrowernumber %]&amp;step=1&amp;guarantorid=[% guarantor.borrowernumber %]">Edit</a>
175
        <a href="memberentry.pl?op=modify&amp;borrowernumber=[% patron.borrowernumber %]&amp;step=1&amp;guarantorid=[% guarantor.borrowernumber %]">Edit</a>
176
        [% ELSE %]
176
        [% ELSE %]
177
        <a href="memberentry.pl?op=modify&amp;borrowernumber=[% borrowernumber %]&amp;step=1">Edit</a>
177
        <a href="memberentry.pl?op=modify&amp;borrowernumber=[% patron.borrowernumber %]&amp;step=1">Edit</a>
178
        [% END %]</div>
178
        [% END %]</div>
179
179
180
</div>
180
</div>
Lines 188-203 Link Here
188
            <fieldset class="brief">
188
            <fieldset class="brief">
189
            [% IF ( picture ) %]
189
            [% IF ( picture ) %]
190
                <legend>Manage patron image</legend>
190
                <legend>Manage patron image</legend>
191
                <div class="hint">To update the image for [% title | html %] [% surname | html %], select a new image file and click 'Upload.' <br />Click the 'Delete' button to remove the current image.
191
                <div class="hint">To update the image for [% patron.title | html %] [% patron.surname | html %], select a new image file and click 'Upload.' <br />Click the 'Delete' button to remove the current image.
192
            [% ELSE %]
192
            [% ELSE %]
193
                <legend>Upload patron image</legend>
193
                <legend>Upload patron image</legend>
194
                <div class="hint">[% title %] [% firstname | html %] [% surname | html %] does not currently have an image available. To import an image for [% title %] [% surname | html %], enter the name of an image file to upload.
194
                <div class="hint">[% patron.title %] [% patron.firstname | html %] [% patron.surname | html %] does not currently have an image available. To import an image for [% patron.title %] [% patron.surname | html %], enter the name of an image file to upload.
195
            [% END %]
195
            [% END %]
196
                    <br />Only PNG, GIF, JPEG, XPM formats are supported.
196
                    <br />Only PNG, GIF, JPEG, XPM formats are supported.
197
                </div>
197
                </div>
198
                <input type="hidden" id="image" name="filetype" value="image" />
198
                <input type="hidden" id="image" name="filetype" value="image" />
199
                <input type="hidden" id="cardnumber" name="cardnumber" value="[% cardnumber | html %]" />
199
                <input type="hidden" id="cardnumber" name="cardnumber" value="[% patron.cardnumber | html %]" />
200
                <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
200
                <input type="hidden" name="borrowernumber" value="[% patron.borrowernumber %]" />
201
                <ol>
201
                <ol>
202
                    <li>
202
                    <li>
203
                       <label for="uploadfile">Select the file to upload: </label><input type="file" id="uploadfile" name="uploadfile" />
203
                       <label for="uploadfile">Select the file to upload: </label><input type="file" id="uploadfile" name="uploadfile" />
Lines 207-213 Link Here
207
                    <input type="hidden" name="csrf_token" value="[% csrf_token %]" />
207
                    <input type="hidden" name="csrf_token" value="[% csrf_token %]" />
208
                    <input type="submit" value="Upload" class="submit" />
208
                    <input type="submit" value="Upload" class="submit" />
209
                    <input name="op" type="hidden" value="Upload" />
209
                    <input name="op" type="hidden" value="Upload" />
210
                    [% IF ( picture ) %]<a id="delpicture" href="/cgi-bin/koha/tools/picture-upload.pl?op=Delete&amp;borrowernumber=[% borrowernumber %]&amp;csrf_token=[% csrf_token %]" class="delete">Delete</a>[% END %]
210
                    [% IF ( picture ) %]<a id="delpicture" href="/cgi-bin/koha/tools/picture-upload.pl?op=Delete&amp;borrowernumber=[% patron.borrowernumber %]&amp;csrf_token=[% csrf_token %]" class="delete">Delete</a>[% END %]
211
                </fieldset>
211
                </fieldset>
212
            </fieldset>
212
            </fieldset>
213
        </form>
213
        </form>
Lines 241-247 Link Here
241
  </ol>
241
  </ol>
242
</div>
242
</div>
243
</div>
243
</div>
244
<div class="action"><a href="memberentry.pl?op=modify&amp;borrowernumber=[% borrowernumber %]&amp;step=4">Edit</a></div>
244
<div class="action"><a href="memberentry.pl?op=modify&amp;borrowernumber=[% patron.borrowernumber %]&amp;step=4">Edit</a></div>
245
[% END %]
245
[% END %]
246
246
247
[% IF ( ExtendedPatronAttributes ) %]
247
[% IF ( ExtendedPatronAttributes ) %]
Lines 270-276 Link Here
270
    </div>
270
    </div>
271
[% END %]
271
[% END %]
272
</div>
272
</div>
273
<div class="action"><a href="memberentry.pl?op=modify&amp;borrowernumber=[% borrowernumber %]&amp;step=4">Edit</a></div>
273
<div class="action"><a href="memberentry.pl?op=modify&amp;borrowernumber=[% patron.borrowernumber %]&amp;step=4">Edit</a></div>
274
[% END %]
274
[% END %]
275
[% END %]
275
[% END %]
276
276
Lines 280-290 Link Here
280
<h3>Patron messaging preferences</h3>
280
<h3>Patron messaging preferences</h3>
281
[% INCLUDE 'messaging-preference-form.inc' %]
281
[% INCLUDE 'messaging-preference-form.inc' %]
282
 [% IF ( SMSSendDriver ) %]
282
 [% IF ( SMSSendDriver ) %]
283
      <div class="rows"> <ol><li><span class="label">SMS number:</span><a href="sms:[% SMSnumber %]">[% SMSnumber %]</a>
283
      <div class="rows"> <ol><li><span class="label">SMS number:</span><a href="sms:[% patron.smsalertnumber %]">[% patron.smsalertnumber %]</a>
284
     </li></ol></div>
284
     </li></ol></div>
285
 [% END %]
285
 [% END %]
286
</div>
286
</div>
287
<div class="action"><a href="memberentry.pl?op=modify&amp;borrowernumber=[% borrowernumber %]&amp;step=5">Edit</a></div>
287
<div class="action"><a href="memberentry.pl?op=modify&amp;borrowernumber=[% patron.borrowernumber %]&amp;step=5">Edit</a></div>
288
[% END %]
288
[% END %]
289
289
290
</div>
290
</div>
Lines 293-308 Link Here
293
 <h3>Library use</h3>
293
 <h3>Library use</h3>
294
<div class="rows"> 
294
<div class="rows"> 
295
<ol>
295
<ol>
296
    <li><span class="label">Card number: </span>[% cardnumber %]</li>
296
    <li><span class="label">Card number: </span>[% patron.cardnumber %]</li>
297
	<li><span class="label">Borrowernumber: </span> [% borrowernumber %]</li>
297
    <li><span class="label">Borrowernumber: </span> [% patron.borrowernumber %]</li>
298
    <li><span class="label">Category: </span>[% categoryname %] ([% categorycode %])</li>
298
    <li><span class="label">Category: </span>[% patron.category.description %] ([% patron.categorycode %])</li>
299
    <li><span class="label">Registration date: </span>[% dateenrolled | $KohaDates %]</li>
299
    <li><span class="label">Registration date: </span>[% patron.dateenrolled | $KohaDates %]</li>
300
    
300
    
301
    <li><span class="label">Expiration date: </span>
301
    <li><span class="label">Expiration date: </span>
302
    [% IF ( was_renewed ) %]
302
    [% IF ( was_renewed ) %]
303
            <strong class="reregistrinfo">[% dateexpiry | $KohaDates %]</strong>
303
            <strong class="reregistrinfo">[% patron.dateexpiry | $KohaDates %]</strong>
304
    [% ELSE %]
304
    [% ELSE %]
305
            [% dateexpiry | $KohaDates %]
305
            [% patron.dateexpiry | $KohaDates %]
306
    [% END %]
306
    [% END %]
307
    </li>
307
    </li>
308
    
308
    
Lines 323-340 Link Here
323
        [% END %]
323
        [% END %]
324
    </li>
324
    </li>
325
325
326
    [% IF ( sort1 ) %]<li><span class="label">Sort field 1:</span>[% AuthorisedValues.GetByCode('Bsort1', sort1) |html %]</li>[% END %]
326
    [% IF ( patron.sort1 ) %]<li><span class="label">Sort field 1:</span>[% AuthorisedValues.GetByCode('Bsort1', patron.sort1) |html %]</li>[% END %]
327
    [% IF ( sort2 ) %]<li><span class="label">Sort field 2:</span>[% AuthorisedValues.GetByCode('Bsort2', sort2) |html %]</li>[% END %]
327
    [% IF ( patron.sort2 ) %]<li><span class="label">Sort field 2:</span>[% AuthorisedValues.GetByCode('Bsort2', patron.sort2) |html %]</li>[% END %]
328
    <li><span class="label">Username: </span>[% userid |html  %]</li>
328
    <li><span class="label">Username: </span>[% patron.userid |html  %]</li>
329
    <li><span class="label">Password: </span>
329
    <li><span class="label">Password: </span>
330
    [% IF ( password ) %]
330
    [% IF ( patron.password ) %]
331
        *******
331
        *******
332
    [% ELSE %]
332
    [% ELSE %]
333
        <span class="problem"><a href="/cgi-bin/koha/members/member-password.pl?member=[% borrowernumber %]">Undefined</a></span>
333
        <span class="problem"><a href="/cgi-bin/koha/members/member-password.pl?member=[% patron.borrowernumber %]">Undefined</a></span>
334
    [% END %] 
334
    [% END %] 
335
    </li>
335
    </li>
336
    [% IF ( borrowernotes ) %]<li><span class="label">Circulation note: </span>[% borrowernotes |html %]</li>[% END %]
336
    [% IF ( patron.borrowernotes ) %]<li><span class="label">Circulation note: </span>[% patron.borrowernotes |html %]</li>[% END %]
337
    [% IF ( opacnote ) %]<li><span class="label">OPAC note:</span>[% opacnote |html %]</li>[% END %]
337
    [% IF ( patron.opacnote ) %]<li><span class="label">OPAC note:</span>[% patron.opacnote |html %]</li>[% END %]
338
    [% IF Koha.Preference( 'NorwegianPatronDBEnable' ) == 1 %]
338
    [% IF Koha.Preference( 'NorwegianPatronDBEnable' ) == 1 %]
339
        [% IF ( sync == 1 ) %]
339
        [% IF ( sync == 1 ) %]
340
            <li><span class="label">Activate sync: </span>Yes</li>
340
            <li><span class="label">Activate sync: </span>Yes</li>
Lines 346-354 Link Here
346
    [% END %]
346
    [% END %]
347
    [% IF ( Koha.Preference('CheckPrevCheckout') == 'softyes' || Koha.Preference('CheckPrevCheckout') == 'softno' ) %]
347
    [% IF ( Koha.Preference('CheckPrevCheckout') == 'softyes' || Koha.Preference('CheckPrevCheckout') == 'softno' ) %]
348
      <li><span class="label">Check previous checkouts: </span>
348
      <li><span class="label">Check previous checkouts: </span>
349
        [% IF ( checkprevcheckout == 'yes' ) %]
349
        [% IF ( patron.checkprevcheckout == 'yes' ) %]
350
        Yes
350
        Yes
351
        [% ELSIF ( checkprevcheckout == 'no' ) %]
351
        [% ELSIF ( patron.checkprevcheckout == 'no' ) %]
352
        No
352
        No
353
        [% ELSE %]
353
        [% ELSE %]
354
        Inherited
354
        Inherited
Lines 358-370 Link Here
358
    [% IF Koha.Preference('TranslateNotices') %]
358
    [% IF Koha.Preference('TranslateNotices') %]
359
        <li>
359
        <li>
360
            <span class="label">Preferred language for notices: </span>
360
            <span class="label">Preferred language for notices: </span>
361
            [% translated_language %]
361
            [% patron.translated_language %]
362
        </li>
362
        </li>
363
    [% END %]
363
    [% END %]
364
	</ol>
364
	</ol>
365
	</div>
365
	</div>
366
 </div>
366
 </div>
367
    <div class="action"><a href="memberentry.pl?op=modify&amp;borrowernumber=[% borrowernumber %]&amp;step=3">Edit</a></div>
367
    <div class="action"><a href="memberentry.pl?op=modify&amp;borrowernumber=[% patron.borrowernumber %]&amp;step=3">Edit</a></div>
368
 
368
 
369
 <div id="patron-alternate-address" style="padding-top: 1em;">
369
 <div id="patron-alternate-address" style="padding-top: 1em;">
370
    <h3>Alternate address</h3>
370
    <h3>Alternate address</h3>
Lines 376-403 Link Here
376
    [% END %]
376
    [% END %]
377
377
378
    <div class="rows">  <ol>
378
    <div class="rows">  <ol>
379
      [% IF ( B_phone ) %]<li><span class="label">Phone: </span><a href="tel:[% B_phone %]">[% B_phone |html  %]</a></li>[% END %]
379
      [% IF ( patron.B_phone ) %]<li><span class="label">Phone: </span><a href="tel:[% patron.B_phone %]">[% patron.B_phone |html  %]</a></li>[% END %]
380
      [% IF ( B_email ) %]<li class="email"><span class="label">Email: </span><a title="[% B_email %]" href="mailto:[% B_email | url %]">[% B_email |html %]</a></li>[% END %]
380
      [% IF ( patron.B_email ) %]<li class="email"><span class="label">Email: </span><a title="[% patron.B_email %]" href="mailto:[% patron.B_email | url %]">[% B_email |html %]</a></li>[% END %]
381
      [% IF ( contactnote ) %]<li><span class="label">Contact note: </span> [% contactnote |html %]</li>[% END %]
381
      [% IF ( patron.contactnote ) %]<li><span class="label">Contact note: </span> [% patron.contactnote |html %]</li>[% END %]
382
      </ol>
382
      </ol>
383
    </div>
383
    </div>
384
</div>
384
</div>
385
<div class="action"><a href="memberentry.pl?op=modify&amp;borrowernumber=[% borrowernumber %]&amp;step=6">Edit</a></div>
385
<div class="action"><a href="memberentry.pl?op=modify&amp;borrowernumber=[% patron.borrowernumber %]&amp;step=6">Edit</a></div>
386
386
387
 <div id="patron-alternative-contact" style="padding-top: 1em;">
387
 <div id="patron-alternative-contact" style="padding-top: 1em;">
388
 <h3>Alternative contact</h3>
388
 <h3>Alternative contact</h3>
389
   <div class="rows"> <ol><li><span class="label">Surname: </span>[% altcontactsurname | html %]</li>
389
   <div class="rows"> <ol><li><span class="label">Surname: </span>[% patron.altcontactsurname | html %]</li>
390
    <li><span class="label">First name: </span>[% altcontactfirstname | html %]</li>
390
    <li><span class="label">First name: </span>[% patron.altcontactfirstname | html %]</li>
391
    <li><span class="label">Address: </span>[% altcontactaddress1 | html %]</li>
391
    <li><span class="label">Address: </span>[% patron.altcontactaddress1 | html %]</li>
392
    <li><span class="label">Address 2: </span>[% altcontactaddress2 | html %]</li>
392
    <li><span class="label">Address 2: </span>[% patron.altcontactaddress2 | html %]</li>
393
	<li><span class="label">City: </span>[% altcontactaddress3 | html %]</li>
393
	<li><span class="label">City: </span>[% patron.altcontactaddress3 | html %]</li>
394
    [% IF ( altcontactstate ) %]<li><span class="label">State: </span>[% altcontactstate | html %]</li>[% END %]
394
    [% IF ( patron.altcontactstate ) %]<li><span class="label">State: </span>[% patron.altcontactstate | html %]</li>[% END %]
395
    <li><span class="label">ZIP/Postal code: </span>[% altcontactzipcode | html %]</li>
395
    <li><span class="label">ZIP/Postal code: </span>[% patron.altcontactzipcode | html %]</li>
396
	[% IF ( altcontactcountry ) %]<li><span class="label">Country: </span>[% altcontactcountry | html %]</li>[% END %]
396
	[% IF ( patron.altcontactcountry ) %]<li><span class="label">Country: </span>[% patron.altcontactcountry | html %]</li>[% END %]
397
    [% IF ( altcontactphone ) %]<li><span class="label">Phone: </span><a href="tel:[% altcontactphone | url %]">[% altcontactphone | html %]</a></li>[% END %]
397
    [% IF ( patron.altcontactphone ) %]<li><span class="label">Phone: </span><a href="tel:[% patron.altcontactphone | url %]">[% patron.altcontactphone | html %]</a></li>[% END %]
398
    </ol></div>
398
    </ol></div>
399
</div>
399
</div>
400
<div class="action"><a href="memberentry.pl?op=modify&amp;borrowernumber=[% borrowernumber %]&amp;step=2">Edit</a></div>
400
<div class="action"><a href="memberentry.pl?op=modify&amp;borrowernumber=[% patron.borrowernumber %]&amp;step=2">Edit</a></div>
401
401
402
</div>
402
</div>
403
</div>
403
</div>
Lines 503-509 Link Here
503
    <fieldset class="action">
503
    <fieldset class="action">
504
        <form action="/cgi-bin/koha/reserve/modrequest_suspendall.pl" method="post">
504
        <form action="/cgi-bin/koha/reserve/modrequest_suspendall.pl" method="post">
505
            <input type="hidden" name="from" value="borrower" />
505
            <input type="hidden" name="from" value="borrower" />
506
            <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
506
            <input type="hidden" name="borrowernumber" value="[% patron.borrowernumber %]" />
507
            <input type="submit" value="Suspend all holds" />
507
            <input type="submit" value="Suspend all holds" />
508
508
509
            [% IF Koha.Preference('AutoResumeSuspendedHolds') %]
509
            [% IF Koha.Preference('AutoResumeSuspendedHolds') %]
Lines 517-523 Link Here
517
    <fieldset class="action">
517
    <fieldset class="action">
518
        <form action="/cgi-bin/koha/reserve/modrequest_suspendall.pl" method="post">
518
        <form action="/cgi-bin/koha/reserve/modrequest_suspendall.pl" method="post">
519
            <input type="hidden" name="from" value="borrower" />
519
            <input type="hidden" name="from" value="borrower" />
520
            <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
520
            <input type="hidden" name="borrowernumber" value="[% patron.borrowernumber %]" />
521
            <input type="hidden" name="suspend" value="0" />
521
            <input type="hidden" name="suspend" value="0" />
522
            <input type="submit" value="Resume all suspended holds" />
522
            <input type="submit" value="Resume all suspended holds" />
523
	</form>
523
	</form>
Lines 559-565 Link Here
559
        /* Set some variable needed in circulation.js */
559
        /* Set some variable needed in circulation.js */
560
        var interface = "[% interface %]";
560
        var interface = "[% interface %]";
561
        var theme = "[% theme %]";
561
        var theme = "[% theme %]";
562
        var borrowernumber = "[% borrowernumber %]";
562
        var borrowernumber = "[% patron.borrowernumber %]";
563
        var branchcode = "[% Branches.GetLoggedInBranchcode() %]";
563
        var branchcode = "[% Branches.GetLoggedInBranchcode() %]";
564
        var exports_enabled = "[% Koha.Preference('ExportCircHistory') %]";
564
        var exports_enabled = "[% Koha.Preference('ExportCircHistory') %]";
565
        var AllowCirculate = [% (CAN_user_circulate_circulate_remaining_permissions)? 1 : 0 %]
565
        var AllowCirculate = [% (CAN_user_circulate_circulate_remaining_permissions)? 1 : 0 %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt (-11 / +10 lines)
Lines 4-10 Link Here
4
[% USE Price %]
4
[% USE Price %]
5
[% SET footerjs = 1 %]
5
[% SET footerjs = 1 %]
6
[% INCLUDE 'doc-head-open.inc' %]
6
[% INCLUDE 'doc-head-open.inc' %]
7
<title>Koha &rsaquo; Patrons &rsaquo; Pay Fines for  [% borrower.firstname |html %] [% borrower.surname |html %]</title>
7
<title>Koha &rsaquo; Patrons &rsaquo; Pay Fines for  [% patron.firstname |html %] [% patron.surname |html %]</title>
8
[% INCLUDE 'doc-head-close.inc' %]
8
[% INCLUDE 'doc-head-close.inc' %]
9
</head>
9
</head>
10
10
Lines 12-39 Link Here
12
[% INCLUDE 'header.inc' %]
12
[% INCLUDE 'header.inc' %]
13
[% INCLUDE 'patron-search.inc' %]
13
[% INCLUDE 'patron-search.inc' %]
14
14
15
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/members/members-home.pl">Patrons</a>  &rsaquo; Pay fines for [% borrower.firstname |html %] [% borrower.surname |html %]</div>
15
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/members/members-home.pl">Patrons</a>  &rsaquo; Pay fines for [% patron.firstname |html %] [% patron.surname |html %]</div>
16
16
17
<div id="doc3" class="yui-t2">
17
<div id="doc3" class="yui-t2">
18
   
18
   
19
   <div id="bd">
19
   <div id="bd">
20
	<div id="yui-main">
20
	<div id="yui-main">
21
	<div class="yui-b">
21
	<div class="yui-b">
22
[% INCLUDE 'members-toolbar.inc' borrowernumber=borrower.borrowernumber %]
22
[% INCLUDE 'members-toolbar.inc' borrowernumber=patron.borrowernumber %]
23
23
24
<!-- The manual invoice and credit buttons -->
24
<!-- The manual invoice and credit buttons -->
25
<div class="statictabs">
25
<div class="statictabs">
26
<ul>
26
<ul>
27
	<li><a href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=[% borrower.borrowernumber %]">Account</a></li>
27
    <li><a href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=[% patron.borrowernumber %]">Account</a></li>
28
    <li class="active"><a href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% borrower.borrowernumber %]" >Pay fines</a></li>
28
    <li class="active"><a href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% patron.borrowernumber %]" >Pay fines</a></li>
29
	<li><a href="/cgi-bin/koha/members/maninvoice.pl?borrowernumber=[% borrower.borrowernumber %]" >Create manual invoice</a></li>
29
    <li><a href="/cgi-bin/koha/members/maninvoice.pl?borrowernumber=[% patron.borrowernumber %]" >Create manual invoice</a></li>
30
	<li><a href="/cgi-bin/koha/members/mancredit.pl?borrowernumber=[% borrower.borrowernumber %]" >Create manual credit</a></li>
30
    <li><a href="/cgi-bin/koha/members/mancredit.pl?borrowernumber=[% patron.borrowernumber %]" >Create manual credit</a></li>
31
</ul>
31
</ul>
32
<div class="tabs-container">
32
<div class="tabs-container">
33
33
34
[% IF ( accounts ) %]
34
[% IF ( accounts ) %]
35
    <form action="/cgi-bin/koha/members/pay.pl" method="post" id="pay-fines-form">
35
    <form action="/cgi-bin/koha/members/pay.pl" method="post" id="pay-fines-form">
36
	<input type="hidden" name="borrowernumber" id="borrowernumber" value="[% borrower.borrowernumber %]" />
36
    <input type="hidden" name="borrowernumber" id="borrowernumber" value="[% patron.borrowernumber %]" />
37
<p><span class="checkall"><a id="CheckAll" href="#"><i class="fa fa-check"></i> Select all</a></span> | <span class="clearall"><a id="CheckNone" href="#"><i class="fa fa-remove"></i> Clear all</a></span></p>
37
<p><span class="checkall"><a id="CheckAll" href="#"><i class="fa fa-check"></i> Select all</a></span> | <span class="clearall"><a id="CheckNone" href="#"><i class="fa fa-remove"></i> Clear all</a></span></p>
38
<table id="finest">
38
<table id="finest">
39
<thead>
39
<thead>
Lines 120-130 Link Here
120
<input type="submit" id="paycollect" name="paycollect"  value="Pay amount" class="submit" />
120
<input type="submit" id="paycollect" name="paycollect"  value="Pay amount" class="submit" />
121
[% IF CAN_user_updatecharges_writeoff %]<input type="submit" name="woall"  id="woall" value="Write off all" class="submit" />[% END %]
121
[% IF CAN_user_updatecharges_writeoff %]<input type="submit" name="woall"  id="woall" value="Write off all" class="submit" />[% END %]
122
<input type="submit" id="payselected" name="payselected"  value="Pay selected" class="submit" />
122
<input type="submit" id="payselected" name="payselected"  value="Pay selected" class="submit" />
123
<a class="cancel" href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=[% borrower.borrowernumber %]">Cancel</a>
123
<a class="cancel" href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=[% patron.borrowernumber %]">Cancel</a>
124
</fieldset>
124
</fieldset>
125
</form>
125
</form>
126
[% ELSE %]
126
    <p>[% patron.firstname |html %] [% patron.surname |html %] has no outstanding fines.</p>
127
    <p>[% borrower.firstname |html %] [% borrower.surname |html %] has no outstanding fines.</p>
128
[% END %]
127
[% END %]
129
</div></div>
128
</div></div>
130
129
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt (-13 / +13 lines)
Lines 2-38 Link Here
2
[% USE Branches %]
2
[% USE Branches %]
3
[% SET footerjs = 1 %]
3
[% SET footerjs = 1 %]
4
[% INCLUDE 'doc-head-open.inc' %]
4
[% INCLUDE 'doc-head-open.inc' %]
5
<title>Koha &rsaquo; Patrons &rsaquo; Collect fine payment for  [% borrower.firstname %] [% borrower.surname %]</title>
5
<title>Koha &rsaquo; Patrons &rsaquo; Collect fine payment for  [% patron.firstname %] [% patron.surname %]</title>
6
[% INCLUDE 'doc-head-close.inc' %]
6
[% INCLUDE 'doc-head-close.inc' %]
7
</head>
7
</head>
8
8
9
<body id="pat_paycollect" class="pat">
9
<body id="pat_paycollect" class="pat">
10
[% INCLUDE 'header.inc' %]
10
[% INCLUDE 'header.inc' %]
11
[% INCLUDE 'patron-search.inc' %]
11
[% INCLUDE 'patron-search.inc' %]
12
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/members/members-home.pl">Patrons</a>  &rsaquo; <a href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% borrower.borrowernumber %]">Pay fines for [% borrower.firstname %] [% borrower.surname %]</a> &rsaquo; [% IF ( pay_individual ) %]Pay an individual fine[% ELSIF ( writeoff_individual ) %]Write off an individual fine[% ELSE %][% IF ( selected_accts ) %]Pay an amount toward selected fines[% ELSE %]Pay an amount toward all fines[% END %][% END %]</div>
12
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/members/members-home.pl">Patrons</a>  &rsaquo; <a href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% patron.borrowernumber %]">Pay fines for [% patron.firstname %] [% patron.surname %]</a> &rsaquo; [% IF ( pay_individual ) %]Pay an individual fine[% ELSIF ( writeoff_individual ) %]Write off an individual fine[% ELSE %][% IF ( selected_accts ) %]Pay an amount toward selected fines[% ELSE %]Pay an amount toward all fines[% END %][% END %]</div>
13
13
14
<div id="doc3" class="yui-t2">
14
<div id="doc3" class="yui-t2">
15
15
16
<div id="bd">
16
<div id="bd">
17
<div id="yui-main">
17
<div id="yui-main">
18
<div class="yui-b">
18
<div class="yui-b">
19
[% INCLUDE 'members-toolbar.inc' borrowernumber=borrower.borrowernumber %]
19
[% INCLUDE 'members-toolbar.inc' borrowernumber=patron.borrowernumber %]
20
20
21
21
22
<!-- The manual invoice and credit buttons -->
22
<!-- The manual invoice and credit buttons -->
23
<div class="statictabs">
23
<div class="statictabs">
24
<ul>
24
<ul>
25
    <li>
25
    <li>
26
    <a href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=[% borrower.borrowernumber %]">Account</a>
26
    <a href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=[% patron.borrowernumber %]">Account</a>
27
    </li>
27
    </li>
28
    <li class="active">
28
    <li class="active">
29
    <a href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% borrower.borrowernumber %]" >Pay fines</a>
29
    <a href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% patron.borrowernumber %]" >Pay fines</a>
30
    </li>
30
    </li>
31
    <li>
31
    <li>
32
    <a href="/cgi-bin/koha/members/maninvoice.pl?borrowernumber=[% borrower.borrowernumber %]" >Create manual invoice</a>
32
    <a href="/cgi-bin/koha/members/maninvoice.pl?borrowernumber=[% patron.borrowernumber %]" >Create manual invoice</a>
33
    </li>
33
    </li>
34
    <li>
34
    <li>
35
    <a href="/cgi-bin/koha/members/mancredit.pl?borrowernumber=[% borrower.borrowernumber %]" >Create manual credit</a>
35
    <a href="/cgi-bin/koha/members/mancredit.pl?borrowernumber=[% patron.borrowernumber %]" >Create manual credit</a>
36
    </li>
36
    </li>
37
</ul>
37
</ul>
38
<div class="tabs-container">
38
<div class="tabs-container">
Lines 45-51 Link Here
45
[% IF ( pay_individual ) %]
45
[% IF ( pay_individual ) %]
46
    <form name="payindivfine" id="payindivfine" method="post" action="/cgi-bin/koha/members/paycollect.pl">
46
    <form name="payindivfine" id="payindivfine" method="post" action="/cgi-bin/koha/members/paycollect.pl">
47
    <input type="hidden" name="csrf_token" value="[% csrf_token %]" />
47
    <input type="hidden" name="csrf_token" value="[% csrf_token %]" />
48
    <input type="hidden" name="borrowernumber" id="borrowernumber" value="[% borrower.borrowernumber %]" />
48
    <input type="hidden" name="borrowernumber" id="borrowernumber" value="[% patron.borrowernumber %]" />
49
    <input type="hidden" name="pay_individual" id="pay_individual" value="[% pay_individual %]" />
49
    <input type="hidden" name="pay_individual" id="pay_individual" value="[% pay_individual %]" />
50
    <input type="hidden" name="itemnumber" id="itemnumber" value="[% itemnumber %]" />
50
    <input type="hidden" name="itemnumber" id="itemnumber" value="[% itemnumber %]" />
51
    <input type="hidden" name="description" id="description" value="[% description %]" />
51
    <input type="hidden" name="description" id="description" value="[% description %]" />
Lines 89-102 Link Here
89
</fieldset>
89
</fieldset>
90
90
91
    <div class="action"><input type="submit" name="submitbutton" value="Confirm" />
91
    <div class="action"><input type="submit" name="submitbutton" value="Confirm" />
92
        <a class="cancel" href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% borrower.borrowernumber %]">Cancel</a></div>
92
        <a class="cancel" href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% patron.borrowernumber %]">Cancel</a></div>
93
    </form>
93
    </form>
94
[% ELSIF ( writeoff_individual ) %]
94
[% ELSIF ( writeoff_individual ) %]
95
    <form name="woindivfine" id="woindivfine" action="/cgi-bin/koha/members/pay.pl" method="post" >
95
    <form name="woindivfine" id="woindivfine" action="/cgi-bin/koha/members/pay.pl" method="post" >
96
    <input type="hidden" name="csrf_token" value="[% csrf_token %]" />
96
    <input type="hidden" name="csrf_token" value="[% csrf_token %]" />
97
    <fieldset class="rows">
97
    <fieldset class="rows">
98
    <legend>Write off an individual fine</legend>
98
    <legend>Write off an individual fine</legend>
99
    <input type="hidden" name="borrowernumber" id="borrowernumber" value="[% borrower.borrowernumber %]" />
99
    <input type="hidden" name="borrowernumber" id="borrowernumber" value="[% patron.borrowernumber %]" />
100
    <input type="hidden" name="pay_individual" id="pay_individual" value="[% pay_individual %]" />
100
    <input type="hidden" name="pay_individual" id="pay_individual" value="[% pay_individual %]" />
101
    <input type="hidden" name="itemnumber" id="itemnumber" value="[% itemnumber %]" />
101
    <input type="hidden" name="itemnumber" id="itemnumber" value="[% itemnumber %]" />
102
    <input type="hidden" name="description" id="description" value="[% description %]" />
102
    <input type="hidden" name="description" id="description" value="[% description %]" />
Lines 130-142 Link Here
130
            </ol>
130
            </ol>
131
        </fieldset>
131
        </fieldset>
132
        <div class="action"><input type="submit" name="confirm_writeoff" id="confirm_writeoff" value="Write off this charge" />
132
        <div class="action"><input type="submit" name="confirm_writeoff" id="confirm_writeoff" value="Write off this charge" />
133
        <a class="cancel" href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% borrower.borrowernumber %]">Cancel</a></div>
133
        <a class="cancel" href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% patron.borrowernumber %]">Cancel</a></div>
134
    </form>
134
    </form>
135
[% ELSE %]
135
[% ELSE %]
136
136
137
    <form name="payfine" id="payfine" method="post" action="/cgi-bin/koha/members/paycollect.pl">
137
    <form name="payfine" id="payfine" method="post" action="/cgi-bin/koha/members/paycollect.pl">
138
    <input type="hidden" name="csrf_token" value="[% csrf_token %]" />
138
    <input type="hidden" name="csrf_token" value="[% csrf_token %]" />
139
    <input type="hidden" name="borrowernumber" id="borrowernumber" value="[% borrower.borrowernumber %]" />
139
    <input type="hidden" name="borrowernumber" id="borrowernumber" value="[% patron.borrowernumber %]" />
140
    <input type="hidden" name="selected_accts" id="selected_accts" value="[% selected_accts %]" />
140
    <input type="hidden" name="selected_accts" id="selected_accts" value="[% selected_accts %]" />
141
    <input type="hidden" name="total" id="total" value="[% total %]" />
141
    <input type="hidden" name="total" id="total" value="[% total %]" />
142
142
Lines 159-165 Link Here
159
    </ol>
159
    </ol>
160
    </fieldset>
160
    </fieldset>
161
    <div class="action"><input type="submit" name="submitbutton" value="Confirm" />
161
    <div class="action"><input type="submit" name="submitbutton" value="Confirm" />
162
        <a class="cancel" href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=[% borrower.borrowernumber %]">Cancel</a></div>
162
        <a class="cancel" href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=[% patron.borrowernumber %]">Cancel</a></div>
163
    </form>
163
    </form>
164
[% END %]
164
[% END %]
165
</div></div>
165
</div></div>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/printfeercpt.tt (-4 / +5 lines)
Lines 1-8 Link Here
1
[% USE Koha %]
1
[% USE Koha %]
2
[% USE KohaDates %]
2
[% USE KohaDates %]
3
[% USE Branches %]
3
[% SET footerjs = 1 %]
4
[% SET footerjs = 1 %]
4
[% INCLUDE 'doc-head-open.inc' %]
5
[% INCLUDE 'doc-head-open.inc' %]
5
<title>Print receipt for [% cardnumber %]</title>
6
<title>Print receipt for [% patron.cardnumber %]</title>
6
[% INCLUDE 'doc-head-close.inc' %]
7
[% INCLUDE 'doc-head-close.inc' %]
7
<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/printreceiptinvoice_[% KOHA_VERSION %].css" />
8
<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/printreceiptinvoice_[% KOHA_VERSION %].css" />
8
[% INCLUDE 'blocking_errors.inc' %]
9
[% INCLUDE 'blocking_errors.inc' %]
Lines 27-39 Link Here
27
 </tr>
28
 </tr>
28
 <tr>
29
 <tr>
29
    <th colspan=4 class="centerednames">
30
    <th colspan=4 class="centerednames">
30
		[% IF ( branchname ) %]<h2>[% branchname %]</h2>[% END %]
31
        <h2>[% Branches.GetName( patron.branchcode ) %]</h2>
31
	</th>
32
	</th>
32
 </tr>
33
 </tr>
33
 <tr>
34
 <tr>
34
    <th colspan=4 >
35
    <th colspan=4 >
35
		Received with thanks from  [% firstname %] [% surname %] <br />
36
        Received with thanks from  [% patron.firstname %] [% patron.surname %] <br />
36
        Card number : [% cardnumber %]<br />
37
        Card number : [% patron.cardnumber %]<br />
37
	</th>
38
	</th>
38
 </tr>
39
 </tr>
39
  <tr>
40
  <tr>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/printinvoice.tt (-4 / +5 lines)
Lines 1-7 Link Here
1
[% USE Koha %]
1
[% USE Koha %]
2
[% USE Branches %]
2
[% SET footerjs = 1 %]
3
[% SET footerjs = 1 %]
3
[% INCLUDE 'doc-head-open.inc' %]
4
[% INCLUDE 'doc-head-open.inc' %]
4
<title>Print receipt for [% cardnumber %]</title>
5
<title>Print receipt for [% patron.cardnumber %]</title>
5
[% INCLUDE 'doc-head-close.inc' %]
6
[% INCLUDE 'doc-head-close.inc' %]
6
<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/printreceiptinvoice_[% KOHA_VERSION %].css" />
7
<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/printreceiptinvoice_[% KOHA_VERSION %].css" />
7
</head>
8
</head>
Lines 25-37 Link Here
25
  </tr>
26
  </tr>
26
  <tr>
27
  <tr>
27
    <th colspan="5" class="centerednames">
28
    <th colspan="5" class="centerednames">
28
		[% IF ( branchname ) %]<h2>[% branchname %]</h2>[% END %]
29
        <h2>[% Branches.GetName( patron.branchcode ) %]</h2>
29
	</th>
30
	</th>
30
  </tr>
31
  </tr>
31
  <tr>
32
  <tr>
32
    <th colspan="5" >
33
    <th colspan="5" >
33
        Bill to: [% firstname %] [% surname %] <br />
34
        Bill to: [% patron.firstname %] [% patron.surname %] <br />
34
        Card number: [% cardnumber %]<br />
35
        Card number: [% patron.cardnumber %]<br />
35
	</th>
36
	</th>
36
  </tr>
37
  </tr>
37
  <tr>
38
  <tr>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/purchase-suggestions.tt (-1 / +1 lines)
Lines 27-33 Link Here
27
                <h2>Purchase suggestions</h2>
27
                <h2>Purchase suggestions</h2>
28
28
29
                <div id="toolbar" class="btn-toolbar">
29
                <div id="toolbar" class="btn-toolbar">
30
                    <a class="btn btn-default btn-sm" id="newsuggestion" href="/cgi-bin/koha/suggestion/suggestion.pl?op=add&amp;suggestedby=[% borrowernumber %]&amp;redirect=purchase_suggestions&amp;borrowernumber=[% borrowernumber %]"><i class="fa fa-plus"></i> New purchase suggestion</a>
30
                    <a class="btn btn-default btn-sm" id="newsuggestion" href="/cgi-bin/koha/suggestion/suggestion.pl?op=add&amp;suggestedby=[% patron.borrowernumber %]&amp;redirect=purchase_suggestions&amp;borrowernumber=[% patron.borrowernumber %]"><i class="fa fa-plus"></i> New purchase suggestion</a>
31
                </div>
31
                </div>
32
32
33
                [% IF suggestions %]
33
                [% IF suggestions %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt (-2 / +2 lines)
Lines 27-38 Link Here
27
    <div class="dialog alert">Staff members are not allowed to access patron's checkout history</div>
27
    <div class="dialog alert">Staff members are not allowed to access patron's checkout history</div>
28
[% ELSIF is_anonymous %]
28
[% ELSIF is_anonymous %]
29
    <div class="dialog alert">This is the anonymous patron, so no circulation history is displayed. To get a list of anonymized loans, please run a report.</div>
29
    <div class="dialog alert">This is the anonymous patron, so no circulation history is displayed. To get a list of anonymized loans, please run a report.</div>
30
[% ELSIF ( privacy == 2)  %]
30
[% ELSIF ( patron.privacy == 2)  %]
31
    <div class="dialog message">This patron has set the privacy rules to never keeping a circulation history.</div>
31
    <div class="dialog message">This patron has set the privacy rules to never keeping a circulation history.</div>
32
[% ELSIF ( !loop_reading ) %]
32
[% ELSIF ( !loop_reading ) %]
33
    <div class="dialog message">This patron has no circulation history.</div>
33
    <div class="dialog message">This patron has no circulation history.</div>
34
[% ELSE %]
34
[% ELSE %]
35
<form action="/cgi-bin/koha/members/readingrec.pl" method="get"><input type="hidden" name="borrowernumber" id="borrowernumber" value="[% borrowernumber %]" /></form>
35
<form action="/cgi-bin/koha/members/readingrec.pl" method="get"><input type="hidden" name="borrowernumber" id="borrowernumber" value="[% patron.borrowernumber %]" /></form>
36
36
37
37
38
<div id="tabs" class="toptabs">
38
<div id="tabs" class="toptabs">
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/routing-lists.tt (-2 / +2 lines)
Lines 57-63 Link Here
57
                      </strong>
57
                      </strong>
58
                    </a>
58
                    </a>
59
                    <input type="hidden" name="biblionumber" value="[% biblionumber %]" />
59
                    <input type="hidden" name="biblionumber" value="[% biblionumber %]" />
60
                    <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
60
                    <input type="hidden" name="borrowernumber" value="[% patron.borrowernumber %]" />
61
                  </td>
61
                  </td>
62
                </tr>
62
                </tr>
63
                [% END %]
63
                [% END %]
Lines 67-73 Link Here
67
          [% ELSE %]
67
          [% ELSE %]
68
          <p>Patron does not belong to any subscription routing lists.</p>
68
          <p>Patron does not belong to any subscription routing lists.</p>
69
          <input type="hidden" name="biblionumber" value="[% biblionumber %]" />
69
          <input type="hidden" name="biblionumber" value="[% biblionumber %]" />
70
                    <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
70
                    <input type="hidden" name="borrowernumber" value="[% patron.borrowernumber %]" />
71
                    [% END %]
71
                    [% END %]
72
72
73
</div>
73
</div>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt (-25 / +25 lines)
Lines 16-22 Link Here
16
<script type="text/javascript">
16
<script type="text/javascript">
17
    // <![CDATA[
17
    // <![CDATA[
18
var MSG_CONFIRM_DELETE_HOLD   = _("Are you sure you want to cancel this hold?");
18
var MSG_CONFIRM_DELETE_HOLD   = _("Are you sure you want to cancel this hold?");
19
var patron_homebranch = "[% Branches.GetName( borrower_branchcode ) |replace("'", "\'") |replace('"', '\"') |replace('\n', '\\n') |replace('\r', '\\r') %]";
19
var patron_homebranch = "[% Branches.GetName( patron.branchcode ) |replace("'", "\'") |replace('"', '\"') |replace('\n', '\\n') |replace('\r', '\\r') %]";
20
var override_items = {[% FOREACH bibitemloo IN bibitemloop %][% FOREACH itemloo IN bibitemloo.itemloop %][% IF ( itemloo.override ) %]
20
var override_items = {[% FOREACH bibitemloo IN bibitemloop %][% FOREACH itemloo IN bibitemloo.itemloop %][% IF ( itemloo.override ) %]
21
    [% itemloo.itemnumber %]: {
21
    [% itemloo.itemnumber %]: {
22
        homebranch: "[% Branches.GetName( itemloo.homebranch ) |replace("'", "\'") |replace('"', '\"') |replace('\n', '\\n') |replace('\r', '\\r') %]",
22
        homebranch: "[% Branches.GetName( itemloo.homebranch ) |replace("'", "\'") |replace('"', '\"') |replace('\n', '\\n') |replace('\r', '\\r') %]",
Lines 194-200 function checkMultiHold() { Link Here
194
    });
194
    });
195
195
196
196
197
[% UNLESS ( borrowernumber || borrowers || noitems ) %]
197
[% UNLESS ( patron || patron.borrowernumber || borrowers || noitems ) %]
198
    [% IF ( CircAutocompl ) %]
198
    [% IF ( CircAutocompl ) %]
199
    $( "#patron" ).autocomplete({
199
    $( "#patron" ).autocomplete({
200
        source: "/cgi-bin/koha/circ/ysearch.pl",
200
        source: "/cgi-bin/koha/circ/ysearch.pl",
Lines 264-270 function checkMultiHold() { Link Here
264
    <h1>Confirm holds</h1>
264
    <h1>Confirm holds</h1>
265
  [% END %]
265
  [% END %]
266
266
267
  [% UNLESS borrowernumber OR noitems %]
267
  [% UNLESS patron OR patron.borrowernumber OR noitems %]
268
    [% IF ( messageborrower ) %]
268
    [% IF ( messageborrower ) %]
269
      <div class="dialog alert"><h3>Patron not found</h3><p>No patron with this name, please, try another</p> </div>
269
      <div class="dialog alert"><h3>Patron not found</h3><p>No patron with this name, please, try another</p> </div>
270
    [% END %]
270
    [% END %]
Lines 297-325 function checkMultiHold() { Link Here
297
      <h3>Cannot place hold</h3>
297
      <h3>Cannot place hold</h3>
298
      <ul>
298
      <ul>
299
        [% IF ( exceeded_maxreserves ) %]
299
        [% IF ( exceeded_maxreserves ) %]
300
          <li><strong>Too many holds: </strong> <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]">[% borrowerfirstname %] [% borrowersurname %] </a> can only place a maximum of [% maxreserves %] total holds.</li>
300
          <li><strong>Too many holds: </strong> <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber %]">[% patron.firstname %] [% patron.surname %] </a> can only place a maximum of [% maxreserves %] total holds.</li>
301
        [% ELSIF ( exceeded_holds_per_record ) %]
301
        [% ELSIF ( exceeded_holds_per_record ) %]
302
          <li><strong>Too many holds for this record: </strong> <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]">[% borrowerfirstname %] [% borrowersurname %] </a> can only place a maximum of [% max_holds_for_record %] hold(s) on this record.</li>
302
          <li><strong>Too many holds for this record: </strong> <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber %]">[% patron.firstname %] [% patron.surname %] </a> can only place a maximum of [% max_holds_for_record %] hold(s) on this record.</li>
303
        [% ELSIF ( alreadypossession ) %]
303
        [% ELSIF ( alreadypossession ) %]
304
          <li> <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]">[% borrowerfirstname %] [% borrowersurname %]</a> <strong>is already in possession</strong> of one item.</li>
304
          <li> <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber %]">[% patron.firstname %] [% patron.surname %]</a> <strong>is already in possession</strong> of one item.</li>
305
        [% ELSIF ( alreadyreserved ) %]
305
        [% ELSIF ( alreadyreserved ) %]
306
          <li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]">[% borrowerfirstname %] [% borrowersurname %]</a> <strong>already has a hold</strong> on this item.</li>
306
          <li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber %]">[% patron.firstname %] [% patron.surname %]</a> <strong>already has a hold</strong> on this item.</li>
307
        [% ELSIF ( ageRestricted ) %]
307
        [% ELSIF ( ageRestricted ) %]
308
          <li><strong>Age restricted</strong></li>
308
          <li><strong>Age restricted</strong></li>
309
        [% ELSIF ( none_available ) %]
309
        [% ELSIF ( none_available ) %]
310
          <li> <strong>No items are available</strong> to be placed on hold.</li>
310
          <li> <strong>No items are available</strong> to be placed on hold.</li>
311
        [% ELSIF ( maxreserves ) %]
311
        [% ELSIF ( maxreserves ) %]
312
          <li><strong>Too many holds: </strong> <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]">[% borrowerfirstname %] [% borrowersurname %] </a> has too many holds.</li>
312
          <li><strong>Too many holds: </strong> <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber %]">[% patron.firstname %] [% patron.surname %] </a> has too many holds.</li>
313
        [% END %]
313
        [% END %]
314
      </ul>
314
      </ul>
315
    [% ELSE %]
315
    [% ELSE %]
316
        <h3>Cannot place hold on some items</h3>
316
        <h3>Cannot place hold on some items</h3>
317
        [% IF ( exceeded_maxreserves ) %]
317
        [% IF ( exceeded_maxreserves ) %]
318
          <li><strong>Too many holds: </strong> <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]">[% borrowerfirstname %] [% borrowersurname %] </a> can place [% new_reserves_allowed %] of the requested [% new_reserves_count %] holds for a maximum of [% maxreserves %] total holds.</li>
318
          <li><strong>Too many holds: </strong> <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber %]">[% patron.firstname %] [% patron.surname %] </a> can place [% new_reserves_allowed %] of the requested [% new_reserves_count %] holds for a maximum of [% maxreserves %] total holds.</li>
319
        [% ELSIF ( exceeded_holds_per_record ) %]
319
        [% ELSIF ( exceeded_holds_per_record ) %]
320
            [% FOREACH biblioloo IN biblioloop %]
320
            [% FOREACH biblioloo IN biblioloop %]
321
                [% IF (biblioloo.tooManyHoldsForThisRecord) %]
321
                [% IF (biblioloo.tooManyHoldsForThisRecord) %]
322
                    <li><strong>Too many holds for <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblioloo.biblionumber %]"> [% biblioloo.title %]</a>: </strong> <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]">[% borrowerfirstname %] [% borrowersurname %] </a> can only place a maximum of [% max_holds_for_record %] hold(s) on this record.</li>
322
                    <li><strong>Too many holds for <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblioloo.biblionumber %]"> [% biblioloo.title %]</a>: </strong> <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber %]">[% patron.firstname %] [% patron.surname %] </a> can only place a maximum of [% max_holds_for_record %] hold(s) on this record.</li>
323
                [% END %]
323
                [% END %]
324
            [% END %]
324
            [% END %]
325
        [% END %]
325
        [% END %]
Lines 328-349 function checkMultiHold() { Link Here
328
    </div>
328
    </div>
329
[% END %]
329
[% END %]
330
330
331
[% IF ( expiry || diffbranch || restricted || ( amount_outstanding && Koha.Preference('maxoutstanding') && amount_outstanding > Koha.Preference('maxoutstanding') ) ) %]
331
[% IF ( expiry || diffbranch || patron.is_debarred || ( amount_outstanding && Koha.Preference('maxoutstanding') && amount_outstanding > Koha.Preference('maxoutstanding') ) ) %]
332
<div class="dialog message"><ul>
332
<div class="dialog message"><ul>
333
    [% IF ( expiry ) %]
333
    [% IF ( expiry ) %]
334
    <li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]">[% borrowerfirstname %] [% borrowersurname %]</a>: <strong>Account has expired</strong></li>
334
    <li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber %]">[% patron.firstname %] [% patron,surname %]</a>: <strong>Account has expired</strong></li>
335
    [% END %]
335
    [% END %]
336
336
337
    [% IF restricted %]
337
    [% IF patron.is_debarred %]
338
    <li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]#reldebarments">[% borrowerfirstname %] [% borrowersurname %]</a>: <strong>Patron has restrictions</strong></li>
338
    <li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber %]#reldebarments">[% patron.firstname %] [% patron.surname %]</a>: <strong>Patron has restrictions</strong></li>
339
    [% END %]
339
    [% END %]
340
340
341
    [% IF amount_outstanding && Koha.Preference('maxoutstanding') && amount_outstanding > Koha.Preference('maxoutstanding') %]
341
    [% IF amount_outstanding && Koha.Preference('maxoutstanding') && amount_outstanding > Koha.Preference('maxoutstanding') %]
342
    <li><a href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% borrowernumber %]">[% borrowerfirstname %] [% borrowersurname %]</a>: <strong>Patron has outstanding fines: [% amount_outstanding | format('%.2f') %]</strong></li>
342
    <li><a href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% patron.borrowernumber %]">[% patron.firstname %] [% patron.surname %]</a>: <strong>Patron has outstanding fines: [% amount_outstanding | format('%.2f') %]</strong></li>
343
    [% END %]
343
    [% END %]
344
344
345
    [% IF ( diffbranch ) %]
345
    [% IF ( diffbranch ) %]
346
    <li> <strong>Pickup library is different. </strong>Patron: <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]">[% borrowerfirstname %] [% borrowersurname %]</a> Patron's home library: ([% Branches.GetName(borrower_branchcode) %] / [% borrower_branchcode %] )</li>
346
    <li> <strong>Pickup library is different. </strong>Patron: <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber %]">[% patron.firstname %] [% patron.surname %]</a> Patron's home library: ([% Branches.GetName(patron.branchcode) %] / [% patron.branchcode %] )</li>
347
    [% END %]
347
    [% END %]
348
348
349
</ul></div>
349
</ul></div>
Lines 361-367 function checkMultiHold() { Link Here
361
            <form action="placerequest.pl" method="post" onsubmit="return checkMultiHold();" name="form">
361
            <form action="placerequest.pl" method="post" onsubmit="return checkMultiHold();" name="form">
362
        [% END %]
362
        [% END %]
363
363
364
        <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
364
        <input type="hidden" name="borrowernumber" value="[% patron.borrowernumber %]" />
365
        <input type="hidden" name="type" value="str8" />
365
        <input type="hidden" name="type" value="str8" />
366
366
367
        [% IF ( multi_hold ) %]
367
        [% IF ( multi_hold ) %]
Lines 380-387 function checkMultiHold() { Link Here
380
        [% END %]
380
        [% END %]
381
381
382
       <ol> <li><span class="label">Patron:</span>
382
       <ol> <li><span class="label">Patron:</span>
383
            [% IF ( borrowernumber ) %]
383
            [% IF ( patron.borrowernumber ) %]
384
                <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]">[% borrowerfirstname %] [% borrowersurname %] ([% cardnumber %])</a>
384
                <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber %]">[% patron.firstname %] [% patron.surname %] ([% cardnumber %])</a>
385
            [% ELSE %]
385
            [% ELSE %]
386
                Not defined yet
386
                Not defined yet
387
            [% END %]
387
            [% END %]
Lines 458-464 function checkMultiHold() { Link Here
458
</ol>
458
</ol>
459
   [% UNLESS ( multi_hold ) %]
459
   [% UNLESS ( multi_hold ) %]
460
        <fieldset class="action">
460
        <fieldset class="action">
461
            [% IF ( borrowernumber ) %]
461
            [% IF ( patron.borrowernumber ) %]
462
                [% IF ( override_required ) %]
462
                [% IF ( override_required ) %]
463
                    <input type="submit" class="warning" value="Place hold" />
463
                    <input type="submit" class="warning" value="Place hold" />
464
                [% ELSIF ( none_available ) %]
464
                [% ELSIF ( none_available ) %]
Lines 595-603 function checkMultiHold() { Link Here
595
                            Can't be cancelled when item is in transit
595
                            Can't be cancelled when item is in transit
596
                    [% ELSE %]
596
                    [% ELSE %]
597
                    [% IF ( itemloo.waitingdate ) %]Waiting[% ELSE %]On hold[% END %]
597
                    [% IF ( itemloo.waitingdate ) %]Waiting[% ELSE %]On hold[% END %]
598
                    [% IF ( itemloo.canreservefromotherbranches ) %]for <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% itemloo.ReservedForBorrowernumber %]">[% itemloo.ReservedForFirstname %] [% itemloo.ReservedForSurname %]</a>[% END %] [% IF ( itemloo.waitingdate ) %]at[% ELSE %]expected at[% END %] [% Branches.GetName( itemloo.ExpectedAtLibrary ) %]
598
                    [% IF ( itemloo.canreservefromotherbranches ) %]for <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% itemloo.ReservedFor.borrowernumber %]">[% itemloo.ReservedFor.firstname %] [% itemloo.ReservedFor.surname %]</a>[% END %] [% IF ( itemloo.waitingdate ) %]at[% ELSE %]expected at[% END %] [% Branches.GetName( itemloo.ExpectedAtLibrary ) %]
599
                    since
599
                    since
600
                    [% IF ( itemloo.waitingdate ) %][% itemloo.waitingdate | $KohaDates %][% ELSE %][% IF ( itemloo.reservedate ) %][% itemloo.reservedate %][% END %][% END %]. <a class="info" href="modrequest.pl?CancelBiblioNumber=[% itemloo.biblionumber %]&amp;CancelBorrowerNumber=[% itemloo.ReservedForBorrowernumber %]&amp;CancelItemnumber=[% itemloo.itemnumber %]"  onclick="return confirmDelete(MSG_CONFIRM_DELETE_HOLD);">Cancel hold</a>
600
                    [% IF ( itemloo.waitingdate ) %][% itemloo.waitingdate | $KohaDates %][% ELSE %][% IF ( itemloo.reservedate ) %][% itemloo.reservedate %][% END %][% END %]. <a class="info" href="modrequest.pl?CancelBiblioNumber=[% itemloo.biblionumber %]&amp;CancelBorrowerNumber=[% itemloo.ReservedFor.borrowernumber %]&amp;CancelItemnumber=[% itemloo.itemnumber %]"  onclick="return confirmDelete(MSG_CONFIRM_DELETE_HOLD);">Cancel hold</a>
601
601
602
                    [% END %]
602
                    [% END %]
603
                [% ELSE %]
603
                [% ELSE %]
Lines 671-677 function checkMultiHold() { Link Here
671
            [% END %]
671
            [% END %]
672
672
673
          [% IF ( biblioloo.alreadyres ) %]
673
          [% IF ( biblioloo.alreadyres ) %]
674
              <li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]">[% borrowerfirstname %] [% borrowersurname %]</a> <strong>already has a hold</strong> on this item </li>
674
              <li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber %]">[% patron.firstname %] [% patron.surname %]</a> <strong>already has a hold</strong> on this item </li>
675
          [% END %]
675
          [% END %]
676
          [% IF ( biblioloo.none_avail ) %]
676
          [% IF ( biblioloo.none_avail ) %]
677
              <li> <strong>No items are available</strong> to be placed on hold</li>
677
              <li> <strong>No items are available</strong> to be placed on hold</li>
Lines 693-699 function checkMultiHold() { Link Here
693
  [% END %]<!-- /multi_hold -->
693
  [% END %]<!-- /multi_hold -->
694
694
695
    <fieldset class="action">
695
    <fieldset class="action">
696
        [% IF ( borrowernumber ) %]
696
        [% IF ( patron AND patron.borrowernumber ) %]
697
            [% IF ( override_required ) %]
697
            [% IF ( override_required ) %]
698
                <input type="submit" class="warning" value="Place hold" />
698
                <input type="submit" class="warning" value="Place hold" />
699
            [% ELSIF ( none_available ) %]
699
            [% ELSIF ( none_available ) %]
Lines 707-713 function checkMultiHold() { Link Here
707
	</fieldset>
707
	</fieldset>
708
[% END %]
708
[% END %]
709
709
710
[% UNLESS ( borrowernumber ) %]
710
[% UNLESS ( patron ) %]
711
[% IF ( reserveloop ) %]
711
[% IF ( reserveloop ) %]
712
<form name="T[% time %]" action="modrequest.pl" method="post">
712
<form name="T[% time %]" action="modrequest.pl" method="post">
713
  [% IF ( multi_hold ) %]
713
  [% IF ( multi_hold ) %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/reviews/reviewswaiting.tt (-1 / +1 lines)
Lines 45-51 Link Here
45
    <tbody>[% FOREACH review IN reviews %]
45
    <tbody>[% FOREACH review IN reviews %]
46
    <tr>
46
    <tr>
47
        <td>
47
        <td>
48
            [% IF ( review.borrowernumber ) %]<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% review.borrowernumber %]">[% review.surname %], [% review.firstname %]</a>[% ELSE %](deleted patron)[% END %]
48
            [% IF ( review.borrowernumber ) %]<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% review.borrowernumber %]">[% review.patron.surname %], [% review.patron.firstname %]</a>[% ELSE %](deleted patron)[% END %]
49
        </td>
49
        </td>
50
        <td>
50
        <td>
51
            <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% review.biblionumber %]">[% review.bibliotitle %]</a>
51
            <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% review.biblionumber %]">[% review.bibliotitle %]</a>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt (-2 / +10 lines)
Lines 209-221 Link Here
209
                                <tr>
209
                                <tr>
210
                                    <td>[% loopro.timestamp %]</td>
210
                                    <td>[% loopro.timestamp %]</td>
211
                                    <td>
211
                                    <td>
212
                                        <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% loopro.user %]" title="display detail for this librarian."> [% IF ( loopro.userfirstname ) || ( loopro.usersurname ) %][% loopro.userfirstname %] [% loopro.usersurname %] ([% loopro.user %]) [% ELSE %][% loopro.user %][% END %]</a>
212
                                        [% IF loopro.librarian %]
213
                                            <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% loopro.librarian.borrowernumber %]" title="display detail for this librarian."> [% IF ( loopro.librarian.firstname ) || ( loopro.librarian.surname ) %][% loopro.librarian.firstname %] [% loopro.librarian.surname %] ([% loopro.librarian.borrowernumber %]) [% ELSE %][% loopro.librarian.borrowernumber %][% END %]</a>
214
                                        [% ELSE %]
215
                                            [% loopro.user %]
216
                                        [% END %]
213
                                    </td>
217
                                    </td>
214
                                    <td>[% PROCESS translate_log_module module=loopro.module %]</td>
218
                                    <td>[% PROCESS translate_log_module module=loopro.module %]</td>
215
                                    <td>[% PROCESS translate_log_action action=loopro.action %]</td>
219
                                    <td>[% PROCESS translate_log_action action=loopro.action %]</td>
216
                                    <td>
220
                                    <td>
217
                                        [% IF ( loopro.module == 'MEMBERS' ) || ( loopro.module == 'CIRCULATION' ) || ( loopro.module == 'FINES' ) %]
221
                                        [% IF ( loopro.module == 'MEMBERS' ) || ( loopro.module == 'CIRCULATION' ) || ( loopro.module == 'FINES' ) %]
218
                                             <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% loopro.object %]" title="Display member details."> [% IF ( loopro.object ) %][% IF ( loopro.borrowerfirstname ) || ( loopro.borrowersurname ) %][% loopro.borrowerfirstname %] [% loopro.borrowersurname %] ([% loopro.object %]) [% ELSE %]Member [% loopro.object %][% END %][% END %] </a>
222
                                            [% IF loopro.patron %]
223
                                                <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% loopro.object %]" title="Display member details."> [% IF ( loopro.object ) %][% IF ( loopro.patron.firstname ) || ( loopro.patron.surname ) %][% loopro.patron.firstname %] [% loopro.patron.surname %] ([% loopro.object %]) [% ELSE %]Member [% loopro.object %][% END %][% END %] </a>
224
                                            [% ELSE %]
225
                                                [% loopro.object %]
226
                                            [% END %]
219
                                        [% ELSE %]
227
                                        [% ELSE %]
220
                                                [% IF ( loopro.module == 'CATALOGUING' ) %]
228
                                                [% IF ( loopro.module == 'CATALOGUING' ) %]
221
                                                    [% IF ( loopro.info.substr(0, 4) == 'item' ) %]
229
                                                    [% IF ( loopro.info.substr(0, 4) == 'item' ) %]
(-)a/members/boraccount.pl (-3 / +1 lines)
Lines 108-118 if (C4::Context->preference('ExtendedPatronAttributes')) { Link Here
108
    );
108
    );
109
}
109
}
110
110
111
$template->param(%{ $patron->unblessed });
112
113
$template->param(
111
$template->param(
112
    patron              => $patron,
114
    finesview           => 1,
113
    finesview           => 1,
115
    borrowernumber      => $borrowernumber,
116
    total               => sprintf("%.2f",$total),
114
    total               => sprintf("%.2f",$total),
117
    totalcredit         => $totalcredit,
115
    totalcredit         => $totalcredit,
118
    is_child            => ($patron->category->category_type eq 'C'),
116
    is_child            => ($patron->category->category_type eq 'C'),
(-)a/members/deletemem.pl (-17 / +1 lines)
Lines 113-135 if ( $op eq 'delete_confirm' or $countissues > 0 or $flags->{'CHARGES'} or $is_ Link Here
113
    $template->param( adultborrower => 1 ) if $patron->category->category_type =~ /^(A|I)$/;
113
    $template->param( adultborrower => 1 ) if $patron->category->category_type =~ /^(A|I)$/;
114
114
115
    $template->param(
115
    $template->param(
116
        # FIXME The patron object should be passed to the template
116
        patron => $patron,
117
        borrowernumber => $patron->borrowernumber,
118
        surname => $patron->surname,
119
        title => $patron->title,
120
        cardnumber => $patron->cardnumber,
121
        firstname => $patron->firstname,
122
        categorycode => $patron->categorycode,
123
        category_type => $patron->category->category_type,
124
        categoryname  => $patron->category->description,
125
        address => $patron->address,
126
        address2 => $patron->address2,
127
        city => $patron->city,
128
        zipcode => $patron->zipcode,
129
        country => $patron->country,
130
        phone => $patron->phone,
131
        email => $patron->email,
132
        branchcode => $patron->branchcode,
133
    );
117
    );
134
    if ($countissues >0) {
118
    if ($countissues >0) {
135
        $template->param(ItemsOnIssues => $countissues);
119
        $template->param(ItemsOnIssues => $countissues);
(-)a/members/discharge.pl (-25 / +1 lines)
Lines 66-74 my $can_be_discharged = Koha::Patron::Discharge::can_be_discharged({ Link Here
66
    borrowernumber => $borrowernumber
66
    borrowernumber => $borrowernumber
67
});
67
});
68
68
69
my $holds = $patron->holds;
70
my $has_reserves = $holds->count;
71
72
# Generating discharge if needed
69
# Generating discharge if needed
73
if ( $input->param('discharge') and $can_be_discharged ) {
70
if ( $input->param('discharge') and $can_be_discharged ) {
74
    my $is_discharged = Koha::Patron::Discharge::is_discharged({
71
    my $is_discharged = Koha::Patron::Discharge::is_discharged({
Lines 109-136 my @validated_discharges = Koha::Patron::Discharge::get_validated({ Link Here
109
$template->param( picture => 1 ) if $patron->image;
106
$template->param( picture => 1 ) if $patron->image;
110
107
111
$template->param(
108
$template->param(
112
    # FIXME The patron object should be passed to the template
109
    patron => $patron,
113
    borrowernumber    => $borrowernumber,
114
    title             => $patron->title,
115
    initials          => $patron->initials,
116
    surname           => $patron->surname,
117
    borrowernumber    => $borrowernumber,
118
    firstname         => $patron->firstname,
119
    cardnumber        => $patron->cardnumber,
120
    categorycode      => $patron->categorycode,
121
    category_type     => $patron->category->category_type,
122
    categoryname      => $patron->category->description,
123
    address           => $patron->address,
124
    streetnumber      => $patron->streetnumber,
125
    streettype        => $patron->streettype,
126
    address2          => $patron->address2,
127
    city              => $patron->city,
128
    zipcode           => $patron->zipcode,
129
    country           => $patron->country,
130
    phone             => $patron->phone,
131
    email             => $patron->email,
132
    branchcode        => $patron->branchcode,
133
    has_reserves      => $has_reserves,
134
    can_be_discharged => $can_be_discharged,
110
    can_be_discharged => $can_be_discharged,
135
    validated_discharges => \@validated_discharges,
111
    validated_discharges => \@validated_discharges,
136
);
112
);
(-)a/members/files.pl (-5 / +1 lines)
Lines 69-75 if ( $op eq 'download' ) { Link Here
69
else {
69
else {
70
70
71
    my $patron_category = $patron->category;
71
    my $patron_category = $patron->category;
72
    $template->param(%{ $patron->unblessed});
72
    $template->param( patron => $patron );
73
73
74
    my %errors;
74
    my %errors;
75
75
Lines 106-115 else { Link Here
106
        $bf->DelFile( id => scalar $cgi->param('file_id') );
106
        $bf->DelFile( id => scalar $cgi->param('file_id') );
107
    }
107
    }
108
108
109
    $template->param(
110
        categoryname    => $patron_category->description,
111
    );
112
113
    if (C4::Context->preference('ExtendedPatronAttributes')) {
109
    if (C4::Context->preference('ExtendedPatronAttributes')) {
114
        my $attributes = GetBorrowerAttributes($borrowernumber);
110
        my $attributes = GetBorrowerAttributes($borrowernumber);
115
        $template->param(
111
        $template->param(
(-)a/members/housebound.pl (-5 / +2 lines)
Lines 63-71 output_and_exit_if_error( $input, $cookie, $template, { module => 'members', log Link Here
63
63
64
# Get supporting cast
64
# Get supporting cast
65
my ( $branch, $category, $houseboundprofile, $visit, $patron_image );
65
my ( $branch, $category, $houseboundprofile, $visit, $patron_image );
66
if ( $patron ) {
66
if ( $patron ) { # FIXME This test is not needed - output_and_exit_if_error handles it
67
    $patron_image = $patron->image;
67
    $patron_image = $patron->image;
68
    $branch = Koha::Libraries->new->find($patron->branchcode);
69
    $category = Koha::Patron::Categories->new->find($patron->categorycode);
68
    $category = Koha::Patron::Categories->new->find($patron->categorycode);
70
    $houseboundprofile = $patron->housebound_profile;
69
    $houseboundprofile = $patron->housebound_profile;
71
}
70
}
Lines 158-164 if ( $method eq 'updateconfirm' and $houseboundprofile ) { Link Here
158
$method = 'update_or_create' if ( !$houseboundprofile );
157
$method = 'update_or_create' if ( !$houseboundprofile );
159
158
160
# Ensure template has all patron details.
159
# Ensure template has all patron details.
161
$template->param(%{$patron->unblessed}) if ( $patron );
160
$template->param( patron => $patron );
162
161
163
# Load extended patron attributes if necessary (taken from members/files.pl).
162
# Load extended patron attributes if necessary (taken from members/files.pl).
164
if ( C4::Context->preference('ExtendedPatronAttributes') and $patron ) {
163
if ( C4::Context->preference('ExtendedPatronAttributes') and $patron ) {
Lines 174-181 $template->param( Link Here
174
    picture            => $patron_image,
173
    picture            => $patron_image,
175
    housebound_profile => $houseboundprofile,
174
    housebound_profile => $houseboundprofile,
176
    visit              => $houseboundvisit,
175
    visit              => $houseboundvisit,
177
    branch             => $branch,
178
    category           => $category,
179
    messages           => \@messages,
176
    messages           => \@messages,
180
    method             => $method,
177
    method             => $method,
181
    choosers           => $choosers,
178
    choosers           => $choosers,
(-)a/members/mancredit.pl (-3 / +1 lines)
Lines 96-107 if ($add){ Link Here
96
        );
96
        );
97
    }
97
    }
98
98
99
    $template->param(%{ $patron->unblessed});
99
    $template->param( patron => $patron );
100
100
101
    $template->param(
101
    $template->param(
102
        finesview      => 1,
102
        finesview      => 1,
103
        borrowernumber => $borrowernumber,
104
        categoryname   => $patron->category->description,
105
        is_child       => ($patron->category->category_type eq 'C'), # FIXME is_child should be a Koha::Patron method
103
        is_child       => ($patron->category->category_type eq 'C'), # FIXME is_child should be a Koha::Patron method
106
        );
104
        );
107
    output_html_with_http_headers $input, $cookie, $template->output;
105
    output_html_with_http_headers $input, $cookie, $template->output;
(-)a/members/maninvoice.pl (-4 / +1 lines)
Lines 95-101 if ($add){ Link Here
95
    });
95
    });
96
96
97
    my $logged_in_user = Koha::Patrons->find( $loggedinuser ) or die "Not logged in";
97
    my $logged_in_user = Koha::Patrons->find( $loggedinuser ) or die "Not logged in";
98
    my $patron         = Koha::Patrons->find($borrowernumber);
99
    output_and_exit_if_error( $input, $cookie, $template, { module => 'members', logged_in_user => $logged_in_user, current_patron => $patron } );
98
    output_and_exit_if_error( $input, $cookie, $template, { module => 'members', logged_in_user => $logged_in_user, current_patron => $patron } );
100
99
101
  # get authorised values with type of MANUAL_INV
100
  # get authorised values with type of MANUAL_INV
Lines 125-135 if ($add){ Link Here
125
        );
124
        );
126
    }
125
    }
127
126
128
    $template->param(%{ $patron->unblessed });
129
    $template->param(
127
    $template->param(
128
        patron         => $patron,
130
        finesview      => 1,
129
        finesview      => 1,
131
        borrowernumber => $borrowernumber,
132
        categoryname   => $patron->category->description,
133
        is_child       => ($patron->category->category_type eq 'C'),
130
        is_child       => ($patron->category->category_type eq 'C'),
134
    );
131
    );
135
    output_html_with_http_headers $input, $cookie, $template->output;
132
    output_html_with_http_headers $input, $cookie, $template->output;
(-)a/members/member-flags.pl (-21 / +1 lines)
Lines 200-226 if (C4::Context->preference('ExtendedPatronAttributes')) { Link Here
200
}
200
}
201
201
202
$template->param(
202
$template->param(
203
    borrowernumber => $bor->{'borrowernumber'},
203
    patron         => $patron,
204
    cardnumber     => $bor->{'cardnumber'},
205
    surname        => $bor->{'surname'},
206
    firstname      => $bor->{'firstname'},
207
    othernames     => $bor->{'othernames'},
208
    categorycode   => $bor->{'categorycode'},
209
    category_type  => $category_type,
210
    categoryname   => $bor->{'description'},
211
    address        => $bor->{address},
212
    address2       => $bor->{'address2'},
213
    streettype     => $bor->{streettype},
214
    city           => $bor->{'city'},
215
    state          => $bor->{'state'},
216
    zipcode        => $bor->{'zipcode'},
217
    country        => $bor->{'country'},
218
    phone          => $bor->{'phone'},
219
    phonepro       => $bor->{'phonepro'},
220
    mobile         => $bor->{'mobile'},
221
    email          => $bor->{'email'},
222
    emailpro       => $bor->{'emailpro'},
223
    branchcode     => $bor->{'branchcode'},
224
    loop           => \@loop,
204
    loop           => \@loop,
225
    is_child       => ( $category_type eq 'C' ),
205
    is_child       => ( $category_type eq 'C' ),
226
    csrf_token =>
206
    csrf_token =>
(-)a/members/member-password.pl (-23 / +1 lines)
Lines 114-142 if ( C4::Context->preference('ExtendedPatronAttributes') ) { Link Here
114
}
114
}
115
115
116
$template->param(
116
$template->param(
117
    othernames                 => $bor->{'othernames'},
117
    patron                     => $patron,
118
    surname                    => $bor->{'surname'},
119
    firstname                  => $bor->{'firstname'},
120
    borrowernumber             => $bor->{'borrowernumber'},
121
    cardnumber                 => $bor->{'cardnumber'},
122
    categorycode               => $bor->{'categorycode'},
123
    category_type              => $category_type,
124
    categoryname               => $bor->{'description'},
125
    address                    => $bor->{address},
126
    address2                   => $bor->{'address2'},
127
    streettype                 => $bor->{streettype},
128
    city                       => $bor->{'city'},
129
    state                      => $bor->{'state'},
130
    zipcode                    => $bor->{'zipcode'},
131
    country                    => $bor->{'country'},
132
    phone                      => $bor->{'phone'},
133
    phonepro                   => $bor->{'phonepro'},
134
    streetnumber               => $bor->{'streetnumber'},
135
    mobile                     => $bor->{'mobile'},
136
    email                      => $bor->{'email'},
137
    emailpro                   => $bor->{'emailpro'},
138
    branchcode                 => $bor->{'branchcode'},
139
    userid                     => $bor->{'userid'},
140
    destination                => $destination,
118
    destination                => $destination,
141
    is_child                   => ( $category_type eq 'C' ),
119
    is_child                   => ( $category_type eq 'C' ),
142
    csrf_token                 => Koha::Token->new->generate_csrf({ session_id => scalar $input->cookie('CGISESSID'), }),
120
    csrf_token                 => Koha::Token->new->generate_csrf({ session_id => scalar $input->cookie('CGISESSID'), }),
(-)a/members/moremember.pl (-10 / +5 lines)
Lines 139-145 my $category_type = $patron->category->category_type; Link Here
139
my $data = $patron->unblessed;
139
my $data = $patron->unblessed;
140
140
141
$debug and printf STDERR "dates (enrolled,expiry,birthdate) raw: (%s, %s, %s)\n", map {$data->{$_}} qw(dateenrolled dateexpiry dateofbirth);
141
$debug and printf STDERR "dates (enrolled,expiry,birthdate) raw: (%s, %s, %s)\n", map {$data->{$_}} qw(dateenrolled dateexpiry dateofbirth);
142
foreach (qw(dateenrolled dateexpiry dateofbirth)) {
142
foreach (qw(dateenrolled dateexpiry dateofbirth)) { # FIXME This should be removed
143
    my $userdate = $data->{$_};
143
    my $userdate = $data->{$_};
144
    unless ($userdate) {
144
    unless ($userdate) {
145
        $debug and warn sprintf "Empty \$data{%12s}", $_;
145
        $debug and warn sprintf "Empty \$data{%12s}", $_;
Lines 156-162 for (qw(gonenoaddress lost borrowernotes)) { Link Here
156
156
157
if ( $patron->is_debarred ) {
157
if ( $patron->is_debarred ) {
158
    $template->param(
158
    $template->param(
159
        userdebarred => 1,
159
        userdebarred => 1, # FIXME Template should use patron->is_debarred
160
        flagged => 1,
160
        flagged => 1,
161
        debarments => scalar GetDebarments({ borrowernumber => $borrowernumber }),
161
        debarments => scalar GetDebarments({ borrowernumber => $borrowernumber }),
162
    );
162
    );
Lines 216-222 else { Link Here
216
    $samebranch = 1;
216
    $samebranch = 1;
217
}
217
}
218
my $library = Koha::Libraries->find( $data->{branchcode})->unblessed;
218
my $library = Koha::Libraries->find( $data->{branchcode})->unblessed;
219
@{$data}{keys %$library} = values %$library; # merge in all branch columns
219
@{$data}{keys %$library} = values %$library; # merge in all branch columns # FIXME This is really ugly, we should pass the library instead
220
220
221
my ( $total, $accts, $numaccts) = GetMemberAccountRecords( $borrowernumber );
221
my ( $total, $accts, $numaccts) = GetMemberAccountRecords( $borrowernumber );
222
222
Lines 234-240 if ($print eq "page") { Link Here
234
}
234
}
235
235
236
# Show OPAC privacy preference is system preference is set
236
# Show OPAC privacy preference is system preference is set
237
if ( C4::Context->preference('OPACPrivacy') ) {
237
if ( C4::Context->preference('OPACPrivacy') ) { # FIXME Should be moved the the template
238
    $template->param( OPACPrivacy => 1);
238
    $template->param( OPACPrivacy => 1);
239
    $template->param( "privacy".$data->{'privacy'} => 1);
239
    $template->param( "privacy".$data->{'privacy'} => 1);
240
}
240
}
Lines 285-291 $template->param( Link Here
285
);
285
);
286
286
287
287
288
$template->param(%$data);
288
$template->param(%$data); # FIXME This should be removed and used $patron instead, but too many things are processed above
289
289
290
if (C4::Context->preference('ExtendedPatronAttributes')) {
290
if (C4::Context->preference('ExtendedPatronAttributes')) {
291
    my $attributes = C4::Members::Attributes::GetBorrowerAttributes($borrowernumber);
291
    my $attributes = C4::Members::Attributes::GetBorrowerAttributes($borrowernumber);
Lines 323-329 if (C4::Context->preference('EnhancedMessagingPreferences')) { Link Here
323
    C4::Form::MessagingPreferences::set_form_values({ borrowernumber => $borrowernumber }, $template);
323
    C4::Form::MessagingPreferences::set_form_values({ borrowernumber => $borrowernumber }, $template);
324
    $template->param(messaging_form_inactive => 1);
324
    $template->param(messaging_form_inactive => 1);
325
    $template->param(SMSSendDriver => C4::Context->preference("SMSSendDriver"));
325
    $template->param(SMSSendDriver => C4::Context->preference("SMSSendDriver"));
326
    $template->param(SMSnumber     => $data->{'smsalertnumber'});
327
    $template->param(TalkingTechItivaPhone => C4::Context->preference("TalkingTechItivaPhoneNotification"));
326
    $template->param(TalkingTechItivaPhone => C4::Context->preference("TalkingTechItivaPhoneNotification"));
328
}
327
}
329
328
Lines 352-360 $template->param( Link Here
352
    patron          => $patron,
351
    patron          => $patron,
353
    translated_language => $translated_language,
352
    translated_language => $translated_language,
354
    detailview      => 1,
353
    detailview      => 1,
355
    borrowernumber  => $borrowernumber,
356
    othernames      => $data->{'othernames'},
357
    categoryname    => $patron->category->description,
358
    was_renewed     => scalar $input->param('was_renewed') ? 1 : 0,
354
    was_renewed     => scalar $input->param('was_renewed') ? 1 : 0,
359
    todaysdate      => output_pref({ dt => dt_from_string, dateformat => 'iso', dateonly => 1 }),
355
    todaysdate      => output_pref({ dt => dt_from_string, dateformat => 'iso', dateonly => 1 }),
360
    totalprice      => sprintf("%.2f", $totalprice),
356
    totalprice      => sprintf("%.2f", $totalprice),
Lines 367-373 $template->param( Link Here
367
    samebranch      => $samebranch,
363
    samebranch      => $samebranch,
368
    quickslip       => $quickslip,
364
    quickslip       => $quickslip,
369
    housebound_role => scalar $patron->housebound_role,
365
    housebound_role => scalar $patron->housebound_role,
370
    privacy_guarantor_checkouts => $data->{'privacy_guarantor_checkouts'},
371
    PatronsPerPage => C4::Context->preference("PatronsPerPage") || 20,
366
    PatronsPerPage => C4::Context->preference("PatronsPerPage") || 20,
372
    relatives_issues_count => $relatives_issues_count,
367
    relatives_issues_count => $relatives_issues_count,
373
    relatives_borrowernumbers => \@relatives,
368
    relatives_borrowernumbers => \@relatives,
(-)a/members/notices.pl (-3 / +1 lines)
Lines 51-57 my ($template, $loggedinuser, $cookie) Link Here
51
my $logged_in_user = Koha::Patrons->find( $loggedinuser ) or die "Not logged in";
51
my $logged_in_user = Koha::Patrons->find( $loggedinuser ) or die "Not logged in";
52
output_and_exit_if_error( $input, $cookie, $template, { module => 'members', logged_in_user => $logged_in_user, current_patron => $patron } );
52
output_and_exit_if_error( $input, $cookie, $template, { module => 'members', logged_in_user => $logged_in_user, current_patron => $patron } );
53
53
54
$template->param( $borrower );
55
$template->param( picture => 1 ) if $patron->image;
54
$template->param( picture => 1 ) if $patron->image;
56
55
57
# Allow resending of messages in Notices tab
56
# Allow resending of messages in Notices tab
Lines 77-89 if (C4::Context->preference('ExtendedPatronAttributes')) { Link Here
77
    );
76
    );
78
}
77
}
79
78
80
$template->param(%$borrower);
81
$template->param( adultborrower => 1 ) if ( $borrower->{category_type} eq 'A' || $borrower->{category_type} eq 'I' );
79
$template->param( adultborrower => 1 ) if ( $borrower->{category_type} eq 'A' || $borrower->{category_type} eq 'I' );
82
$template->param(
80
$template->param(
81
    patron             => $patron,
83
    QUEUED_MESSAGES    => $queued_messages,
82
    QUEUED_MESSAGES    => $queued_messages,
84
    borrowernumber     => $borrowernumber,
83
    borrowernumber     => $borrowernumber,
85
    sentnotices        => 1,
84
    sentnotices        => 1,
86
    categoryname       => $patron->category->description,
87
);
85
);
88
output_html_with_http_headers $input, $cookie, $template->output;
86
output_html_with_http_headers $input, $cookie, $template->output;
89
87
(-)a/members/pay.pl (-10 / +3 lines)
Lines 67-79 if ( !$borrowernumber ) { Link Here
67
67
68
# get borrower details
68
# get borrower details
69
my $logged_in_user = Koha::Patrons->find( $loggedinuser ) or die "Not logged in";
69
my $logged_in_user = Koha::Patrons->find( $loggedinuser ) or die "Not logged in";
70
my $patron         = Koha::Patrons->find($borrowernumber);
70
our $patron         = Koha::Patrons->find($borrowernumber);
71
output_and_exit_if_error( $input, $cookie, $template, { module => 'members', logged_in_user => $logged_in_user, current_patron => $patron } );
71
output_and_exit_if_error( $input, $cookie, $template, { module => 'members', logged_in_user => $logged_in_user, current_patron => $patron } );
72
72
73
my $category = $patron->category;
74
our $borrower = $patron->unblessed;
75
$borrower->{description} = $category->description;
76
$borrower->{category_type} = $category->category_type;
77
our $user = $input->remote_user;
73
our $user = $input->remote_user;
78
$user ||= q{};
74
$user ||= q{};
79
75
Lines 142-157 sub add_accounts_to_template { Link Here
142
        }
138
        }
143
        push @accounts, $account_line;
139
        push @accounts, $account_line;
144
    }
140
    }
145
    borrower_add_additional_fields($borrower);
141
    borrower_add_additional_fields($patron->unblessed);
146
147
    $template->param(%$borrower);
148
142
149
    my $patron_image = Koha::Patron::Images->find($borrower->{borrowernumber});
143
    my $patron_image = Koha::Patron::Images->find($borrower->{borrowernumber});
150
    $template->param( picture => 1 ) if $patron_image;
144
    $template->param( picture => 1 ) if $patron_image;
151
    $template->param(
145
    $template->param(
146
        patron   => $patron,
152
        accounts => \@accounts,
147
        accounts => \@accounts,
153
        borrower => $borrower,
154
        categoryname => $borrower->{'description'},
155
        total    => $total,
148
        total    => $total,
156
    );
149
    );
157
    return;
150
    return;
(-)a/members/paycollect.pl (-4 / +1 lines)
Lines 55-62 output_and_exit_if_error( $input, $cookie, $template, { module => 'members', log Link Here
55
55
56
my $borrower       = $patron->unblessed;
56
my $borrower       = $patron->unblessed;
57
my $category       = $patron->category;
57
my $category       = $patron->category;
58
$borrower->{description} = $category->description;
59
$borrower->{category_type} = $category->category_type;
60
my $user           = $input->remote_user;
58
my $user           = $input->remote_user;
61
59
62
my $branch         = C4::Context->userenv->{'branch'};
60
my $branch         = C4::Context->userenv->{'branch'};
Lines 179-186 $template->param(%$borrower); Link Here
179
177
180
$template->param(
178
$template->param(
181
    borrowernumber => $borrowernumber,    # some templates require global
179
    borrowernumber => $borrowernumber,    # some templates require global
182
    borrower      => $borrower,
180
    patron        => $patron,
183
    categoryname  => $borrower->{description},
184
    total         => $total_due,
181
    total         => $total_due,
185
    ExtendedPatronAttributes => C4::Context->preference('ExtendedPatronAttributes'),
182
    ExtendedPatronAttributes => C4::Context->preference('ExtendedPatronAttributes'),
186
183
(-)a/members/printfeercpt.pl (-22 / +4 lines)
Lines 54-68 my $patron = Koha::Patrons->find( $borrowernumber ); Link Here
54
output_and_exit_if_error( $input, $cookie, $template, { module => 'members', logged_in_user => $logged_in_user, current_patron => $patron } );
54
output_and_exit_if_error( $input, $cookie, $template, { module => 'members', logged_in_user => $logged_in_user, current_patron => $patron } );
55
55
56
my $category = $patron->category;
56
my $category = $patron->category;
57
my $data = $patron->unblessed;
58
$data->{description} = $category->description;
59
$data->{category_type} = $category->category_type;
60
57
61
if ( $action eq 'print' ) {
58
if ( $action eq 'print' ) {
62
#  ReversePayment( $borrowernumber, $input->param('accountno') );
59
#  ReversePayment( $borrowernumber, $input->param('accountno') );
63
}
60
}
64
61
65
if ( $data->{'category_type'} eq 'C') {
62
if ( $category->category_type eq 'C') {
66
    my $patron_categories = Koha::Patron::Categories->search_limited({ category_type => 'A' }, {order_by => ['categorycode']});
63
    my $patron_categories = Koha::Patron::Categories->search_limited({ category_type => 'A' }, {order_by => ['categorycode']});
67
    $template->param( 'CATCODE_MULTI' => 1) if $patron_categories->count > 1;
64
    $template->param( 'CATCODE_MULTI' => 1) if $patron_categories->count > 1;
68
    $template->param( 'catcode' => $patron_categories->next->categorycde )  if $patron_categories->count == 1;
65
    $template->param( 'catcode' => $patron_categories->next->categorycde )  if $patron_categories->count == 1;
Lines 117-147 for (my $i=0;$i<$numaccts;$i++){ Link Here
117
    push(@accountrows, \%row);
114
    push(@accountrows, \%row);
118
}
115
}
119
116
120
$template->param( adultborrower => 1 ) if ( $data->{'category_type'} eq 'A' || $data->{'category_type'} eq 'I' );
117
$template->param( adultborrower => 1 ) if ( $category->category_type eq 'A' || $category->category_type eq 'I' );
121
118
122
$template->param( picture => 1 ) if $patron->image;
119
$template->param( picture => 1 ) if $patron->image;
123
120
124
$template->param(
121
$template->param(
122
    patron               => $patron,
125
    finesview           => 1,
123
    finesview           => 1,
126
    firstname           => $data->{'firstname'},
127
    surname             => $data->{'surname'},
128
    borrowernumber      => $borrowernumber,
129
    cardnumber          => $data->{'cardnumber'},
130
    categorycode        => $data->{'categorycode'},
131
    category_type       => $data->{'category_type'},
132
 #   category_description => $data->{'description'},
133
    categoryname		 => $data->{'description'},
134
    address             => $data->{'address'},
135
    address2            => $data->{'address2'},
136
    city                => $data->{'city'},
137
    zipcode             => $data->{'zipcode'},
138
    country             => $data->{'country'},
139
    phone               => $data->{'phone'},
140
    email               => $data->{'email'},
141
    branchcode          => $data->{'branchcode'},
142
    total               => sprintf("%.2f",$total),
124
    total               => sprintf("%.2f",$total),
143
    totalcredit         => $totalcredit,
125
    totalcredit         => $totalcredit,
144
	is_child        => ($data->{'category_type'} eq 'C'),
126
    is_child            => ($category->category_type eq 'C'),
145
    accounts            => \@accountrows );
127
    accounts            => \@accountrows );
146
128
147
output_html_with_http_headers $input, $cookie, $template->output;
129
output_html_with_http_headers $input, $cookie, $template->output;
(-)a/members/printinvoice.pl (-21 / +4 lines)
Lines 53-63 my $patron = Koha::Patrons->find( $borrowernumber ); Link Here
53
output_and_exit_if_error( $input, $cookie, $template, { module => 'members', logged_in_user => $logged_in_user, current_patron => $patron } );
53
output_and_exit_if_error( $input, $cookie, $template, { module => 'members', logged_in_user => $logged_in_user, current_patron => $patron } );
54
54
55
my $category = $patron->category;
55
my $category = $patron->category;
56
my $data = $patron->unblessed;
57
$data->{description} = $category->description;
58
$data->{category_type} = $category->category_type;
59
56
60
if ( $data->{'category_type'} eq 'C' ) {
57
if ( $category->category_type eq 'C' ) {
61
    my $patron_categories = Koha::Patron::Categories->search_limited({ category_type => 'A' }, {order_by => ['categorycode']});
58
    my $patron_categories = Koha::Patron::Categories->search_limited({ category_type => 'A' }, {order_by => ['categorycode']});
62
    $template->param( 'CATCODE_MULTI' => 1) if $patron_categories->count > 1;
59
    $template->param( 'CATCODE_MULTI' => 1) if $patron_categories->count > 1;
63
    $template->param( 'catcode' => $patron_categories->next->categorycode )  if $patron_categories->count == 1;
60
    $template->param( 'catcode' => $patron_categories->next->categorycode )  if $patron_categories->count == 1;
Lines 117-146 for ( my $i = 0 ; $i < $numaccts ; $i++ ) { Link Here
117
    push( @accountrows, \%row );
114
    push( @accountrows, \%row );
118
}
115
}
119
116
120
$template->param( adultborrower => 1 ) if ( $data->{'category_type'} eq 'A' || $data->{'category_type'} eq 'I' );
117
$template->param( adultborrower => 1 ) if ( $category->category_type eq 'A' || $category->category_type eq 'I' );
121
118
122
$template->param( picture => 1 ) if $patron->image;
119
$template->param( picture => 1 ) if $patron->image;
123
120
124
$template->param(
121
$template->param(
122
    patron         => $patron,
125
    finesview      => 1,
123
    finesview      => 1,
126
    firstname      => $data->{'firstname'},
127
    surname        => $data->{'surname'},
128
    borrowernumber => $borrowernumber,
129
    cardnumber     => $data->{'cardnumber'},
130
    categorycode   => $data->{'categorycode'},
131
    category_type  => $data->{'category_type'},
132
    categoryname   => $data->{'description'},
133
    address        => $data->{'address'},
134
    address2       => $data->{'address2'},
135
    city           => $data->{'city'},
136
    zipcode        => $data->{'zipcode'},
137
    country        => $data->{'country'},
138
    phone          => $data->{'phone'},
139
    email          => $data->{'email'},
140
    branchcode     => $data->{'branchcode'},
141
    total          => sprintf( "%.2f", $total ),
124
    total          => sprintf( "%.2f", $total ),
142
    totalcredit    => $totalcredit,
125
    totalcredit    => $totalcredit,
143
    is_child       => ( $data->{'category_type'} eq 'C' ),
126
    is_child       => ( $category->category_type eq 'C' ),
144
    accounts       => \@accountrows
127
    accounts       => \@accountrows
145
);
128
);
146
129
(-)a/members/purchase-suggestions.pl (-7 / +1 lines)
Lines 47-61 my $patron = Koha::Patrons->find( $borrowernumber ); Link Here
47
output_and_exit_if_error( $input, $cookie, $template, { module => 'members', logged_in_user => $logged_in_user, current_patron => $patron } );
47
output_and_exit_if_error( $input, $cookie, $template, { module => 'members', logged_in_user => $logged_in_user, current_patron => $patron } );
48
48
49
my $category = $patron->category;
49
my $category = $patron->category;
50
my $data = $patron->unblessed;
51
$data->{description} = $category->description;
52
$data->{category_type} = $category->category_type;
53
foreach my $key ( keys %$data ) {
54
    $template->param( $key => $data->{$key} );
55
}
56
$template->param(
50
$template->param(
51
    patron => $patron,
57
    suggestionsview  => 1,
52
    suggestionsview  => 1,
58
    categoryname => $data->{'description'},
59
);
53
);
60
54
61
if (C4::Context->preference('ExtendedPatronAttributes')) {
55
if (C4::Context->preference('ExtendedPatronAttributes')) {
(-)a/members/readingrec.pl (-23 / +12 lines)
Lines 36-46 use Koha::Patron::Categories; Link Here
36
36
37
my $input = CGI->new;
37
my $input = CGI->new;
38
38
39
#get borrower details
40
my $data = undef;
41
my $borrowernumber = undef;
42
my $cardnumber = undef;
43
44
my ($template, $loggedinuser, $cookie)= get_template_and_user({template_name => "members/readingrec.tt",
39
my ($template, $loggedinuser, $cookie)= get_template_and_user({template_name => "members/readingrec.tt",
45
				query => $input,
40
				query => $input,
46
				type => "intranet",
41
				type => "intranet",
Lines 52-91 my ($template, $loggedinuser, $cookie)= get_template_and_user({template_name => Link Here
52
my $op = $input->param('op') || '';
47
my $op = $input->param('op') || '';
53
my $patron;
48
my $patron;
54
if ($input->param('cardnumber')) {
49
if ($input->param('cardnumber')) {
55
    $cardnumber = $input->param('cardnumber');
50
    my $cardnumber = $input->param('cardnumber');
56
    $patron = Koha::Patrons->find( { cardnumber => $cardnumber } );
51
    $patron = Koha::Patrons->find( { cardnumber => $cardnumber } );
57
}
52
}
58
if ($input->param('borrowernumber')) {
53
if ($input->param('borrowernumber')) {
59
    $borrowernumber = $input->param('borrowernumber');
54
    my $borrowernumber = $input->param('borrowernumber');
60
    $patron = Koha::Patrons->find( $borrowernumber );
55
    $patron = Koha::Patrons->find( $borrowernumber );
61
}
56
}
62
57
63
my $logged_in_user = Koha::Patrons->find( $loggedinuser ) or die "Not logged in";
58
my $logged_in_user = Koha::Patrons->find( $loggedinuser ) or die "Not logged in";
64
output_and_exit_if_error( $input, $cookie, $template, { module => 'members', logged_in_user => $logged_in_user, current_patron => $patron } );
59
output_and_exit_if_error( $input, $cookie, $template, { module => 'members', logged_in_user => $logged_in_user, current_patron => $patron } );
65
60
66
$data = $patron->unblessed;
67
$borrowernumber = $patron->borrowernumber;
68
69
my $order = 'date_due desc';
61
my $order = 'date_due desc';
70
my $limit = 0;
62
my $limit = 0;
71
my $issues = ();
63
my $issues = ();
72
# Do not request the old issues of anonymous patron
64
# Do not request the old issues of anonymous patron
73
if ( $borrowernumber eq C4::Context->preference('AnonymousPatron') ){
65
if ( $patron->borrowernumber eq C4::Context->preference('AnonymousPatron') ){
74
    # use of 'eq' in the above comparison is intentional -- the
66
    # use of 'eq' in the above comparison is intentional -- the
75
    # system preference value could be blank
67
    # system preference value could be blank
76
    $template->param( is_anonymous => 1 );
68
    $template->param( is_anonymous => 1 );
77
} else {
69
} else {
78
    $issues = GetAllIssues($borrowernumber,$order,$limit);
70
    $issues = GetAllIssues($patron->borrowernumber,$order,$limit);
79
}
71
}
80
72
81
#   barcode export
73
#   barcode export
82
if ( $op eq 'export_barcodes' ) {
74
if ( $op eq 'export_barcodes' ) {
83
    # FIXME This should be moved out of this script
75
    # FIXME This should be moved out of this script
84
    if ( $data->{'privacy'} < 2) {
76
    if ( $patron->privacy < 2) {
85
        my $today = output_pref({ dt => dt_from_string, dateformat => 'iso', dateonly => 1 });
77
        my $today = output_pref({ dt => dt_from_string, dateformat => 'iso', dateonly => 1 });
86
        my @barcodes =
78
        my @barcodes =
87
          map { $_->{barcode} } grep { $_->{returndate} =~ m/^$today/o } @{$issues};
79
          map { $_->{barcode} } grep { $_->{returndate} =~ m/^$today/o } @{$issues};
88
        my $borrowercardnumber = $data->{cardnumber};
80
        my $borrowercardnumber = $patron->cardnumber;
89
        my $delimiter = "\n";
81
        my $delimiter = "\n";
90
        binmode( STDOUT, ":encoding(UTF-8)" );
82
        binmode( STDOUT, ":encoding(UTF-8)" );
91
        print $input->header(
83
        print $input->header(
Lines 100-112 if ( $op eq 'export_barcodes' ) { Link Here
100
    }
92
    }
101
}
93
}
102
94
103
if ( $data->{'category_type'} eq 'C') {
95
my $category = $patron->category;
96
if ( $category->category_type eq 'C') {
104
    my $patron_categories = Koha::Patron::Categories->search_limited({ category_type => 'A' }, {order_by => ['categorycode']});
97
    my $patron_categories = Koha::Patron::Categories->search_limited({ category_type => 'A' }, {order_by => ['categorycode']});
105
    $template->param( 'CATCODE_MULTI' => 1) if $patron_categories->count > 1;
98
    $template->param( 'CATCODE_MULTI' => 1) if $patron_categories->count > 1;
106
    $template->param( 'catcode' => $patron_categories->next->categorycode )  if $patron_categories->count == 1;
99
    $template->param( 'catcode' => $patron_categories->next->categorycode )  if $patron_categories->count == 1;
107
}
100
}
108
101
109
$template->param( adultborrower => 1 ) if ( $data->{'category_type'} eq 'A' || $data->{'category_type'} eq 'I' );
102
$template->param( adultborrower => 1 ) if ( $category->category_type eq 'A' || $category->category_type eq 'I' );
110
if (! $limit){
103
if (! $limit){
111
	$limit = 'full';
104
	$limit = 'full';
112
}
105
}
Lines 114-134 if (! $limit){ Link Here
114
$template->param( picture => 1 ) if $patron->image;
107
$template->param( picture => 1 ) if $patron->image;
115
108
116
if (C4::Context->preference('ExtendedPatronAttributes')) {
109
if (C4::Context->preference('ExtendedPatronAttributes')) {
117
    my $attributes = GetBorrowerAttributes($borrowernumber);
110
    my $attributes = GetBorrowerAttributes($patron->borrowernumber);
118
    $template->param(
111
    $template->param(
119
        ExtendedPatronAttributes => 1,
112
        ExtendedPatronAttributes => 1,
120
        extendedattributes => $attributes
113
        extendedattributes => $attributes
121
    );
114
    );
122
}
115
}
123
116
124
$template->param(%$data);
125
126
$template->param(
117
$template->param(
118
    patron            => $patron,
127
    readingrecordview => 1,
119
    readingrecordview => 1,
128
    borrowernumber    => $borrowernumber,
120
    is_child          => ( $category->category_type eq 'C' ),
129
    privacy           => $data->{'privacy'},
130
    categoryname      => $data->{description},
131
    is_child          => ( $data->{category_type} eq 'C' ),
132
    loop_reading      => $issues,
121
    loop_reading      => $issues,
133
);
122
);
134
output_html_with_http_headers $input, $cookie, $template->output;
123
output_html_with_http_headers $input, $cookie, $template->output;
(-)a/members/routing-lists.pl (-12 / +3 lines)
Lines 52-60 my $patron = Koha::Patrons->find( $borrowernumber ); Link Here
52
output_and_exit_if_error( $query, $cookie, $template, { module => 'members', logged_in_user => $logged_in_user, current_patron => $patron } );
52
output_and_exit_if_error( $query, $cookie, $template, { module => 'members', logged_in_user => $logged_in_user, current_patron => $patron } );
53
53
54
my $category = $patron->category;
54
my $category = $patron->category;
55
my $patron_info = $patron->unblessed;
56
$patron_info->{description} = $category->description;
57
$patron_info->{category_type} = $category->category_type;
58
55
59
my $count;
56
my $count;
60
my @borrowerSubscriptions;
57
my @borrowerSubscriptions;
Lines 75-92 $template->param( Link Here
75
    routinglistview => 1
72
    routinglistview => 1
76
);
73
);
77
74
78
$template->param( adultborrower => 1 ) if ( $patron_info->{category_type} =~ /^(A|I)$/ );
75
$template->param( adultborrower => 1 ) if ( $category->category_type =~ /^(A|I)$/ );
79
80
##################################################################################
81
82
$template->param(%$patron_info);
83
76
84
$template->param(
77
$template->param(
78
    patron            => $patron,
85
    findborrower      => $findborrower,
79
    findborrower      => $findborrower,
86
    borrower          => $patron_info,
80
    branch            => $branch, # FIXME This is confusing
87
    borrowernumber    => $borrowernumber,
88
    branch            => $branch,
89
    categoryname      => $patron_info->{description},
90
);
81
);
91
82
92
if (C4::Context->preference('ExtendedPatronAttributes')) {
83
if (C4::Context->preference('ExtendedPatronAttributes')) {
(-)a/members/statistics.pl (-9 / +2 lines)
Lines 52-64 my $patron = Koha::Patrons->find( $borrowernumber ); Link Here
52
output_and_exit_if_error( $input, $cookie, $template, { module => 'members', logged_in_user => $logged_in_user, current_patron => $patron } );
52
output_and_exit_if_error( $input, $cookie, $template, { module => 'members', logged_in_user => $logged_in_user, current_patron => $patron } );
53
53
54
my $category = $patron->category;
54
my $category = $patron->category;
55
my $borrower= $patron->unblessed;
56
$borrower->{description} = $category->description;
57
$borrower->{category_type} = $category->category_type;
58
55
59
$template->param(
60
    categoryname    => $borrower->{'description'},
61
);
62
# Construct column names
56
# Construct column names
63
my $fields = C4::Members::Statistics::get_fields();
57
my $fields = C4::Members::Statistics::get_fields();
64
our @statistic_column_names = split '\|', $fields;
58
our @statistic_column_names = split '\|', $fields;
Lines 92-102 if (C4::Context->preference('ExtendedPatronAttributes')) { Link Here
92
86
93
$template->param( picture => 1 ) if $patron->image;
87
$template->param( picture => 1 ) if $patron->image;
94
88
95
$template->param(%$borrower);
89
$template->param( adultborrower => 1 ) if ( $category->category_type eq 'A' || $category->category_type eq 'I' );
96
97
$template->param( adultborrower => 1 ) if ( $borrower->{category_type} eq 'A' || $borrower->{category_type} eq 'I' );
98
90
99
$template->param(
91
$template->param(
92
    patron             => $patron,
100
    statisticsview     => 1,
93
    statisticsview     => 1,
101
    datas              => $datas,
94
    datas              => $datas,
102
    column_names       => \@statistic_column_names,
95
    column_names       => \@statistic_column_names,
(-)a/members/summary-print.pl (-8 / +1 lines)
Lines 47-57 my $logged_in_user = Koha::Patrons->find( $loggedinuser ) or die "Not logged in" Link Here
47
my $patron         = Koha::Patrons->find( $borrowernumber );
47
my $patron         = Koha::Patrons->find( $borrowernumber );
48
output_and_exit_if_error( $input, $cookie, $template, { module => 'members', logged_in_user => $logged_in_user, current_patron => $patron } );
48
output_and_exit_if_error( $input, $cookie, $template, { module => 'members', logged_in_user => $logged_in_user, current_patron => $patron } );
49
49
50
my $category = $patron->category;
51
my $data = $patron->unblessed;
52
$data->{description} = $category->description;
53
$data->{category_type} = $category->category_type;
54
55
my ( $total, $accts, $numaccts ) = GetMemberAccountRecords($borrowernumber);
50
my ( $total, $accts, $numaccts ) = GetMemberAccountRecords($borrowernumber);
56
foreach my $accountline (@$accts) {
51
foreach my $accountline (@$accts) {
57
    if (   $accountline->{accounttype} ne 'F'
52
    if (   $accountline->{accounttype} ne 'F'
Lines 68-76 my $holds_rs = Koha::Holds->search( Link Here
68
);
63
);
69
64
70
$template->param(
65
$template->param(
71
    %$data,
66
    patron => $patron,
72
73
    borrowernumber => $borrowernumber,
74
67
75
    accounts => $accts,
68
    accounts => $accts,
76
    totaldue => $total,
69
    totaldue => $total,
(-)a/opac/opac-detail.pl (-1 / +1 lines)
Lines 848-854 if ( C4::Context->preference('reviewson') ) { Link Here
848
        }
848
        }
849
    }
849
    }
850
    for my $review (@$reviews) {
850
    for my $review (@$reviews) {
851
        my $patron = Koha::Patrons->find( $review->{borrowernumber} );
851
        my $patron = Koha::Patrons->find( $review->{borrowernumber} ); # FIXME Should be Koha::Review->reviewer or similar
852
852
853
        # setting some borrower info into this hash
853
        # setting some borrower info into this hash
854
        if ( $patron ) {
854
        if ( $patron ) {
(-)a/opac/opac-reserve.pl (-4 lines)
Lines 480-491 foreach my $biblioNum (@biblionumbers) { Link Here
480
        my $holds = $item->current_holds;
480
        my $holds = $item->current_holds;
481
481
482
        if ( my $first_hold = $holds->next ) {
482
        if ( my $first_hold = $holds->next ) {
483
            my $patron = Koha::Patrons->find( $first_hold->borrowernumber );
484
            $itemLoopIter->{backgroundcolor} = 'reserved';
483
            $itemLoopIter->{backgroundcolor} = 'reserved';
485
            $itemLoopIter->{reservedate}     = output_pref({ dt => dt_from_string($first_hold->reservedate), dateonly => 1 }); # FIXME Should be formatted in the template
484
            $itemLoopIter->{reservedate}     = output_pref({ dt => dt_from_string($first_hold->reservedate), dateonly => 1 }); # FIXME Should be formatted in the template
486
            $itemLoopIter->{ReservedForBorrowernumber} = $first_hold->borrowernumber;
487
            $itemLoopIter->{ReservedForSurname}        = $patron->surname;
488
            $itemLoopIter->{ReservedForFirstname}      = $patron->firstname;
489
            $itemLoopIter->{ExpectedAtLibrary}         = $first_hold->branchcode;
485
            $itemLoopIter->{ExpectedAtLibrary}         = $first_hold->branchcode;
490
            $itemLoopIter->{waitingdate} = $first_hold->waitingdate;
486
            $itemLoopIter->{waitingdate} = $first_hold->waitingdate;
491
        }
487
        }
(-)a/reserve/request.pl (-20 / +2 lines)
Lines 179-203 if ($borrowernumber_hold && !$action) { Link Here
179
        $diffbranch = 1;
179
        $diffbranch = 1;
180
    }
180
    }
181
181
182
    my $is_debarred = $patron->is_debarred;
183
    $template->param(
182
    $template->param(
184
                borrowernumber      => $patron->borrowernumber,
185
                borrowersurname     => $patron->surname,
186
                borrowerfirstname   => $patron->firstname,
187
                borrowerstreetaddress   => $patron->address,
188
                borrowercity        => $patron->city,
189
                borrowerphone       => $patron->phone,
190
                borrowermobile      => $patron->mobile,
191
                borrowerfax         => $patron->fax,
192
                borrowerphonepro    => $patron->phonepro,
193
                borroweremail       => $patron->email,
194
                borroweremailpro    => $patron->emailpro,
195
                cardnumber          => $patron->cardnumber,
196
                expiry              => $expiry,
183
                expiry              => $expiry,
197
                diffbranch          => $diffbranch,
184
                diffbranch          => $diffbranch,
198
                messages            => $messages,
185
                messages            => $messages,
199
                warnings            => $warnings,
186
                warnings            => $warnings,
200
                restricted          => $is_debarred,
201
                amount_outstanding  => GetMemberAccountRecords($patron->borrowernumber),
187
                amount_outstanding  => GetMemberAccountRecords($patron->borrowernumber),
202
    );
188
    );
203
}
189
}
Lines 403-411 foreach my $biblionumber (@biblionumbers) { Link Here
403
389
404
                $item->{backgroundcolor} = 'reserved';
390
                $item->{backgroundcolor} = 'reserved';
405
                $item->{reservedate}     = output_pref({ dt => dt_from_string( $first_hold->reservedate ), dateonly => 1 }); # FIXME Should be formatted in the template
391
                $item->{reservedate}     = output_pref({ dt => dt_from_string( $first_hold->reservedate ), dateonly => 1 }); # FIXME Should be formatted in the template
406
                $item->{ReservedForBorrowernumber}     = $p->borrowernumber;
392
                $item->{ReservedFor}     = $p;
407
                $item->{ReservedForSurname}     = $p->surname;
408
                $item->{ReservedForFirstname}     = $p->firstname;
409
                $item->{ExpectedAtLibrary}     = $first_hold->branchcode;
393
                $item->{ExpectedAtLibrary}     = $first_hold->branchcode;
410
                $item->{waitingdate} = $first_hold->waitingdate;
394
                $item->{waitingdate} = $first_hold->waitingdate;
411
            }
395
            }
Lines 615-623 foreach my $biblionumber (@biblionumbers) { Link Here
615
                     holdsview => 1,
599
                     holdsview => 1,
616
                     C4::Search::enabled_staff_search_views,
600
                     C4::Search::enabled_staff_search_views,
617
                    );
601
                    );
618
    if ( $patron ) {
619
        $template->param( borrower_branchcode => $patron->branchcode );
620
    }
621
602
622
    $biblioloopiter{biblionumber} = $biblionumber;
603
    $biblioloopiter{biblionumber} = $biblionumber;
623
    $biblioloopiter{title} = $biblio->title;
604
    $biblioloopiter{title} = $biblio->title;
Lines 645-650 if ( C4::Context->preference( 'AllowHoldDateInFuture' ) ) { Link Here
645
}
626
}
646
627
647
$template->param(
628
$template->param(
629
    patron => $patron,
648
    SuspendHoldsIntranet => C4::Context->preference('SuspendHoldsIntranet'),
630
    SuspendHoldsIntranet => C4::Context->preference('SuspendHoldsIntranet'),
649
    AutoResumeSuspendedHolds => C4::Context->preference('AutoResumeSuspendedHolds'),
631
    AutoResumeSuspendedHolds => C4::Context->preference('AutoResumeSuspendedHolds'),
650
);
632
);
(-)a/reviews/reviewswaiting.pl (-2 / +1 lines)
Lines 75-82 for my $review ( @$reviews ) { Link Here
75
    my $borrowernumber = $review->{borrowernumber};
75
    my $borrowernumber = $review->{borrowernumber};
76
    my $patron = Koha::Patrons->find( $borrowernumber);
76
    my $patron = Koha::Patrons->find( $borrowernumber);
77
    if ( $patron ) {
77
    if ( $patron ) {
78
        $review->{surname}     = $patron->surname;
78
        $review->{patron} = $patron;
79
        $review->{firstname}   = $patron->firstname;
80
    }
79
    }
81
}
80
}
82
81
(-)a/tools/viewlog.pl (-9 / +2 lines)
Lines 119-128 if ($do_it) { Link Here
119
        $result->{'biblionumber'}      = q{};
119
        $result->{'biblionumber'}      = q{};
120
        $result->{'biblioitemnumber'}  = q{};
120
        $result->{'biblioitemnumber'}  = q{};
121
        $result->{'barcode'}           = q{};
121
        $result->{'barcode'}           = q{};
122
        $result->{'userfirstname'}     = q{};
123
        $result->{'usersurname'}       = q{};
124
        $result->{'borrowerfirstname'} = q{};
125
        $result->{'borrowersurname'}   = q{};
126
122
127
        if ( substr( $result->{'info'}, 0, 4 ) eq 'item' || $result->{module} eq "CIRCULATION" ) {
123
        if ( substr( $result->{'info'}, 0, 4 ) eq 'item' || $result->{module} eq "CIRCULATION" ) {
128
124
Lines 141-148 if ($do_it) { Link Here
141
        if ( $result->{'user'} ) {
137
        if ( $result->{'user'} ) {
142
            my $patron = Koha::Patrons->find( $result->{'user'} );
138
            my $patron = Koha::Patrons->find( $result->{'user'} );
143
            if ($patron) {
139
            if ($patron) {
144
                $result->{'userfirstname'} = $patron->firstname;
140
                $result->{librarian} = $patron;
145
                $result->{'usersurname'}   = $patron->surname;
146
            }
141
            }
147
        }
142
        }
148
143
Lines 151-158 if ($do_it) { Link Here
151
            if ( $result->{'object'} ) {
146
            if ( $result->{'object'} ) {
152
                my $patron = Koha::Patrons->find( $result->{'object'} );
147
                my $patron = Koha::Patrons->find( $result->{'object'} );
153
                if ($patron) {
148
                if ($patron) {
154
                    $result->{'borrowerfirstname'} = $patron->firstname;
149
                    $result->{patron} = $patron;
155
                    $result->{'borrowersurname'}   = $patron->surname;
156
                }
150
                }
157
            }
151
            }
158
        }
152
        }
159
- 

Return to bug 18789