From c15460a070db322a1c65f2c29edd8fd61881457a Mon Sep 17 00:00:00 2001 From: Colin Campbell Date: Mon, 11 Apr 2011 18:06:29 +0100 Subject: [PATCH] Bug 6164 Send Borrower Data to template consistently Content-Type: text/plain; charset="utf-8" messaging and notices patron tabs were not passing borrower info in a manner consistent with other tabs --- members/messaging.pl | 4 ++-- members/notices.pl | 6 +----- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/members/messaging.pl b/members/messaging.pl index ef9cfa4..8791dcf 100755 --- a/members/messaging.pl +++ b/members/messaging.pl @@ -84,7 +84,6 @@ $template->param( messagingview => 1, message_queue => $message_queue, DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(), borrowernumber => $borrowernumber, - branchcode => $borrower->{'branchcode'}, branchname => GetBranchName($borrower->{'branchcode'}), dateformat => C4::Context->preference("dateformat"), categoryname => $borrower->{'description'}, @@ -94,7 +93,8 @@ $template->param( messagingview => 1, #$messaging_preferences->{'SMSnumber'}{'value'} = defined $borrower->{'smsalertnumber'} # ? $borrower->{'smsalertnumber'} : $borrower->{'mobile'}; -$template->param( BORROWER_INFO => [ $borrower ], +$template->param( %{ $borrower } ); +$template->param( messagingview => 1, is_child => ($borrower->{'category_type'} eq 'C'), ); diff --git a/members/notices.pl b/members/notices.pl index f6680d5..088d5a8 100755 --- a/members/notices.pl +++ b/members/notices.pl @@ -51,16 +51,12 @@ $template->param( picture => 1 ) if $picture; # Getting the messages my $queued_messages = C4::Letters::GetQueuedMessages({borrowernumber => $borrowernumber}); +$template->param( %{$borrower} ); $template->param( QUEUED_MESSAGES => $queued_messages, - BORROWER_INFO => [ $borrower ], - firstname => $borrower->{'firstname'}, - surname => $borrower->{'surname'}, borrowernumber => $borrowernumber, sentnotices => 1 ); output_html_with_http_headers $input, $cookie, $template->output; - - -- 1.7.4.2