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

(-)a/acqui/acqui-home.pl (-4 / +1 lines)
Lines 73-82 foreach my $budget ( @{$budget_arr} ) { Link Here
73
73
74
    my $patron = Koha::Patrons->find( $budget->{budget_owner_id} );
74
    my $patron = Koha::Patrons->find( $budget->{budget_owner_id} );
75
    if ( $patron ) {
75
    if ( $patron ) {
76
        # FIXME should pass the entire object into budget_owner
76
        $budget->{budget_owner} = $patron;
77
        $budget->{budget_owner_firstname} = $patron->firstname;
78
        $budget->{budget_owner_surname} = $patron->surname;
79
        $budget->{budget_owner_borrowernumber} = $patron->borrowernumber;
80
    }
77
    }
81
78
82
    if ( !defined $budget->{budget_amount} ) {
79
    if ( !defined $budget->{budget_amount} ) {
(-)a/acqui/booksellers.pl (-2 / +1 lines)
Lines 137-144 for my $vendor (@suppliers) { Link Here
137
                $basket->{$_} ||= 0;
137
                $basket->{$_} ||= 0;
138
            }
138
            }
139
            if ( $patron ) {
139
            if ( $patron ) {
140
                $basket->{authorisedby_firstname} = $patron->firstname;
140
                $basket->{authorisedby} = $patron;
141
                $basket->{authorisedby_surname} = $patron->surname;
142
            }
141
            }
143
            if ($basket->{basketgroupid}) {
142
            if ($basket->{basketgroupid}) {
144
                my $basketgroup = C4::Acquisition::GetBasketgroup($basket->{basketgroupid});
143
                my $basketgroup = C4::Acquisition::GetBasketgroup($basket->{basketgroupid});
(-)a/admin/aqbudgets.pl (-2 / +1 lines)
Lines 115-122 if ($op eq 'add_form') { Link Here
115
            exit;
115
            exit;
116
        }
116
        }
117
        $dropbox_disabled = BudgetHasChildren($budget_id);
117
        $dropbox_disabled = BudgetHasChildren($budget_id);
118
        my $patron = Koha::Patrons->find( $budget->{budget_owner_id} );
118
        $budget->{budget_owner} = Koha::Patrons->find( $budget->{budget_owner_id} );
119
        $budget->{budget_owner_name} = ( $patron ? $patron->firstname . ' ' . $patron->surname : '' );
120
    }
119
    }
121
120
122
    # build budget hierarchy
121
    # build budget hierarchy
(-)a/circ/branchtransfers.pl (-4 / +1 lines)
Lines 206-215 foreach my $code ( keys %$messages ) { Link Here
206
            $err{borrowernumber} = $messages->{'WasReturned'};
206
            $err{borrowernumber} = $messages->{'WasReturned'};
207
            my $patron = Koha::Patrons->find( $messages->{'WasReturned'} );
207
            my $patron = Koha::Patrons->find( $messages->{'WasReturned'} );
208
            if ( $patron ) { # Just in case...
208
            if ( $patron ) { # Just in case...
209
                $err{title}      = $patron->title;
209
                $err{patron} = $patron;
210
                $err{firstname}  = $patron->firstname;
211
                $err{surname}    = $patron->surname;
212
                $err{cardnumber} = $patron->cardnumber;
213
            }
210
            }
214
        }
211
        }
215
        $err{errdesteqholding} = ( $code eq 'DestinationEqualsHolding' );
212
        $err{errdesteqholding} = ( $code eq 'DestinationEqualsHolding' );
(-)a/circ/overdue.pl (-15 lines)
Lines 301-327 if ($noreport) { Link Here
301
        push @overduedata, {
301
        push @overduedata, {
302
            patron                 => scalar Koha::Patrons->find( $data->{borrowernumber} ),
302
            patron                 => scalar Koha::Patrons->find( $data->{borrowernumber} ),
303
            duedate                => output_pref($dt),
303
            duedate                => output_pref($dt),
304
            borrowernumber         => $data->{borrowernumber},
305
            barcode                => $data->{barcode},
304
            barcode                => $data->{barcode},
306
            cardnumber             => $data->{cardnumber},
307
            itemnum                => $data->{itemnumber},
305
            itemnum                => $data->{itemnumber},
308
            issuedate              => output_pref({ dt => dt_from_string( $data->{issuedate} ), dateonly => 1 }),
306
            issuedate              => output_pref({ dt => dt_from_string( $data->{issuedate} ), dateonly => 1 }),
309
            borrowertitle          => $data->{borrowertitle},
310
            surname                => $data->{surname},
311
            firstname              => $data->{firstname},
312
            streetnumber           => $data->{streetnumber},                   
313
            streettype             => $data->{streettype},                     
314
            address                => $data->{address},                        
315
            address2               => $data->{address2},                       
316
            city                   => $data->{city},                   
317
            zipcode                => $data->{zipcode},                        
318
            country                => $data->{country},
319
            phone                  => $data->{phone},
320
            email                  => $data->{email},
321
            biblionumber           => $data->{biblionumber},
307
            biblionumber           => $data->{biblionumber},
322
            title                  => $data->{title},
308
            title                  => $data->{title},
323
            author                 => $data->{author},
309
            author                 => $data->{author},
324
            branchcode             => $data->{branchcode},
325
            homebranchcode         => $data->{homebranchcode},
310
            homebranchcode         => $data->{homebranchcode},
326
            holdingbranchcode      => $data->{holdingbranchcode},
311
            holdingbranchcode      => $data->{holdingbranchcode},
327
            itemcallnumber         => $data->{itemcallnumber},
312
            itemcallnumber         => $data->{itemcallnumber},
(-)a/circ/transferstoreceive.pl (-7 / +1 lines)
Lines 105-117 while ( my $library = $libraries->next ) { Link Here
105
            my $item = Koha::Items->find( $num->{itemnumber} );
105
            my $item = Koha::Items->find( $num->{itemnumber} );
106
            my $holds = $item->current_holds;
106
            my $holds = $item->current_holds;
107
            if ( my $first_hold = $holds->next ) {
107
            if ( my $first_hold = $holds->next ) {
108
                my $patron = Koha::Patrons->find( $first_hold->borrowernumber );
108
                $getransf{patron} = Koha::Patrons->find( $first_hold->borrowernumber );
109
                # FIXME The full patron object should be passed to the template
110
                $getransf{'borrowernum'}       = $patron->borrowernumber;
111
                $getransf{'borrowername'}      = $patron->surname;
112
                $getransf{'borrowerfirstname'} = $patron->firstname;
113
                $getransf{'borrowermail'}      = $patron->email if $patron->email;
114
                $getransf{'borrowerphone'}     = $patron->phone;
115
            }
109
            }
116
            push( @transferloop, \%getransf );
110
            push( @transferloop, \%getransf );
117
        }
111
        }
(-)a/circ/waitingreserves.pl (-9 / +1 lines)
Lines 123-137 foreach my $num (@getreserves) { Link Here
123
    if ( $homebranch ne $holdingbranch ) {
123
    if ( $homebranch ne $holdingbranch ) {
124
        $getreserv{'dotransfer'} = 1;
124
        $getreserv{'dotransfer'} = 1;
125
    }
125
    }
126
    $getreserv{'borrowername'}      = $patron->surname;
126
    $getreserv{patron} = $patron;
127
    $getreserv{'borrowerfirstname'} = $patron->firstname;
128
    $getreserv{'borrowerphone'}     = $patron->phone;
129
130
    my $borEmail = GetFirstValidEmailAddress( $borrowernum );
131
132
    if ( $borEmail ) {
133
        $getreserv{'borrowermail'}  = $borEmail;
134
    }
135
127
136
    if ($today > $calcDate) {
128
    if ($today > $calcDate) {
137
        if ($cancelall) {
129
        if ($cancelall) {
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/borrower_debarments.inc (-2 / +2 lines)
Lines 66-72 Link Here
66
                        <td>[% IF d.expiration %] [% d.expiration | $KohaDates %] [% ELSE %] <i>Indefinite</i> [% END %]</td>
66
                        <td>[% IF d.expiration %] [% d.expiration | $KohaDates %] [% ELSE %] <i>Indefinite</i> [% END %]</td>
67
                        [% IF CAN_user_borrowers_edit_borrowers && CAN_user_circulate_manage_restrictions %]
67
                        [% IF CAN_user_borrowers_edit_borrowers && CAN_user_circulate_manage_restrictions %]
68
                            <td>
68
                            <td>
69
                                <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">
69
                                <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">
70
                                    <i class="fa fa-trash"></i> Remove
70
                                    <i class="fa fa-trash"></i> Remove
71
                                </a>
71
                                </a>
72
                            </td>
72
                            </td>
Lines 79-85 Link Here
79
    [% IF CAN_user_borrowers_edit_borrowers && CAN_user_circulate_manage_restrictions %]
79
    [% IF CAN_user_borrowers_edit_borrowers && CAN_user_circulate_manage_restrictions %]
80
        <p><a href="#" id="add_manual_restriction"><i class="fa fa-plus"></i> Add manual restriction</a></p>
80
        <p><a href="#" id="add_manual_restriction"><i class="fa fa-plus"></i> Add manual restriction</a></p>
81
        <form method="post" action="/cgi-bin/koha/members/mod_debarment.pl" class="clearfix">
81
        <form method="post" action="/cgi-bin/koha/members/mod_debarment.pl" class="clearfix">
82
            <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
82
            <input type="hidden" name="borrowernumber" value="[% patron.borrowernumber %]" />
83
            <input type="hidden" name="action" value="add" />
83
            <input type="hidden" name="action" value="add" />
84
            <fieldset class="rows" id="manual_restriction_form">
84
            <fieldset class="rows" id="manual_restriction_form">
85
                <legend>Add manual restriction</legend>
85
                <legend>Add manual restriction</legend>
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc (-32 / +32 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-57 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 ) %]<li class="patronphone">
26
    [% IF ( patron.phone ) %]<li class="patronphone">
27
        <a href="tel:[% phone | url %]">[% phone | html %]</a>
27
        <a href="tel:[% patron.phone | url %]">[% patron.phone | html %]</a>
28
    [% ELSE %]
28
    [% ELSE %]
29
        [% IF ( mobile ) %]
29
        [% IF ( patron.mobile ) %]
30
            <a href="tel:[% mobile | url %]">[% mobile | html %]</a>
30
            <a href="tel:[% patron.mobile | url %]">[% patron.mobile | html %]</a>
31
        [% ELSE %]
31
        [% ELSE %]
32
            [% IF ( phonepro ) %]
32
            [% IF ( patron.phonepro ) %]
33
                <a href="tel:[% phonepro | url %]">[% phonepro | html %]</a>
33
                <a href="tel:[% patron.phonepro | url %]">[% patron.phonepro | html %]</a>
34
            [% END %]
34
            [% END %]
35
        [% END %]</li>
35
        [% END %]</li>
36
    [% END %]
36
    [% END %]
37
    [% IF ( email ) %]
37
    [% IF ( patron.email ) %]
38
        <li class="email"> <a href="mailto:[% email | url %]" title="[% email | html %]">[% email | html %]</a></li>
38
        <li class="email"> <a href="mailto:[% patron.email | url %]" title="[% patron.email | html %]">[% patron.email | html %]</a></li>
39
    [% ELSE %]
39
    [% ELSE %]
40
        [% IF ( emailpro ) %]
40
        [% IF ( patron.emailpro ) %]
41
            <li class="email"> <a href="mailto:[% emailpro | url %]" title="[% emailpro | html %]">[% emailpro | html %]</a></li>
41
            <li class="email"> <a href="mailto:[% patron.emailpro | url %]" title="[% patron.emailpro | html %]">[% patron.emailpro | html %]</a></li>
42
        [% END %]
42
        [% END %]
43
    [% END %]
43
    [% END %]
44
44
45
    [% UNLESS ( address or address2 ) %]
45
    [% UNLESS ( patron.address or patron.address2 ) %]
46
        <li><span class="empty" id="noaddressstored">No address stored.</span></li>
46
        <li><span class="empty" id="noaddressstored">No address stored.</span></li>
47
    [% END %]
47
    [% END %]
48
    [% UNLESS ( city ) %]
48
    [% UNLESS ( patron.city ) %]
49
        <li><span class="empty" id="nocitystored">No city stored.</span></li>
49
        <li><span class="empty" id="nocitystored">No city stored.</span></li>
50
    [% END %]
50
    [% END %]
51
    [% UNLESS ( phone or mobile or phonepro) %]
51
    [% UNLESS ( patron.phone or patron.mobile or patron.phonepro) %]
52
        <li> <span class="empty">No phone stored.</span></li>
52
        <li> <span class="empty">No phone stored.</span></li>
53
    [% END %]
53
    [% END %]
54
    [% UNLESS ( email or emailpro) %]
54
    [% UNLESS ( patron.email or patron.emailpro) %]
55
        <li> <span class="empty">No email stored.</span></li>
55
        <li> <span class="empty">No email stored.</span></li>
56
    [% END %]
56
    [% END %]
57
57
Lines 62-116 Link Here
62
            [% END %]
62
            [% END %]
63
        [% END %]
63
        [% END %]
64
    [% END %][% END %]
64
    [% END %][% END %]
65
    <li class="patroncategory">Category: [% categoryname %] ([% categorycode %])</li>
65
    <li class="patroncategory">Category: [% patron.category.description %] ([% patron.categorycode %])</li>
66
    <li class="patronlibrary">Home library: [% Branches.GetName( branchcode ) %]</li>
66
    <li class="patronlibrary">Home library: [% Branches.GetName( patron.branchcode ) %]</li>
67
</ul></div>
67
</ul></div>
68
<div id="menu">
68
<div id="menu">
69
<ul>
69
<ul>
70
    [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
70
    [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
71
        [% IF ( circview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% borrowernumber %]">Check out</a></li>
71
        [% IF ( circview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% patron.borrowernumber %]">Check out</a></li>
72
        [% IF Koha.Preference('BatchCheckouts') &&
72
        [% IF Koha.Preference('BatchCheckouts') &&
73
              Koha.Preference('BatchCheckoutsValidCategories').split('\|').grep('^' _ categorycode _ '$').size > 0 %]
73
              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 ( 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 ( 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_parameters ) %]
91
    [% IF ( CAN_user_parameters ) %]
92
        [% 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>
92
        [% 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>
93
    [% END %]
93
    [% END %]
94
    [% IF CAN_user_borrowers_edit_borrowers %]
94
    [% IF CAN_user_borrowers_edit_borrowers %]
95
	[% IF ( sentnotices ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/notices.pl?borrowernumber=[% borrowernumber %]">Notices</a></li>
95
	[% IF ( sentnotices ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/notices.pl?borrowernumber=[% patron.borrowernumber %]">Notices</a></li>
96
    [% END %]
96
    [% END %]
97
    [% IF CAN_user_borrowers_edit_borrowers %]
97
    [% IF CAN_user_borrowers_edit_borrowers %]
98
        [% IF (  statisticsview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/statistics.pl?borrowernumber=[% borrowernumber %]">Statistics</a></li>
98
        [% IF (  statisticsview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/statistics.pl?borrowernumber=[% patron.borrowernumber %]">Statistics</a></li>
99
    [% END %]
99
    [% END %]
100
    [% IF CAN_user_borrowers_edit_borrowers %]
100
    [% IF CAN_user_borrowers_edit_borrowers %]
101
        [% IF ( EnableBorrowerFiles ) %]
101
        [% IF ( EnableBorrowerFiles ) %]
102
            [% IF ( borrower_files ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/files.pl?borrowernumber=[% borrowernumber %]">Files</a></li>
102
            [% IF ( borrower_files ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/files.pl?borrowernumber=[% patron.borrowernumber %]">Files</a></li>
103
        [% END %]
103
        [% END %]
104
    [% END %]
104
    [% END %]
105
105
106
    [% IF CAN_user_borrowers_edit_borrowers %]
106
    [% IF CAN_user_borrowers_edit_borrowers %]
107
        [% IF ( suggestionsview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/purchase-suggestions.pl?borrowernumber=[% borrowernumber %]">Purchase suggestions</a></li>
107
        [% IF ( suggestionsview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/purchase-suggestions.pl?borrowernumber=[% patron.borrowernumber %]">Purchase suggestions</a></li>
108
    [% END %]
108
    [% END %]
109
    [% IF CAN_user_borrowers_edit_borrowers && useDischarge %]
109
    [% IF CAN_user_borrowers_edit_borrowers && useDischarge %]
110
        [% IF dischargeview %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/discharge.pl?borrowernumber=[% borrowernumber %]">Discharges</a></li>
110
        [% IF dischargeview %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/discharge.pl?borrowernumber=[% patron.borrowernumber %]">Discharges</a></li>
111
    [% END %]
111
    [% END %]
112
    [% IF Koha.Preference('HouseboundModule') %]
112
    [% IF Koha.Preference('HouseboundModule') %]
113
        [% IF houseboundview %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/housebound.pl?borrowernumber=[% borrowernumber %]">Housebound</a></li>
113
        [% IF houseboundview %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/housebound.pl?borrowernumber=[% patron.borrowernumber %]">Housebound</a></li>
114
    [% END %]
114
    [% END %]
115
</ul></div>
115
</ul></div>
116
[% END %]
116
[% END %]
(-)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 %][% end %] [% address %] [% IF roadtype_desc %][% roadtype_desc %] [% END %][% end %]</li>
7
        <li class="patronaddress1">[% if (patron.streetnumber) %][% patron.streetnumber %][% end %] [% patron.address %] [% IF roadtype_desc %][% roadtype_desc %] [% END %][% 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
        [% city %][% IF ( state ) %], [% state %][% END %]
14
        [% patron.city %][% IF ( patron.state ) %], [% patron.state %][% END %]
15
        [% zipcode %][% IF ( country ) %], [% country %][% END %]</li>
15
        [% patron.zipcode %][% IF ( patron.country ) %], [% patron.country %][% 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 %][% end %] [% B_address %] [% IF roadtype_desc %][% roadtype_desc %] [% END %][% end %]</li>
7
        <li class="patronaddress1">[% if (patron.B_streetnumber) %][% patron.B_streetnumber %][% end %] [% patron.B_address %] [% IF roadtype_desc %][% roadtype_desc %] [% END %][% 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
        [% B_city %][% IF ( B_state ) %], [% B_state %][% END %]
14
        [% patron.B_city %][% IF ( patron.B_state ) %], [% patron.B_state %][% END %]
15
        [% B_zipcode %][% IF ( B_country ) %], [% B_country %][% END %]</li>
15
        [% patron.B_zipcode %][% IF ( patron.B_country ) %], [% patron.B_country %][% 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 %]
87
                [% IF c.city_name == patron.city %]
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 %]
86
            [% IF c.city_name == patron.city %]
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 %]
75
                [% IF c.city_name == patron.city %]
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 (-21 / +21 lines)
Lines 26-32 $(document).ready(function(){ Link Here
26
            });
26
            });
27
        [% ELSE %]
27
        [% ELSE %]
28
            $("#deletepatron").click(function(){
28
            $("#deletepatron").click(function(){
29
                window.location='/cgi-bin/koha/members/deletemem.pl?member=[% borrowernumber | url%]';
29
                window.location='/cgi-bin/koha/members/deletemem.pl?member=[% patron.borrowernumber | url%]';
30
            });
30
            });
31
        [% END %]
31
        [% END %]
32
        $("#renewpatron").click(function(){
32
        $("#renewpatron").click(function(){
Lines 61-67 $(document).ready(function(){ Link Here
61
        return false;
61
        return false;
62
    });
62
    });
63
    $("#print_overdues").click(function(){
63
    $("#print_overdues").click(function(){
64
        window.open("/cgi-bin/koha/members/print_overdues.pl?borrowernumber=[% borrowernumber %]", "printwindow");
64
        window.open("/cgi-bin/koha/members/print_overdues.pl?borrowernumber=[% patron.borrowernumber %]", "printwindow");
65
        $(".btn-group").removeClass("open");
65
        $(".btn-group").removeClass("open");
66
        return false;
66
        return false;
67
    });
67
    });
Lines 76-107 $(document).ready(function(){ Link Here
76
function confirm_local_deletion() {
76
function confirm_local_deletion() {
77
    var is_confirmed = window.confirm(_("Are you sure you want to delete this patron from the local database? This cannot be undone."));
77
    var is_confirmed = window.confirm(_("Are you sure you want to delete this patron from the local database? This cannot be undone."));
78
    if (is_confirmed) {
78
    if (is_confirmed) {
79
        window.location='/cgi-bin/koha/members/deletemem.pl?member=[% borrowernumber %]&deletelocal=true&deleteremote=false';
79
        window.location='/cgi-bin/koha/members/deletemem.pl?member=[% patron.borrowernumber %]&deletelocal=true&deleteremote=false';
80
    }
80
    }
81
}
81
}
82
function confirm_remote_deletion() {
82
function confirm_remote_deletion() {
83
    var is_confirmed = window.confirm(_("Are you sure you want to delete this patron from the Norwegian national patron database? This cannot be undone."));
83
    var is_confirmed = window.confirm(_("Are you sure you want to delete this patron from the Norwegian national patron database? This cannot be undone."));
84
    if (is_confirmed) {
84
    if (is_confirmed) {
85
        window.location='/cgi-bin/koha/members/deletemem.pl?member=[% borrowernumber %]&deletelocal=false&deleteremote=true';
85
        window.location='/cgi-bin/koha/members/deletemem.pl?member=[% patron.borrowernumber %]&deletelocal=false&deleteremote=true';
86
    }
86
    }
87
}
87
}
88
function confirm_both_deletion() {
88
function confirm_both_deletion() {
89
    var is_confirmed = window.confirm(_("Are you sure you want to delete this patron both from the local database and from the Norwegian national patron database? This cannot be undone."));
89
    var is_confirmed = window.confirm(_("Are you sure you want to delete this patron both from the local database and from the Norwegian national patron database? This cannot be undone."));
90
    if (is_confirmed) {
90
    if (is_confirmed) {
91
        window.location='/cgi-bin/koha/members/deletemem.pl?member=[% borrowernumber %]&deletelocal=true&deleteremote=true';
91
        window.location='/cgi-bin/koha/members/deletemem.pl?member=[% patron.borrowernumber %]&deletelocal=true&deleteremote=true';
92
    }
92
    }
93
}
93
}
94
94
95
[% IF ( is_child ) %]function confirm_updatechild() {
95
[% IF ( is_child ) %]function confirm_updatechild() {
96
    var is_confirmed = window.confirm(_("Are you sure you want to update this child to an Adult category?  This cannot be undone."));
96
    var is_confirmed = window.confirm(_("Are you sure you want to update this child to an Adult category?  This cannot be undone."));
97
    if (is_confirmed) {
97
    if (is_confirmed) {
98
        window.location='/cgi-bin/koha/members/update-child.pl?op=update&borrowernumber=[% borrowernumber %]&catcode=[% catcode %]&catcode_multi=[% CATCODE_MULTI %]';
98
        window.location='/cgi-bin/koha/members/update-child.pl?op=update&borrowernumber=[% patron.borrowernumber %]&catcode=[% catcode %]&catcode_multi=[% CATCODE_MULTI %]';
99
    }
99
    }
100
}
100
}
101
101
102
function update_child() {
102
function update_child() {
103
    [% IF ( CATCODE_MULTI ) %]
103
    [% IF ( CATCODE_MULTI ) %]
104
        window.open('/cgi-bin/koha/members/update-child.pl?op=multi&borrowernumber=[% borrowernumber %]','UpdateChild','width=400,height=300,toolbar=no,scrollbars=yes,resizable=yes');
104
        window.open('/cgi-bin/koha/members/update-child.pl?op=multi&borrowernumber=[% patron.borrowernumber %]','UpdateChild','width=400,height=300,toolbar=no,scrollbars=yes,resizable=yes');
105
    [% ELSE %]
105
    [% ELSE %]
106
        confirm_updatechild();
106
        confirm_updatechild();
107
    [% END %]
107
    [% END %]
Lines 111-132 function update_child() { Link Here
111
function confirm_reregistration() {
111
function confirm_reregistration() {
112
    var is_confirmed = window.confirm(_("Are you sure you want to renew this patron's registration?"));
112
    var is_confirmed = window.confirm(_("Are you sure you want to renew this patron's registration?"));
113
    if (is_confirmed) {
113
    if (is_confirmed) {
114
    window.location = '/cgi-bin/koha/members/setstatus.pl?borrowernumber=[% borrowernumber %]&amp;destination=[% destination %]&amp;reregistration=y';
114
    window.location = '/cgi-bin/koha/members/setstatus.pl?borrowernumber=[% patron.borrowernumber %]&amp;destination=[% destination %]&amp;reregistration=y';
115
    }
115
    }
116
}
116
}
117
function export_barcodes() {
117
function export_barcodes() {
118
    window.open('/cgi-bin/koha/members/readingrec.pl?borrowernumber=[% borrowernumber %]&amp;op=export_barcodes');
118
    window.open('/cgi-bin/koha/members/readingrec.pl?borrowernumber=[% patron.borrowernumber %]&amp;op=export_barcodes');
119
}
119
}
120
var slip_re = /slip/;
120
var slip_re = /slip/;
121
function printx_window(print_type) {
121
function printx_window(print_type) {
122
    var handler = print_type.match(slip_re) ? "printslip" : "summary-print";
122
    var handler = print_type.match(slip_re) ? "printslip" : "summary-print";
123
    window.open("/cgi-bin/koha/members/" + handler + ".pl?borrowernumber=[% borrowernumber %]&amp;print=" + print_type, "printwindow");
123
    window.open("/cgi-bin/koha/members/" + handler + ".pl?borrowernumber=[% patron.borrowernumber %]&amp;print=" + print_type, "printwindow");
124
    return false;
124
    return false;
125
}
125
}
126
function searchToHold(){
126
function searchToHold(){
127
    var date = new Date();
127
    var date = new Date();
128
    date.setTime(date.getTime() + (10 * 60 * 1000));
128
    date.setTime(date.getTime() + (10 * 60 * 1000));
129
    $.cookie("holdfor", "[% borrowernumber %]", { path: "/", expires: date });
129
    $.cookie("holdfor", "[% patron.borrowernumber %]", { path: "/", expires: date });
130
    location.href="/cgi-bin/koha/catalogue/search.pl";
130
    location.href="/cgi-bin/koha/catalogue/search.pl";
131
}
131
}
132
//]]>
132
//]]>
Lines 135-155 function searchToHold(){ Link Here
135
<div id="toolbar" class="btn-toolbar">
135
<div id="toolbar" class="btn-toolbar">
136
    [% IF CAN_user_borrowers_edit_borrowers %]
136
    [% IF CAN_user_borrowers_edit_borrowers %]
137
        [% IF ( guarantor ) %]
137
        [% IF ( guarantor ) %]
138
            <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 %]">
138
            <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 %]">
139
        [% ELSE %]
139
        [% ELSE %]
140
            <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 %]">
140
            <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 %]">
141
        [% END %]
141
        [% END %]
142
        <i class="fa fa-pencil"></i> Edit</a>
142
        <i class="fa fa-pencil"></i> Edit</a>
143
    [% END %]
143
    [% END %]
144
144
145
    [% IF CAN_user_borrowers_edit_borrowers %]
145
    [% IF CAN_user_borrowers_edit_borrowers %]
146
        [% IF adultborrower AND Koha.Preference("borrowerRelationship") %]
146
        [% IF adultborrower AND Koha.Preference("borrowerRelationship") %]
147
            <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>
147
            <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>
148
        [% END %]
148
        [% END %]
149
        [% IF CAN_user_borrowers_edit_borrowers %]
149
        [% IF CAN_user_borrowers_edit_borrowers %]
150
            <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>
150
            <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>
151
        [% END %]
151
        [% END %]
152
        <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>
152
        <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>
153
    [% END %]
153
    [% END %]
154
154
155
    <div class="btn-group">
155
    <div class="btn-group">
Lines 174-190 function searchToHold(){ Link Here
174
        <button class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown">More <span class="caret"></span></button>
174
        <button class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown">More <span class="caret"></span></button>
175
            <ul class="dropdown-menu">
175
            <ul class="dropdown-menu">
176
                [% IF CAN_user_borrowers_edit_borrowers %]
176
                [% IF CAN_user_borrowers_edit_borrowers %]
177
                    <li><a id="renewpatron" href="/cgi-bin/koha/members/setstatus.pl?borrowernumber=[% borrowernumber %]&amp;destination=[% destination %]&amp;reregistration=y">Renew patron</a></li>
177
                    <li><a id="renewpatron" href="/cgi-bin/koha/members/setstatus.pl?borrowernumber=[% patron.borrowernumber %]&amp;destination=[% destination %]&amp;reregistration=y">Renew patron</a></li>
178
                [% ELSE %]
178
                [% ELSE %]
179
                    <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>
179
                    <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>
180
                [% END %]
180
                [% END %]
181
                [% IF ( CAN_user_permissions ) %]
181
                [% IF ( CAN_user_permissions ) %]
182
                    <li><a id="patronflags" href="/cgi-bin/koha/members/member-flags.pl?member=[% borrowernumber %]">Set permissions</a></li>
182
                    <li><a id="patronflags" href="/cgi-bin/koha/members/member-flags.pl?member=[% patron.borrowernumber %]">Set permissions</a></li>
183
                [% ELSE %]
183
                [% ELSE %]
184
                    <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>
184
                    <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>
185
                [% END %]
185
                [% END %]
186
                [% IF CAN_user_borrowers_edit_borrowers && useDischarge %]
186
                [% IF CAN_user_borrowers_edit_borrowers && useDischarge %]
187
                    <li><a href="/cgi-bin/koha/members/discharge.pl?borrowernumber=[% borrowernumber %]">Discharge</a></li>
187
                    <li><a href="/cgi-bin/koha/members/discharge.pl?borrowernumber=[% patron.borrowernumber %]">Discharge</a></li>
188
                [% END %]
188
                [% END %]
189
                [% IF CAN_user_borrowers_edit_borrowers %]
189
                [% IF CAN_user_borrowers_edit_borrowers %]
190
                    [% IF ( NorwegianPatronDBEnable == 1 ) %]
190
                    [% IF ( NorwegianPatronDBEnable == 1 ) %]
Lines 226-232 function searchToHold(){ Link Here
226
                        <label for="message_type">Add a message for:</label>
226
                        <label for="message_type">Add a message for:</label>
227
                        <select name="message_type" id="message_type">
227
                        <select name="message_type" id="message_type">
228
                            <option value="L">Staff - Internal note</option>
228
                            <option value="L">Staff - Internal note</option>
229
                            <option value="B">OPAC - [% firstname | html %] [% surname | html %]</option>
229
                            <option value="B">OPAC - [% patron.firstname | html %] [% patron.surname | html %]</option>
230
                        </select>
230
                        </select>
231
                    </div>
231
                    </div>
232
                    [% bor_notes = AuthorisedValues.Get( 'BOR_NOTES' ) %]
232
                    [% bor_notes = AuthorisedValues.Get( 'BOR_NOTES' ) %]
Lines 244-250 function searchToHold(){ Link Here
244
                    <div class="form-group">
244
                    <div class="form-group">
245
                        <textarea rows="3" class="modal-textarea" name="borrower_message" id="borrower_message" ></textarea>
245
                        <textarea rows="3" class="modal-textarea" name="borrower_message" id="borrower_message" ></textarea>
246
                    </div>
246
                    </div>
247
                    <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
247
                    <input type="hidden" name="borrowernumber" value="[% patron.borrowernumber %]" />
248
                    <input type="hidden" name="batch" value="[% batch %]" />
248
                    <input type="hidden" name="batch" value="[% batch %]" />
249
                    <input type="hidden" name="branchcode" value="[% LoginBranchcode %]" />
249
                    <input type="hidden" name="branchcode" value="[% LoginBranchcode %]" />
250
                </div>
250
                </div>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt (-2 / +2 lines)
Lines 191-198 $(document).ready(function() { Link Here
191
                    [% END %]
191
                    [% END %]
192
                </td>
192
                </td>
193
                <td>[% loop_budge.budget_name %]</td>
193
                <td>[% loop_budge.budget_name %]</td>
194
                <td>[% IF ( loop_budge.budget_owner_borrowernumber ) %]
194
                <td>[% IF ( loop_budge.budget_owner ) %]
195
                        <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>
195
                        <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>
196
                    [% ELSE %]
196
                    [% ELSE %]
197
                        &nbsp;
197
                        &nbsp;
198
                    [% END %]
198
                    [% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt (-2 / +4 lines)
Lines 159-166 $(document).ready(function() { Link Here
159
                                        </td>
159
                                        </td>
160
                                        <td>[% basket.expected_items %]</td>
160
                                        <td>[% basket.expected_items %]</td>
161
                                        <td>
161
                                        <td>
162
                                            [% basket.authorisedby_firstname %]
162
                                            [% IF basket.authorisedby %]
163
                                            [% basket.authorisedby_surname %]
163
                                                [% basket.authorisedby.firstname %]
164
                                                [% basket.authorisedbysurname %]
165
                                            [% END %]
164
                                        </td>
166
                                        </td>
165
                                        <td><span title="[% basket.creationdate %]">[% basket.creationdate | $KohaDates %]</span></td>
167
                                        <td><span title="[% basket.creationdate %]">[% basket.creationdate | $KohaDates %]</span></td>
166
                                        <td>
168
                                        <td>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt (-4 / +4 lines)
Lines 502-518 var MSG_PARENT_BENEATH_BUDGET = "- " + _("New budget-parent is beneath budget") Link Here
502
502
503
    <li>
503
    <li>
504
        <span class="label">Owner: </span>
504
        <span class="label">Owner: </span>
505
        [% IF ( budget_owner_name ) %]
505
        [% IF  budget_owner %]
506
            <span  id="budget_owner_name">
506
            <span  id="budget_owner_name">
507
                <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% budget_owner_id %]">
507
                <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% budget_owner.borrowernumber %]">
508
                    [% budget_owner_name %]
508
                    [% budget_owner.firstname %] [% budget_owner.surname %]
509
                </a> |
509
                </a> |
510
            </span>
510
            </span>
511
        [% END %]
511
        [% END %]
512
        <a id="edit_owner" class="new_window" href="#"><i class="fa fa-search"></i> Select owner</a>
512
        <a id="edit_owner" class="new_window" href="#"><i class="fa fa-search"></i> Select owner</a>
513
        <a id="remove_owner" href="#"><i class="fa fa-trash"></i> Remove owner</a>
513
        <a id="remove_owner" href="#"><i class="fa fa-trash"></i> Remove owner</a>
514
        <input type="hidden" name="budget_owner_id" id="budget_owner_id"
514
        <input type="hidden" name="budget_owner_id" id="budget_owner_id"
515
            value="[% budget_owner_id %]" />
515
            value="[% budget_owner.borrowernumber %]" />
516
    </li>
516
    </li>
517
517
518
518
(-)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 66-81 $(document).ready(function() { Link Here
66
                            [% IF ( reser.itemtype ) %] (<b>[% reser.itemtype %]</b>)[% END %]
66
                            [% IF ( reser.itemtype ) %] (<b>[% reser.itemtype %]</b>)[% END %]
67
                            <br />Barcode: [% reser.barcode %]
67
                            <br />Barcode: [% reser.barcode %]
68
                    </td>
68
                    </td>
69
                    <td>[% IF ( reser.borrowername ) %]
69
                    <td>[% IF ( reser.patron ) %]
70
                        <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% reser.borrowernum %]">
70
                        <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% reser.patron.borrowernumber %]">
71
                            [% reser.borrowername %][%IF ( reser.borrowerfirstname ) %], [% reser.borrowerfirstname %][% END %]
71
                            [% reser.patron.surname %][%IF ( reser.patron.firstname ) %], [% reser.patron.firstname %][% END %]
72
                        </a>
72
                        </a>
73
                        [% IF ( reser.borrowerphone ) %]<br />[% reser.borrowerphone %][% END %]
73
                        [% IF ( reser.patron.phone ) %]<br />[% reser.patron.phone %][% END %]
74
                            [% IF ( reser.borrowermail ) %]
74
                            [% IF ( reser.patron.email ) %]
75
                                <br />
75
                                <br />
76
                                [% BLOCK subject %]Hold:[% END %]
76
                                [% BLOCK subject %]Hold:[% END %]
77
                                <a href="mailto:[% reser.borrowermail %]?subject=[% INCLUDE subject %] [% reser.title |html %]">
77
                                <a href="mailto:[% reser.patron.email %]?subject=[% INCLUDE subject %] [% reser.title |html %]">
78
                                    [% reser.borrowermail %]
78
                                    [% reser.patron.email %]
79
                                </a>
79
                                </a>
80
                            [% END %]
80
                            [% END %]
81
                        [% ELSE %]
81
                        [% ELSE %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt (-7 / +7 lines)
Lines 103-112 Link Here
103
                            [% UNLESS ( item_level_itypes ) %][% IF ( reserveloo.itemtype ) %]&nbsp; (<b>[% reserveloo.itemtype %]</b>)[% END %][% END %]
103
                            [% UNLESS ( item_level_itypes ) %][% IF ( reserveloo.itemtype ) %]&nbsp; (<b>[% reserveloo.itemtype %]</b>)[% END %][% END %]
104
                            <br />Barcode: [% reserveloo.barcode %]
104
                            <br />Barcode: [% reserveloo.barcode %]
105
                    </td>
105
                    </td>
106
                    <td><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% reserveloo.borrowernum %]">[% reserveloo.borrowername %], [% reserveloo.borrowerfirstname %]</a>
106
                    <td><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% reserveloo.patron.borrowernumber %]">[% reserveloo.patron.surname%], [% reserveloo.patron.firstname %]</a>
107
                        [% IF ( reserveloo.borrowerphone ) %]<br />[% reserveloo.borrowerphone %][% END %]
107
                        [% IF ( reserveloo.patron.phone ) %]<br />[% reserveloo.patron.phone %][% END %]
108
                        [% IF ( reserveloo.borrowermail ) %]<br /><a href="mailto:[% reserveloo.borrowermail %]?subject=Hold waiting: [% reserveloo.title %]">
108
                        [% IF ( reserveloo.patron.first_valid_email_address ) %]<br /><a href="mailto:[% reserveloo.patron.first_valid_email_address %]?subject=Hold waiting: [% reserveloo.title %]">
109
                        [% reserveloo.borrowermail %]</a>[% END %]
109
                        [% reserveloo.patron.first_valid_email_address %]</a>[% END %]
110
                    </td>
110
                    </td>
111
                    <td>[% Branches.GetName( reserveloo.homebranch ) %]</td>
111
                    <td>[% Branches.GetName( reserveloo.homebranch ) %]</td>
112
                    <td>[% Branches.GetName( reserveloo.holdingbranch ) %]</td>
112
                    <td>[% Branches.GetName( reserveloo.holdingbranch ) %]</td>
Lines 169-177 Link Here
169
                            [% UNLESS ( item_level_itypes ) %][% IF ( overloo.itemtype ) %]&nbsp; (<b>[% overloo.itemtype %]</b>)[% END %][% END %]
169
                            [% UNLESS ( item_level_itypes ) %][% IF ( overloo.itemtype ) %]&nbsp; (<b>[% overloo.itemtype %]</b>)[% END %][% END %]
170
                        <br />Barcode: [% overloo.barcode %]
170
                        <br />Barcode: [% overloo.barcode %]
171
                    </td>
171
                    </td>
172
                    <td><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% overloo.borrowernum %]">[% overloo.borrowername %], [% overloo.borrowerfirstname %]</a><br />[% overloo.borrowerphone %]<br />
172
                    <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 />
173
                        [% IF ( overloo.borrowermail ) %]<a href="mailto:[% overloo.borrowermail %]?subject=Reservation: [% overloo.title |url %]">
173
                        [% IF ( overloo.patron.first_valid_email_address ) %]<a href="mailto:[% overloo.patron.first_valid_email_address %]?subject=Reservation: [% overloo.title |url %]">
174
        [% overloo.borrowermail %]</a>[% END %]
174
        [% overloo.patron.first_valid_email_address %]</a>[% END %]
175
                    </td>
175
                    </td>
176
                    <td>[% Branches.GetName( overloo.homebranch ) %]</td>
176
                    <td>[% Branches.GetName( overloo.homebranch ) %]</td>
177
                    <td>[% Branches.GetName( overloo.holdingbranch ) %]</td>
177
                    <td>[% Branches.GetName( overloo.holdingbranch ) %]</td>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt (-5 / +5 lines)
Lines 50-64 $(document).ready(function() { Link Here
50
	<div id="yui-main">
50
	<div id="yui-main">
51
	<div class="yui-b">
51
	<div class="yui-b">
52
[% INCLUDE 'members-toolbar.inc' %]
52
[% INCLUDE 'members-toolbar.inc' %]
53
<form action="/cgi-bin/koha/members/boraccount.pl" method="get"><input type="hidden" name="borrowernumber" id="borrowernumber" value="[% borrowernumber %]" /></form>
53
<form action="/cgi-bin/koha/members/boraccount.pl" method="get"><input type="hidden" name="borrowernumber" id="borrowernumber" value="[% patron.borrowernumber %]" /></form>
54
54
55
<!-- The manual invoice and credit buttons -->
55
<!-- The manual invoice and credit buttons -->
56
<div class="statictabs">
56
<div class="statictabs">
57
<ul>
57
<ul>
58
    <li class="active"><a href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=[% borrowernumber %]">Account</a></li>
58
    <li class="active"><a href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=[% patron.borrowernumber %]">Account</a></li>
59
	<li><a href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% borrowernumber %]" >Pay fines</a></li>
59
    <li><a href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% patron.borrowernumber %]" >Pay fines</a></li>
60
	<li><a href="/cgi-bin/koha/members/maninvoice.pl?borrowernumber=[% borrowernumber %]" >Create manual invoice</a></li>
60
    <li><a href="/cgi-bin/koha/members/maninvoice.pl?borrowernumber=[% patron.borrowernumber %]" >Create manual invoice</a></li>
61
	<li><a href="/cgi-bin/koha/members/mancredit.pl?borrowernumber=[% borrowernumber %]" >Create manual credit</a></li>
61
    <li><a href="/cgi-bin/koha/members/mancredit.pl?borrowernumber=[% patron.borrowernumber %]" >Create manual credit</a></li>
62
</ul>
62
</ul>
63
<div class="tabs-container">
63
<div class="tabs-container">
64
<!-- The table with the account items -->
64
<!-- The table with the account items -->
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/deletemem.tt (-7 / +7 lines)
Lines 1-12 Link Here
1
[% INCLUDE 'doc-head-open.inc' %]
1
[% INCLUDE 'doc-head-open.inc' %]
2
<title>Koha &rsaquo; Delete patron [% firstname %] [% surname %]</title>
2
<title>Koha &rsaquo; Delete patron [% patron.firstname %] [% patron.surname %]</title>
3
[% INCLUDE 'doc-head-close.inc' %]
3
[% INCLUDE 'doc-head-close.inc' %]
4
</head>
4
</head>
5
<body id="pat_deletemem" class="pat">
5
<body id="pat_deletemem" class="pat">
6
[% INCLUDE 'header.inc' %]
6
[% INCLUDE 'header.inc' %]
7
[% INCLUDE 'patron-search.inc' %]
7
[% INCLUDE 'patron-search.inc' %]
8
8
9
<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>
9
<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>
10
<div id="doc3" class="yui-t2">
10
<div id="doc3" class="yui-t2">
11
   
11
   
12
   <div id="bd">
12
   <div id="bd">
Lines 28-45 Link Here
28
            [% END %]
28
            [% END %]
29
            </ul>
29
            </ul>
30
    </div>
30
    </div>
31
    [% ELSIF op == 'delete_confirm' and borrowernumber %]
31
    [% ELSIF op == 'delete_confirm' and patron %]
32
        [%# TODO add "patron does not exist" unless borrowernumber %]
32
        [%# TODO add "patron does not exist" unless patron %]
33
        <div class="dialog alert">
33
        <div class="dialog alert">
34
            <h3>Are you sure you want to delete the patron [% firstname %] [% surname %]? This cannot be undone.</h3>
34
            <h3>Are you sure you want to delete the patron [% patron.firstname %] [% patron.surname %]? This cannot be undone.</h3>
35
            <form action="/cgi-bin/koha/members/deletemem.pl">
35
            <form action="/cgi-bin/koha/members/deletemem.pl">
36
                <input type="hidden" name="csrf_token" value="[% csrf_token %]" />
36
                <input type="hidden" name="csrf_token" value="[% csrf_token %]" />
37
                <input type="hidden" name="member" value="[% borrowernumber %]"/>
37
                <input type="hidden" name="member" value="[% patron.borrowernumber %]"/>
38
                <input type="hidden" name="op" value="delete_confirmed" />
38
                <input type="hidden" name="op" value="delete_confirmed" />
39
                <button type="submit" class="approve"><i class="fa fa-fw fa-check"></i> Yes, delete</button>
39
                <button type="submit" class="approve"><i class="fa fa-fw fa-check"></i> Yes, delete</button>
40
            </form>
40
            </form>
41
            <form action="/cgi-bin/koha/members/moremember.pl">
41
            <form action="/cgi-bin/koha/members/moremember.pl">
42
                <input type="hidden" name="borrowernumber" value="[% borrowernumber %]"/>
42
                <input type="hidden" name="borrowernumber" value="[% patron.borrowernumber %]"/>
43
                <button type="submit" class="deny"><i class="fa fa-fw fa-remove"></i> No, do not delete</button>
43
                <button type="submit" class="deny"><i class="fa fa-fw fa-remove"></i> No, do not delete</button>
44
            </form>
44
            </form>
45
        </div>
45
        </div>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/discharge.tt (-4 / +4 lines)
Lines 2-8 Link Here
2
[% USE AuthorisedValues %]
2
[% USE AuthorisedValues %]
3
[% USE Branches %]
3
[% USE Branches %]
4
[% INCLUDE 'doc-head-open.inc' %]
4
[% INCLUDE 'doc-head-open.inc' %]
5
<title>Koha &rsaquo; Patrons &rsaquo; [% UNLESS blocking_error  %]Discharge for [% firstname %] [% surname %] ([% cardnumber %])[% END %]</title>
5
<title>Koha &rsaquo; Patrons &rsaquo; [% UNLESS blocking_error  %]Discharge for [% patron.firstname %] [% patron.surname %] ([% patron.cardnumber %])[% END %]</title>
6
[% INCLUDE 'doc-head-close.inc' %]
6
[% INCLUDE 'doc-head-close.inc' %]
7
</head>
7
</head>
8
<body id="discharge" class="discharge">
8
<body id="discharge" class="discharge">
Lines 12-18 Link Here
12
<div id="breadcrumbs">
12
<div id="breadcrumbs">
13
         <a href="/cgi-bin/koha/mainpage.pl">Home</a>
13
         <a href="/cgi-bin/koha/mainpage.pl">Home</a>
14
&rsaquo; <a href="/cgi-bin/koha/members/members-home.pl">Patrons</a>
14
&rsaquo; <a href="/cgi-bin/koha/members/members-home.pl">Patrons</a>
15
&rsaquo; [% UNLESS blocking_error  %]Discharge for [% firstname %] [% surname %] ([% cardnumber %])[% END %]
15
&rsaquo; [% UNLESS blocking_error  %]Discharge for [% patron.firstname %] [% patron.surname %] ([% patron.cardnumber %])[% END %]
16
</div>
16
</div>
17
17
18
<div id="doc3" class="yui-t1">
18
<div id="doc3" class="yui-t1">
Lines 32-43 Link Here
32
[% UNLESS can_be_discharged %]
32
[% UNLESS can_be_discharged %]
33
    <p>Cannot edit discharge: the patron has checked out items.</p>
33
    <p>Cannot edit discharge: the patron has checked out items.</p>
34
[% ELSE %]
34
[% ELSE %]
35
    [% IF has_reserves %]
35
    [% IF patron.holds.count %]
36
        <p>Borrower has reserves: they will be canceled if the discharge is generated.</p>
36
        <p>Borrower has reserves: they will be canceled if the discharge is generated.</p>
37
    [% END %]
37
    [% END %]
38
    <form method="post">
38
    <form method="post">
39
        <input type="submit" value="Generate discharge" name="discharge" />
39
        <input type="submit" value="Generate discharge" name="discharge" />
40
        <input type="hidden" value="[% borrowernumber %]" name="borrowernumber" />
40
        <input type="hidden" value="[% patron.borrowernumber %]" name="borrowernumber" />
41
    </form>
41
    </form>
42
[% END %]
42
[% END %]
43
43
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/housebound.tt (-8 / +8 lines)
Lines 65-71 Link Here
65
              <h4>Manage housebound profile</h4>
65
              <h4>Manage housebound profile</h4>
66
              <form id="editform" method="post" name="editform"
66
              <form id="editform" method="post" name="editform"
67
                    action="/cgi-bin/koha/members/housebound.pl">
67
                    action="/cgi-bin/koha/members/housebound.pl">
68
                <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
68
                <input type="hidden" name="borrowernumber" value="[% patron.borrowernumber %]" />
69
                [% IF ( housebound_profile ) %]
69
                [% IF ( housebound_profile ) %]
70
                  <input type="hidden" name="method" value="updateconfirm" />
70
                  <input type="hidden" name="method" value="updateconfirm" />
71
                [% ELSE %]
71
                [% ELSE %]
Lines 196-202 Link Here
196
                <fieldset class="action">
196
                <fieldset class="action">
197
                  <button type="submit" class="btn btn-default btn-sm"><i class="fa fa-save"></i> Save changes</button>
197
                  <button type="submit" class="btn btn-default btn-sm"><i class="fa fa-save"></i> Save changes</button>
198
                  <a class="cancel btn btn-link btn-sm"
198
                  <a class="cancel btn btn-link btn-sm"
199
                     href="/cgi-bin/koha/members/housebound.pl?borrowernumber=[% borrowernumber %]">
199
                     href="/cgi-bin/koha/members/housebound.pl?borrowernumber=[% patron.borrowernumber %]">
200
                    Cancel
200
                    Cancel
201
                  </a>
201
                  </a>
202
                </fieldset>
202
                </fieldset>
Lines 213-219 Link Here
213
                [% ELSE %]
213
                [% ELSE %]
214
                  <input type="hidden" name="method" value="addvisitconfirm" />
214
                  <input type="hidden" name="method" value="addvisitconfirm" />
215
                [% END %]
215
                [% END %]
216
                <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
216
                <input type="hidden" name="borrowernumber" value="[% patron.borrowernumber %]" />
217
                <fieldset class="rows" id="instance">
217
                <fieldset class="rows" id="instance">
218
                  <legend>Delivery details</legend>
218
                  <legend>Delivery details</legend>
219
                  <ol>
219
                  <ol>
Lines 322-328 Link Here
322
                <fieldset class="action">
322
                <fieldset class="action">
323
                  <button type="submit" class="btn btn-default btn-sm"><i class="fa fa-save"></i> Save</button>
323
                  <button type="submit" class="btn btn-default btn-sm"><i class="fa fa-save"></i> Save</button>
324
                  <a class="cancel"
324
                  <a class="cancel"
325
                     href="/cgi-bin/koha/members/housebound.pl?borrowernumber=[% borrowernumber %]">
325
                     href="/cgi-bin/koha/members/housebound.pl?borrowernumber=[% patron.borrowernumber %]">
326
                    Cancel
326
                    Cancel
327
                  </a>
327
                  </a>
328
                </fieldset>
328
                </fieldset>
Lines 379-385 Link Here
379
                  </li>
379
                  </li>
380
                </ol>
380
                </ol>
381
                <div class="action">
381
                <div class="action">
382
                  <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>
382
                  <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>
383
                </div>
383
                </div>
384
              </div>
384
              </div>
385
              <div>
385
              <div>
Lines 405-419 Link Here
405
                        </a>
405
                        </a>
406
                      </td>
406
                      </td>
407
                      <td class="actions">
407
                      <td class="actions">
408
                        <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>
408
                        <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>
409
                        <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>
409
                        <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>
410
                      </td>
410
                      </td>
411
                    </tr>
411
                    </tr>
412
                    [% END %]
412
                    [% END %]
413
                </table>
413
                </table>
414
                [% END %]
414
                [% END %]
415
                <div class="action">
415
                <div class="action">
416
                  <a href="/cgi-bin/koha/members/housebound.pl?method=visit_update_or_create&borrowernumber=[% borrowernumber %]"
416
                  <a href="/cgi-bin/koha/members/housebound.pl?method=visit_update_or_create&borrowernumber=[% patron.borrowernumber %]"
417
                    class="btn btn-default btn-sm">
417
                    class="btn btn-default btn-sm">
418
                    <i class="fa fa-plus"></i> Add a new delivery
418
                    <i class="fa fa-plus"></i> Add a new delivery
419
                  </a>
419
                  </a>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tt (-6 / +6 lines)
Lines 27-41 $(document).ready(function(){ Link Here
27
<!-- The manual invoice and credit buttons -->
27
<!-- The manual invoice and credit buttons -->
28
<div class="statictabs">
28
<div class="statictabs">
29
<ul>
29
<ul>
30
	<li><a href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=[% borrowernumber %]">Account</a></li>
30
    <li><a href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=[% patron.borrowernumber %]">Account</a></li>
31
	<li><a href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% borrowernumber %]" >Pay fines</a></li>
31
    <li><a href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% patron.borrowernumber %]" >Pay fines</a></li>
32
	<li><a href="/cgi-bin/koha/members/maninvoice.pl?borrowernumber=[% borrowernumber %]" >Create manual invoice</a></li>
32
    <li><a href="/cgi-bin/koha/members/maninvoice.pl?borrowernumber=[% patron.borrowernumber %]" >Create manual invoice</a></li>
33
    <li class="active"><a href="/cgi-bin/koha/members/mancredit.pl?borrowernumber=[% borrowernumber %]" >Create manual credit</a></li>
33
    <li class="active"><a href="/cgi-bin/koha/members/mancredit.pl?borrowernumber=[% patron.borrowernumber %]" >Create manual credit</a></li>
34
</ul>
34
</ul>
35
<div class="tabs-container">
35
<div class="tabs-container">
36
36
37
<form action="/cgi-bin/koha/members/mancredit.pl" method="post" id="mancredit">
37
<form action="/cgi-bin/koha/members/mancredit.pl" method="post" id="mancredit">
38
<input type="hidden" name="borrowernumber" id="borrowernumber" value="[% borrowernumber %]" />
38
<input type="hidden" name="borrowernumber" id="borrowernumber" value="[% patron.borrowernumber %]" />
39
39
40
<fieldset class="rows">
40
<fieldset class="rows">
41
<legend>Manual credit</legend><ol>
41
<legend>Manual credit</legend><ol>
Lines 49-55 $(document).ready(function(){ Link Here
49
    <li><label for="amount">Amount: </label><input type="number" name="amount" id="amount" required="required" value="" step="any" min="0" /> Example: 5.00</li>
49
    <li><label for="amount">Amount: </label><input type="number" name="amount" id="amount" required="required" value="" step="any" min="0" /> Example: 5.00</li>
50
</ol></fieldset>
50
</ol></fieldset>
51
51
52
<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>
52
<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>
53
</form>
53
</form>
54
54
55
</div></div>
55
</div></div>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tt (-6 / +6 lines)
Lines 35-44 $(document).ready(function(){ Link Here
35
<!-- The manual invoice and credit buttons -->
35
<!-- The manual invoice and credit buttons -->
36
<div class="statictabs">
36
<div class="statictabs">
37
<ul>
37
<ul>
38
	<li><a href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=[% borrowernumber %]">Account</a></li>
38
    <li><a href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=[% patron.borrowernumber %]">Account</a></li>
39
	<li><a href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% borrowernumber %]" >Pay fines</a></li>
39
    <li><a href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% patron.borrowernumber %]" >Pay fines</a></li>
40
    <li class="active"><a href="/cgi-bin/koha/members/maninvoice.pl?borrowernumber=[% borrowernumber %]" >Create manual invoice</a></li>
40
    <li class="active"><a href="/cgi-bin/koha/members/maninvoice.pl?borrowernumber=[% patron.borrowernumber %]" >Create manual invoice</a></li>
41
	<li><a href="/cgi-bin/koha/members/mancredit.pl?borrowernumber=[% borrowernumber %]" >Create manual credit</a></li>
41
    <li><a href="/cgi-bin/koha/members/mancredit.pl?borrowernumber=[% patron.borrowernumber %]" >Create manual credit</a></li>
42
</ul>
42
</ul>
43
<div class="tabs-container">
43
<div class="tabs-container">
44
44
Lines 47-53 $(document).ready(function(){ Link Here
47
  ERROR an invalid itemnumber was entered, please hit back and try again
47
  ERROR an invalid itemnumber was entered, please hit back and try again
48
[% END %]
48
[% END %]
49
[% ELSE %]
49
[% ELSE %]
50
<form action="/cgi-bin/koha/members/maninvoice.pl" method="post" id="maninvoice"><input type="hidden" name="borrowernumber" id="borrowernumber" value="[% borrowernumber %]" />
50
<form action="/cgi-bin/koha/members/maninvoice.pl" method="post" id="maninvoice"><input type="hidden" name="borrowernumber" id="borrowernumber" value="[% patron.borrowernumber %]" />
51
	<fieldset class="rows">
51
	<fieldset class="rows">
52
	<legend>Manual invoice</legend>
52
	<legend>Manual invoice</legend>
53
	<ol>
53
	<ol>
Lines 69-75 $(document).ready(function(){ Link Here
69
    <li><label for="note">Note: </label><input type="text" name="note" size="50" id="note" /></li>
69
    <li><label for="note">Note: </label><input type="text" name="note" size="50" id="note" /></li>
70
    <li><label for="amount">Amount: </label><input type="number" name="amount" id="amount" required="required" value="" step="any" min="0" /> Example: 5.00</li>
70
    <li><label for="amount">Amount: </label><input type="number" name="amount" id="amount" required="required" value="" step="any" min="0" /> Example: 5.00</li>
71
	</ol></fieldset>
71
	</ol></fieldset>
72
<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>
72
<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>
73
</form>
73
</form>
74
74
75
[% END %]
75
[% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-flags.tt (-5 / +5 lines)
Lines 1-7 Link Here
1
[% USE Branches %]
1
[% USE Branches %]
2
[% PROCESS 'permissions.inc' %]
2
[% PROCESS 'permissions.inc' %]
3
[% INCLUDE 'doc-head-open.inc' %]
3
[% INCLUDE 'doc-head-open.inc' %]
4
<title>Koha &rsaquo; Patrons &rsaquo; Set permissions for [% surname %], [% firstname %]</title>
4
<title>Koha &rsaquo; Patrons &rsaquo; Set permissions for [% patron.surname %], [% patron.firstname %]</title>
5
<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/treeview/jquery.treeview.css"/>
5
<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/treeview/jquery.treeview.css"/>
6
[% INCLUDE 'doc-head-close.inc' %]
6
[% INCLUDE 'doc-head-close.inc' %]
7
<script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.treeview.pack.js"></script>
7
<script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.treeview.pack.js"></script>
Lines 112-118 Link Here
112
[% INCLUDE 'header.inc' %]
112
[% INCLUDE 'header.inc' %]
113
[% INCLUDE 'patron-search.inc' %]
113
[% INCLUDE 'patron-search.inc' %]
114
114
115
<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>
115
<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>
116
116
117
<div id="doc3" class="yui-t2">
117
<div id="doc3" class="yui-t2">
118
   
118
   
Lines 123-131 Link Here
123
123
124
<form method="post" action="/cgi-bin/koha/members/member-flags.pl">
124
<form method="post" action="/cgi-bin/koha/members/member-flags.pl">
125
    <input type="hidden" name="csrf_token" value="[% csrf_token %]" />
125
    <input type="hidden" name="csrf_token" value="[% csrf_token %]" />
126
    <input type="hidden" name="member" id="borrowernumber" value="[% borrowernumber %]" />
126
    <input type="hidden" name="member" id="borrowernumber" value="[% patron.borrowernumber %]" />
127
    <input type="hidden" name="newflags" value="1" />
127
    <input type="hidden" name="newflags" value="1" />
128
    <h1>Set permissions for [% surname %], [% firstname %]</h1>
128
    <h1>Set permissions for [% patron.surname %], [% patron.firstname %]</h1>
129
    <!-- <ul id="permissionstree"><li class="root">All privileges<ul> -->
129
    <!-- <ul id="permissionstree"><li class="root">All privileges<ul> -->
130
    <ul id="permissionstree" class="treeview-grey">
130
    <ul id="permissionstree" class="treeview-grey">
131
        <!-- <li class="folder-close">One level down<ul> -->
131
        <!-- <li class="folder-close">One level down<ul> -->
Lines 165-171 Link Here
165
    <!-- </ul></li></ul> -->
165
    <!-- </ul></li></ul> -->
166
    </ul>
166
    </ul>
167
167
168
<fieldset class="action"><input type="submit" value="Save" /> <a class="cancel" href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]">Cancel</a></fieldset>
168
<fieldset class="action"><input type="submit" value="Save" /> <a class="cancel" href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber %]">Cancel</a></fieldset>
169
169
170
</form>
170
</form>
171
</div>
171
</div>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-password.tt (-8 / +8 lines)
Lines 1-6 Link Here
1
[% USE Branches %]
1
[% USE Branches %]
2
[% INCLUDE 'doc-head-open.inc' %]
2
[% INCLUDE 'doc-head-open.inc' %]
3
<title>Koha &rsaquo; Patrons &rsaquo; [% IF ( newpassword ) %]Password updated [% ELSE %]Update password for [% surname %], [% firstname %][% END %]</title>
3
<title>Koha &rsaquo; Patrons &rsaquo; [% IF ( newpassword ) %]Password updated [% ELSE %]Update password for [% patron.surname %], [% patron.firstname %][% END %]</title>
4
[% INCLUDE 'doc-head-close.inc' %]
4
[% INCLUDE 'doc-head-close.inc' %]
5
<script type="text/JavaScript">
5
<script type="text/JavaScript">
6
//<![CDATA[
6
//<![CDATA[
Lines 29-35 Link Here
29
        });
29
        });
30
        $("body").on('click', "#fillrandom",function(e) {
30
        $("body").on('click', "#fillrandom",function(e) {
31
            e.preventDefault();
31
            e.preventDefault();
32
            $.get("/cgi-bin/koha/members/member-password.pl?member=[% userid %]", function(response) {
32
            $.get("/cgi-bin/koha/members/member-password.pl?member=[% patron.userid %]", function(response) {
33
                var defaultnewpass = $(response).find("#defaultnewpassfield").val();
33
                var defaultnewpass = $(response).find("#defaultnewpassfield").val();
34
                $("#newpassword").after("<input type=\"text\" name=\"newpassword\"  id=\"newpassword\" value=\"" + defaultnewpass + "\">").remove();
34
                $("#newpassword").after("<input type=\"text\" name=\"newpassword\"  id=\"newpassword\" value=\"" + defaultnewpass + "\">").remove();
35
                $("#newpassword2").after("<input type=\"text\" name=\"newpassword2\" id=\"newpassword2\" value=\"" + defaultnewpass + "\">").remove();
35
                $("#newpassword2").after("<input type=\"text\" name=\"newpassword2\" id=\"newpassword2\" value=\"" + defaultnewpass + "\">").remove();
Lines 55-61 Link Here
55
[% INCLUDE 'header.inc' %]
55
[% INCLUDE 'header.inc' %]
56
[% INCLUDE 'patron-search.inc' %]
56
[% INCLUDE 'patron-search.inc' %]
57
57
58
<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>
58
<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>
59
59
60
<div id="doc3" class="yui-t2">
60
<div id="doc3" class="yui-t2">
61
61
Lines 71-78 Link Here
71
71
72
<form method="post" id="changepasswordf" action="/cgi-bin/koha/members/member-password.pl">
72
<form method="post" id="changepasswordf" action="/cgi-bin/koha/members/member-password.pl">
73
<input type="hidden" name="destination" value="[% destination %]" />
73
<input type="hidden" name="destination" value="[% destination %]" />
74
<input type="hidden" name="cardnumber" value="[% cardnumber %]" />
74
<input type="hidden" name="cardnumber" value="[% patron.cardnumber %]" />
75
<input type="hidden" name="borrowernumber" id="borrowernumber" value="[% borrowernumber %]" />
75
<input type="hidden" name="borrowernumber" id="borrowernumber" value="[% patron.borrowernumber %]" />
76
	[% IF ( errormsg ) %]
76
	[% IF ( errormsg ) %]
77
		<div class="dialog alert">
77
		<div class="dialog alert">
78
		<h4>The following errors have occurred:</h4>
78
		<h4>The following errors have occurred:</h4>
Lines 94-103 Link Here
94
	[% END %]
94
	[% END %]
95
95
96
96
97
    <fieldset class="brief"><legend>Change username and/or password for [% firstname %] [% surname %]</legend>
97
    <fieldset class="brief"><legend>Change username and/or password for [% patron.firstname %] [% patron.surname %]</legend>
98
	<ol>
98
	<ol>
99
    <li><label for="newuserid">New username:</label>
99
    <li><label for="newuserid">New username:</label>
100
	<input type="hidden" name="member" value="[% borrowernumber %]" /><input type="text" id="newuserid" name="newuserid" size="20" value="[% userid %]" /></li>
100
    <input type="hidden" name="member" value="[% patron.borrowernumber %]" /><input type="text" id="newuserid" name="newuserid" size="20" value="[% patron.userid %]" /></li>
101
    <li><label for="newpassword">New password:</label>
101
    <li><label for="newpassword">New password:</label>
102
    <div class="hint">Koha cannot display existing passwords. Leave the field blank to leave password unchanged.</div>
102
    <div class="hint">Koha cannot display existing passwords. Leave the field blank to leave password unchanged.</div>
103
	[% IF ( minPasswordLength ) %]<div class="hint">Minimum password length: [% minPasswordLength %]</div>[% END %]
103
	[% IF ( minPasswordLength ) %]<div class="hint">Minimum password length: [% minPasswordLength %]</div>[% END %]
Lines 118-124 Link Here
118
    <fieldset class="action">
118
    <fieldset class="action">
119
        <input type="hidden" name="csrf_token" value="[% csrf_token %]" />
119
        <input type="hidden" name="csrf_token" value="[% csrf_token %]" />
120
        <input type="submit" value="Save" />
120
        <input type="submit" value="Save" />
121
        <a class="cancel" href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]">Cancel</a>
121
        <a class="cancel" href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber %]">Cancel</a>
122
    </fieldset>
122
    </fieldset>
123
</form>[% END %]
123
</form>[% END %]
124
124
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt (-1 / +1 lines)
Lines 2-8 Link Here
2
[% USE KohaDates %]
2
[% USE KohaDates %]
3
[% USE Branches %]
3
[% USE Branches %]
4
[% INCLUDE 'doc-head-open.inc' %]
4
[% INCLUDE 'doc-head-open.inc' %]
5
<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>
5
<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>
6
[% INCLUDE 'doc-head-close.inc' %]
6
[% INCLUDE 'doc-head-close.inc' %]
7
<script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.fixFloat.js"></script>
7
<script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.fixFloat.js"></script>
8
[% INCLUDE 'calendar.inc' %]
8
[% INCLUDE 'calendar.inc' %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tt (-10 / +10 lines)
Lines 3-15 Link Here
3
[% USE KohaDates %]
3
[% USE KohaDates %]
4
[% USE Price %]
4
[% USE Price %]
5
[% INCLUDE 'doc-head-open.inc' %]
5
[% INCLUDE 'doc-head-open.inc' %]
6
    <title>Summary for [% firstname %] [% surname %] ([% cardnumber %])</title>
6
    <title>Summary for [% patron.firstname %] [% patron.surname %] ([% patron.cardnumber %])</title>
7
    [% INCLUDE 'doc-head-close.inc' %]
7
    [% INCLUDE 'doc-head-close.inc' %]
8
    [% INCLUDE 'slip-print.inc' #printThenClose %]
8
    [% INCLUDE 'slip-print.inc' #printThenClose %]
9
</head>
9
</head>
10
<body id="pat_moremember-print" class="pat">
10
<body id="pat_moremember-print" class="pat">
11
    <div id="main">
11
    <div id="main">
12
        <h3><a href="/cgi-bin/koha/circ/circulation.pl?findborrower=[% cardnumber %]">Account summary: [% firstname %] [% surname %] ([% cardnumber %])</a></h3>
12
        <h3><a href="/cgi-bin/koha/circ/circulation.pl?findborrower=[% patron.cardnumber %]">Account summary: [% patron.firstname %] [% patron.surname %] ([% patron.cardnumber %])</a></h3>
13
13
14
        <ul>
14
        <ul>
15
            [% IF Koha.Preference( 'AddressFormat' ) %]
15
            [% IF Koha.Preference( 'AddressFormat' ) %]
Lines 17-31 Link Here
17
            [% ELSE %]
17
            [% ELSE %]
18
                [% INCLUDE 'member-display-address-style-us.inc' %]
18
                [% INCLUDE 'member-display-address-style-us.inc' %]
19
            [% END %]
19
            [% END %]
20
            <li>[% IF ( phone ) %][% phone %][% ELSE %](no phone number on file)[% END %]</li>
20
            <li>[% IF ( patron.phone ) %][% patron.phone %][% ELSE %](no phone number on file)[% END %]</li>
21
            <li>[% IF ( email ) %][% email %][% ELSE %](no primary email on file)[% END %]</li>
21
            <li>[% IF ( patron.email ) %][% patron.email %][% ELSE %](no primary email on file)[% END %]</li>
22
            [% IF ( emailpro ) %]
22
            [% IF ( patron.emailpro ) %]
23
                <li>[% emailpro %]</li>
23
                <li>[% patron.emailpro %]</li>
24
            [% END %]
24
            [% END %]
25
            <li>Registration date: [% dateenrolled | $KohaDates %]</li>
25
            <li>Registration date: [% patron.dateenrolled | $KohaDates %]</li>
26
            <li>Expiration date: [% dateexpiry | $KohaDates %]</li>
26
            <li>Expiration date: [% patron.dateexpiry | $KohaDates %]</li>
27
            <li>Library: [% Branches.GetName( branchcode ) %]</li>
27
            <li>Library: [% Branches.GetName( patron.branchcode ) %]</li>
28
            <li>Category: [% description %]</li>
28
            <li>Category: [% patron.category.description %]</li>
29
        </ul>
29
        </ul>
30
30
31
        [% IF ( issues ) %]
31
        [% IF ( issues ) %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt (-62 / +62 lines)
Lines 27-33 Link Here
27
/* Set some variable needed in circulation.js */
27
/* Set some variable needed in circulation.js */
28
var interface = "[% interface %]";
28
var interface = "[% interface %]";
29
var theme = "[% theme %]";
29
var theme = "[% theme %]";
30
var borrowernumber = "[% borrowernumber %]";
30
var borrowernumber = "[% patron.borrowernumber %]";
31
var branchcode = "[% Branches.GetLoggedInBranchcode() %]";
31
var branchcode = "[% Branches.GetLoggedInBranchcode() %]";
32
var exports_enabled = "[% Koha.Preference('ExportCircHistory') %]";
32
var exports_enabled = "[% Koha.Preference('ExportCircHistory') %]";
33
var AllowCirculate = [% (CAN_user_circulate_circulate_remaining_permissions)? 1 : 0 %]
33
var AllowCirculate = [% (CAN_user_circulate_circulate_remaining_permissions)? 1 : 0 %]
Lines 46-52 $(document).ready(function() { Link Here
46
    if ( $('#clubs-tab').length ) {
46
    if ( $('#clubs-tab').length ) {
47
        $('#clubs-tab-link').on('click', function() {
47
        $('#clubs-tab-link').on('click', function() {
48
            $('#clubs-tab').text(_("Loading..."));
48
            $('#clubs-tab').text(_("Loading..."));
49
            $('#clubs-tab').load('/cgi-bin/koha/clubs/patron-clubs-tab.pl?borrowernumber=[% borrowernumber %]');
49
            $('#clubs-tab').load('/cgi-bin/koha/clubs/patron-clubs-tab.pl?borrowernumber=[% patron.borrowernumber %]');
50
        });
50
        });
51
    }
51
    }
52
52
Lines 174-180 function validate1(date) { Link Here
174
[% END %]
174
[% END %]
175
<div class="yui-g">
175
<div class="yui-g">
176
176
177
    [% IF ( was_renewed ) %]<div class="dialog message">Patron's account has been renewed until [% dateexpiry | $KohaDates %]</div>[% END %]
177
    [% IF ( was_renewed ) %]<div class="dialog message">Patron's account has been renewed until [% patron.dateexpiry | $KohaDates %]</div>[% END %]
178
178
179
    [% IF fines %]
179
    [% IF fines %]
180
    <div id="circmessages" class="circmessage attention">
180
    <div id="circmessages" class="circmessage attention">
Lines 205-222 function validate1(date) { Link Here
205
                <a href="#reldebarments" id="view_restrictions">View restrictions</a>
205
                <a href="#reldebarments" id="view_restrictions">View restrictions</a>
206
            </li>
206
            </li>
207
        [% END %]
207
        [% END %]
208
        [% IF ( gonenoaddress ) %]<li class="blocker">Patron's address is in doubt.</li>[% END %]
208
        [% IF ( patron.gonenoaddress ) %]<li class="blocker">Patron's address is in doubt.</li>[% END %]
209
        [% IF ( lost ) %]<li class="blocker">Patron's card has been reported lost.</li>[% END %]
209
        [% IF ( lost ) %]<li class="blocker">Patron's card has been reported lost.</li>[% END %]
210
        </ul>
210
        </ul>
211
    </div>
211
    </div>
212
    [% END %]
212
    [% END %]
213
213
214
<h3>[% UNLESS ( I ) %]
214
<h3>[% UNLESS ( I ) %]
215
   [% title | html %] [% firstname | html %] [% END %] [% surname | html %] ([% cardnumber | html %])</h3>
215
   [% patron.title | html %] [% patron.firstname | html %] [% END %] [% patron.surname | html %] ([% patron.cardnumber | html %])</h3>
216
 <div class="yui-u first">
216
 <div class="yui-u first">
217
<div id="patron-information" style="padding : .5em;">
217
<div id="patron-information" style="padding : .5em;">
218
218
219
     [% UNLESS ( I ) %][% IF ( othernames ) %]&ldquo;[% othernames | html %]&rdquo;[% END %]
219
     [% UNLESS ( I ) %][% IF ( patron.othernames ) %]&ldquo;[% patron.othernames | html %]&rdquo;[% END %]
220
220
221
    <div class = "address">
221
    <div class = "address">
222
        [% IF Koha.Preference( 'AddressFormat' ) %]
222
        [% IF Koha.Preference( 'AddressFormat' ) %]
Lines 229-251 function validate1(date) { Link Here
229
	<div class="rows">
229
	<div class="rows">
230
		<ol>
230
		<ol>
231
        [% IF ( I ) %]
231
        [% IF ( I ) %]
232
            [% IF ( phonepro ) %]<li><span class="label">Organization phone: </span><a href="tel:[% phonepro %]">[% phonepro | html %]</a></li>[% END %]
232
            [% IF ( patron.phonepro ) %]<li><span class="label">Organization phone: </span><a href="tel:[% patron.phonepro %]">[% patron.phonepro | html %]</a></li>[% END %]
233
            [% IF ( emailpro ) %]<li class="email"><span class="label">Organization email: </span>[% emailpro | html %]</li>[% END %]
233
            [% IF ( patron.emailpro ) %]<li class="email"><span class="label">Organization email: </span>[% patron.emailpro | html %]</li>[% END %]
234
        [% ELSE %]
234
        [% ELSE %]
235
            [% IF ( phone ) %]<li><span class="label">Primary phone: </span><a href="tel:[% phone %]">[% phone | html %]</a></li>[% END %]
235
            [% IF ( patron.phone ) %]<li><span class="label">Primary phone: </span><a href="tel:[% patron.phone %]">[% patron.phone | html %]</a></li>[% END %]
236
            [% IF ( phonepro ) %]<li><span class="label">Secondary phone: </span><a href="tel:[% phonepro %]">[% phonepro | html %]</a></li>[% END %]
236
            [% IF ( patron.phonepro ) %]<li><span class="label">Secondary phone: </span><a href="tel:[% patron.phonepro %]">[% patron.phonepro | html %]</a></li>[% END %]
237
            [% IF ( mobile ) %]<li><span class="label">Other phone: </span><a href="tel:[% mobile %]">[% mobile | html %]</a></li>[% END %]
237
            [% IF ( patron.mobile ) %]<li><span class="label">Other phone: </span><a href="tel:[% patron.mobile %]">[% patron.mobile | html %]</a></li>[% END %]
238
        [% END %]
238
        [% END %]
239
239
240
	[% IF ( fax ) %]<li><span class="label">Fax: </span>[% fax %]</li>[% END %]
240
    [% IF ( patron.fax ) %]<li><span class="label">Fax: </span>[% patron.fax %]</li>[% END %]
241
    [% UNLESS ( I ) %]
241
    [% UNLESS ( I ) %]
242
        [% IF ( email ) %]<li class="email"><span class="label">Primary email:</span><a title="[% email %]" href="mailto:[% email | url %]">[% email | html %]</a></li>[% END %]
242
        [% 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 %]
243
        [% IF ( emailpro ) %]<li class="email"><span class="label">Secondary email: </span><a title="[% emailpro %]" href="mailto:[% emailpro | url %]">[% emailpro | html %]</a></li>[% END %]
243
        [% 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 %]
244
    [% END %]
244
    [% END %]
245
    [% IF ( initials ) %]<li><span class="label">Initials: </span>[% initials %]</li>[% END %]
245
    [% IF ( patron.initials ) %]<li><span class="label">Initials: </span>[% patron.initials %]</li>[% END %]
246
    [% IF ( dateofbirth ) %]<li><span class="label">Date of birth:</span>[% dateofbirth | $KohaDates %] ([% age %] years)</li>[% END %]
246
    [% IF ( patron.dateofbirth ) %]<li><span class="label">Date of birth:</span>[% patron.dateofbirth | $KohaDates %] ([% age %] years)</li>[% END %]
247
    [% IF ( sex ) %]<li><span class="label">Gender:</span>
247
    [% IF ( patron.sex ) %]<li><span class="label">Gender:</span>
248
    [% IF ( sex == 'F' ) %]Female[% ELSIF ( sex == 'M' ) %]Male[% ELSE %][% sex %][% END %]
248
    [% IF ( patron.sex == 'F' ) %]Female[% ELSIF ( patron.sex == 'M' ) %]Male[% ELSE %][% patron.sex %][% END %]
249
    </li>[% END %][% END %]
249
    </li>[% END %][% END %]
250
    [% IF guarantees %]
250
    [% IF guarantees %]
251
        <li>
251
        <li>
Lines 274-282 function validate1(date) { Link Here
274
</div>
274
</div>
275
      <div class="action">
275
      <div class="action">
276
        [% IF ( guarantor.borrowernumber ) %]
276
        [% IF ( guarantor.borrowernumber ) %]
277
        <a href="memberentry.pl?op=modify&amp;borrowernumber=[% borrowernumber %]&amp;step=1&amp;guarantorid=[% guarantor.borrowernumber %]">Edit</a>
277
        <a href="memberentry.pl?op=modify&amp;borrowernumber=[% patron.borrowernumber %]&amp;step=1&amp;guarantorid=[% guarantor.borrowernumber %]">Edit</a>
278
        [% ELSE %]
278
        [% ELSE %]
279
        <a href="memberentry.pl?op=modify&amp;borrowernumber=[% borrowernumber %]&amp;step=1">Edit</a>
279
        <a href="memberentry.pl?op=modify&amp;borrowernumber=[% patron.borrowernumber %]&amp;step=1">Edit</a>
280
        [% END %]</div>
280
        [% END %]</div>
281
281
282
</div>
282
</div>
Lines 290-305 function validate1(date) { Link Here
290
            <fieldset class="brief">
290
            <fieldset class="brief">
291
            [% IF ( picture ) %]
291
            [% IF ( picture ) %]
292
                <legend>Manage patron image</legend>
292
                <legend>Manage patron image</legend>
293
                <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.
293
                <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.
294
            [% ELSE %]
294
            [% ELSE %]
295
                <legend>Upload patron image</legend>
295
                <legend>Upload patron image</legend>
296
                <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.
296
                <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.
297
            [% END %]
297
            [% END %]
298
                    <br />Only PNG, GIF, JPEG, XPM formats are supported.
298
                    <br />Only PNG, GIF, JPEG, XPM formats are supported.
299
                </div>
299
                </div>
300
                <input type="hidden" id="image" name="filetype" value="image" />
300
                <input type="hidden" id="image" name="filetype" value="image" />
301
                <input type="hidden" id="cardnumber" name="cardnumber" value="[% cardnumber | html %]" />
301
                <input type="hidden" id="cardnumber" name="cardnumber" value="[% patron.cardnumber | html %]" />
302
                <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
302
                <input type="hidden" name="borrowernumber" value="[% patron.borrowernumber %]" />
303
                <ol>
303
                <ol>
304
                    <li>
304
                    <li>
305
                       <label for="uploadfile">Select the file to upload: </label><input type="file" id="uploadfile" name="uploadfile" />
305
                       <label for="uploadfile">Select the file to upload: </label><input type="file" id="uploadfile" name="uploadfile" />
Lines 309-315 function validate1(date) { Link Here
309
                    <input type="hidden" name="csrf_token" value="[% csrf_token %]" />
309
                    <input type="hidden" name="csrf_token" value="[% csrf_token %]" />
310
                    <input type="submit" value="Upload" class="submit" />
310
                    <input type="submit" value="Upload" class="submit" />
311
                    <input name="op" type="hidden" value="Upload" />
311
                    <input name="op" type="hidden" value="Upload" />
312
                    [% 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 %]
312
                    [% 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 %]
313
                </fieldset>
313
                </fieldset>
314
            </fieldset>
314
            </fieldset>
315
        </form>
315
        </form>
Lines 343-349 function validate1(date) { Link Here
343
  </ol>
343
  </ol>
344
</div>
344
</div>
345
</div>
345
</div>
346
<div class="action"><a href="memberentry.pl?op=modify&amp;borrowernumber=[% borrowernumber %]&amp;step=4">Edit</a></div>
346
<div class="action"><a href="memberentry.pl?op=modify&amp;borrowernumber=[% patron.borrowernumber %]&amp;step=4">Edit</a></div>
347
[% END %]
347
[% END %]
348
348
349
[% IF ( ExtendedPatronAttributes ) %]
349
[% IF ( ExtendedPatronAttributes ) %]
Lines 372-378 function validate1(date) { Link Here
372
    </div>
372
    </div>
373
[% END %]
373
[% END %]
374
</div>
374
</div>
375
<div class="action"><a href="memberentry.pl?op=modify&amp;borrowernumber=[% borrowernumber %]&amp;step=4">Edit</a></div>
375
<div class="action"><a href="memberentry.pl?op=modify&amp;borrowernumber=[% patron.borrowernumber %]&amp;step=4">Edit</a></div>
376
[% END %]
376
[% END %]
377
[% END %]
377
[% END %]
378
378
Lines 382-392 function validate1(date) { Link Here
382
<h3>Patron messaging preferences</h3>
382
<h3>Patron messaging preferences</h3>
383
[% INCLUDE 'messaging-preference-form.inc' %]
383
[% INCLUDE 'messaging-preference-form.inc' %]
384
 [% IF ( SMSSendDriver ) %]
384
 [% IF ( SMSSendDriver ) %]
385
      <div class="rows"> <ol><li><span class="label">SMS number:</span><a href="sms:[% SMSnumber %]">[% SMSnumber %]</a>
385
      <div class="rows"> <ol><li><span class="label">SMS number:</span><a href="sms:[% patron.smsalertnumber %]">[% patron.smsalertnumber %]</a>
386
     </li></ol></div>
386
     </li></ol></div>
387
 [% END %]
387
 [% END %]
388
</div>
388
</div>
389
<div class="action"><a href="memberentry.pl?op=modify&amp;borrowernumber=[% borrowernumber %]&amp;step=5">Edit</a></div>
389
<div class="action"><a href="memberentry.pl?op=modify&amp;borrowernumber=[% patron.borrowernumber %]&amp;step=5">Edit</a></div>
390
[% END %]
390
[% END %]
391
391
392
</div>
392
</div>
Lines 395-410 function validate1(date) { Link Here
395
 <h3>Library use</h3>
395
 <h3>Library use</h3>
396
<div class="rows"> 
396
<div class="rows"> 
397
<ol>
397
<ol>
398
    <li><span class="label">Card number: </span>[% cardnumber %]</li>
398
    <li><span class="label">Card number: </span>[% patron.cardnumber %]</li>
399
	<li><span class="label">Borrowernumber: </span> [% borrowernumber %]</li>
399
	<li><span class="label">Borrowernumber: </span> [% patron.borrowernumber %]</li>
400
    <li><span class="label">Category: </span>[% description %] ([% categorycode %])</li>
400
    <li><span class="label">Category: </span>[% patron.category.description %] ([% patron.categorycode %])</li>
401
    <li><span class="label">Registration date: </span>[% dateenrolled | $KohaDates %]</li>
401
    <li><span class="label">Registration date: </span>[% patron.dateenrolled | $KohaDates %]</li>
402
    
402
    
403
    <li><span class="label">Expiration date: </span>
403
    <li><span class="label">Expiration date: </span>
404
    [% IF ( was_renewed ) %]
404
    [% IF ( was_renewed ) %]
405
            <strong class="reregistrinfo">[% dateexpiry | $KohaDates %]</strong>
405
            <strong class="reregistrinfo">[% patron.dateexpiry | $KohaDates %]</strong>
406
    [% ELSE %]
406
    [% ELSE %]
407
            [% dateexpiry | $KohaDates %]
407
            [% patron.dateexpiry | $KohaDates %]
408
    [% END %]
408
    [% END %]
409
    </li>
409
    </li>
410
    
410
    
Lines 425-442 function validate1(date) { Link Here
425
        [% END %]
425
        [% END %]
426
    </li>
426
    </li>
427
427
428
    [% IF ( sort1 ) %]<li><span class="label">Sort field 1:</span>[% AuthorisedValues.GetByCode('Bsort1', sort1) %]</li>[% END %]
428
    [% IF ( patron.sort1 ) %]<li><span class="label">Sort field 1:</span>[% AuthorisedValues.GetByCode('Bsort1', patron.sort1) %]</li>[% END %]
429
    [% IF ( sort2 ) %]<li><span class="label">Sort field 2:</span>[% AuthorisedValues.GetByCode('Bsort2', sort2) %]</li>[% END %]
429
    [% IF ( patron.sort2 ) %]<li><span class="label">Sort field 2:</span>[% AuthorisedValues.GetByCode('Bsort2', patron.sort2) %]</li>[% END %]
430
    <li><span class="label">Username: </span>[% userid %]</li>
430
    <li><span class="label">Username: </span>[% patron.userid %]</li>
431
    <li><span class="label">Password: </span>
431
    <li><span class="label">Password: </span>
432
    [% IF ( password ) %]
432
    [% IF ( patron.password ) %]
433
        *******
433
        *******
434
    [% ELSE %]
434
    [% ELSE %]
435
        <span class="problem"><a href="/cgi-bin/koha/members/member-password.pl?member=[% borrowernumber %]">Undefined</a></span>
435
        <span class="problem"><a href="/cgi-bin/koha/members/member-password.pl?member=[% patron.borrowernumber %]">Undefined</a></span>
436
    [% END %] 
436
    [% END %] 
437
    </li>
437
    </li>
438
    [% IF ( borrowernotes ) %]<li><span class="label">Circulation note: </span>[% borrowernotes %]</li>[% END %]
438
    [% IF ( patron.borrowernotes ) %]<li><span class="label">Circulation note: </span>[% patron.borrowernotes %]</li>[% END %]
439
    [% IF ( opacnote ) %]<li><span class="label">OPAC note:</span>[% opacnote %]</li>[% END %]
439
    [% IF ( patron.opacnote ) %]<li><span class="label">OPAC note:</span>[% patron.opacnote %]</li>[% END %]
440
    [% IF Koha.Preference( 'NorwegianPatronDBEnable' ) == 1 %]
440
    [% IF Koha.Preference( 'NorwegianPatronDBEnable' ) == 1 %]
441
        [% IF ( sync == 1 ) %]
441
        [% IF ( sync == 1 ) %]
442
            <li><span class="label">Activate sync: </span>Yes</li>
442
            <li><span class="label">Activate sync: </span>Yes</li>
Lines 448-456 function validate1(date) { Link Here
448
    [% END %]
448
    [% END %]
449
    [% IF ( Koha.Preference('CheckPrevCheckout') == 'softyes' || Koha.Preference('CheckPrevCheckout') == 'softno' ) %]
449
    [% IF ( Koha.Preference('CheckPrevCheckout') == 'softyes' || Koha.Preference('CheckPrevCheckout') == 'softno' ) %]
450
      <li><span class="label">Check previous checkouts: </span>
450
      <li><span class="label">Check previous checkouts: </span>
451
        [% IF ( checkprevcheckout == 'yes' ) %]
451
        [% IF ( patron.checkprevcheckout == 'yes' ) %]
452
        Yes
452
        Yes
453
        [% ELSIF ( checkprevcheckout == 'no' ) %]
453
        [% ELSIF ( patron.checkprevcheckout == 'no' ) %]
454
        No
454
        No
455
        [% ELSE %]
455
        [% ELSE %]
456
        Inherited
456
        Inherited
Lines 460-472 function validate1(date) { Link Here
460
    [% IF Koha.Preference('TranslateNotices') %]
460
    [% IF Koha.Preference('TranslateNotices') %]
461
        <li>
461
        <li>
462
            <span class="label">Preferred language for notices: </span>
462
            <span class="label">Preferred language for notices: </span>
463
            [% translated_language %]
463
            [% patron.translated_language %]
464
        </li>
464
        </li>
465
    [% END %]
465
    [% END %]
466
	</ol>
466
	</ol>
467
	</div>
467
	</div>
468
 </div>
468
 </div>
469
    <div class="action"><a href="memberentry.pl?op=modify&amp;borrowernumber=[% borrowernumber %]&amp;step=3">Edit</a></div>
469
    <div class="action"><a href="memberentry.pl?op=modify&amp;borrowernumber=[% patron.borrowernumber %]&amp;step=3">Edit</a></div>
470
 
470
 
471
    [% UNLESS ( I ) %]
471
    [% UNLESS ( I ) %]
472
 <div id="patron-alternate-address" style="padding-top: 1em;">
472
 <div id="patron-alternate-address" style="padding-top: 1em;">
Lines 479-507 function validate1(date) { Link Here
479
    [% END %]
479
    [% END %]
480
480
481
    <div class="rows">  <ol>
481
    <div class="rows">  <ol>
482
      [% IF ( B_phone ) %]<li><span class="label">Phone: </span><a href="tel:[% B_phone %]">[% B_phone %]</a></li>[% END %]
482
      [% IF ( patron.B_phone ) %]<li><span class="label">Phone: </span><a href="tel:[% patron.B_phone %]">[% patron.B_phone %]</a></li>[% END %]
483
      [% IF ( B_email ) %]<li class="email"><span class="label">Email: </span><a title="[% B_email %]" href="mailto:[% B_email %]">[% B_email %]</a></li>[% END %]
483
      [% IF ( patron.B_email ) %]<li class="email"><span class="label">Email: </span><a title="[% patron.B_email %]" href="mailto:[% patron.B_email %]">[% patron.B_email %]</a></li>[% END %]
484
      [% IF ( contactnote ) %]<li><span class="label">Contact note: </span> [% contactnote %]</li>[% END %]
484
      [% IF ( patron.contactnote ) %]<li><span class="label">Contact note: </span> [% patron.contactnote %]</li>[% END %]
485
      </ol>
485
      </ol>
486
    </div>
486
    </div>
487
</div>
487
</div>
488
<div class="action"><a href="memberentry.pl?op=modify&amp;borrowernumber=[% borrowernumber %]&amp;step=6">Edit</a></div>
488
<div class="action"><a href="memberentry.pl?op=modify&amp;borrowernumber=[% patron.borrowernumber %]&amp;step=6">Edit</a></div>
489
    [% END %]
489
    [% END %]
490
490
491
 <div id="patron-alternative-contact" style="padding-top: 1em;">
491
 <div id="patron-alternative-contact" style="padding-top: 1em;">
492
 <h3>Alternative contact</h3>
492
 <h3>Alternative contact</h3>
493
   <div class="rows"> <ol><li><span class="label">Surname: </span>[% altcontactsurname | html %]</li>
493
   <div class="rows"> <ol><li><span class="label">Surname: </span>[% patron.altcontactsurname | html %]</li>
494
    <li><span class="label">First name: </span>[% altcontactfirstname | html %]</li>
494
    <li><span class="label">First name: </span>[% patron.altcontactfirstname | html %]</li>
495
    <li><span class="label">Address: </span>[% altcontactaddress1 | html %]</li>
495
    <li><span class="label">Address: </span>[% patron.altcontactaddress1 | html %]</li>
496
    <li><span class="label">Address 2: </span>[% altcontactaddress2 | html %]</li>
496
    <li><span class="label">Address 2: </span>[% patron.altcontactaddress2 | html %]</li>
497
	<li><span class="label">City: </span>[% altcontactaddress3 | html %]</li>
497
	<li><span class="label">City: </span>[% patron.altcontactaddress3 | html %]</li>
498
    [% IF ( altcontactstate ) %]<li><span class="label">State: </span>[% altcontactstate | html %]</li>[% END %]
498
    [% IF ( patron.altcontactstate ) %]<li><span class="label">State: </span>[% patron.altcontactstate | html %]</li>[% END %]
499
    <li><span class="label">ZIP/Postal code: </span>[% altcontactzipcode | html %]</li>
499
    <li><span class="label">ZIP/Postal code: </span>[% patron.altcontactzipcode | html %]</li>
500
	[% IF ( altcontactcountry ) %]<li><span class="label">Country: </span>[% altcontactcountry | html %]</li>[% END %]
500
	[% IF ( patron.altcontactcountry ) %]<li><span class="label">Country: </span>[% patron.altcontactcountry | html %]</li>[% END %]
501
    [% IF ( altcontactphone ) %]<li><span class="label">Phone: </span><a href="tel:[% altcontactphone | url %]">[% altcontactphone | html %]</a></li>[% END %]
501
    [% IF ( patron.altcontactphone ) %]<li><span class="label">Phone: </span><a href="tel:[% patron.altcontactphone | url %]">[% patron.altcontactphone | html %]</a></li>[% END %]
502
    </ol></div>
502
    </ol></div>
503
</div>
503
</div>
504
<div class="action"><a href="memberentry.pl?op=modify&amp;borrowernumber=[% borrowernumber %]&amp;step=2">Edit</a></div>
504
<div class="action"><a href="memberentry.pl?op=modify&amp;borrowernumber=[% patron.borrowernumber %]&amp;step=2">Edit</a></div>
505
505
506
</div>
506
</div>
507
</div>
507
</div>
Lines 608-614 function validate1(date) { Link Here
608
    <fieldset class="action">
608
    <fieldset class="action">
609
        <form action="/cgi-bin/koha/reserve/modrequest_suspendall.pl" method="post">
609
        <form action="/cgi-bin/koha/reserve/modrequest_suspendall.pl" method="post">
610
            <input type="hidden" name="from" value="borrower" />
610
            <input type="hidden" name="from" value="borrower" />
611
            <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
611
            <input type="hidden" name="borrowernumber" value="[% patron.borrowernumber %]" />
612
            <input type="submit" value="Suspend all holds" />
612
            <input type="submit" value="Suspend all holds" />
613
613
614
            [% IF AutoResumeSuspendedHolds %]
614
            [% IF AutoResumeSuspendedHolds %]
Lines 622-628 function validate1(date) { Link Here
622
    <fieldset class="action">
622
    <fieldset class="action">
623
        <form action="/cgi-bin/koha/reserve/modrequest_suspendall.pl" method="post">
623
        <form action="/cgi-bin/koha/reserve/modrequest_suspendall.pl" method="post">
624
            <input type="hidden" name="from" value="borrower" />
624
            <input type="hidden" name="from" value="borrower" />
625
            <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
625
            <input type="hidden" name="borrowernumber" value="[% patron.borrowernumber %]" />
626
            <input type="hidden" name="suspend" value="0" />
626
            <input type="hidden" name="suspend" value="0" />
627
            <input type="submit" value="Resume all suspended holds" />
627
            <input type="submit" value="Resume all suspended holds" />
628
	</form>
628
	</form>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt (-9 / +9 lines)
Lines 3-9 Link Here
3
[% USE Branches %]
3
[% USE Branches %]
4
[% USE Price %]
4
[% USE Price %]
5
[% INCLUDE 'doc-head-open.inc' %]
5
[% INCLUDE 'doc-head-open.inc' %]
6
<title>Koha &rsaquo; Patrons &rsaquo; Pay Fines for  [% borrower.firstname %] [% borrower.surname %]</title>
6
<title>Koha &rsaquo; Patrons &rsaquo; Pay Fines for  [% patron.firstname %] [% patron.surname %]</title>
7
[% INCLUDE 'doc-head-close.inc' %]
7
[% INCLUDE 'doc-head-close.inc' %]
8
<script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.checkboxes.min.js"></script>
8
<script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.checkboxes.min.js"></script>
9
<script type= "text/javascript">
9
<script type= "text/javascript">
Lines 48-54 function enableCheckboxActions(){ Link Here
48
[% INCLUDE 'header.inc' %]
48
[% INCLUDE 'header.inc' %]
49
[% INCLUDE 'patron-search.inc' %]
49
[% INCLUDE 'patron-search.inc' %]
50
50
51
<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 %] [% borrower.surname %]</div>
51
<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 %] [% patron.surname %]</div>
52
52
53
<div id="doc3" class="yui-t2">
53
<div id="doc3" class="yui-t2">
54
   
54
   
Lines 60-75 function enableCheckboxActions(){ Link Here
60
<!-- The manual invoice and credit buttons -->
60
<!-- The manual invoice and credit buttons -->
61
<div class="statictabs">
61
<div class="statictabs">
62
<ul>
62
<ul>
63
	<li><a href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=[% borrower.borrowernumber %]">Account</a></li>
63
    <li><a href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=[% patron.borrowernumber %]">Account</a></li>
64
    <li class="active"><a href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% borrower.borrowernumber %]" >Pay fines</a></li>
64
    <li class="active"><a href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% patron.borrowernumber %]" >Pay fines</a></li>
65
	<li><a href="/cgi-bin/koha/members/maninvoice.pl?borrowernumber=[% borrower.borrowernumber %]" >Create manual invoice</a></li>
65
    <li><a href="/cgi-bin/koha/members/maninvoice.pl?borrowernumber=[% patron.borrowernumber %]" >Create manual invoice</a></li>
66
	<li><a href="/cgi-bin/koha/members/mancredit.pl?borrowernumber=[% borrower.borrowernumber %]" >Create manual credit</a></li>
66
    <li><a href="/cgi-bin/koha/members/mancredit.pl?borrowernumber=[% patron.borrowernumber %]" >Create manual credit</a></li>
67
</ul>
67
</ul>
68
<div class="tabs-container">
68
<div class="tabs-container">
69
69
70
[% IF ( accounts ) %]
70
[% IF ( accounts ) %]
71
    <form action="/cgi-bin/koha/members/pay.pl" method="post" id="pay-fines-form">
71
    <form action="/cgi-bin/koha/members/pay.pl" method="post" id="pay-fines-form">
72
	<input type="hidden" name="borrowernumber" id="borrowernumber" value="[% borrower.borrowernumber %]" />
72
    <input type="hidden" name="borrowernumber" id="borrowernumber" value="[% patron.borrowernumber %]" />
73
<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>
73
<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>
74
<table id="finest">
74
<table id="finest">
75
<thead>
75
<thead>
Lines 164-174 function enableCheckboxActions(){ Link Here
164
<input type="submit" id="paycollect" name="paycollect"  value="Pay amount" class="submit" />
164
<input type="submit" id="paycollect" name="paycollect"  value="Pay amount" class="submit" />
165
[% IF CAN_user_updatecharges_writeoff %]<input type="submit" name="woall"  id="woall" value="Write off all" class="submit" />[% END %]
165
[% IF CAN_user_updatecharges_writeoff %]<input type="submit" name="woall"  id="woall" value="Write off all" class="submit" />[% END %]
166
<input type="submit" id="payselected" name="payselected"  value="Pay selected" class="submit" />
166
<input type="submit" id="payselected" name="payselected"  value="Pay selected" class="submit" />
167
<a class="cancel" href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=[% borrower.borrowernumber %]">Cancel</a>
167
<a class="cancel" href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=[% patron.borrowernumber %]">Cancel</a>
168
</fieldset>
168
</fieldset>
169
</form>
169
</form>
170
[% ELSE %]
170
[% ELSE %]
171
    <p>[% borrower.firstname %] [% borrower.surname %] has no outstanding fines.</p>
171
    <p>[% patron.firstname %] [% patron.surname %] has no outstanding fines.</p>
172
[% END %]
172
[% END %]
173
</div></div>
173
</div></div>
174
174
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt (-12 / +12 lines)
Lines 1-7 Link Here
1
[% USE Koha %]
1
[% USE Koha %]
2
[% USE Branches %]
2
[% USE Branches %]
3
[% INCLUDE 'doc-head-open.inc' %]
3
[% INCLUDE 'doc-head-open.inc' %]
4
<title>Koha &rsaquo; Patrons &rsaquo; Collect fine payment for  [% borrower.firstname %] [% borrower.surname %]</title>
4
<title>Koha &rsaquo; Patrons &rsaquo; Collect fine payment for  [% patron.firstname %] [% patron.surname %]</title>
5
[% INCLUDE 'doc-head-close.inc' %]
5
[% INCLUDE 'doc-head-close.inc' %]
6
<script type= "text/javascript">
6
<script type= "text/javascript">
7
//<![CDATA[
7
//<![CDATA[
Lines 66-72 function moneyFormat(textObj) { Link Here
66
<body id="pat_paycollect" class="pat">
66
<body id="pat_paycollect" class="pat">
67
[% INCLUDE 'header.inc' %]
67
[% INCLUDE 'header.inc' %]
68
[% INCLUDE 'patron-search.inc' %]
68
[% INCLUDE 'patron-search.inc' %]
69
<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>
69
<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>
70
70
71
<div id="doc3" class="yui-t2">
71
<div id="doc3" class="yui-t2">
72
72
Lines 80-95 function moneyFormat(textObj) { Link Here
80
<div class="statictabs">
80
<div class="statictabs">
81
<ul>
81
<ul>
82
    <li>
82
    <li>
83
    <a href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=[% borrower.borrowernumber %]">Account</a>
83
    <a href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=[% patron.borrowernumber %]">Account</a>
84
    </li>
84
    </li>
85
    <li class="active">
85
    <li class="active">
86
    <a href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% borrower.borrowernumber %]" >Pay fines</a>
86
    <a href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% patron.borrowernumber %]" >Pay fines</a>
87
    </li>
87
    </li>
88
    <li>
88
    <li>
89
    <a href="/cgi-bin/koha/members/maninvoice.pl?borrowernumber=[% borrower.borrowernumber %]" >Create manual invoice</a>
89
    <a href="/cgi-bin/koha/members/maninvoice.pl?borrowernumber=[% patron.borrowernumber %]" >Create manual invoice</a>
90
    </li>
90
    </li>
91
    <li>
91
    <li>
92
    <a href="/cgi-bin/koha/members/mancredit.pl?borrowernumber=[% borrower.borrowernumber %]" >Create manual credit</a>
92
    <a href="/cgi-bin/koha/members/mancredit.pl?borrowernumber=[% patron.borrowernumber %]" >Create manual credit</a>
93
    </li>
93
    </li>
94
</ul>
94
</ul>
95
<div class="tabs-container">
95
<div class="tabs-container">
Lines 101-107 function moneyFormat(textObj) { Link Here
101
101
102
[% IF ( pay_individual ) %]
102
[% IF ( pay_individual ) %]
103
    <form name="payindivfine" id="payindivfine" method="post" action="/cgi-bin/koha/members/paycollect.pl">
103
    <form name="payindivfine" id="payindivfine" method="post" action="/cgi-bin/koha/members/paycollect.pl">
104
    <input type="hidden" name="borrowernumber" id="borrowernumber" value="[% borrower.borrowernumber %]" />
104
    <input type="hidden" name="borrowernumber" id="borrowernumber" value="[% patron.borrowernumber %]" />
105
    <input type="hidden" name="pay_individual" id="pay_individual" value="[% pay_individual %]" />
105
    <input type="hidden" name="pay_individual" id="pay_individual" value="[% pay_individual %]" />
106
    <input type="hidden" name="itemnumber" id="itemnumber" value="[% itemnumber %]" />
106
    <input type="hidden" name="itemnumber" id="itemnumber" value="[% itemnumber %]" />
107
    <input type="hidden" name="description" id="description" value="[% description %]" />
107
    <input type="hidden" name="description" id="description" value="[% description %]" />
Lines 152-164 function moneyFormat(textObj) { Link Here
152
</fieldset>
152
</fieldset>
153
153
154
    <div class="action"><input type="submit" name="submitbutton" value="Confirm" />
154
    <div class="action"><input type="submit" name="submitbutton" value="Confirm" />
155
        <a class="cancel" href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% borrower.borrowernumber %]">Cancel</a></div>
155
        <a class="cancel" href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% patron.borrowernumber %]">Cancel</a></div>
156
    </form>
156
    </form>
157
[% ELSIF ( writeoff_individual ) %]
157
[% ELSIF ( writeoff_individual ) %]
158
    <form name="woindivfine" id="woindivfine" action="/cgi-bin/koha/members/pay.pl" method="post" >
158
    <form name="woindivfine" id="woindivfine" action="/cgi-bin/koha/members/pay.pl" method="post" >
159
    <fieldset class="rows">
159
    <fieldset class="rows">
160
    <legend>Write off an individual fine</legend>
160
    <legend>Write off an individual fine</legend>
161
    <input type="hidden" name="borrowernumber" id="borrowernumber" value="[% borrower.borrowernumber %]" />
161
    <input type="hidden" name="borrowernumber" id="borrowernumber" value="[% patron.borrowernumber %]" />
162
    <input type="hidden" name="pay_individual" id="pay_individual" value="[% pay_individual %]" />
162
    <input type="hidden" name="pay_individual" id="pay_individual" value="[% pay_individual %]" />
163
    <input type="hidden" name="itemnumber" id="itemnumber" value="[% itemnumber %]" />
163
    <input type="hidden" name="itemnumber" id="itemnumber" value="[% itemnumber %]" />
164
    <input type="hidden" name="description" id="description" value="[% description %]" />
164
    <input type="hidden" name="description" id="description" value="[% description %]" />
Lines 192-203 function moneyFormat(textObj) { Link Here
192
    </table>
192
    </table>
193
    </fieldset>
193
    </fieldset>
194
    <div class="action"><input type="submit" name="confirm_writeoff" id="confirm_writeoff" value="Write off this charge" />
194
    <div class="action"><input type="submit" name="confirm_writeoff" id="confirm_writeoff" value="Write off this charge" />
195
        <a class="cancel" href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% borrower.borrowernumber %]">Cancel</a></div>
195
        <a class="cancel" href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% patron.borrowernumber %]">Cancel</a></div>
196
    </form>
196
    </form>
197
[% ELSE %]
197
[% ELSE %]
198
198
199
    <form name="payfine" id="payfine" method="post" action="/cgi-bin/koha/members/paycollect.pl">
199
    <form name="payfine" id="payfine" method="post" action="/cgi-bin/koha/members/paycollect.pl">
200
    <input type="hidden" name="borrowernumber" id="borrowernumber" value="[% borrower.borrowernumber %]" />
200
    <input type="hidden" name="borrowernumber" id="borrowernumber" value="[% patron.borrowernumber %]" />
201
    <input type="hidden" name="selected_accts" id="selected_accts" value="[% selected_accts %]" />
201
    <input type="hidden" name="selected_accts" id="selected_accts" value="[% selected_accts %]" />
202
    <input type="hidden" name="total" id="total" value="[% total %]" />
202
    <input type="hidden" name="total" id="total" value="[% total %]" />
203
203
Lines 220-226 function moneyFormat(textObj) { Link Here
220
    </ol>
220
    </ol>
221
    </fieldset>
221
    </fieldset>
222
    <div class="action"><input type="submit" name="submitbutton" value="Confirm" />
222
    <div class="action"><input type="submit" name="submitbutton" value="Confirm" />
223
        <a class="cancel" href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=[% borrower.borrowernumber %]">Cancel</a></div>
223
        <a class="cancel" href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=[% patron.borrowernumber %]">Cancel</a></div>
224
    </form>
224
    </form>
225
[% END %]
225
[% END %]
226
</div></div>
226
</div></div>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/printfeercpt.tt (-4 / +5 lines)
Lines 1-7 Link Here
1
[% USE Koha %]
1
[% USE Koha %]
2
[% USE KohaDates %]
2
[% USE KohaDates %]
3
[% USE Branches %]
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.css" />
7
<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/printreceiptinvoice.css" />
7
[% INCLUDE 'slip-print.inc' #printThenClose %]
8
[% INCLUDE 'slip-print.inc' #printThenClose %]
Lines 25-37 Link Here
25
 </tr>
26
 </tr>
26
 <tr>
27
 <tr>
27
    <th colspan=4 class="centerednames">
28
    <th colspan=4 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=4 >
33
    <th colspan=4 >
33
		Received with thanks from  [% firstname %] [% surname %] <br />
34
        Received with thanks from  [% 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/printinvoice.tt (-4 / +5 lines)
Lines 1-6 Link Here
1
[% USE Koha %]
1
[% USE Koha %]
2
[% USE Branches %]
2
[% INCLUDE 'doc-head-open.inc' %]
3
[% INCLUDE 'doc-head-open.inc' %]
3
<title>Print receipt for [% cardnumber %]</title>
4
<title>Print receipt for [% patron.cardnumber %]</title>
4
[% INCLUDE 'doc-head-close.inc' %]
5
[% INCLUDE 'doc-head-close.inc' %]
5
<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/printreceiptinvoice.css" />
6
<link rel="stylesheet" type="text/css" href="[% interface %]/[% theme %]/css/printreceiptinvoice.css" />
6
[% INCLUDE 'slip-print.inc' #printThenClose %]
7
[% INCLUDE 'slip-print.inc' #printThenClose %]
Lines 24-36 Link Here
24
  </tr>
25
  </tr>
25
  <tr>
26
  <tr>
26
    <th colspan="5" class="centerednames">
27
    <th colspan="5" class="centerednames">
27
		[% IF ( branchname ) %]<h2>[% branchname %]</h2>[% END %]
28
        <h2>[% Branches.GetName( patron.branchcode ) %]</h2>
28
	</th>
29
	</th>
29
  </tr>
30
  </tr>
30
  <tr>
31
  <tr>
31
    <th colspan="5" >
32
    <th colspan="5" >
32
        Bill to: [% firstname %] [% surname %] <br />
33
        Bill to: [% patron.firstname %] [% patron.surname %] <br />
33
        Card number: [% cardnumber %]<br />
34
        Card number: [% patron.cardnumber %]<br />
34
	</th>
35
	</th>
35
  </tr>
36
  </tr>
36
  <tr>
37
  <tr>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/purchase-suggestions.tt (-1 / +1 lines)
Lines 37-43 Link Here
37
                <h2>Purchase suggestions</h2>
37
                <h2>Purchase suggestions</h2>
38
38
39
                <div id="toolbar" class="btn-toolbar">
39
                <div id="toolbar" class="btn-toolbar">
40
                    <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>
40
                    <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>
41
                </div>
41
                </div>
42
42
43
                [% IF suggestions %]
43
                [% IF suggestions %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt (-2 / +2 lines)
Lines 53-64 Link Here
53
    <div class="dialog alert">Staff members are not allowed to access patron's checkout history</div>
53
    <div class="dialog alert">Staff members are not allowed to access patron's checkout history</div>
54
[% ELSIF is_anonymous %]
54
[% ELSIF is_anonymous %]
55
    <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>
55
    <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>
56
[% ELSIF ( privacy == 2)  %]
56
[% ELSIF ( patron.privacy == 2)  %]
57
    <div class="dialog message">This patron has set the privacy rules to never keeping a circulation history.</div>
57
    <div class="dialog message">This patron has set the privacy rules to never keeping a circulation history.</div>
58
[% ELSIF ( !loop_reading ) %]
58
[% ELSIF ( !loop_reading ) %]
59
    <div class="dialog message">This patron has no circulation history.</div>
59
    <div class="dialog message">This patron has no circulation history.</div>
60
[% ELSE %]
60
[% ELSE %]
61
<form action="/cgi-bin/koha/members/readingrec.pl" method="get"><input type="hidden" name="borrowernumber" id="borrowernumber" value="[% borrowernumber %]" /></form>
61
<form action="/cgi-bin/koha/members/readingrec.pl" method="get"><input type="hidden" name="borrowernumber" id="borrowernumber" value="[% patron.borrowernumber %]" /></form>
62
62
63
63
64
<div id="tabs" class="toptabs">
64
<div id="tabs" class="toptabs">
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/routing-lists.tt (-2 / +2 lines)
Lines 55-61 Link Here
55
                      </strong>
55
                      </strong>
56
                    </a>
56
                    </a>
57
                    <input type="hidden" name="biblionumber" value="[% biblionumber %]" />
57
                    <input type="hidden" name="biblionumber" value="[% biblionumber %]" />
58
                    <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
58
                    <input type="hidden" name="borrowernumber" value="[% patron.borrowernumber %]" />
59
                  </td>
59
                  </td>
60
                </tr>
60
                </tr>
61
                [% END %]
61
                [% END %]
Lines 65-71 Link Here
65
          [% ELSE %]
65
          [% ELSE %]
66
          <p>Patron does not belong to any subscription routing lists.</p>
66
          <p>Patron does not belong to any subscription routing lists.</p>
67
          <input type="hidden" name="biblionumber" value="[% biblionumber %]" />
67
          <input type="hidden" name="biblionumber" value="[% biblionumber %]" />
68
                    <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
68
                    <input type="hidden" name="borrowernumber" value="[% patron.borrowernumber %]" />
69
                    [% END %]
69
                    [% END %]
70
70
71
</div>
71
</div>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/statistics.tt (-2 / +2 lines)
Lines 28-34 Link Here
28
<div id="breadcrumbs">
28
<div id="breadcrumbs">
29
         <a href="/cgi-bin/koha/mainpage.pl">Home</a>
29
         <a href="/cgi-bin/koha/mainpage.pl">Home</a>
30
&rsaquo; <a href="/cgi-bin/koha/members/members-home.pl">Patrons</a>
30
&rsaquo; <a href="/cgi-bin/koha/members/members-home.pl">Patrons</a>
31
&rsaquo; [% UNLESS blocking_error  %]Statistics for [% firstname %] [% surname %] ([% cardnumber %])[% END %]
31
&rsaquo; [% UNLESS blocking_error  %]Statistics for [% paton.firstname %] [% patron.surname %] ([% patron.cardnumber %])[% END %]
32
</div>
32
</div>
33
33
34
<div id="doc3" class="yui-t1">
34
<div id="doc3" class="yui-t1">
Lines 38-44 Link Here
38
        <div class="yui-b">
38
        <div class="yui-b">
39
        [% INCLUDE 'members-toolbar.inc' %]
39
        [% INCLUDE 'members-toolbar.inc' %]
40
40
41
            <h3>Statistics for [% UNLESS ( I ) %][% title %] [% firstname %] [% END %] [% surname %] ([% cardnumber %])</h3>
41
            <h3>Statistics for [% UNLESS ( I ) %][% patron.title %] [% patron.firstname %] [% END %] [% patron.surname %] ([% patron.cardnumber %])</h3>
42
            [% IF ( datas.size ) %]
42
            [% IF ( datas.size ) %]
43
                <table id="statistics">
43
                <table id="statistics">
44
                <thead>
44
                <thead>
(-)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 174-180 function checkMultiHold() { Link Here
174
    });
174
    });
175
175
176
176
177
[% UNLESS ( borrowernumber || borrowers || noitems ) %]
177
[% UNLESS ( patron || patron.borrowernumber || borrowers || noitems ) %]
178
    [% IF ( CircAutocompl ) %]
178
    [% IF ( CircAutocompl ) %]
179
    $( "#patron" ).autocomplete({
179
    $( "#patron" ).autocomplete({
180
        source: "/cgi-bin/koha/circ/ysearch.pl",
180
        source: "/cgi-bin/koha/circ/ysearch.pl",
Lines 244-250 function checkMultiHold() { Link Here
244
    <h1>Confirm holds</h1>
244
    <h1>Confirm holds</h1>
245
  [% END %]
245
  [% END %]
246
246
247
  [% UNLESS borrowernumber OR noitems %]
247
  [% UNLESS patron OR patron.borrowernumber OR noitems %]
248
    [% IF ( messageborrower ) %]
248
    [% IF ( messageborrower ) %]
249
      <div class="dialog alert"><h3>Patron not found</h3><p>No patron with this name, please, try another</p> </div>
249
      <div class="dialog alert"><h3>Patron not found</h3><p>No patron with this name, please, try another</p> </div>
250
    [% END %]
250
    [% END %]
Lines 277-305 function checkMultiHold() { Link Here
277
      <h3>Cannot place hold</h3>
277
      <h3>Cannot place hold</h3>
278
      <ul>
278
      <ul>
279
        [% IF ( exceeded_maxreserves ) %]
279
        [% IF ( exceeded_maxreserves ) %]
280
          <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>
280
          <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>
281
        [% ELSIF ( exceeded_holds_per_record ) %]
281
        [% ELSIF ( exceeded_holds_per_record ) %]
282
          <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>
282
          <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>
283
        [% ELSIF ( alreadypossession ) %]
283
        [% ELSIF ( alreadypossession ) %]
284
          <li> <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]">[% borrowerfirstname %] [% borrowersurname %]</a> <strong>is already in possession</strong> of one item.</li>
284
          <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>
285
        [% ELSIF ( alreadyreserved ) %]
285
        [% ELSIF ( alreadyreserved ) %]
286
          <li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]">[% borrowerfirstname %] [% borrowersurname %]</a> <strong>already has a hold</strong> on this item.</li>
286
          <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>
287
        [% ELSIF ( ageRestricted ) %]
287
        [% ELSIF ( ageRestricted ) %]
288
          <li><strong>Age restricted</strong></li>
288
          <li><strong>Age restricted</strong></li>
289
        [% ELSIF ( none_available ) %]
289
        [% ELSIF ( none_available ) %]
290
          <li> <strong>No items are available</strong> to be placed on hold.</li>
290
          <li> <strong>No items are available</strong> to be placed on hold.</li>
291
        [% ELSIF ( maxreserves ) %]
291
        [% ELSIF ( maxreserves ) %]
292
          <li><strong>Too many holds: </strong> <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]">[% borrowerfirstname %] [% borrowersurname %] </a> has too many holds.</li>
292
          <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>
293
        [% END %]
293
        [% END %]
294
      </ul>
294
      </ul>
295
    [% ELSE %]
295
    [% ELSE %]
296
        <h3>Cannot place hold on some items</h3>
296
        <h3>Cannot place hold on some items</h3>
297
        [% IF ( exceeded_maxreserves ) %]
297
        [% IF ( exceeded_maxreserves ) %]
298
          <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>
298
          <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>
299
        [% ELSIF ( exceeded_holds_per_record ) %]
299
        [% ELSIF ( exceeded_holds_per_record ) %]
300
            [% FOREACH biblioloo IN biblioloop %]
300
            [% FOREACH biblioloo IN biblioloop %]
301
                [% IF (biblioloo.tooManyHoldsForThisRecord) %]
301
                [% IF (biblioloo.tooManyHoldsForThisRecord) %]
302
                    <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>
302
                    <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>
303
                [% END %]
303
                [% END %]
304
            [% END %]
304
            [% END %]
305
        [% END %]
305
        [% END %]
Lines 308-329 function checkMultiHold() { Link Here
308
    </div>
308
    </div>
309
[% END %]
309
[% END %]
310
310
311
[% IF ( expiry || diffbranch || restricted || ( amount_outstanding && Koha.Preference('maxoutstanding') && amount_outstanding > Koha.Preference('maxoutstanding') ) ) %]
311
[% IF ( expiry || diffbranch || patron.is_debarred || ( amount_outstanding && Koha.Preference('maxoutstanding') && amount_outstanding > Koha.Preference('maxoutstanding') ) ) %]
312
<div class="dialog message"><ul>
312
<div class="dialog message"><ul>
313
    [% IF ( expiry ) %]
313
    [% IF ( expiry ) %]
314
    <li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]">[% borrowerfirstname %] [% borrowersurname %]</a>: <strong>Account has expired</strong></li>
314
    <li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber %]">[% patron.firstname %] [% patron,surname %]</a>: <strong>Account has expired</strong></li>
315
    [% END %]
315
    [% END %]
316
316
317
    [% IF restricted %]
317
    [% IF patron.is_debarred %]
318
    <li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]#reldebarments">[% borrowerfirstname %] [% borrowersurname %]</a>: <strong>Patron has restrictions</strong></li>
318
    <li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber %]#reldebarments">[% patron.firstname %] [% patron.surname %]</a>: <strong>Patron has restrictions</strong></li>
319
    [% END %]
319
    [% END %]
320
320
321
    [% IF amount_outstanding && Koha.Preference('maxoutstanding') && amount_outstanding > Koha.Preference('maxoutstanding') %]
321
    [% IF amount_outstanding && Koha.Preference('maxoutstanding') && amount_outstanding > Koha.Preference('maxoutstanding') %]
322
    <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>
322
    <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>
323
    [% END %]
323
    [% END %]
324
324
325
    [% IF ( diffbranch ) %]
325
    [% IF ( diffbranch ) %]
326
    <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: ([% borrower_branchname %] / [% borrower_branchcode %] )</li>
326
    <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>
327
    [% END %]
327
    [% END %]
328
328
329
</ul></div>
329
</ul></div>
Lines 341-347 function checkMultiHold() { Link Here
341
            <form action="placerequest.pl" method="post" onsubmit="return checkMultiHold();" name="form">
341
            <form action="placerequest.pl" method="post" onsubmit="return checkMultiHold();" name="form">
342
        [% END %]
342
        [% END %]
343
343
344
        <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
344
        <input type="hidden" name="borrowernumber" value="[% patron.borrowernumber %]" />
345
        <input type="hidden" name="type" value="str8" />
345
        <input type="hidden" name="type" value="str8" />
346
346
347
        [% IF ( multi_hold ) %]
347
        [% IF ( multi_hold ) %]
Lines 360-367 function checkMultiHold() { Link Here
360
        [% END %]
360
        [% END %]
361
361
362
       <ol> <li><span class="label">Patron:</span>
362
       <ol> <li><span class="label">Patron:</span>
363
            [% IF ( borrowernumber ) %]
363
            [% IF ( patron.borrowernumber ) %]
364
                <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]">[% borrowerfirstname %] [% borrowersurname %] ([% cardnumber %])</a>
364
                <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber %]">[% patron.firstname %] [% patron.surname %] ([% cardnumber %])</a>
365
            [% ELSE %]
365
            [% ELSE %]
366
                Not defined yet
366
                Not defined yet
367
            [% END %]
367
            [% END %]
Lines 438-444 function checkMultiHold() { Link Here
438
</ol>
438
</ol>
439
   [% UNLESS ( multi_hold ) %]
439
   [% UNLESS ( multi_hold ) %]
440
        <fieldset class="action">
440
        <fieldset class="action">
441
            [% IF ( borrowernumber ) %]
441
            [% IF ( patron.borrowernumber ) %]
442
                [% IF ( override_required ) %]
442
                [% IF ( override_required ) %]
443
                    <input type="submit" class="warning" value="Place hold" />
443
                    <input type="submit" class="warning" value="Place hold" />
444
                [% ELSIF ( none_available ) %]
444
                [% ELSIF ( none_available ) %]
Lines 576-584 function checkMultiHold() { Link Here
576
                            Can't be cancelled when item is in transit
576
                            Can't be cancelled when item is in transit
577
                    [% ELSE %]
577
                    [% ELSE %]
578
                    [% IF ( itemloo.waitingdate ) %]Waiting[% ELSE %]On hold[% END %]
578
                    [% IF ( itemloo.waitingdate ) %]Waiting[% ELSE %]On hold[% END %]
579
                    [% 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 ) %]
579
                    [% 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 ) %]
580
                    since
580
                    since
581
                    [% 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>
581
                    [% 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>
582
582
583
                    [% END %]
583
                    [% END %]
584
                [% ELSE %]
584
                [% ELSE %]
Lines 649-655 function checkMultiHold() { Link Here
649
            [% END %]
649
            [% END %]
650
650
651
          [% IF ( biblioloo.alreadyres ) %]
651
          [% IF ( biblioloo.alreadyres ) %]
652
              <li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]">[% borrowerfirstname %] [% borrowersurname %]</a> <strong>already has a hold</strong> on this item </li>
652
              <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>
653
          [% END %]
653
          [% END %]
654
          [% IF ( biblioloo.none_avail ) %]
654
          [% IF ( biblioloo.none_avail ) %]
655
              <li> <strong>No items are available</strong> to be placed on hold</li>
655
              <li> <strong>No items are available</strong> to be placed on hold</li>
Lines 671-677 function checkMultiHold() { Link Here
671
  [% END %]<!-- /multi_hold -->
671
  [% END %]<!-- /multi_hold -->
672
672
673
    <fieldset class="action">
673
    <fieldset class="action">
674
        [% IF ( borrowernumber ) %]
674
        [% IF ( patron AND patron.borrowernumber ) %]
675
            [% IF ( override_required ) %]
675
            [% IF ( override_required ) %]
676
                <input type="submit" class="warning" value="Place hold" />
676
                <input type="submit" class="warning" value="Place hold" />
677
            [% ELSIF ( none_available ) %]
677
            [% ELSIF ( none_available ) %]
Lines 685-691 function checkMultiHold() { Link Here
685
	</fieldset>
685
	</fieldset>
686
[% END %]
686
[% END %]
687
687
688
[% UNLESS ( borrowernumber ) %]
688
[% UNLESS ( patron ) %]
689
[% IF ( reserveloop ) %]
689
[% IF ( reserveloop ) %]
690
<form name="T[% time %]" action="modrequest.pl" method="post">
690
<form name="T[% time %]" action="modrequest.pl" method="post">
691
  [% IF ( multi_hold ) %]
691
  [% IF ( multi_hold ) %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/reviews/reviewswaiting.tt (-1 / +1 lines)
Lines 44-50 Link Here
44
    <tbody>[% FOREACH review IN reviews %]
44
    <tbody>[% FOREACH review IN reviews %]
45
    <tr>
45
    <tr>
46
        <td>
46
        <td>
47
            [% IF ( review.borrowernumber ) %]<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% review.borrowernumber %]">[% review.surname %], [% review.firstname %]</a>[% ELSE %](deleted patron)[% END %]
47
            [% 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 %]
48
        </td>
48
        </td>
49
        <td>
49
        <td>
50
            <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% review.biblionumber %]">[% review.bibliotitle %]</a>
50
            <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 208-220 Link Here
208
                                <tr>
208
                                <tr>
209
                                    <td>[% loopro.timestamp %]</td>
209
                                    <td>[% loopro.timestamp %]</td>
210
                                    <td>
210
                                    <td>
211
                                        <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>
211
                                        [% IF loopro.librarian %]
212
                                            <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>
213
                                        [% ELSE %]
214
                                            [% loopro.user %]
215
                                        [% END %]
212
                                    </td>
216
                                    </td>
213
                                    <td>[% PROCESS translate_log_module module=loopro.module %]</td>
217
                                    <td>[% PROCESS translate_log_module module=loopro.module %]</td>
214
                                    <td>[% PROCESS translate_log_action action=loopro.action %]</td>
218
                                    <td>[% PROCESS translate_log_action action=loopro.action %]</td>
215
                                    <td>
219
                                    <td>
216
                                        [% IF ( loopro.module == 'MEMBERS' ) || ( loopro.module == 'CIRCULATION' ) || ( loopro.module == 'FINES' ) %]
220
                                        [% IF ( loopro.module == 'MEMBERS' ) || ( loopro.module == 'CIRCULATION' ) || ( loopro.module == 'FINES' ) %]
217
                                             <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>
221
                                            [% IF loopro.patron %]
222
                                                <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>
223
                                            [% ELSE %]
224
                                                [% loopro.object %]
225
                                            [% END %]
218
                                        [% ELSE %]
226
                                        [% ELSE %]
219
                                                [% IF ( loopro.module == 'CATALOGUING' ) %]
227
                                                [% IF ( loopro.module == 'CATALOGUING' ) %]
220
                                                    [% IF ( loopro.info.substr(0, 4) == 'item' ) %]
228
                                                    [% IF ( loopro.info.substr(0, 4) == 'item' ) %]
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt (-5 / +5 lines)
Lines 930-944 Link Here
930
                                                    [% END %]
930
                                                    [% END %]
931
                                                    [% SWITCH ShowReviewer %]
931
                                                    [% SWITCH ShowReviewer %]
932
                                                    [% CASE 'full' %]
932
                                                    [% CASE 'full' %]
933
                                                        <h5>Comment by [% review.title %] [% review.firstname %] [% review.surname %]</h5>
933
                                                        <h5>Comment by [% review.patron.title %] [% review.patron.firstname %] [% review.patron.surname %]</h5>
934
                                                    [% CASE 'first' %]
934
                                                    [% CASE 'first' %]
935
                                                        <h5>Comment by [% review.firstname %]</h5>
935
                                                        <h5>Comment by [% review.patron.firstname %]</h5>
936
                                                    [% CASE 'surname' %]
936
                                                    [% CASE 'surname' %]
937
                                                        <h5>Comment by [% review.surname %]</h5>
937
                                                        <h5>Comment by [% review.patron.surname %]</h5>
938
                                                    [% CASE 'firstandinitial' %]
938
                                                    [% CASE 'firstandinitial' %]
939
                                                        <h5>Comment by [% review.firstname %] [% review.surname|truncate(2,'.') %]</h5>
939
                                                        <h5>Comment by [% review.patron.firstname %] [% review.patron.surname|truncate(2,'.') %]</h5>
940
                                                    [% CASE 'username' %]
940
                                                    [% CASE 'username' %]
941
                                                        <h5>Comment by [% review.userid %]</h5>
941
                                                        <h5>Comment by [% review.patron.userid %]</h5>
942
                                                    [% END %]
942
                                                    [% END %]
943
                                                    <small>[% review.datereviewed | $KohaDates %]</small>
943
                                                    <small>[% review.datereviewed | $KohaDates %]</small>
944
                                                [% ELSIF ( ShowReviewer == "none") %]
944
                                                [% ELSIF ( ShowReviewer == "none") %]
(-)a/members/boraccount.pl (-3 / +1 lines)
Lines 105-115 if (C4::Context->preference('ExtendedPatronAttributes')) { Link Here
105
    );
105
    );
106
}
106
}
107
107
108
$template->param(%{ $patron->unblessed });
109
110
$template->param(
108
$template->param(
109
    patron              => $patron,
111
    finesview           => 1,
110
    finesview           => 1,
112
    borrowernumber      => $borrowernumber,
113
    total               => sprintf("%.2f",$total),
111
    total               => sprintf("%.2f",$total),
114
    totalcredit         => $totalcredit,
112
    totalcredit         => $totalcredit,
115
    is_child            => ($patron->category->category_type eq 'C'),
113
    is_child            => ($patron->category->category_type eq 'C'),
(-)a/members/deletemem.pl (-17 / +1 lines)
Lines 114-136 if ( $op eq 'delete_confirm' or $countissues > 0 or $flags->{'CHARGES'} or $is_ Link Here
114
    $template->param( adultborrower => 1 ) if $patron->category->category_type =~ /^(A|I)$/;
114
    $template->param( adultborrower => 1 ) if $patron->category->category_type =~ /^(A|I)$/;
115
115
116
    $template->param(
116
    $template->param(
117
        # FIXME The patron object should be passed to the template
117
        patron => $patron,
118
        borrowernumber => $patron->borrowernumber,
119
        surname => $patron->surname,
120
        title => $patron->title,
121
        cardnumber => $patron->cardnumber,
122
        firstname => $patron->firstname,
123
        categorycode => $patron->categorycode,
124
        category_type => $patron->category->category_type,
125
        categoryname  => $patron->category->description,
126
        address => $patron->address,
127
        address2 => $patron->address2,
128
        city => $patron->city,
129
        zipcode => $patron->zipcode,
130
        country => $patron->country,
131
        phone => $patron->phone,
132
        email => $patron->email,
133
        branchcode => $patron->branchcode,
134
        RoutingSerials => C4::Context->preference('RoutingSerials'),
118
        RoutingSerials => C4::Context->preference('RoutingSerials'),
135
    );
119
    );
136
    if ($countissues >0) {
120
    if ($countissues >0) {
(-)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 (-2 / +1 lines)
Lines 68-74 if ( $op eq 'download' ) { Link Here
68
    print $file->{'file_content'};
68
    print $file->{'file_content'};
69
}
69
}
70
else {
70
else {
71
    $template->param(%{ $patron->unblessed});
71
    $template->param( patron => $patron );
72
72
73
    my %errors;
73
    my %errors;
74
74
Lines 106-112 else { Link Here
106
    }
106
    }
107
107
108
    $template->param(
108
    $template->param(
109
        categoryname    => $patron->category->description,
110
        RoutingSerials => C4::Context->preference('RoutingSerials'),
109
        RoutingSerials => C4::Context->preference('RoutingSerials'),
111
    );
110
    );
112
111
(-)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 93-104 if ($add){ Link Here
93
        );
93
        );
94
    }
94
    }
95
95
96
    $template->param(%{ $patron->unblessed});
96
    $template->param( patron => $patron );
97
97
98
    $template->param(
98
    $template->param(
99
        finesview      => 1,
99
        finesview      => 1,
100
        borrowernumber => $borrowernumber,
101
        categoryname   => $patron->category->description,
102
        is_child       => ($patron->category->category_type eq 'C'), # FIXME is_child should be a Koha::Patron method
100
        is_child       => ($patron->category->category_type eq 'C'), # FIXME is_child should be a Koha::Patron method
103
        RoutingSerials => C4::Context->preference('RoutingSerials'),
101
        RoutingSerials => C4::Context->preference('RoutingSerials'),
104
        );
102
        );
(-)a/members/maninvoice.pl (-4 / +1 lines)
Lines 91-97 if ($add){ Link Here
91
    });
91
    });
92
92
93
    my $logged_in_user = Koha::Patrons->find( $loggedinuser ) or die "Not logged in";
93
    my $logged_in_user = Koha::Patrons->find( $loggedinuser ) or die "Not logged in";
94
    my $patron         = Koha::Patrons->find($borrowernumber);
95
    output_and_exit_if_error( $input, $cookie, $template, { module => 'members', logged_in_user => $logged_in_user, current_patron => $patron } );
94
    output_and_exit_if_error( $input, $cookie, $template, { module => 'members', logged_in_user => $logged_in_user, current_patron => $patron } );
96
95
97
  # get authorised values with type of MANUAL_INV
96
  # get authorised values with type of MANUAL_INV
Lines 121-131 if ($add){ Link Here
121
        );
120
        );
122
    }
121
    }
123
122
124
    $template->param(%{ $patron->unblessed });
125
    $template->param(
123
    $template->param(
124
        patron         => $patron,
126
        finesview      => 1,
125
        finesview      => 1,
127
        borrowernumber => $borrowernumber,
128
        categoryname   => $patron->category->description,
129
        is_child       => ($patron->category->category_type eq 'C'),
126
        is_child       => ($patron->category->category_type eq 'C'),
130
        RoutingSerials => C4::Context->preference('RoutingSerials'),
127
        RoutingSerials => C4::Context->preference('RoutingSerials'),
131
    );
128
    );
(-)a/members/member-flags.pl (-21 / +1 lines)
Lines 196-222 if (C4::Context->preference('ExtendedPatronAttributes')) { Link Here
196
}
196
}
197
197
198
$template->param(
198
$template->param(
199
		borrowernumber => $bor->{'borrowernumber'},
199
    patron => $patron,
200
    cardnumber => $bor->{'cardnumber'},
201
		surname => $bor->{'surname'},
202
		firstname => $bor->{'firstname'},
203
        othernames => $bor->{'othernames'},
204
		categorycode => $bor->{'categorycode'},
205
		category_type => $category_type,
206
		categoryname => $bor->{'description'},
207
        address => $bor->{address},
208
		address2 => $bor->{'address2'},
209
        streettype => $bor->{streettype},
210
		city => $bor->{'city'},
211
        state => $bor->{'state'},
212
		zipcode => $bor->{'zipcode'},
213
		country => $bor->{'country'},
214
		phone => $bor->{'phone'},
215
        phonepro => $bor->{'phonepro'},
216
        mobile => $bor->{'mobile'},
217
		email => $bor->{'email'},
218
        emailpro => $bor->{'emailpro'},
219
		branchcode => $bor->{'branchcode'},
220
		loop => \@loop,
200
		loop => \@loop,
221
		is_child        => ($category_type eq 'C'),
201
		is_child        => ($category_type eq 'C'),
222
        RoutingSerials => C4::Context->preference('RoutingSerials'),
202
        RoutingSerials => C4::Context->preference('RoutingSerials'),
(-)a/members/member-password.pl (-23 / +1 lines)
Lines 120-148 if ( C4::Context->preference('ExtendedPatronAttributes') ) { Link Here
120
}
120
}
121
121
122
$template->param(
122
$template->param(
123
    othernames                 => $bor->{'othernames'},
123
    patron                     => $patron,
124
    surname                    => $bor->{'surname'},
125
    firstname                  => $bor->{'firstname'},
126
    borrowernumber             => $bor->{'borrowernumber'},
127
    cardnumber                 => $bor->{'cardnumber'},
128
    categorycode               => $bor->{'categorycode'},
129
    category_type              => $category_type,
130
    categoryname               => $bor->{'description'},
131
    address                    => $bor->{address},
132
    address2                   => $bor->{'address2'},
133
    streettype                 => $bor->{streettype},
134
    city                       => $bor->{'city'},
135
    state                      => $bor->{'state'},
136
    zipcode                    => $bor->{'zipcode'},
137
    country                    => $bor->{'country'},
138
    phone                      => $bor->{'phone'},
139
    phonepro                   => $bor->{'phonepro'},
140
    streetnumber               => $bor->{'streetnumber'},
141
    mobile                     => $bor->{'mobile'},
142
    email                      => $bor->{'email'},
143
    emailpro                   => $bor->{'emailpro'},
144
    branchcode                 => $bor->{'branchcode'},
145
    userid                     => $bor->{'userid'},
146
    destination                => $destination,
124
    destination                => $destination,
147
    is_child                   => ( $category_type eq 'C' ),
125
    is_child                   => ( $category_type eq 'C' ),
148
    minPasswordLength          => $minpw,
126
    minPasswordLength          => $minpw,
(-)a/members/moremember.pl (-10 / +5 lines)
Lines 137-143 my $category_type = $patron->category->category_type; Link Here
137
my $data = $patron->unblessed;
137
my $data = $patron->unblessed;
138
138
139
$debug and printf STDERR "dates (enrolled,expiry,birthdate) raw: (%s, %s, %s)\n", map {$data->{$_}} qw(dateenrolled dateexpiry dateofbirth);
139
$debug and printf STDERR "dates (enrolled,expiry,birthdate) raw: (%s, %s, %s)\n", map {$data->{$_}} qw(dateenrolled dateexpiry dateofbirth);
140
foreach (qw(dateenrolled dateexpiry dateofbirth)) {
140
foreach (qw(dateenrolled dateexpiry dateofbirth)) { # FIXME This should be removed
141
    my $userdate = $data->{$_};
141
    my $userdate = $data->{$_};
142
    unless ($userdate) {
142
    unless ($userdate) {
143
        $debug and warn sprintf "Empty \$data{%12s}", $_;
143
        $debug and warn sprintf "Empty \$data{%12s}", $_;
Lines 154-160 for (qw(gonenoaddress lost borrowernotes)) { Link Here
154
154
155
if ( $patron->is_debarred ) {
155
if ( $patron->is_debarred ) {
156
    $template->param(
156
    $template->param(
157
        userdebarred => 1,
157
        userdebarred => 1, # FIXME Template should use patron->is_debarred
158
        flagged => 1,
158
        flagged => 1,
159
        debarments => GetDebarments({ borrowernumber => $borrowernumber }),
159
        debarments => GetDebarments({ borrowernumber => $borrowernumber }),
160
    );
160
    );
Lines 214-220 else { Link Here
214
    $samebranch = 1;
214
    $samebranch = 1;
215
}
215
}
216
my $library = Koha::Libraries->find( $data->{branchcode})->unblessed;
216
my $library = Koha::Libraries->find( $data->{branchcode})->unblessed;
217
@{$data}{keys %$library} = values %$library; # merge in all branch columns
217
@{$data}{keys %$library} = values %$library; # merge in all branch columns # FIXME This is really ugly, we should pass the library instead
218
218
219
my ( $total, $accts, $numaccts) = GetMemberAccountRecords( $borrowernumber );
219
my ( $total, $accts, $numaccts) = GetMemberAccountRecords( $borrowernumber );
220
220
Lines 232-238 if ($print eq "page") { Link Here
232
}
232
}
233
233
234
# Show OPAC privacy preference is system preference is set
234
# Show OPAC privacy preference is system preference is set
235
if ( C4::Context->preference('OPACPrivacy') ) {
235
if ( C4::Context->preference('OPACPrivacy') ) { # FIXME Should be moved the the template
236
    $template->param( OPACPrivacy => 1);
236
    $template->param( OPACPrivacy => 1);
237
    $template->param( "privacy".$data->{'privacy'} => 1);
237
    $template->param( "privacy".$data->{'privacy'} => 1);
238
}
238
}
Lines 283-289 $template->param( Link Here
283
);
283
);
284
284
285
285
286
$template->param(%$data);
286
$template->param(%$data); # FIXME This should be removed and used $patron instead, but too many things are processed above
287
287
288
if (C4::Context->preference('ExtendedPatronAttributes')) {
288
if (C4::Context->preference('ExtendedPatronAttributes')) {
289
    my $attributes = C4::Members::Attributes::GetBorrowerAttributes($borrowernumber);
289
    my $attributes = C4::Members::Attributes::GetBorrowerAttributes($borrowernumber);
Lines 321-327 if (C4::Context->preference('EnhancedMessagingPreferences')) { Link Here
321
    C4::Form::MessagingPreferences::set_form_values({ borrowernumber => $borrowernumber }, $template);
321
    C4::Form::MessagingPreferences::set_form_values({ borrowernumber => $borrowernumber }, $template);
322
    $template->param(messaging_form_inactive => 1);
322
    $template->param(messaging_form_inactive => 1);
323
    $template->param(SMSSendDriver => C4::Context->preference("SMSSendDriver"));
323
    $template->param(SMSSendDriver => C4::Context->preference("SMSSendDriver"));
324
    $template->param(SMSnumber     => $data->{'smsalertnumber'});
325
    $template->param(TalkingTechItivaPhone => C4::Context->preference("TalkingTechItivaPhoneNotification"));
324
    $template->param(TalkingTechItivaPhone => C4::Context->preference("TalkingTechItivaPhoneNotification"));
326
}
325
}
327
326
Lines 341-349 $template->param( Link Here
341
    patron          => $patron,
340
    patron          => $patron,
342
    translated_language => $translated_language,
341
    translated_language => $translated_language,
343
    detailview      => 1,
342
    detailview      => 1,
344
    borrowernumber  => $borrowernumber,
345
    othernames      => $data->{'othernames'},
346
    categoryname    => $data->{'description'},
347
    was_renewed     => scalar $input->param('was_renewed') ? 1 : 0,
343
    was_renewed     => scalar $input->param('was_renewed') ? 1 : 0,
348
    todaysdate      => output_pref({ dt => dt_from_string, dateformat => 'iso', dateonly => 1 }),
344
    todaysdate      => output_pref({ dt => dt_from_string, dateformat => 'iso', dateonly => 1 }),
349
    totalprice      => sprintf("%.2f", $totalprice),
345
    totalprice      => sprintf("%.2f", $totalprice),
Lines 355-361 $template->param( Link Here
355
    samebranch      => $samebranch,
351
    samebranch      => $samebranch,
356
    quickslip       => $quickslip,
352
    quickslip       => $quickslip,
357
    housebound_role => scalar $patron->housebound_role,
353
    housebound_role => scalar $patron->housebound_role,
358
    privacy_guarantor_checkouts => $data->{'privacy_guarantor_checkouts'},
359
    AutoResumeSuspendedHolds => C4::Context->preference('AutoResumeSuspendedHolds'),
354
    AutoResumeSuspendedHolds => C4::Context->preference('AutoResumeSuspendedHolds'),
360
    SuspendHoldsIntranet => C4::Context->preference('SuspendHoldsIntranet'),
355
    SuspendHoldsIntranet => C4::Context->preference('SuspendHoldsIntranet'),
361
    RoutingSerials => C4::Context->preference('RoutingSerials'),
356
    RoutingSerials => C4::Context->preference('RoutingSerials'),
(-)a/members/notices.pl (-3 / +1 lines)
Lines 48-54 my ($template, $loggedinuser, $cookie) Link Here
48
my $logged_in_user = Koha::Patrons->find( $loggedinuser ) or die "Not logged in";
48
my $logged_in_user = Koha::Patrons->find( $loggedinuser ) or die "Not logged in";
49
output_and_exit_if_error( $input, $cookie, $template, { module => 'members', logged_in_user => $logged_in_user, current_patron => $patron } );
49
output_and_exit_if_error( $input, $cookie, $template, { module => 'members', logged_in_user => $logged_in_user, current_patron => $patron } );
50
50
51
$template->param( $borrower );
52
$template->param( picture => 1 ) if $patron->image;
51
$template->param( picture => 1 ) if $patron->image;
53
52
54
# Allow resending of messages in Notices tab
53
# Allow resending of messages in Notices tab
Lines 74-86 if (C4::Context->preference('ExtendedPatronAttributes')) { Link Here
74
    );
73
    );
75
}
74
}
76
75
77
$template->param(%$borrower);
78
$template->param( adultborrower => 1 ) if ( $borrower->{category_type} eq 'A' || $borrower->{category_type} eq 'I' );
76
$template->param( adultborrower => 1 ) if ( $borrower->{category_type} eq 'A' || $borrower->{category_type} eq 'I' );
79
$template->param(
77
$template->param(
78
    patron             => $patron,
80
    QUEUED_MESSAGES    => $queued_messages,
79
    QUEUED_MESSAGES    => $queued_messages,
81
    borrowernumber     => $borrowernumber,
80
    borrowernumber     => $borrowernumber,
82
    sentnotices        => 1,
81
    sentnotices        => 1,
83
    categoryname       => $patron->category->description,
84
    RoutingSerials => C4::Context->preference('RoutingSerials'),
82
    RoutingSerials => C4::Context->preference('RoutingSerials'),
85
);
83
);
86
output_html_with_http_headers $input, $cookie, $template->output;
84
output_html_with_http_headers $input, $cookie, $template->output;
(-)a/members/pay.pl (-10 / +3 lines)
Lines 68-80 if ( !$borrowernumber ) { Link Here
68
68
69
# get borrower details
69
# get borrower details
70
my $logged_in_user = Koha::Patrons->find( $loggedinuser ) or die "Not logged in";
70
my $logged_in_user = Koha::Patrons->find( $loggedinuser ) or die "Not logged in";
71
my $patron         = Koha::Patrons->find($borrowernumber);
71
our $patron         = Koha::Patrons->find($borrowernumber);
72
output_and_exit_if_error( $input, $cookie, $template, { module => 'members', logged_in_user => $logged_in_user, current_patron => $patron } );
72
output_and_exit_if_error( $input, $cookie, $template, { module => 'members', logged_in_user => $logged_in_user, current_patron => $patron } );
73
73
74
my $category = $patron->category;
75
our $borrower = $patron->unblessed;
76
$borrower->{description} = $category->description;
77
$borrower->{category_type} = $category->category_type;
78
our $user = $input->remote_user;
74
our $user = $input->remote_user;
79
$user ||= q{};
75
$user ||= q{};
80
76
Lines 148-163 sub add_accounts_to_template { Link Here
148
              };
144
              };
149
        }
145
        }
150
    }
146
    }
151
    borrower_add_additional_fields($borrower);
147
    borrower_add_additional_fields($patron->unblessed);
152
153
    $template->param(%$borrower);
154
148
155
    my $patron_image = Koha::Patron::Images->find($borrower->{borrowernumber});
149
    my $patron_image = Koha::Patron::Images->find($borrower->{borrowernumber});
156
    $template->param( picture => 1 ) if $patron_image;
150
    $template->param( picture => 1 ) if $patron_image;
157
    $template->param(
151
    $template->param(
158
        accounts => $accounts,
152
        accounts => $accounts,
159
        borrower => $borrower,
153
        patron   => $patron,
160
        categoryname => $borrower->{'description'},
161
        total    => $total,
154
        total    => $total,
162
    );
155
    );
163
    return;
156
    return;
(-)a/members/paycollect.pl (-4 / +1 lines)
Lines 56-63 output_and_exit_if_error( $input, $cookie, $template, { module => 'members', log Link Here
56
56
57
my $borrower       = $patron->unblessed;
57
my $borrower       = $patron->unblessed;
58
my $category       = $patron->category;
58
my $category       = $patron->category;
59
$borrower->{description} = $category->description;
60
$borrower->{category_type} = $category->category_type;
61
my $user           = $input->remote_user;
59
my $user           = $input->remote_user;
62
60
63
my $branch         = C4::Context->userenv->{'branch'};
61
my $branch         = C4::Context->userenv->{'branch'};
Lines 181-188 $template->param(%$borrower); Link Here
181
179
182
$template->param(
180
$template->param(
183
    borrowernumber => $borrowernumber,    # some templates require global
181
    borrowernumber => $borrowernumber,    # some templates require global
184
    borrower      => $borrower,
182
    patron        => $patron,
185
    categoryname  => $borrower->{description},
186
    total         => $total_due,
183
    total         => $total_due,
187
    RoutingSerials => C4::Context->preference('RoutingSerials'),
184
    RoutingSerials => C4::Context->preference('RoutingSerials'),
188
    ExtendedPatronAttributes => C4::Context->preference('ExtendedPatronAttributes'),
185
    ExtendedPatronAttributes => C4::Context->preference('ExtendedPatronAttributes'),
(-)a/members/printfeercpt.pl (-22 / +4 lines)
Lines 55-69 my $patron = Koha::Patrons->find( $borrowernumber ); Link Here
55
output_and_exit_if_error( $input, $cookie, $template, { module => 'members', logged_in_user => $logged_in_user, current_patron => $patron } );
55
output_and_exit_if_error( $input, $cookie, $template, { module => 'members', logged_in_user => $logged_in_user, current_patron => $patron } );
56
56
57
my $category = $patron->category;
57
my $category = $patron->category;
58
my $data = $patron->unblessed;
59
$data->{description} = $category->description;
60
$data->{category_type} = $category->category_type;
61
58
62
if ( $action eq 'print' ) {
59
if ( $action eq 'print' ) {
63
#  ReversePayment( $borrowernumber, $input->param('accountno') );
60
#  ReversePayment( $borrowernumber, $input->param('accountno') );
64
}
61
}
65
62
66
if ( $data->{'category_type'} eq 'C') {
63
if ( $category->category_type eq 'C') {
67
    my $patron_categories = Koha::Patron::Categories->search_limited({ category_type => 'A' }, {order_by => ['categorycode']});
64
    my $patron_categories = Koha::Patron::Categories->search_limited({ category_type => 'A' }, {order_by => ['categorycode']});
68
    $template->param( 'CATCODE_MULTI' => 1) if $patron_categories->count > 1;
65
    $template->param( 'CATCODE_MULTI' => 1) if $patron_categories->count > 1;
69
    $template->param( 'catcode' => $patron_categories->next )  if $patron_categories->count == 1;
66
    $template->param( 'catcode' => $patron_categories->next )  if $patron_categories->count == 1;
Lines 118-148 for (my $i=0;$i<$numaccts;$i++){ Link Here
118
    push(@accountrows, \%row);
115
    push(@accountrows, \%row);
119
}
116
}
120
117
121
$template->param( adultborrower => 1 ) if ( $data->{'category_type'} eq 'A' || $data->{'category_type'} eq 'I' );
118
$template->param( adultborrower => 1 ) if ( $category->category_type eq 'A' || $category->category_type eq 'I' );
122
119
123
$template->param( picture => 1 ) if $patron->image;
120
$template->param( picture => 1 ) if $patron->image;
124
121
125
$template->param(
122
$template->param(
123
    patron               => $patron,
126
    finesview           => 1,
124
    finesview           => 1,
127
    firstname           => $data->{'firstname'},
128
    surname             => $data->{'surname'},
129
    borrowernumber      => $borrowernumber,
130
    cardnumber          => $data->{'cardnumber'},
131
    categorycode        => $data->{'categorycode'},
132
    category_type       => $data->{'category_type'},
133
 #   category_description => $data->{'description'},
134
    categoryname		 => $data->{'description'},
135
    address             => $data->{'address'},
136
    address2            => $data->{'address2'},
137
    city                => $data->{'city'},
138
    zipcode             => $data->{'zipcode'},
139
    country             => $data->{'country'},
140
    phone               => $data->{'phone'},
141
    email               => $data->{'email'},
142
    branchcode          => $data->{'branchcode'},
143
    total               => sprintf("%.2f",$total),
125
    total               => sprintf("%.2f",$total),
144
    totalcredit         => $totalcredit,
126
    totalcredit         => $totalcredit,
145
	is_child        => ($data->{'category_type'} eq 'C'),
127
    is_child            => ($category->category_type eq 'C'),
146
    accounts            => \@accountrows );
128
    accounts            => \@accountrows );
147
129
148
output_html_with_http_headers $input, $cookie, $template->output;
130
output_html_with_http_headers $input, $cookie, $template->output;
(-)a/members/printinvoice.pl (-21 / +4 lines)
Lines 54-64 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 ( $data->{'category_type'} eq 'C' ) {
58
if ( $category->category_type eq 'C' ) {
62
    my $patron_categories = Koha::Patron::Categories->search_limited({ category_type => 'A' }, {order_by => ['categorycode']});
59
    my $patron_categories = Koha::Patron::Categories->search_limited({ category_type => 'A' }, {order_by => ['categorycode']});
63
    $template->param( 'CATCODE_MULTI' => 1) if $patron_categories->count > 1;
60
    $template->param( 'CATCODE_MULTI' => 1) if $patron_categories->count > 1;
64
    $template->param( 'catcode' => $patron_categories->next )  if $patron_categories->count == 1;
61
    $template->param( 'catcode' => $patron_categories->next )  if $patron_categories->count == 1;
Lines 118-147 for ( my $i = 0 ; $i < $numaccts ; $i++ ) { Link Here
118
    push( @accountrows, \%row );
115
    push( @accountrows, \%row );
119
}
116
}
120
117
121
$template->param( adultborrower => 1 ) if ( $data->{'category_type'} eq 'A' || $data->{'category_type'} eq 'I' );
118
$template->param( adultborrower => 1 ) if ( $category->category_type eq 'A' || $category->category_type eq 'I' );
122
119
123
$template->param( picture => 1 ) if $patron->image;
120
$template->param( picture => 1 ) if $patron->image;
124
121
125
$template->param(
122
$template->param(
123
    patron         => $patron,
126
    finesview      => 1,
124
    finesview      => 1,
127
    firstname      => $data->{'firstname'},
128
    surname        => $data->{'surname'},
129
    borrowernumber => $borrowernumber,
130
    cardnumber     => $data->{'cardnumber'},
131
    categorycode   => $data->{'categorycode'},
132
    category_type  => $data->{'category_type'},
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 ),
125
    total          => sprintf( "%.2f", $total ),
143
    totalcredit    => $totalcredit,
126
    totalcredit    => $totalcredit,
144
    is_child       => ( $data->{'category_type'} eq 'C' ),
127
    is_child       => ( $category->category_type eq 'C' ),
145
    accounts       => \@accountrows
128
    accounts       => \@accountrows
146
);
129
);
147
130
(-)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
    RoutingSerials => C4::Context->preference('RoutingSerials'),
53
    RoutingSerials => C4::Context->preference('RoutingSerials'),
60
);
54
);
61
55
(-)a/members/readingrec.pl (-23 / +12 lines)
Lines 37-47 use Koha::Patron::Categories; Link Here
37
37
38
my $input = CGI->new;
38
my $input = CGI->new;
39
39
40
#get borrower details
41
my $data = undef;
42
my $borrowernumber = undef;
43
my $cardnumber = undef;
44
45
my ($template, $loggedinuser, $cookie)= get_template_and_user({template_name => "members/readingrec.tt",
40
my ($template, $loggedinuser, $cookie)= get_template_and_user({template_name => "members/readingrec.tt",
46
				query => $input,
41
				query => $input,
47
				type => "intranet",
42
				type => "intranet",
Lines 53-67 my ($template, $loggedinuser, $cookie)= get_template_and_user({template_name => Link Here
53
my $op = $input->param('op') || '';
48
my $op = $input->param('op') || '';
54
my $patron;
49
my $patron;
55
if ($input->param('cardnumber')) {
50
if ($input->param('cardnumber')) {
56
    $cardnumber = $input->param('cardnumber');
51
    my $cardnumber = $input->param('cardnumber');
57
    $patron = Koha::Patrons->find( { cardnumber => $cardnumber } );
52
    $patron = Koha::Patrons->find( { cardnumber => $cardnumber } );
58
    $data = $patron->unblessed;
59
    $borrowernumber = $data->{'borrowernumber'}; # we must define this as it is used to retrieve other data about the patron
60
}
53
}
61
if ($input->param('borrowernumber')) {
54
if ($input->param('borrowernumber')) {
62
    $borrowernumber = $input->param('borrowernumber');
55
    my $borrowernumber = $input->param('borrowernumber');
63
    $patron = Koha::Patrons->find( $borrowernumber );
56
    $patron = Koha::Patrons->find( $borrowernumber );
64
    $data = $patron->unblessed;
65
}
57
}
66
58
67
my $logged_in_user = Koha::Patrons->find( $loggedinuser ) or die "Not logged in";
59
my $logged_in_user = Koha::Patrons->find( $loggedinuser ) or die "Not logged in";
Lines 71-92 my $order = 'date_due desc'; Link Here
71
my $limit = 0;
63
my $limit = 0;
72
my $issues = ();
64
my $issues = ();
73
# Do not request the old issues of anonymous patron
65
# Do not request the old issues of anonymous patron
74
if ( $borrowernumber eq C4::Context->preference('AnonymousPatron') ){
66
if ( $patron->borrowernumber eq C4::Context->preference('AnonymousPatron') ){
75
    # use of 'eq' in the above comparison is intentional -- the
67
    # use of 'eq' in the above comparison is intentional -- the
76
    # system preference value could be blank
68
    # system preference value could be blank
77
    $template->param( is_anonymous => 1 );
69
    $template->param( is_anonymous => 1 );
78
} else {
70
} else {
79
    $issues = GetAllIssues($borrowernumber,$order,$limit);
71
    $issues = GetAllIssues($patron->borrowernumber,$order,$limit);
80
}
72
}
81
73
82
#   barcode export
74
#   barcode export
83
if ( $op eq 'export_barcodes' ) {
75
if ( $op eq 'export_barcodes' ) {
84
    # FIXME This should be moved out of this script
76
    # FIXME This should be moved out of this script
85
    if ( $data->{'privacy'} < 2) {
77
    if ( $patron->privacy < 2) {
86
        my $today = output_pref({ dt => dt_from_string, dateformat => 'iso', dateonly => 1 });
78
        my $today = output_pref({ dt => dt_from_string, dateformat => 'iso', dateonly => 1 });
87
        my @barcodes =
79
        my @barcodes =
88
          map { $_->{barcode} } grep { $_->{returndate} =~ m/^$today/o } @{$issues};
80
          map { $_->{barcode} } grep { $_->{returndate} =~ m/^$today/o } @{$issues};
89
        my $borrowercardnumber = $data->{cardnumber};
81
        my $borrowercardnumber = $patron->cardnumber;
90
        my $delimiter = "\n";
82
        my $delimiter = "\n";
91
        binmode( STDOUT, ":encoding(UTF-8)" );
83
        binmode( STDOUT, ":encoding(UTF-8)" );
92
        print $input->header(
84
        print $input->header(
Lines 101-113 if ( $op eq 'export_barcodes' ) { Link Here
101
    }
93
    }
102
}
94
}
103
95
104
if ( $data->{'category_type'} eq 'C') {
96
my $category = $patron->category;
97
if ( $category->category_type eq 'C') {
105
    my $patron_categories = Koha::Patron::Categories->search_limited({ category_type => 'A' }, {order_by => ['categorycode']});
98
    my $patron_categories = Koha::Patron::Categories->search_limited({ category_type => 'A' }, {order_by => ['categorycode']});
106
    $template->param( 'CATCODE_MULTI' => 1) if $patron_categories->count > 1;
99
    $template->param( 'CATCODE_MULTI' => 1) if $patron_categories->count > 1;
107
    $template->param( 'catcode' => $patron_categories->next )  if $patron_categories->count == 1;
100
    $template->param( 'catcode' => $patron_categories->next )  if $patron_categories->count == 1;
108
}
101
}
109
102
110
$template->param( adultborrower => 1 ) if ( $data->{'category_type'} eq 'A' || $data->{'category_type'} eq 'I' );
103
$template->param( adultborrower => 1 ) if ( $category->category_type eq 'A' || $category->category_type eq 'I' );
111
if (! $limit){
104
if (! $limit){
112
	$limit = 'full';
105
	$limit = 'full';
113
}
106
}
Lines 115-135 if (! $limit){ Link Here
115
$template->param( picture => 1 ) if $patron->image;
108
$template->param( picture => 1 ) if $patron->image;
116
109
117
if (C4::Context->preference('ExtendedPatronAttributes')) {
110
if (C4::Context->preference('ExtendedPatronAttributes')) {
118
    my $attributes = GetBorrowerAttributes($borrowernumber);
111
    my $attributes = GetBorrowerAttributes($patron->borrowernumber);
119
    $template->param(
112
    $template->param(
120
        ExtendedPatronAttributes => 1,
113
        ExtendedPatronAttributes => 1,
121
        extendedattributes => $attributes
114
        extendedattributes => $attributes
122
    );
115
    );
123
}
116
}
124
117
125
$template->param(%$data);
126
127
$template->param(
118
$template->param(
119
    patron            => $patron,
128
    readingrecordview => 1,
120
    readingrecordview => 1,
129
    borrowernumber    => $borrowernumber,
121
    is_child          => ( $category->category_type eq 'C' ),
130
    privacy           => $data->{'privacy'},
131
    categoryname      => $data->{description},
132
    is_child          => ( $data->{category_type} eq 'C' ),
133
    loop_reading      => $issues,
122
    loop_reading      => $issues,
134
    RoutingSerials => C4::Context->preference('RoutingSerials'),
123
    RoutingSerials => C4::Context->preference('RoutingSerials'),
135
);
124
);
(-)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
    RoutingSerials    => C4::Context->preference('RoutingSerials'),
81
    RoutingSerials    => C4::Context->preference('RoutingSerials'),
91
);
82
);
92
83
(-)a/members/statistics.pl (-12 / +2 lines)
Lines 52-67 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
foreach my $key ( keys %$borrower ) {
60
    $template->param( $key => $borrower->{$key} );
61
}
62
$template->param(
63
    categoryname    => $borrower->{'description'},
64
);
65
# Construct column names
56
# Construct column names
66
my $fields = C4::Members::Statistics::get_fields();
57
my $fields = C4::Members::Statistics::get_fields();
67
our @statistic_column_names = split '\|', $fields;
58
our @statistic_column_names = split '\|', $fields;
Lines 95-105 if (C4::Context->preference('ExtendedPatronAttributes')) { Link Here
95
86
96
$template->param( picture => 1 ) if $patron->image;
87
$template->param( picture => 1 ) if $patron->image;
97
88
98
$template->param(%$borrower);
89
$template->param( adultborrower => 1 ) if ( $category->category_type eq 'A' || $category->category_type eq 'I' );
99
100
$template->param( adultborrower => 1 ) if ( $borrower->{category_type} eq 'A' || $borrower->{category_type} eq 'I' );
101
90
102
$template->param(
91
$template->param(
92
    patron             => $patron,
103
    statisticsview     => 1,
93
    statisticsview     => 1,
104
    datas              => $datas,
94
    datas              => $datas,
105
    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 (-7 / +2 lines)
Lines 840-856 if ( C4::Context->preference('reviewson') ) { Link Here
840
        }
840
        }
841
    }
841
    }
842
    for my $review (@$reviews) {
842
    for my $review (@$reviews) {
843
        my $patron = Koha::Patrons->find( $review->{borrowernumber} );
843
        my $patron = Koha::Patrons->find( $review->{borrowernumber} ); # FIXME Should be Koha::Review->reviewer or similar
844
844
845
        # setting some borrower info into this hash
845
        $review->{patron} = $patron;
846
        $review->{title}     = $patron->title;
847
        $review->{surname}   = $patron->surname;
848
        $review->{firstname} = $patron->firstname;
849
        if ( $libravatar_enabled and $patron->email ) {
846
        if ( $libravatar_enabled and $patron->email ) {
850
            $review->{avatarurl} = libravatar_url( email => $patron->email, https => $ENV{HTTPS} );
847
            $review->{avatarurl} = libravatar_url( email => $patron->email, https => $ENV{HTTPS} );
851
        }
848
        }
852
        $review->{userid}     = $patron->userid;
853
        $review->{cardnumber} = $patron->cardnumber;
854
849
855
        if ( $patron->borrowernumber eq $borrowernumber ) {
850
        if ( $patron->borrowernumber eq $borrowernumber ) {
856
            $review->{your_comment} = 1;
851
            $review->{your_comment} = 1;
(-)a/opac/opac-reserve.pl (-4 lines)
Lines 478-489 foreach my $biblioNum (@biblionumbers) { Link Here
478
        my $holds = $item->current_holds;
478
        my $holds = $item->current_holds;
479
479
480
        if ( my $first_hold = $holds->next ) {
480
        if ( my $first_hold = $holds->next ) {
481
            my $patron = Koha::Patrons->find( $first_hold->borrowernumber );
482
            $itemLoopIter->{backgroundcolor} = 'reserved';
481
            $itemLoopIter->{backgroundcolor} = 'reserved';
483
            $itemLoopIter->{reservedate}     = output_pref({ dt => dt_from_string($first_hold->reservedate), dateonly => 1 }); # FIXME Should be formatted in the template
482
            $itemLoopIter->{reservedate}     = output_pref({ dt => dt_from_string($first_hold->reservedate), dateonly => 1 }); # FIXME Should be formatted in the template
484
            $itemLoopIter->{ReservedForBorrowernumber} = $first_hold->borrowernumber;
485
            $itemLoopIter->{ReservedForSurname}        = $patron->surname;
486
            $itemLoopIter->{ReservedForFirstname}      = $patron->firstname;
487
            $itemLoopIter->{ExpectedAtLibrary}         = $first_hold->branchcode;
483
            $itemLoopIter->{ExpectedAtLibrary}         = $first_hold->branchcode;
488
            $itemLoopIter->{waitingdate} = $first_hold->waitingdate;
484
            $itemLoopIter->{waitingdate} = $first_hold->waitingdate;
489
        }
485
        }
(-)a/reserve/request.pl (-20 / +2 lines)
Lines 176-200 if ($borrowernumber_hold && !$action) { Link Here
176
        $diffbranch = 1;
176
        $diffbranch = 1;
177
    }
177
    }
178
178
179
    my $is_debarred = $patron->is_debarred;
180
    $template->param(
179
    $template->param(
181
                borrowernumber      => $patron->borrowernumber,
182
                borrowersurname     => $patron->surname,
183
                borrowerfirstname   => $patron->firstname,
184
                borrowerstreetaddress   => $patron->address,
185
                borrowercity        => $patron->city,
186
                borrowerphone       => $patron->phone,
187
                borrowermobile      => $patron->mobile,
188
                borrowerfax         => $patron->fax,
189
                borrowerphonepro    => $patron->phonepro,
190
                borroweremail       => $patron->email,
191
                borroweremailpro    => $patron->emailpro,
192
                cardnumber          => $patron->cardnumber,
193
                expiry              => $expiry,
180
                expiry              => $expiry,
194
                diffbranch          => $diffbranch,
181
                diffbranch          => $diffbranch,
195
                messages            => $messages,
182
                messages            => $messages,
196
                warnings            => $warnings,
183
                warnings            => $warnings,
197
                restricted          => $is_debarred,
198
                amount_outstanding  => GetMemberAccountRecords($patron->borrowernumber),
184
                amount_outstanding  => GetMemberAccountRecords($patron->borrowernumber),
199
    );
185
    );
200
}
186
}
Lines 400-408 foreach my $biblionumber (@biblionumbers) { Link Here
400
386
401
                $item->{backgroundcolor} = 'reserved';
387
                $item->{backgroundcolor} = 'reserved';
402
                $item->{reservedate}     = output_pref({ dt => dt_from_string( $first_hold->reservedate ), dateonly => 1 }); # FIXME Should be formatted in the template
388
                $item->{reservedate}     = output_pref({ dt => dt_from_string( $first_hold->reservedate ), dateonly => 1 }); # FIXME Should be formatted in the template
403
                $item->{ReservedForBorrowernumber}     = $p->borrowernumber;
389
                $item->{ReservedFor}     = $p;
404
                $item->{ReservedForSurname}     = $p->surname;
405
                $item->{ReservedForFirstname}     = $p->firstname;
406
                $item->{ExpectedAtLibrary}     = $first_hold->branchcode;
390
                $item->{ExpectedAtLibrary}     = $first_hold->branchcode;
407
                $item->{waitingdate} = $first_hold->waitingdate;
391
                $item->{waitingdate} = $first_hold->waitingdate;
408
            }
392
            }
Lines 610-618 foreach my $biblionumber (@biblionumbers) { Link Here
610
                     holdsview => 1,
594
                     holdsview => 1,
611
                     C4::Search::enabled_staff_search_views,
595
                     C4::Search::enabled_staff_search_views,
612
                    );
596
                    );
613
    if ( $patron ) {
614
        $template->param( borrower_branchcode => $patron->branchcode );
615
    }
616
597
617
    $biblioloopiter{biblionumber} = $biblionumber;
598
    $biblioloopiter{biblionumber} = $biblionumber;
618
    $biblioloopiter{title} = $dat->{title};
599
    $biblioloopiter{title} = $dat->{title};
Lines 640-645 if ( C4::Context->preference( 'AllowHoldDateInFuture' ) ) { Link Here
640
}
621
}
641
622
642
$template->param(
623
$template->param(
624
    patron => $patron,
643
    SuspendHoldsIntranet => C4::Context->preference('SuspendHoldsIntranet'),
625
    SuspendHoldsIntranet => C4::Context->preference('SuspendHoldsIntranet'),
644
    AutoResumeSuspendedHolds => C4::Context->preference('AutoResumeSuspendedHolds'),
626
    AutoResumeSuspendedHolds => C4::Context->preference('AutoResumeSuspendedHolds'),
645
);
627
);
(-)a/reviews/reviewswaiting.pl (-3 / +1 lines)
Lines 70-79 foreach ( @$reviews ) { Link Here
70
    my $borrowernumber = $_->{borrowernumber};
70
    my $borrowernumber = $_->{borrowernumber};
71
    my $patron = Koha::Patrons->find( $borrowernumber);
71
    my $patron = Koha::Patrons->find( $borrowernumber);
72
    my $biblioData     = GetBiblioData($_->{biblionumber});
72
    my $biblioData     = GetBiblioData($_->{biblionumber});
73
    # setting some borrower info into this hash
74
    $_->{bibliotitle} = $biblioData->{'title'};
73
    $_->{bibliotitle} = $biblioData->{'title'};
75
    $_->{surname}     = $patron->surname;
74
    $_->{patron}      = $patron;
76
    $_->{firstname}   = $patron->firstname;
77
}
75
}
78
76
79
my $url = "/cgi-bin/koha/reviews/reviewswaiting.pl?status=$status";
77
my $url = "/cgi-bin/koha/reviews/reviewswaiting.pl?status=$status";
(-)a/tools/viewlog.pl (-9 / +2 lines)
Lines 116-125 if ($do_it) { Link Here
116
        $result->{'biblionumber'}      = q{};
116
        $result->{'biblionumber'}      = q{};
117
        $result->{'biblioitemnumber'}  = q{};
117
        $result->{'biblioitemnumber'}  = q{};
118
        $result->{'barcode'}           = q{};
118
        $result->{'barcode'}           = q{};
119
        $result->{'userfirstname'}     = q{};
120
        $result->{'usersurname'}       = q{};
121
        $result->{'borrowerfirstname'} = q{};
122
        $result->{'borrowersurname'}   = q{};
123
119
124
        if ( substr( $result->{'info'}, 0, 4 ) eq 'item' || $result->{module} eq "CIRCULATION" ) {
120
        if ( substr( $result->{'info'}, 0, 4 ) eq 'item' || $result->{module} eq "CIRCULATION" ) {
125
121
Lines 138-145 if ($do_it) { Link Here
138
        if ( $result->{'user'} ) {
134
        if ( $result->{'user'} ) {
139
            my $patron = Koha::Patrons->find( $result->{'user'} );
135
            my $patron = Koha::Patrons->find( $result->{'user'} );
140
            if ($patron) {
136
            if ($patron) {
141
                $result->{'userfirstname'} = $patron->firstname;
137
                $result->{librarian} = $patron;
142
                $result->{'usersurname'}   = $patron->surname;
143
            }
138
            }
144
        }
139
        }
145
140
Lines 148-155 if ($do_it) { Link Here
148
            if ( $result->{'object'} ) {
143
            if ( $result->{'object'} ) {
149
                my $patron = Koha::Patrons->find( $result->{'object'} );
144
                my $patron = Koha::Patrons->find( $result->{'object'} );
150
                if ($patron) {
145
                if ($patron) {
151
                    $result->{'borrowerfirstname'} = $patron->firstname;
146
                    $result->{patron} = $patron;
152
                    $result->{'borrowersurname'}   = $patron->surname;
153
                }
147
                }
154
            }
148
            }
155
        }
149
        }
156
- 

Return to bug 18789