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

(-)a/circ/circulation.pl (-2 / +8 lines)
Lines 632-638 my $fast_cataloging = 0; Link Here
632
    if (defined getframeworkinfo('FA')) {
632
    if (defined getframeworkinfo('FA')) {
633
    $fast_cataloging = 1 
633
    $fast_cataloging = 1 
634
    }
634
    }
635
my $attributes = GetBorrowerAttributes($borrowernumber);
635
636
if (C4::Context->preference('ExtendedPatronAttributes')) {
637
    my $attributes = GetBorrowerAttributes($borrowernumber);
638
    $template->param(
639
        ExtendedPatronAttributes => 1,
640
        extendedattributes => $attributes
641
    );
642
}
636
643
637
$template->param(
644
$template->param(
638
    lib_messages_loop => $lib_messages_loop,
645
    lib_messages_loop => $lib_messages_loop,
Lines 682-688 $template->param( Link Here
682
    circview => 1,
689
    circview => 1,
683
    soundon           => C4::Context->preference("SoundOn"),
690
    soundon           => C4::Context->preference("SoundOn"),
684
    fast_cataloging   => $fast_cataloging,
691
    fast_cataloging   => $fast_cataloging,
685
    extendedattributes => $attributes,
686
);
692
);
687
693
688
# save stickyduedate to session
694
# save stickyduedate to session
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc (-2 / +2 lines)
Lines 48-60 Link Here
48
            <li> <span class="empty">No email stored.</span>    </li>
48
            <li> <span class="empty">No email stored.</span>    </li>
49
        [% END %]
49
        [% END %]
50
    [% END %]
50
    [% END %]
51
    [% FOREACH extendedattribute IN extendedattributes %]
51
    [% IF ( ExtendedPatronAttributes ) %][% FOREACH extendedattribute IN extendedattributes %]
52
        [% IF ( extendedattribute.display_checkout ) %]
52
        [% IF ( extendedattribute.display_checkout ) %]
53
            [% IF ( extendedattribute.value ) %]
53
            [% IF ( extendedattribute.value ) %]
54
                <li>[% extendedattribute.description %] : [% IF ( extendedattribute.value_description ) %][% extendedattribute.value_description %][% ELSE %][% extendedattribute.value %][% END %]</li>
54
                <li>[% extendedattribute.description %] : [% IF ( extendedattribute.value_description ) %][% extendedattribute.value_description %][% ELSE %][% extendedattribute.value %][% END %]</li>
55
            [% END %]
55
            [% END %]
56
        [% END %]
56
        [% END %]
57
    [% END %]
57
    [% END %][% END %]
58
    <li>Category: [% categoryname %] ([% categorycode %])</li>
58
    <li>Category: [% categoryname %] ([% categorycode %])</li>
59
    <li>Home Library: [% IF ( branchname ) %][% branchname %][% ELSE %][% branch %][% END %]</li>
59
    <li>Home Library: [% IF ( branchname ) %][% branchname %][% ELSE %][% branch %][% END %]</li>
60
</ul></div>
60
</ul></div>
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.tt (-2 / +2 lines)
Lines 50-62 in the global namespace %] Link Here
50
            <li> <span class="empty">No email stored.</span>    </li>
50
            <li> <span class="empty">No email stored.</span>    </li>
51
        [% END %]
51
        [% END %]
52
    [% END %]
52
    [% END %]
53
    [% FOREACH extendedattribute IN borrower.extendedattributes %]
53
    [% IF ( ExtendedPatronAttributes ) %][% FOREACH extendedattribute IN borrower.extendedattributes %]
54
        [% IF ( extendedattribute.display_checkout ) %]
54
        [% IF ( extendedattribute.display_checkout ) %]
55
            [% IF ( extendedattribute.value ) %]
55
            [% IF ( extendedattribute.value ) %]
56
                <li>[% extendedattribute.description %] : [% IF ( extendedattribute.value_description ) %][% extendedattribute.value_description %][% ELSE %][% extendedattribute.value %][% END %]</li>
56
                <li>[% extendedattribute.description %] : [% IF ( extendedattribute.value_description ) %][% extendedattribute.value_description %][% ELSE %][% extendedattribute.value %][% END %]</li>
57
            [% END %]
57
            [% END %]
58
        [% END %]
58
        [% END %]
59
    [% END %]
59
    [% END %][% END %]
60
    <li>Category: [% borrower.description %] ([% borrower.categorycode %])</li>
60
    <li>Category: [% borrower.description %] ([% borrower.categorycode %])</li>
61
    <li>Home Library: [% IF ( borrower.branchname ) %][% borrower.branchname %][% ELSE %][% borrower.branch %][% END %]</li>
61
    <li>Home Library: [% IF ( borrower.branchname ) %][% borrower.branchname %][% ELSE %][% borrower.branch %][% END %]</li>
62
</ul></div>
62
</ul></div>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt (-5 / +5 lines)
Lines 285-296 function validate1(date) { Link Here
285
        <th>Type</th>
285
        <th>Type</th>
286
        <th>Value</th>
286
        <th>Value</th>
287
    </tr>
287
    </tr>
288
    [% FOREACH patron_attribute IN patron_attributes %]
288
    [% FOREACH extendedattribute IN extendedattributes %]
289
    <tr>
289
    <tr>
290
        <td>[% patron_attribute.code %] ([% patron_attribute.description %])</td>
290
        <td>[% extendedattribute.code %] ([% extendedattribute.description %])</td>
291
        <td>[% patron_attribute.value %]
291
        <td>[% extendedattribute.value %]
292
            [% IF ( patron_attribute.value_description ) %]
292
            [% IF ( extendedattribute.value_description ) %]
293
                ([% patron_attribute.value_description %])
293
                ([% extendedattribute.value_description %])
294
            [% END %]
294
            [% END %]
295
        </td>
295
        </td>
296
    </tr>
296
    </tr>
(-)a/members/boraccount.pl (-2 / +8 lines)
Lines 94-100 $template->param( adultborrower => 1 ) if ( $data->{'category_type'} eq 'A' ); Link Here
94
94
95
my ($picture, $dberror) = GetPatronImage($data->{'cardnumber'});
95
my ($picture, $dberror) = GetPatronImage($data->{'cardnumber'});
96
$template->param( picture => 1 ) if $picture;
96
$template->param( picture => 1 ) if $picture;
97
my $attributes = GetBorrowerAttributes($borrowernumber);
97
98
if (C4::Context->preference('ExtendedPatronAttributes')) {
99
    my $attributes = GetBorrowerAttributes($borrowernumber);
100
    $template->param(
101
        ExtendedPatronAttributes => 1,
102
        extendedattributes => $attributes
103
    );
104
}
98
105
99
$template->param(
106
$template->param(
100
    finesview           => 1,
107
    finesview           => 1,
Lines 120-126 $template->param( Link Here
120
    is_child            => ($data->{'category_type'} eq 'C'),
127
    is_child            => ($data->{'category_type'} eq 'C'),
121
    reverse_col         => $reverse_col,
128
    reverse_col         => $reverse_col,
122
    accounts            => $accts,
129
    accounts            => $accts,
123
    extendedattributes => $attributes,
124
);
130
);
125
131
126
output_html_with_http_headers $input, $cookie, $template->output;
132
output_html_with_http_headers $input, $cookie, $template->output;
(-)a/members/mancredit.pl (-1 / +7 lines)
Lines 78-84 if ($add){ Link Here
78
    $template->param( adultborrower => 1 ) if ( $data->{category_type} eq 'A' );
78
    $template->param( adultborrower => 1 ) if ( $data->{category_type} eq 'A' );
79
    my ($picture, $dberror) = GetPatronImage($data->{'cardnumber'});
79
    my ($picture, $dberror) = GetPatronImage($data->{'cardnumber'});
80
    $template->param( picture => 1 ) if $picture;
80
    $template->param( picture => 1 ) if $picture;
81
82
if (C4::Context->preference('ExtendedPatronAttributes')) {
81
    my $attributes = GetBorrowerAttributes($borrowernumber);
83
    my $attributes = GetBorrowerAttributes($borrowernumber);
84
    $template->param(
85
        ExtendedPatronAttributes => 1,
86
        extendedattributes => $attributes
87
    );
88
}
82
    
89
    
83
    $template->param(
90
    $template->param(
84
        borrowernumber => $borrowernumber,
91
        borrowernumber => $borrowernumber,
Lines 99-105 if ($add){ Link Here
99
		    branchcode => $data->{'branchcode'},
106
		    branchcode => $data->{'branchcode'},
100
		    branchname => GetBranchName($data->{'branchcode'}),
107
		    branchname => GetBranchName($data->{'branchcode'}),
101
		    is_child        => ($data->{'category_type'} eq 'C'),
108
		    is_child        => ($data->{'category_type'} eq 'C'),
102
            extendedattributes => $attributes,
103
        );
109
        );
104
    output_html_with_http_headers $input, $cookie, $template->output;
110
    output_html_with_http_headers $input, $cookie, $template->output;
105
}
111
}
(-)a/members/maninvoice.pl (-2 / +7 lines)
Lines 106-113 if ($add){ Link Here
106
    $template->param( adultborrower => 1 ) if ( $data->{'category_type'} eq 'A' );
106
    $template->param( adultborrower => 1 ) if ( $data->{'category_type'} eq 'A' );
107
    my ($picture, $dberror) = GetPatronImage($data->{'cardnumber'});
107
    my ($picture, $dberror) = GetPatronImage($data->{'cardnumber'});
108
    $template->param( picture => 1 ) if $picture;
108
    $template->param( picture => 1 ) if $picture;
109
    my $attributes = GetBorrowerAttributes($borrowernumber);
110
109
110
if (C4::Context->preference('ExtendedPatronAttributes')) {
111
    my $attributes = GetBorrowerAttributes($borrowernumber);
112
    $template->param(
113
        ExtendedPatronAttributes => 1,
114
        extendedattributes => $attributes
115
    );
116
}
111
	$template->param(
117
	$template->param(
112
                borrowernumber => $borrowernumber,
118
                borrowernumber => $borrowernumber,
113
		firstname => $data->{'firstname'},
119
		firstname => $data->{'firstname'},
Lines 127-133 if ($add){ Link Here
127
		branchcode => $data->{'branchcode'},
133
		branchcode => $data->{'branchcode'},
128
		branchname => GetBranchName($data->{'branchcode'}),
134
		branchname => GetBranchName($data->{'branchcode'}),
129
		is_child        => ($data->{'category_type'} eq 'C'),
135
		is_child        => ($data->{'category_type'} eq 'C'),
130
        extendedattributes => $attributes,
131
    );
136
    );
132
    output_html_with_http_headers $input, $cookie, $template->output;
137
    output_html_with_http_headers $input, $cookie, $template->output;
133
}
138
}
(-)a/members/member-flags.pl (-2 / +8 lines)
Lines 162-168 if ($input->param('newflags')) { Link Here
162
$template->param( adultborrower => 1 ) if ( $bor->{'category_type'} eq 'A' );
162
$template->param( adultborrower => 1 ) if ( $bor->{'category_type'} eq 'A' );
163
    my ($picture, $dberror) = GetPatronImage($bor->{'cardnumber'});
163
    my ($picture, $dberror) = GetPatronImage($bor->{'cardnumber'});
164
    $template->param( picture => 1 ) if $picture;
164
    $template->param( picture => 1 ) if $picture;
165
my $attributes = GetBorrowerAttributes($bor->{'borrowernumber'});
165
166
if (C4::Context->preference('ExtendedPatronAttributes')) {
167
    my $attributes = GetBorrowerAttributes($bor->{'borrowernumber'});
168
    $template->param(
169
        ExtendedPatronAttributes => 1,
170
        extendedattributes => $attributes
171
    );
172
}
166
173
167
$template->param(
174
$template->param(
168
		borrowernumber => $bor->{'borrowernumber'},
175
		borrowernumber => $bor->{'borrowernumber'},
Lines 184-190 $template->param( Link Here
184
		branchname => GetBranchName($bor->{'branchcode'}),
191
		branchname => GetBranchName($bor->{'branchcode'}),
185
		loop => \@loop,
192
		loop => \@loop,
186
		is_child        => ($bor->{'category_type'} eq 'C'),
193
		is_child        => ($bor->{'category_type'} eq 'C'),
187
        extendedattributes => $attributes,
188
		);
194
		);
189
195
190
    output_html_with_http_headers $input, $cookie, $template->output;
196
    output_html_with_http_headers $input, $cookie, $template->output;
(-)a/members/member-password.pl (-2 / +8 lines)
Lines 90-96 if ( $newpassword && ! $errormsg ) { Link Here
90
$template->param( adultborrower => 1 ) if ( $bor->{'category_type'} eq 'A' );
90
$template->param( adultborrower => 1 ) if ( $bor->{'category_type'} eq 'A' );
91
my ($picture, $dberror) = GetPatronImage($bor->{'cardnumber'});
91
my ($picture, $dberror) = GetPatronImage($bor->{'cardnumber'});
92
$template->param( picture => 1 ) if $picture;
92
$template->param( picture => 1 ) if $picture;
93
my $attributes = GetBorrowerAttributes($bor->{'borrowernumber'});
93
94
if (C4::Context->preference('ExtendedPatronAttributes')) {
95
    my $attributes = GetBorrowerAttributes($bor->{'borrowernumber'});
96
    $template->param(
97
        ExtendedPatronAttributes => 1,
98
        extendedattributes => $attributes
99
    );
100
}
94
101
95
    $template->param( othernames => $bor->{'othernames'},
102
    $template->param( othernames => $bor->{'othernames'},
96
	    surname     => $bor->{'surname'},
103
	    surname     => $bor->{'surname'},
Lines 114-120 my $attributes = GetBorrowerAttributes($bor->{'borrowernumber'}); Link Here
114
	    destination => $destination,
121
	    destination => $destination,
115
		is_child        => ($bor->{'category_type'} eq 'C'),
122
		is_child        => ($bor->{'category_type'} eq 'C'),
116
	    defaultnewpassword => $defaultnewpassword,
123
	    defaultnewpassword => $defaultnewpassword,
117
    	extendedattributes => $attributes,
118
	);
124
	);
119
125
120
126
(-)a/members/moremember.pl (-4 / +5 lines)
Lines 425-432 my $branch=C4::Context->userenv->{'branch'}; Link Here
425
$template->param(%$data);
425
$template->param(%$data);
426
426
427
if (C4::Context->preference('ExtendedPatronAttributes')) {
427
if (C4::Context->preference('ExtendedPatronAttributes')) {
428
    $template->param(ExtendedPatronAttributes => 1);
428
    my $attributes = GetBorrowerAttributes($borrowernumber);
429
    $template->param(patron_attributes => C4::Members::Attributes::GetBorrowerAttributes($borrowernumber));
429
    $template->param(
430
        ExtendedPatronAttributes => 1,
431
        extendedattributes => $attributes
432
    );
430
    my @types = C4::Members::AttributeTypes::GetAttributeTypes();
433
    my @types = C4::Members::AttributeTypes::GetAttributeTypes();
431
    if (scalar(@types) == 0) {
434
    if (scalar(@types) == 0) {
432
        $template->param(no_patron_attribute_types => 1);
435
        $template->param(no_patron_attribute_types => 1);
Lines 439-445 if (C4::Context->preference('EnhancedMessagingPreferences')) { Link Here
439
    $template->param(SMSSendDriver => C4::Context->preference("SMSSendDriver"));
442
    $template->param(SMSSendDriver => C4::Context->preference("SMSSendDriver"));
440
    $template->param(SMSnumber     => defined $data->{'smsalertnumber'} ? $data->{'smsalertnumber'} : $data->{'mobile'});
443
    $template->param(SMSnumber     => defined $data->{'smsalertnumber'} ? $data->{'smsalertnumber'} : $data->{'mobile'});
441
}
444
}
442
my $attributes = GetBorrowerAttributes($borrowernumber);
443
445
444
$template->param(
446
$template->param(
445
    detailview => 1,
447
    detailview => 1,
Lines 469-475 $template->param( Link Here
469
    "dateformat_" . (C4::Context->preference("dateformat") || '') => 1,
471
    "dateformat_" . (C4::Context->preference("dateformat") || '') => 1,
470
    samebranch     => $samebranch,
472
    samebranch     => $samebranch,
471
    quickslip		  => $quickslip,
473
    quickslip		  => $quickslip,
472
    extendedattributes => $attributes,
473
);
474
);
474
475
475
#Get the slip news items
476
#Get the slip news items
(-)a/members/notices.pl (-2 / +8 lines)
Lines 53-59 $template->param( picture => 1 ) if $picture; Link Here
53
# Getting the messages
53
# Getting the messages
54
my $queued_messages = C4::Letters::GetQueuedMessages({borrowernumber => $borrowernumber});
54
my $queued_messages = C4::Letters::GetQueuedMessages({borrowernumber => $borrowernumber});
55
$template->param( %{$borrower} );
55
$template->param( %{$borrower} );
56
my $attributes = GetBorrowerAttributes($borrowernumber);
56
57
if (C4::Context->preference('ExtendedPatronAttributes')) {
58
    my $attributes = GetBorrowerAttributes($borrowernumber);
59
    $template->param(
60
        ExtendedPatronAttributes => 1,
61
        extendedattributes => $attributes
62
    );
63
}
57
64
58
$template->param(
65
$template->param(
59
			QUEUED_MESSAGES 	=> $queued_messages,
66
			QUEUED_MESSAGES 	=> $queued_messages,
Lines 61-67 $template->param( Link Here
61
			sentnotices 		=> 1,
68
			sentnotices 		=> 1,
62
                        branchname              => GetBranchName($borrower->{'branchcode'}),
69
                        branchname              => GetBranchName($borrower->{'branchcode'}),
63
                        categoryname            => $borrower->{'description'},
70
                        categoryname            => $borrower->{'description'},
64
                        extendedattributes      => $attributes,
65
);
71
);
66
output_html_with_http_headers $input, $cookie, $template->output;
72
output_html_with_http_headers $input, $cookie, $template->output;
67
73
(-)a/members/pay.pl (-1 / +7 lines)
Lines 233-239 sub borrower_add_additional_fields { Link Here
233
    if ($picture) {
233
    if ($picture) {
234
        $b_ref->{has_picture} = 1;
234
        $b_ref->{has_picture} = 1;
235
    }
235
    }
236
    $b_ref->{extendedattributes} = GetBorrowerAttributes($borrowernumber);
236
237
    if (C4::Context->preference('ExtendedPatronAttributes')) {
238
        $b_ref->{extendedattributes} = GetBorrowerAttributes($borrowernumber);
239
        $template->param(
240
            ExtendedPatronAttributes => 1,
241
        );
242
    }
237
243
238
    $b_ref->{branchname} = GetBranchName( $b_ref->{branchcode} );
244
    $b_ref->{branchname} = GetBranchName( $b_ref->{branchcode} );
239
    return;
245
    return;
(-)a/members/readingrec.pl (-3 / +8 lines)
Lines 96-102 if (! $limit){ Link Here
96
96
97
my ($picture, $dberror) = GetPatronImage($data->{'cardnumber'});
97
my ($picture, $dberror) = GetPatronImage($data->{'cardnumber'});
98
$template->param( picture => 1 ) if $picture;
98
$template->param( picture => 1 ) if $picture;
99
my $attributes = GetBorrowerAttributes($borrowernumber);
99
100
if (C4::Context->preference('ExtendedPatronAttributes')) {
101
    my $attributes = GetBorrowerAttributes($borrowernumber);
102
    $template->param(
103
        ExtendedPatronAttributes => 1,
104
        extendedattributes => $attributes
105
    );
106
}
100
107
101
$template->param(
108
$template->param(
102
						readingrecordview => 1,
109
						readingrecordview => 1,
Lines 125-131 $template->param( Link Here
125
			   			branchname => GetBranchName($data->{'branchcode'}),
132
			   			branchname => GetBranchName($data->{'branchcode'}),
126
						showfulllink => (scalar @loop_reading > 50),					
133
						showfulllink => (scalar @loop_reading > 50),					
127
						loop_reading => \@loop_reading,
134
						loop_reading => \@loop_reading,
128
					    extendedattributes => $attributes,
129
);
135
);
130
output_html_with_http_headers $input, $cookie, $template->output;
136
output_html_with_http_headers $input, $cookie, $template->output;
131
137
132
- 

Return to bug 6980