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

(-)a/C4/Utils/DataTables/Members.pm (+1 lines)
Lines 210-215 sub search { Link Here
210
        my $patron_object = Koha::Patrons->find( $patron->{borrowernumber} );
210
        my $patron_object = Koha::Patrons->find( $patron->{borrowernumber} );
211
        $patron->{overdues} = $patron_object->get_overdues->count;
211
        $patron->{overdues} = $patron_object->get_overdues->count;
212
        $patron->{issues} = $patron_object->checkouts->count;
212
        $patron->{issues} = $patron_object->checkouts->count;
213
        $patron->{age} = $patron_object->get_age;
213
        my $balance = $patron_object->account->balance;
214
        my $balance = $patron_object->account->balance;
214
        # FIXME Should be formatted from the template
215
        # FIXME Should be formatted from the template
215
        $patron->{fines} = sprintf("%.2f", $balance);
216
        $patron->{fines} = sprintf("%.2f", $balance);
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc (+10 lines)
Lines 54-59 Link Here
54
                <li class="email"> <a href="mailto:[% patron.emailpro | url %]" title="[% patron.emailpro | html %]">[% patron.emailpro | html %]</a></li>
54
                <li class="email"> <a href="mailto:[% patron.emailpro | url %]" title="[% patron.emailpro | html %]">[% patron.emailpro | html %]</a></li>
55
            [% END %]
55
            [% END %]
56
        [% END %]
56
        [% END %]
57
        [% IF ( patron.dateofbirth ) %]
58
            <li>
59
                <span class="label">Date of birth:</span>
60
                [% INCLUDE 'patron-age.inc' %]
61
            </li>
62
        [% END %]
57
63
58
        [% UNLESS ( patron.address or patron.address2 ) %]
64
        [% UNLESS ( patron.address or patron.address2 ) %]
59
            <li><span class="empty" id="noaddressstored">No address stored.</span></li>
65
            <li><span class="empty" id="noaddressstored">No address stored.</span></li>
Lines 67-72 Link Here
67
        [% UNLESS ( patron.email or patron.emailpro) %]
73
        [% UNLESS ( patron.email or patron.emailpro) %]
68
            <li> <span class="empty">No email stored.</span></li>
74
            <li> <span class="empty">No email stored.</span></li>
69
        [% END %]
75
        [% END %]
76
        [% UNLESS ( patron.dateofbirth ) %]
77
            <li> <span class="empty">No date of birth stored.</span></li>
78
        [% END %]
79
70
    [% END %]
80
    [% END %]
71
81
72
    [% IF Koha.Preference('ExtendedPatronAttributes') %]
82
    [% IF Koha.Preference('ExtendedPatronAttributes') %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-patron-search-results.inc (-1 / +1 lines)
Lines 26-32 Link Here
26
                    <td><a href="[% data_url | url %]">[% borrower.surname | html %], [% borrower.firstname | html %]</a></td>
26
                    <td><a href="[% data_url | url %]">[% borrower.surname | html %], [% borrower.firstname | html %]</a></td>
27
            [% END %]
27
            [% END %]
28
                <td>[% borrower.cardnumber | html %]</td>
28
                <td>[% borrower.cardnumber | html %]</td>
29
                <td>[% borrower.dateofbirth | $KohaDates %]</td>
29
                <td>[% INCLUDE 'patron-age.inc' patron = borrower %]</td>
30
                <td>[% Categories.GetName( borrower.categorycode ) | html %]</td>
30
                <td>[% Categories.GetName( borrower.categorycode ) | html %]</td>
31
                <td>[% Branches.GetName( borrower.branchcode ) | html %]</td>
31
                <td>[% Branches.GetName( borrower.branchcode ) | html %]</td>
32
                <td>[% borrower.address | html %]</td>
32
                <td>[% borrower.address | html %]</td>
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-age.inc (+8 lines)
Line 0 Link Here
1
[%- USE KohaDates -%]
2
[%- IF ( patron ) -%]
3
    [%- IF ( patron.dateofbirth ) -%]
4
        [% patron.dateofbirth | $KohaDates -%]
5
        [%- IF ( patron.get_age ) %] ([% patron.get_age | html %] years)
6
        [%- ELSIF ( patron.age ) %] ([% patron.age | html %] years)[% END -%]
7
   [%- END -%]
8
[%- END -%]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt (-1 / +1 lines)
Lines 251-257 Link Here
251
                                            [% IF ( patron.dateofbirth ) %]
251
                                            [% IF ( patron.dateofbirth ) %]
252
                                                <li>
252
                                                <li>
253
                                                    <span class="label">Date of birth:</span>
253
                                                    <span class="label">Date of birth:</span>
254
                                                    [% patron.dateofbirth | $KohaDates %] ([% patron.get_age | html %] years)
254
                                                    [% INCLUDE 'patron-age.inc' %]
255
                                                </li>
255
                                                </li>
256
                                            [% END %]
256
                                            [% END %]
257
                                            [% IF ( patron.sex ) %]
257
                                            [% IF ( patron.sex ) %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/tables/guarantor_search.tt (-1 / +1 lines)
Lines 14-20 Link Here
14
                "dt_name":
14
                "dt_name":
15
                    "[% INCLUDE 'patron-title.inc' borrowernumber = data.borrowernumber category_type = data.category_type firstname = data.firstname surname = data.surname othernames = data.othernames cardnumber = data.cardnumber invert_name = 1%]",
15
                    "[% INCLUDE 'patron-title.inc' borrowernumber = data.borrowernumber category_type = data.category_type firstname = data.firstname surname = data.surname othernames = data.othernames cardnumber = data.cardnumber invert_name = 1%]",
16
                "dt_dateofbirth":
16
                "dt_dateofbirth":
17
                    "[% data.dateofbirth | $KohaDates %]",
17
                    "[% INCLUDE 'patron-age.inc' patron = data %]",
18
                "dt_address":
18
                "dt_address":
19
                    "[% INCLUDE escape_address data=data %]",
19
                    "[% INCLUDE escape_address data=data %]",
20
                "dt_action":
20
                "dt_action":
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/tables/members_results.tt (-1 / +1 lines)
Lines 19-25 Link Here
19
                "dt_name":
19
                "dt_name":
20
                    "<a href=\"/cgi-bin/koha/members/moremember.pl?borrowernumber=[% data.borrowernumber | html %]\" class=\"patron_preview\" data-borrowernumber=\"[% data.borrowernumber | html %]\" style='white-space:nowrap'>[% INCLUDE 'patron-title.inc' borrowernumber = data.borrowernumber category_type = data.category_type firstname = data.firstname surname = data.surname othernames = data.othernames invert_name = 1 | $To %]</a><br />[% INCLUDE escape_address data = data %][% IF data.email %]<br/>Email: <a href='mailto:[% data.email | html | $To %]'>[% data.email | html | $To %]</a>[% END %]",
20
                    "<a href=\"/cgi-bin/koha/members/moremember.pl?borrowernumber=[% data.borrowernumber | html %]\" class=\"patron_preview\" data-borrowernumber=\"[% data.borrowernumber | html %]\" style='white-space:nowrap'>[% INCLUDE 'patron-title.inc' borrowernumber = data.borrowernumber category_type = data.category_type firstname = data.firstname surname = data.surname othernames = data.othernames invert_name = 1 | $To %]</a><br />[% INCLUDE escape_address data = data %][% IF data.email %]<br/>Email: <a href='mailto:[% data.email | html | $To %]'>[% data.email | html | $To %]</a>[% END %]",
21
    "dt_dateofbirth":
21
    "dt_dateofbirth":
22
        "[% data.dateofbirth | $KohaDates %]",
22
        "[% INCLUDE 'patron-age.inc' patron = data %]",
23
                "dt_category":
23
                "dt_category":
24
                    "[% data.category_description | html | $To %] ([% data.category_type | html | $To %])",
24
                    "[% data.category_description | html | $To %] ([% data.category_type | html | $To %])",
25
                "dt_branch":
25
                "dt_branch":
(-)a/members/moremember.pl (-2 lines)
Lines 122-128 if ( !$patron->is_valid_age ) { Link Here
122
    $template->param( age_low => $patron->category->dateofbirthrequired );
122
    $template->param( age_low => $patron->category->dateofbirthrequired );
123
    $template->param( age_high => $patron->category->upperagelimit );
123
    $template->param( age_high => $patron->category->upperagelimit );
124
}
124
}
125
$template->param( age => $patron->get_age );
126
125
127
# Generate CSRF token for upload and delete image buttons
126
# Generate CSRF token for upload and delete image buttons
128
$template->param(
127
$template->param(
129
- 

Return to bug 15400