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

(-)a/C4/Members.pm (-1 / +45 lines)
Lines 26-37 use C4::Dates qw(format_date_in_iso); Link Here
26
use Digest::MD5 qw(md5_base64);
26
use Digest::MD5 qw(md5_base64);
27
use Date::Calc qw/Today Add_Delta_YM/;
27
use Date::Calc qw/Today Add_Delta_YM/;
28
use C4::Log; # logaction
28
use C4::Log; # logaction
29
use C4::Branch;
29
use C4::Overdues;
30
use C4::Overdues;
30
use C4::Reserves;
31
use C4::Reserves;
31
use C4::Accounts;
32
use C4::Accounts;
32
use C4::Biblio;
33
use C4::Biblio;
33
use C4::SQLHelper qw(InsertInTable UpdateInTable SearchInTable);
34
use C4::SQLHelper qw(InsertInTable UpdateInTable SearchInTable);
34
use C4::Members::Attributes qw(SearchIdMatchingAttribute);
35
use C4::Members::Attributes qw(SearchIdMatchingAttribute GetBorrowerAttributes);
35
36
36
our ($VERSION,@ISA,@EXPORT,@EXPORT_OK,$debug);
37
our ($VERSION,@ISA,@EXPORT,@EXPORT_OK,$debug);
37
38
Lines 91-96 BEGIN { Link Here
91
		&DeleteMessage
92
		&DeleteMessage
92
		&GetMessages
93
		&GetMessages
93
		&GetMessagesCount
94
		&GetMessagesCount
95
96
        &SetMemberInfosInTemplate
94
	);
97
	);
95
98
96
	#Modify data
99
	#Modify data
Lines 1705-1710 sub DelMember { Link Here
1705
    return $sth->rows;
1708
    return $sth->rows;
1706
}
1709
}
1707
1710
1711
=head2 SetMemberInfosInTemplate
1712
    &SetMemberInfosInTemplate($borrowernumber, $template)
1713
    
1714
    
1715
Settings borrower informations for template user
1716
1717
=cut
1718
1719
sub SetMemberInfosInTemplate {
1720
    my ($borrowernumber, $template) = @_;
1721
    
1722
    my $borrower = GetMemberDetails( $borrowernumber, 0 );
1723
    foreach my $key (keys %$borrower){
1724
        $template->param($key => $borrower->{$key});
1725
    }
1726
    
1727
    # Computes full borrower address
1728
    my (undef, $roadttype_hashref) = &GetRoadTypes();
1729
    my $address = $borrower->{'streetnumber'}.' '.$roadttype_hashref->{$borrower->{'streettype'}}.' '.$borrower->{'address'};
1730
    $template->param(is_child  => ($borrower->{'category_type'} eq 'C'),
1731
                    address    => $address,
1732
                    branchname => GetBranchName($borrower->{'branchcode'}),
1733
                    );
1734
                    
1735
    foreach (qw(dateenrolled dateexpiry dateofbirth)) {
1736
		my $userdate = $borrower->{$_};
1737
		unless ($userdate) {
1738
			$borrower->{$_} = '';
1739
			next;
1740
		}
1741
		$userdate = C4::Dates->new($userdate,'iso')->output('syspref');
1742
		$borrower->{$_} = $userdate || '';
1743
		$template->param( $_ => $userdate );
1744
    }
1745
    
1746
    my $attributes = GetBorrowerAttributes($borrowernumber);
1747
    $template->param(
1748
        extendedattributes => $attributes,
1749
    );
1750
}
1751
1708
=head2 ExtendMemberSubscriptionTo (OUEST-PROVENCE)
1752
=head2 ExtendMemberSubscriptionTo (OUEST-PROVENCE)
1709
1753
1710
    $date = ExtendMemberSubscriptionTo($borrowerid, $date);
1754
    $date = ExtendMemberSubscriptionTo($borrowerid, $date);
(-)a/C4/Members/AttributeTypes.pm (-4 / +27 lines)
Lines 102-107 sub new { Link Here
102
    $self->{'opac_display'} = 0;
102
    $self->{'opac_display'} = 0;
103
    $self->{'password_allowed'} = 0;
103
    $self->{'password_allowed'} = 0;
104
    $self->{'staff_searchable'} = 0;
104
    $self->{'staff_searchable'} = 0;
105
    $self->{'display_checkout'} = 0;
105
    $self->{'authorised_value_category'} = '';
106
    $self->{'authorised_value_category'} = '';
106
107
107
    bless $self, $class;
108
    bless $self, $class;
Lines 136-141 sub fetch { Link Here
136
    $self->{'opac_display'}              = $row->{'opac_display'};
137
    $self->{'opac_display'}              = $row->{'opac_display'};
137
    $self->{'password_allowed'}          = $row->{'password_allowed'};
138
    $self->{'password_allowed'}          = $row->{'password_allowed'};
138
    $self->{'staff_searchable'}          = $row->{'staff_searchable'};
139
    $self->{'staff_searchable'}          = $row->{'staff_searchable'};
140
    $self->{'display_checkout'}          = $row->{'display_checkout'};
139
    $self->{'authorised_value_category'} = $row->{'authorised_value_category'};
141
    $self->{'authorised_value_category'} = $row->{'authorised_value_category'};
140
142
141
    bless $self, $class;
143
    bless $self, $class;
Lines 166-179 sub store { Link Here
166
                                         opac_display = ?,
168
                                         opac_display = ?,
167
                                         password_allowed = ?,
169
                                         password_allowed = ?,
168
                                         staff_searchable = ?,
170
                                         staff_searchable = ?,
169
                                         authorised_value_category = ?
171
                                         authorised_value_category = ?,
172
                                         display_checkout = ?
170
                                     WHERE code = ?");
173
                                     WHERE code = ?");
171
    } else {
174
    } else {
172
        $sth = $dbh->prepare_cached("INSERT INTO borrower_attribute_types 
175
        $sth = $dbh->prepare_cached("INSERT INTO borrower_attribute_types 
173
                                        (description, repeatable, unique_id, opac_display, password_allowed,
176
                                        (description, repeatable, unique_id, opac_display, password_allowed,
174
                                         staff_searchable, authorised_value_category, code)
177
                                         staff_searchable, authorised_value_category, display_checkout, code)
175
                                        VALUES (?, ?, ?, ?, ?,
178
                                        VALUES (?, ?, ?, ?, ?,
176
                                                ?, ?, ?)");
179
                                                ?, ?, ?, ?)");
177
    }
180
    }
178
    $sth->bind_param(1, $self->{'description'});
181
    $sth->bind_param(1, $self->{'description'});
179
    $sth->bind_param(2, $self->{'repeatable'});
182
    $sth->bind_param(2, $self->{'repeatable'});
Lines 182-188 sub store { Link Here
182
    $sth->bind_param(5, $self->{'password_allowed'});
185
    $sth->bind_param(5, $self->{'password_allowed'});
183
    $sth->bind_param(6, $self->{'staff_searchable'});
186
    $sth->bind_param(6, $self->{'staff_searchable'});
184
    $sth->bind_param(7, $self->{'authorised_value_category'});
187
    $sth->bind_param(7, $self->{'authorised_value_category'});
185
    $sth->bind_param(8, $self->{'code'});
188
    $sth->bind_param(8, $self->{'display_checkout'});
189
    $sth->bind_param(9, $self->{'code'});
186
    $sth->execute;
190
    $sth->execute;
187
191
188
}
192
}
Lines 288-293 sub staff_searchable { Link Here
288
    @_ ? $self->{'staff_searchable'} = ((shift) ? 1 : 0) : $self->{'staff_searchable'};
292
    @_ ? $self->{'staff_searchable'} = ((shift) ? 1 : 0) : $self->{'staff_searchable'};
289
}
293
}
290
294
295
=head2 display_checkout
296
297
=over 4
298
299
my $display_checkout = $attr_type->display_checkout();
300
$attr_type->display_checkout($display_checkout);
301
302
=back
303
304
Accessor.  The C<$display_checkout> argument
305
is interpreted as a Perl boolean.
306
307
=cut
308
309
sub display_checkout {
310
    my $self = shift;
311
    @_ ? $self->{'display_checkout'} = ((shift) ? 1 : 0) : $self->{'display_checkout'};
312
}
313
291
=head2 authorised_value_category
314
=head2 authorised_value_category
292
315
293
  my $authorised_value_category = $attr_type->authorised_value_category();
316
  my $authorised_value_category = $attr_type->authorised_value_category();
(-)a/C4/Members/Attributes.pm (-1 / +2 lines)
Lines 72-78 sub GetBorrowerAttributes { Link Here
72
    my $opac_only = @_ ? shift : 0;
72
    my $opac_only = @_ ? shift : 0;
73
73
74
    my $dbh = C4::Context->dbh();
74
    my $dbh = C4::Context->dbh();
75
    my $query = "SELECT code, description, attribute, lib, password
75
    my $query = "SELECT code, description, attribute, lib, password, display_checkout
76
                 FROM borrower_attributes
76
                 FROM borrower_attributes
77
                 JOIN borrower_attribute_types USING (code)
77
                 JOIN borrower_attribute_types USING (code)
78
                 LEFT JOIN authorised_values ON (category = authorised_value_category AND attribute = authorised_value)
78
                 LEFT JOIN authorised_values ON (category = authorised_value_category AND attribute = authorised_value)
Lines 89-94 sub GetBorrowerAttributes { Link Here
89
            value             => $row->{'attribute'},  
89
            value             => $row->{'attribute'},  
90
            value_description => $row->{'lib'},  
90
            value_description => $row->{'lib'},  
91
            password          => $row->{'password'},
91
            password          => $row->{'password'},
92
            display_checkout  => $row->{'display_checkout'},
92
        }
93
        }
93
    }
94
    }
94
    return \@results;
95
    return \@results;
(-)a/admin/patron-attr-types.pl (-1 / +8 lines)
Lines 106-111 sub error_add_attribute_type_form { Link Here
106
    if ($input->param('staff_searchable')) {
106
    if ($input->param('staff_searchable')) {
107
        $template->param(staff_searchable_checked => 'checked="checked"');
107
        $template->param(staff_searchable_checked => 'checked="checked"');
108
    }
108
    }
109
    if ($input->param('display_checkout')) {
110
        $template->param(display_checkout_checked => 'checked="checked"');
111
    }
109
112
110
    $template->param(
113
    $template->param(
111
        attribute_type_form => 1,
114
        attribute_type_form => 1,
Lines 147-152 sub add_update_attribute_type { Link Here
147
    $attr_type->authorised_value_category($authorised_value_category);
150
    $attr_type->authorised_value_category($authorised_value_category);
148
    my $password_allowed = $input->param('password_allowed');
151
    my $password_allowed = $input->param('password_allowed');
149
    $attr_type->password_allowed($password_allowed);
152
    $attr_type->password_allowed($password_allowed);
153
    my $display_checkout = $input->param('display_checkout');
154
    $attr_type->display_checkout($display_checkout);
150
155
151
    if ($op eq 'edit') {
156
    if ($op eq 'edit') {
152
        $template->param(edited_attribute_type => $attr_type->code());
157
        $template->param(edited_attribute_type => $attr_type->code());
Lines 222-228 sub edit_attribute_type_form { Link Here
222
    if ($attr_type->staff_searchable()) {
227
    if ($attr_type->staff_searchable()) {
223
        $template->param(staff_searchable_checked => 'checked="checked"');
228
        $template->param(staff_searchable_checked => 'checked="checked"');
224
    }
229
    }
225
230
    if ($attr_type->display_checkout()) {
231
        $template->param(display_checkout_checked => 'checked="checked"');
232
    }
226
    authorised_value_category_list($template, $attr_type->authorised_value_category());
233
    authorised_value_category_list($template, $attr_type->authorised_value_category());
227
234
228
    $template->param(
235
    $template->param(
(-)a/circ/circulation.pl (-9 / +4 lines)
Lines 220-227 if ($borrowernumber) { Link Here
220
220
221
    # Warningdate is the date that the warning starts appearing
221
    # Warningdate is the date that the warning starts appearing
222
    my (  $today_year,   $today_month,   $today_day) = Today();
222
    my (  $today_year,   $today_month,   $today_day) = Today();
223
    my ($warning_year, $warning_month, $warning_day) = split /-/, $borrower->{'dateexpiry'};
223
    my ($warning_year, $warning_month, $warning_day) = split (/-/, $borrower->{'dateexpiry'});
224
    my (  $enrol_year,   $enrol_month,   $enrol_day) = split /-/, $borrower->{'dateenrolled'};
224
    my (  $enrol_year,   $enrol_month,   $enrol_day) = split (/-/, $borrower->{'dateenrolled'});
225
    # Renew day is calculated by adding the enrolment period to today
225
    # Renew day is calculated by adding the enrolment period to today
226
    my (  $renew_year,   $renew_month,   $renew_day);
226
    my (  $renew_year,   $renew_month,   $renew_day);
227
    if ($enrol_year*$enrol_month*$enrol_day>0) {
227
    if ($enrol_year*$enrol_month*$enrol_day>0) {
Lines 622-631 if($lib_messages_loop){ $template->param(flagged => 1 ); } Link Here
622
my $bor_messages_loop = GetMessages( $borrowernumber, 'B', $branch );
622
my $bor_messages_loop = GetMessages( $borrowernumber, 'B', $branch );
623
if($bor_messages_loop){ $template->param(flagged => 1 ); }
623
if($bor_messages_loop){ $template->param(flagged => 1 ); }
624
624
625
# Computes full borrower address
626
my (undef, $roadttype_hashref) = &GetRoadTypes();
627
my $address = $borrower->{'streetnumber'}.' '.$roadttype_hashref->{$borrower->{'streettype'}}.' '.$borrower->{'address'};
628
629
my $fast_cataloging = 0;
625
my $fast_cataloging = 0;
630
    if (defined getframeworkinfo('FA')) {
626
    if (defined getframeworkinfo('FA')) {
631
    $fast_cataloging = 1 
627
    $fast_cataloging = 1 
Lines 646-654 $template->param( Link Here
646
    surname           => $borrower->{'surname'},
642
    surname           => $borrower->{'surname'},
647
    dateexpiry        => format_date($newexpiry),
643
    dateexpiry        => format_date($newexpiry),
648
    expiry            => format_date($borrower->{'dateexpiry'}),
644
    expiry            => format_date($borrower->{'dateexpiry'}),
649
    categorycode      => $borrower->{'categorycode'},
650
    categoryname      => $borrower->{description},
645
    categoryname      => $borrower->{description},
651
    address           => $address,
652
    address2          => $borrower->{'address2'},
646
    address2          => $borrower->{'address2'},
653
    email             => $borrower->{'email'},
647
    email             => $borrower->{'email'},
654
    emailpro          => $borrower->{'emailpro'},
648
    emailpro          => $borrower->{'emailpro'},
Lines 657-663 $template->param( Link Here
657
    zipcode           => $borrower->{'zipcode'},
651
    zipcode           => $borrower->{'zipcode'},
658
    country           => $borrower->{'country'},
652
    country           => $borrower->{'country'},
659
    phone             => $borrower->{'phone'} || $borrower->{'mobile'},
653
    phone             => $borrower->{'phone'} || $borrower->{'mobile'},
660
    cardnumber        => $borrower->{'cardnumber'},
661
    amountold         => $amountold,
654
    amountold         => $amountold,
662
    barcode           => $barcode,
655
    barcode           => $barcode,
663
    stickyduedate     => $stickyduedate,
656
    stickyduedate     => $stickyduedate,
Lines 680-685 $template->param( Link Here
680
    fast_cataloging   => $fast_cataloging,
673
    fast_cataloging   => $fast_cataloging,
681
);
674
);
682
675
676
SetMemberInfosInTemplate($borrowernumber, $template);
677
683
# save stickyduedate to session
678
# save stickyduedate to session
684
if ($stickyduedate) {
679
if ($stickyduedate) {
685
    $session->param( 'stickyduedate', $duedatespec );
680
    $session->param( 'stickyduedate', $duedatespec );
(-)a/installer/data/mysql/atomicupdate/0009-patron-attr-display-checkout.pl (+7 lines)
Line 0 Link Here
1
#! /usr/bin/perl
2
use strict;
3
use warnings;
4
use C4::Context;
5
my $dbh=C4::Context->dbh;
6
$dbh->do("ALTER TABLE borrower_attribute_types ADD COLUMN `display_checkout` TINYINT(1) NOT NULL DEFAULT '0';");
7
print "Upgrade done (Added a display_checkout field in borrower_attribute_types table)\n";
(-)a/installer/data/mysql/kohastructure.sql (+1 lines)
Lines 281-286 CREATE TABLE `borrower_attribute_types` ( Link Here
281
  `password_allowed` tinyint(1) NOT NULL default 0,
281
  `password_allowed` tinyint(1) NOT NULL default 0,
282
  `staff_searchable` tinyint(1) NOT NULL default 0,
282
  `staff_searchable` tinyint(1) NOT NULL default 0,
283
  `authorised_value_category` varchar(10) default NULL,
283
  `authorised_value_category` varchar(10) default NULL,
284
  `display_checkout` tinyint(1) NOT NULL default 0,
284
  PRIMARY KEY  (`code`),
285
  PRIMARY KEY  (`code`),
285
  KEY `auth_val_cat_idx` (`authorised_value_category`)
286
  KEY `auth_val_cat_idx` (`authorised_value_category`)
286
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
287
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
(-)a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css (-1 / +33 lines)
Lines 1924-1929 ul.budget_hierarchy li:last-child:after { Link Here
1924
ul.budget_hierarchy li:first-child:after {
1924
ul.budget_hierarchy li:first-child:after {
1925
    content: "";
1925
    content: "";
1926
}
1926
}
1927
#cartmenulink img {
1928
	background-image : none;
1929
	display : inline;
1930
	padding : 3px 6px 0 0;
1931
}
1932
1933
* html #cartmenulink {
1934
	border : 1px solid #336600;
1935
}
1936
1937
* html #listsmenulink {
1938
	border : 1px solid #006699;
1939
}
1940
1941
#collapsedaddress {
1942
    border: solid 1px #eee;
1943
    margin-right: 10px;
1944
    overflow: hidden;
1945
}
1946
#toggleaddress {
1947
    display: block;
1948
    padding: 2px 2px 2px 12px;
1949
    margin-right: 10px;
1950
    cursor: pointer;
1951
}
1952
.toggleaddress {
1953
    background: #eee url(../../img/more-right-arrow.gif) 0 50% no-repeat;
1954
}
1955
.toggleaddress2 {
1956
    background: #eee url(../../img/more-up-arrow.gif) 0 50% no-repeat;
1957
}
1958
1927
.holdcount { font-size : 105%; line-height : 200%; }
1959
.holdcount { font-size : 105%; line-height : 200%; }
1928
.holdcount a { border : 1px solid #a4bedd; background-color : #e4ecf5; font-weight : bold; -moz-border-radius: 4px; padding : .1em .4em; text-decoration : none; }
1960
.holdcount a { border : 1px solid #a4bedd; background-color : #e4ecf5; font-weight : bold; -moz-border-radius: 4px; padding : .1em .4em; text-decoration : none; }
1929
.holdcount a:hover { background-color : #ebeff7; }
1961
.holdcount a:hover { background-color : #ebeff7; }
Lines 1988-1991 fieldset.rows+h3 {clear:both;padding-top:.5em;} Link Here
1988
.importing .importing_msg {
2020
.importing .importing_msg {
1989
    padding-left: 10px;
2021
    padding-left: 10px;
1990
    padding-bottom: 10px;
2022
    padding-bottom: 10px;
1991
}
2023
}
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc (-40 / +71 lines)
Lines 4-9 Link Here
4
<style type="tex/css">img { width: expression(this.width > 140 ? 140: true);
4
<style type="tex/css">img { width: expression(this.width > 140 ? 140: true);
5
}</style>
5
}</style>
6
<![endif]-->
6
<![endif]-->
7
<script type="text/javascript">
8
$(document).ready(function()
9
{
10
  //hide the all of the element with class msg_body
11
  $("#collapsedaddress").hide();
12
  //toggle the componenet with class msg_body
13
  $("#toggleaddress").click(function()
14
  {
15
    $("#collapsedaddress").slideToggle("normal");
16
    $("#toggleaddress").toggleClass("toggleaddress2");
17
  });
18
});
19
</script>
7
<ul>
20
<ul>
8
<!-- TMPL_IF NAME="patronimages" -->
21
<!-- TMPL_IF NAME="patronimages" -->
9
<!-- TMPL_IF NAME="picture" -->
22
<!-- TMPL_IF NAME="picture" -->
Lines 12-57 Link Here
12
<li><img src="/intranet-tmpl/prog/img/patron-blank.png" alt="<!-- TMPL_VAR name="firstname" --> <!-- TMPL_VAR name="surname" --> (<!-- TMPL_VAR NAME="cardnumber" -->)" border="0" style="margin: .3em 0 .3em .3em; padding: .2em; border: 1px solid #CCCCCC;" /></li>
25
<li><img src="/intranet-tmpl/prog/img/patron-blank.png" alt="<!-- TMPL_VAR name="firstname" --> <!-- TMPL_VAR name="surname" --> (<!-- TMPL_VAR NAME="cardnumber" -->)" border="0" style="margin: .3em 0 .3em .3em; padding: .2em; border: 1px solid #CCCCCC;" /></li>
13
<!-- /TMPL_IF -->
26
<!-- /TMPL_IF -->
14
<!-- /TMPL_IF -->
27
<!-- /TMPL_IF -->
15
    <li><!-- TMPL_IF NAME="address"-->
28
    <li><!-- TMPL_VAR NAME="categoryname" --> (<!-- TMPL_VAR NAME="categorycode" -->)</li>
16
            <!-- TMPL_VAR NAME="address" -->
29
    <li><!-- TMPL_IF NAME="branchname" --><!-- TMPL_VAR NAME="branchname" --><!-- TMPL_ELSE --><!-- TMPL_VAR NAME="branch" --><!-- /TMPL_IF --></li>
17
    <!-- TMPL_ELSE -->
30
    <!-- TMPL_LOOP NAME="extendedattributes" -->
18
            <span class="empty">No address stored.</span>
31
    	<!-- TMPL_IF NAME="display_checkout" -->
19
    <!-- /TMPL_IF --></li>
32
    		<!-- TMPL_IF NAME="value" -->
20
    <!-- TMPL_IF NAME="address2" -->
33
    			<!-- TMPL_VAR NAME="description" --> : <!-- TMPL_IF NAME="value_description" --><!-- TMPL_VAR NAME="value_description" --><!-- TMPL_ELSE --><!-- TMPL_VAR NAME="value" --><!-- /TMPL_IF -->
21
        <li><!-- TMPL_VAR NAME="address2" --></li>
34
    		<!-- /TMPL_IF -->
22
    <!-- /TMPL_IF --><li> 
35
    	<!-- /TMPL_IF -->
23
    <!-- TMPL_IF NAME="city" -->
36
    <!-- /TMPL_LOOP -->
24
            <!-- TMPL_VAR NAME="city" -->
37
    <li>
25
	    <!-- TMPL_VAR NAME="zipcode" -->
38
		<div id="collapsedaddress">
26
	    <!-- TMPL_IF NAME="country" -->, <!-- TMPL_VAR NAME="country" --><!-- /TMPL_IF -->
39
			<p>
27
    <!-- TMPL_ELSE -->
40
		    <!-- TMPL_IF NAME="address"-->
28
        <span class="empty">No city stored.</span>
41
		            <!-- TMPL_VAR NAME="address" -->
29
    <!-- /TMPL_IF --></li>
42
		    <!-- TMPL_ELSE -->
30
    <li><!--TMPL_IF NAME="phone" -->
43
		            <span class="empty">No address stored.</span>
31
        <!-- TMPL_VAR NAME="phone" -->
44
		    <!-- /TMPL_IF -->
32
    <!-- TMPL_ELSE -->
45
		    <!-- TMPL_IF NAME="address2" -->
33
        <!--TMPL_IF NAME="mobile" -->
46
		        <!-- TMPL_VAR NAME="address2" -->
34
            <!-- TMPL_VAR NAME="mobile" -->
47
		    <!-- /TMPL_IF -->
35
        <!-- TMPL_ELSE -->
48
		    <!-- TMPL_IF NAME="city" -->
36
            <!--TMPL_IF NAME="phonepro" -->
49
		            <!-- TMPL_VAR NAME="city" -->
37
                <!-- TMPL_VAR NAME="phonepro" -->
50
			    <!-- TMPL_VAR NAME="zipcode" -->
38
            <!-- TMPL_ELSE -->
51
			    <!-- TMPL_IF NAME="country" -->, <!-- TMPL_VAR NAME="country" --><!-- /TMPL_IF -->
39
                <span class="empty">No phone stored.</span>    
52
		    <!-- TMPL_ELSE -->
40
            <!-- /TMPL_IF -->
53
		        <span class="empty">No city stored.</span>
41
        <!-- /TMPL_IF -->
54
		    <!-- /TMPL_IF -->
42
    <!-- /TMPL_IF --></li>
55
		    </p>
43
    <!-- TMPL_IF NAME="email" -->
56
		    <p>
44
        <li class="email"> <a href="mailto:<!-- TMPL_VAR NAME="email" -->" title="<!-- TMPL_VAR NAME="email" -->"><!-- TMPL_VAR NAME="email" --></a></li>
57
		    <!--TMPL_IF NAME="phone" -->
45
    <!-- TMPL_ELSE -->
58
		        <!-- TMPL_VAR NAME="phone" -->
46
        <!-- TMPL_IF NAME="emailpro" -->
59
		    <!-- TMPL_ELSE -->
47
            <li class="email"> <a href="mailto:<!-- TMPL_VAR NAME="emailpro" -->" title="<!-- TMPL_VAR NAME="emailpro" -->"><!-- TMPL_VAR NAME="emailpro" --></a></li>
60
		        <!--TMPL_IF NAME="mobile" -->
48
        <!-- TMPL_ELSE -->
61
		            <!-- TMPL_VAR NAME="mobile" -->
49
            <li> <span class="empty">No email stored.</span>    </li>
62
		        <!-- TMPL_ELSE -->
50
        <!-- /TMPL_IF -->
63
		            <!--TMPL_IF NAME="phonepro" -->
51
    <!-- /TMPL_IF -->
64
		                <!-- TMPL_VAR NAME="phonepro" -->
52
    <li>Category: <!-- TMPL_VAR NAME="categoryname" --> (<!-- TMPL_VAR NAME="categorycode" -->)</li>
65
		            <!-- TMPL_ELSE -->
53
    <li>Home Library: <!-- TMPL_IF NAME="branchname" --><!-- TMPL_VAR NAME="branchname" --><!-- TMPL_ELSE --><!-- TMPL_VAR NAME="branch" --><!-- /TMPL_IF --></li>
66
		                <span class="empty">No phone stored.</span>    
54
</ul></div>
67
		            <!-- /TMPL_IF -->
68
		        <!-- /TMPL_IF -->
69
		    <!-- /TMPL_IF -->
70
		    </p><p>
71
		    <!-- TMPL_IF NAME="email" -->
72
		        <a href="mailto:<!-- TMPL_VAR NAME="email" -->" title="<!-- TMPL_VAR NAME="email" -->"><!-- TMPL_VAR NAME="email" --></a>
73
		    <!-- TMPL_ELSE -->
74
		        <!-- TMPL_IF NAME="emailpro" -->
75
		            <a href="mailto:<!-- TMPL_VAR NAME="emailpro" -->" title="<!-- TMPL_VAR NAME="emailpro" -->"><!-- TMPL_VAR NAME="emailpro" --></a>
76
		        <!-- TMPL_ELSE -->
77
		            <span class="empty">No email stored.</span>
78
		        <!-- /TMPL_IF -->
79
		    <!-- /TMPL_IF -->
80
		    </p>
81
		</div>
82
		<a id="toggleaddress" class="toggleaddress">View/Hide address</a>
83
    </li>
84
</ul>
85
</div>
55
<div id="menu">
86
<div id="menu">
56
<ul>
87
<ul>
57
	<!-- TMPL_IF NAME="circview" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->">Check Out</a></li>
88
	<!-- TMPL_IF NAME="circview" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->">Check Out</a></li>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tmpl (+5 lines)
Lines 122-127 function CheckAttributeTypeForm(f) { Link Here
122
            <input type="checkbox" id="staff_searchable" name="staff_searchable" <!-- TMPL_VAR name="staff_searchable_checked" --> />
122
            <input type="checkbox" id="staff_searchable" name="staff_searchable" <!-- TMPL_VAR name="staff_searchable_checked" --> />
123
            <span>Check to make this attribute staff_searchable in the staff patron search.</span>
123
            <span>Check to make this attribute staff_searchable in the staff patron search.</span>
124
       </li>
124
       </li>
125
       <li><label for="display_checkout">Display in check-out: </label>
126
            <input type="checkbox" id="display_checkout" name="display_checkout" <!-- TMPL_VAR name="display_checkout_checked" --> />
127
            <span>Check to show this attribute in member check-out.</span>
128
       </li>
129
       
125
        <li><label for="authorised_value_category">Authorized value category: </label>
130
        <li><label for="authorised_value_category">Authorized value category: </label>
126
            <select name="authorised_value_category" id="authorised_value_category">
131
            <select name="authorised_value_category" id="authorised_value_category">
127
                <option value=""></option>
132
                <option value=""></option>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tmpl (-1 / +1 lines)
Lines 407-413 function Dopop(link) { Link Here
407
            <td><!-- TMPL_VAR Name="itemcallnumber" --></td>
407
            <td><!-- TMPL_VAR Name="itemcallnumber" --></td>
408
            <td><!-- TMPL_VAR Name="itemtype" --> <!-- TMPL_VAR Name="ccode" --></td>
408
            <td><!-- TMPL_VAR Name="itemtype" --> <!-- TMPL_VAR Name="ccode" --></td>
409
			<td><!-- TMPL_IF Name="duedate" -->
409
			<td><!-- TMPL_IF Name="duedate" -->
410
                <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR Name="borrowernumber" -->">
410
                <a href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=<!-- TMPL_VAR Name="borrowernumber" -->">
411
                    <!-- TMPL_VAR Name="borsurname" -->, <!-- TMPL_VAR Name="borfirstname" --> (<!-- TMPL_VAR name="borcategorycode" -->)
411
                    <!-- TMPL_VAR Name="borsurname" -->, <!-- TMPL_VAR Name="borfirstname" --> (<!-- TMPL_VAR name="borcategorycode" -->)
412
                </a>
412
                </a>
413
            <!-- TMPL_ELSE -->Not checked out<!-- /TMPL_IF --></td>
413
            <!-- TMPL_ELSE -->Not checked out<!-- /TMPL_IF --></td>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl (-1 / +1 lines)
Lines 179-185 function validate1(date) { Link Here
179
179
180
     <!-- TMPL_UNLESS NAME="I" --><!-- TMPL_IF NAME="othernames" -->&ldquo;<!-- TMPL_VAR NAME="othernames" -->&rdquo;<!-- /TMPL_IF -->
180
     <!-- TMPL_UNLESS NAME="I" --><!-- TMPL_IF NAME="othernames" -->&ldquo;<!-- TMPL_VAR NAME="othernames" -->&rdquo;<!-- /TMPL_IF -->
181
181
182
<p class="address"><!-- TMPL_VAR NAME="streetnumber" -->
182
<p class="address">
183
        <!--TMPL_IF NAME="roaddetails"-->
183
        <!--TMPL_IF NAME="roaddetails"-->
184
         <!-- TMPL_VAR NAME="roaddetails" -->,
184
         <!-- TMPL_VAR NAME="roaddetails" -->,
185
        <!-- /TMPL_IF -->
185
        <!-- /TMPL_IF -->
(-)a/members/member.pl (+6 lines)
Lines 115-120 if ($results) { Link Here
115
	}
115
	}
116
    $count = scalar(@$results);
116
    $count = scalar(@$results);
117
}
117
}
118
119
if($count == 1){
120
    print $input->redirect("/cgi-bin/koha/members/moremember.pl?borrowernumber=" . @$results[0]->{borrowernumber});
121
    exit;
122
}
123
118
my @resultsdata;
124
my @resultsdata;
119
$to=($count>$to?$to:$count);
125
$to=($count>$to?$to:$count);
120
my $index=$from;
126
my $index=$from;
(-)a/members/moremember.pl (-3 / +1 lines)
Lines 146-152 foreach (qw(dateenrolled dateexpiry dateofbirth)) { Link Here
146
		$data->{$_} = $userdate || '';
146
		$data->{$_} = $userdate || '';
147
		$template->param( $_ => $userdate );
147
		$template->param( $_ => $userdate );
148
}
148
}
149
$data->{'IS_ADULT'} = ( $data->{'categorycode'} ne 'I' );
150
149
151
for (qw(debarred gonenoaddress lost borrowernotes)) {
150
for (qw(debarred gonenoaddress lost borrowernotes)) {
152
	 $data->{$_} and $template->param(flagged => 1) and last;
151
	 $data->{$_} and $template->param(flagged => 1) and last;
Lines 427-433 $template->param( picture => 1 ) if $picture; Link Here
427
426
428
my $branch=C4::Context->userenv->{'branch'};
427
my $branch=C4::Context->userenv->{'branch'};
429
428
430
$template->param($data);
429
SetMemberInfosInTemplate($borrowernumber, $template);
431
430
432
if (C4::Context->preference('ExtendedPatronAttributes')) {
431
if (C4::Context->preference('ExtendedPatronAttributes')) {
433
    $template->param(ExtendedPatronAttributes => 1);
432
    $template->param(ExtendedPatronAttributes => 1);
434
- 

Return to bug 5436