From db0686c0f38d947ff115667ee60244b5bed5ee0d Mon Sep 17 00:00:00 2001 From: Jesse Weaver Date: Wed, 8 Jun 2011 16:17:56 -0600 Subject: [PATCH] Bug 6485 - Checkout slip should be more useful This patch makes the following improvements to the checkout slip: * Does not show the branchname if it is the same as the global LibraryName, which is useful for single-library catalogs. * Shows branchaddress* information. This is wrapped in a
with class .slip-address-info, making it easy to disable with intranetuserjs... * ... which has been added to the checkout slip. --- .../prog/en/modules/members/moremember-receipt.tt | 17 +++++++++++++++++ members/moremember.pl | 3 +++ 2 files changed, 20 insertions(+), 0 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-receipt.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-receipt.tt index 4a85ccb..0ef561c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-receipt.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-receipt.tt @@ -6,10 +6,18 @@ +[% IF ( intranetuserjs ) %] + +[% END %] @@ -17,6 +25,15 @@

[% LibraryName %]

[% IF ( branchname ) %][% branchname %]
[% END %] +
+[% IF ( branchphone ) %][% branchphone %]
[% END %] +[% IF ( branchaddress1 ) %][% branchaddress1 %]
[% END %] +[% IF ( branchaddress2 ) %][% branchaddress2 %]
[% END %] +[% IF ( branchaddress3 ) %][% branchaddress3 %]
[% END %] +[% IF ( branchcity ) %][% branchcity %], [% branchstate %] [% branchzip %]
[% END %] +
+
+ Checked out to [% firstname %] [% surname %]
([% cardnumber %])
diff --git a/members/moremember.pl b/members/moremember.pl index b766f2f..f8e3dfb 100755 --- a/members/moremember.pl +++ b/members/moremember.pl @@ -428,6 +428,9 @@ $template->param( picture => 1 ) if $picture; my $branch=C4::Context->userenv->{'branch'}; $template->param(%$data); +if (C4::Context->preference('LibraryName') eq $branchdetail->{'branchname'}) { + $template->param(branchname => ''); +} if (C4::Context->preference('ExtendedPatronAttributes')) { $template->param(ExtendedPatronAttributes => 1); -- 1.7.4.1