projects
/
koha.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bug 4330 : Fixing copyright and removing unconditional warn chris c mail 2010-12...
[koha.git]
/
members
/
moremember.pl
diff --git
a/members/moremember.pl
b/members/moremember.pl
index
34a3e09
..
bb593c4
100755
(executable)
--- a/
members/moremember.pl
+++ b/
members/moremember.pl
@@
-1,6
+1,7
@@
#!/usr/bin/perl
# Copyright 2000-2002 Katipo Communications
#!/usr/bin/perl
# Copyright 2000-2002 Katipo Communications
+# Copyright 2010 BibLibre
#
# This file is part of Koha.
#
#
# This file is part of Koha.
#
@@
-49,6
+50,7
@@
use C4::Biblio;
use C4::Reserves;
use C4::Branch; # GetBranchName
use C4::Form::MessagingPreferences;
use C4::Reserves;
use C4::Branch; # GetBranchName
use C4::Form::MessagingPreferences;
+use C4::NewsChannels; #get slip news
#use Smart::Comments;
#use Data::Dumper;
#use Smart::Comments;
#use Data::Dumper;
@@
-89,6
+91,9
@@
if ($print eq "page") {
$template_name = "members/moremember-receipt.tmpl";
$quickslip = 1;
$flagsrequired = { circulate => "circulate_remaining_permissions" };
$template_name = "members/moremember-receipt.tmpl";
$quickslip = 1;
$flagsrequired = { circulate => "circulate_remaining_permissions" };
+} elsif ($print eq "brief") {
+ $template_name = "members/moremember-brief.tmpl";
+ $flagsrequired = { borrowers => 1 };
} else {
$template_name = "members/moremember.tmpl";
$flagsrequired = { borrowers => 1 };
} else {
$template_name = "members/moremember.tmpl";
$flagsrequired = { borrowers => 1 };
@@
-151,7
+156,7
@@
$data->{ "sex_".$data->{'sex'}."_p" } = 1;
my $catcode;
if ( $category_type eq 'C') {
my $catcode;
if ( $category_type eq 'C') {
- if ($data->{
'guarantorid'} ne '0'
) {
+ if ($data->{
guarantorid}
) {
my $data2 = GetMember( 'borrowernumber' => $data->{'guarantorid'} );
foreach (qw(address city B_address B_city phone mobile zipcode country B_country)) {
$data->{$_} = $data2->{$_};
my $data2 = GetMember( 'borrowernumber' => $data->{'guarantorid'} );
foreach (qw(address city B_address B_city phone mobile zipcode country B_country)) {
$data->{$_} = $data2->{$_};
@@
-168,7
+173,7
@@
if ( $category_type eq 'C') {
if ( $data->{'ethnicity'} || $data->{'ethnotes'} ) {
$template->param( printethnicityline => 1 );
}
if ( $data->{'ethnicity'} || $data->{'ethnotes'} ) {
$template->param( printethnicityline => 1 );
}
-if ( $category_type eq 'A' ) {
+if ( $category_type eq 'A'
|| $category_type eq 'I'
) {
$template->param( isguarantee => 1 );
# FIXME
$template->param( isguarantee => 1 );
# FIXME
@@
-188,7
+193,7
@@
if ( $category_type eq 'A' ) {
);
}
$template->param( guaranteeloop => \@guaranteedata );
);
}
$template->param( guaranteeloop => \@guaranteedata );
- ( $template->param( adultborrower => 1 ) ) if ( $category_type eq 'A' );
+ ( $template->param( adultborrower => 1 ) ) if ( $category_type eq 'A'
|| $category_type eq 'I'
);
}
else {
if ($data->{'guarantorid'}){
}
else {
if ($data->{'guarantorid'}){
@@
-218,8
+223,7
@@
if ( C4::Context->preference("IndependantBranches") ) {
$samebranch = 1;
}
my $branchdetail = GetBranchDetail( $data->{'branchcode'});
$samebranch = 1;
}
my $branchdetail = GetBranchDetail( $data->{'branchcode'});
-$data->{'branchname'} = $branchdetail->{branchname};
-
+@{$data}{keys %$branchdetail} = values %$branchdetail; # merge in all branch columns
my ( $total, $accts, $numaccts) = GetMemberAccountRecords( $borrowernumber );
my $lib1 = &GetSortDetails( "Bsort1", $data->{'sort1'} );
my ( $total, $accts, $numaccts) = GetMemberAccountRecords( $borrowernumber );
my $lib1 = &GetSortDetails( "Bsort1", $data->{'sort1'} );
@@
-227,6
+231,12
@@
my $lib2 = &GetSortDetails( "Bsort2", $data->{'sort2'} );
$template->param( lib1 => $lib1 ) if ($lib1);
$template->param( lib2 => $lib2 ) if ($lib2);
$template->param( lib1 => $lib1 ) if ($lib1);
$template->param( lib2 => $lib2 ) if ($lib2);
+# Show OPAC privacy preference is system preference is set
+if ( C4::Context->preference('OPACPrivacy') ) {
+ $template->param( OPACPrivacy => 1);
+ $template->param( "privacy".$data->{'privacy'} => 1);
+}
+
# current issues
#
my $issue = GetPendingIssues($borrowernumber);
# current issues
#
my $issue = GetPendingIssues($borrowernumber);
@@
-423,6
+433,7
@@
$template->param(
categoryname => $data->{'description'},
reregistration => $reregistration,
branch => $branch,
categoryname => $data->{'description'},
reregistration => $reregistration,
branch => $branch,
+ todaysdate => C4::Dates->today(),
totalprice => sprintf("%.2f", $totalprice),
totaldue => sprintf("%.2f", $total),
totaldue_raw => $total,
totalprice => sprintf("%.2f", $totalprice),
totaldue => sprintf("%.2f", $total),
totaldue_raw => $total,
@@
-440,4
+451,13
@@
$template->param(
quickslip => $quickslip,
);
quickslip => $quickslip,
);
+#Get the slip news items
+my $all_koha_news = &GetNewsToDisplay("slip");
+my $koha_news_count = scalar @$all_koha_news;
+
+$template->param(
+ koha_news => $all_koha_news,
+ koha_news_count => $koha_news_count
+);
+
output_html_with_http_headers $input, $cookie, $template->output;
output_html_with_http_headers $input, $cookie, $template->output;