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

(-)a/C4/Members.pm (+55 lines)
Lines 87-92 BEGIN { Link Here
87
		&DeleteMessage
87
		&DeleteMessage
88
		&GetMessages
88
		&GetMessages
89
		&GetMessagesCount
89
		&GetMessagesCount
90
		&SetMemberInfosInTemplate
91
      &getFullBorrowerAddress
90
	);
92
	);
91
93
92
	#Modify data
94
	#Modify data
Lines 1642-1647 sub DelMember { Link Here
1642
    return $sth->rows;
1644
    return $sth->rows;
1643
}
1645
}
1644
1646
1647
=head2 SetMemberInfosInTemplate
1648
    &SetMemberInfosInTemplate($borrowernumber, $template)
1649
    
1650
    
1651
Settings borrower informations for template user
1652
1653
=cut
1654
1655
sub SetMemberInfosInTemplate {
1656
    my ($borrowernumber, $template) = @_;
1657
    
1658
    my $borrower = GetMemberDetails( $borrowernumber, 0 );
1659
    foreach my $key (keys %$borrower){
1660
        $template->param($key => $borrower->{$key});
1661
    }
1662
    
1663
    # Computes full borrower address
1664
    my (undef, $roadttype_hashref) = &GetRoadTypes();
1665
    my $address = $borrower->{'streetnumber'}.' '.$roadttype_hashref->{$borrower->{'streettype'}}.' '.$borrower->{'address'};
1666
    $template->param(is_child  => ($borrower->{'category_type'} eq 'C'),
1667
                    address    => $address,
1668
                    branchname => GetBranchName($borrower->{'branchcode'}),
1669
                    );
1670
                    
1671
    foreach (qw(dateenrolled dateexpiry dateofbirth)) {
1672
		my $userdate = $borrower->{$_};
1673
		unless ($userdate) {
1674
			$borrower->{$_} = '';
1675
			next;
1676
		}
1677
		$userdate = C4::Dates->new($userdate,'iso')->output('syspref');
1678
		$borrower->{$_} = $userdate || '';
1679
		$template->param( $_ => $userdate );
1680
    }
1681
    
1682
    my $attributes = GetBorrowerAttributes($borrowernumber);
1683
    $template->param(
1684
        extendedattributes => $attributes,
1685
    );
1686
}
1687
1688
sub getFullBorrowerAddress {
1689
    my ( $borrowernumber ) = @_;
1690
    my $borrower = GetMemberDetails( $borrowernumber, 0 );
1691
    # Computes full borrower address
1692
    my ( undef, $roadttype_hashref ) = &GetRoadTypes();
1693
    my $address1="";
1694
    if(($borrower->{'streetnumber'}) ne ''){$address1=$address1.$borrower->{'streetnumber'}.' ';}
1695
    if(($roadttype_hashref->{ $borrower->{'streettype'} }) ne ""){$address1=$address1.$roadttype_hashref->{ $borrower->{'streettype'} }.' ';}
1696
    $address1=$address1.$borrower->{'address'};
1697
    return $address1;
1698
}
1699
1645
=head2 ExtendMemberSubscriptionTo (OUEST-PROVENCE)
1700
=head2 ExtendMemberSubscriptionTo (OUEST-PROVENCE)
1646
1701
1647
    $date = ExtendMemberSubscriptionTo($borrowerid, $date);
1702
    $date = ExtendMemberSubscriptionTo($borrowerid, $date);
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl (+2 lines)
Lines 172-177 function validate1(date) { Link Here
172
        <!--TMPL_IF NAME="roaddetails"-->
172
        <!--TMPL_IF NAME="roaddetails"-->
173
         <!-- TMPL_VAR NAME="roaddetails" -->,
173
         <!-- TMPL_VAR NAME="roaddetails" -->,
174
        <!-- /TMPL_IF -->
174
        <!-- /TMPL_IF -->
175
176
175
        <!-- TMPL_VAR NAME="address" --><br />
177
        <!-- TMPL_VAR NAME="address" --><br />
176
        <!-- TMPL_IF NAME="address2" --><!-- TMPL_VAR NAME="address2"--><br /><!-- /TMPL_IF -->
178
        <!-- TMPL_IF NAME="address2" --><!-- TMPL_VAR NAME="address2"--><br /><!-- /TMPL_IF -->
177
    	<!-- TMPL_IF NAME="city" --><!-- TMPL_VAR NAME="city" --><!-- /TMPL_IF -->
179
    	<!-- TMPL_IF NAME="city" --><!-- TMPL_VAR NAME="city" --><!-- /TMPL_IF -->
(-)a/members/member.pl (-6 / +6 lines)
Lines 116-121 foreach my $borrower(@$results[$from..$to-1]){ Link Here
116
  my ($od,$issue,$fines)=GetMemberIssuesAndFines($$borrower{'borrowernumber'});
116
  my ($od,$issue,$fines)=GetMemberIssuesAndFines($$borrower{'borrowernumber'});
117
117
118
  $$borrower{'dateexpiry'}= C4::Dates->new($$borrower{'dateexpiry'},'iso')->output('syspref');
118
  $$borrower{'dateexpiry'}= C4::Dates->new($$borrower{'dateexpiry'},'iso')->output('syspref');
119
    $$borrower{'address'}=getFullBorrowerAddress($$borrower{'borrowernumber'});
119
120
120
  my %row = (
121
  my %row = (
121
    count => $index++,
122
    count => $index++,
Lines 163-172 $template->param( Link Here
163
    branchloop=>\@branchloop,
164
    branchloop=>\@branchloop,
164
    categories=>\@categories,
165
    categories=>\@categories,
165
    searching       => "1",
166
    searching       => "1",
166
		actionname		=>basename($0),
167
    actionname		=>basename($0),
167
		%$patron,
168
    %$patron,
168
        numresults      => $count,
169
    numresults      => $count,
169
        resultsloop     => \@resultsdata,
170
    resultsloop     => \@resultsdata,
170
            );
171
);
171
172
172
output_html_with_http_headers $input, $cookie, $template->output;
173
output_html_with_http_headers $input, $cookie, $template->output;
173
- 

Return to bug 5749