Variable redeclared in same scope

[koha.git] / C4 / Suggestions.pm

diff --git a/C4/Suggestions.pm b/C4/Suggestions.pm
index ed2bbfa..5ea6c77 100644 (file)
--- a/C4/Suggestions.pm
+++ b/C4/Suggestions.pm
@@ -13,12 +13,13 @@ package C4::Suggestions;
 # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
 # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
 #
-# You should have received a copy of the GNU General Public License along with
-# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-# Suite 330, Boston, MA  02111-1307 USA
+# You should have received a copy of the GNU General Public License along
+# with Koha; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 
 use strict;
+#use warnings; FIXME - Bug 2505
 use CGI;
 
 use C4::Context;
@@ -137,7 +138,7 @@ sub SearchSuggestion  {
     LEFT JOIN categories AS C2 ON C2.categorycode = U2.categorycode
     WHERE STATUS NOT IN ('CLAIMED')
     } , map {
-        if ( my $s = $$suggestion{$_} ) {
+        if ( my $s = $suggestion->{$_} ) {
         push @sql_params,'%'.$s.'%'; 
         " and suggestions.$_ like ? ";
         } else { () }
@@ -147,7 +148,7 @@ sub SearchSuggestion  {
     my $userenv = C4::Context->userenv;
     if (C4::Context->preference('IndependantBranches')) {
             if ($userenv) {
-                if (($userenv->{flags} % 2) != 1 && !$$suggestion{branchcode}){
+                if (($userenv->{flags} % 2) != 1 && !$suggestion->{branchcode}){
                 push @sql_params,$$userenv{branch};
                 push @query,q{ and (branchcode = ? or branchcode ='')};
                 }
@@ -161,7 +162,7 @@ sub SearchSuggestion  {
     >} keys %$suggestion
     ) {
         if ($$suggestion{$field}){
-            push @sql_params,$$suggestion{$field};
+            push @sql_params,$suggestion->{$field};
             push @query, " and suggestions.$field=?";
         } 
         else {
@@ -378,17 +379,24 @@ Note that there is no function to modify a suggestion.
 sub ModSuggestion {
     my ($suggestion)=@_;
     my $status_update_table=UpdateInTable("suggestions", $suggestion);
-    # check mail sending.
-    if ($$suggestion{STATUS}){
-        my $letter=C4::Letters::getletter('suggestions',$$suggestion{STATUS});
-        if ($letter){
-        my $enqueued = C4::Letters::EnqueueLetter({
-            letter=>$letter,
-            borrowernumber=>$$suggestion{suggestedby},
-            suggestionid=>$$suggestion{suggestionid},
-            msg_transport_type=>'email'
+
+    if ($suggestion->{STATUS}) {
+        # fetch the entire updated suggestion so that we can populate the letter
+        my $full_suggestion = GetSuggestion($suggestion->{suggestionid});
+        my $letter = C4::Letters::getletter('suggestions', $full_suggestion->{STATUS});
+        if ($letter) {
+            C4::Letters::parseletter($letter, 'branches',    $full_suggestion->{branchcode});
+            C4::Letters::parseletter($letter, 'borrowers',   $full_suggestion->{suggestedby});
+            C4::Letters::parseletter($letter, 'suggestions', $full_suggestion->{suggestionid});
+            C4::Letters::parseletter($letter, 'biblio',      $full_suggestion->{biblionumber});
+            my $enqueued = C4::Letters::EnqueueLetter({
+                letter                  => $letter,
+                borrowernumber          => $full_suggestion->{suggestedby},
+                suggestionid            => $full_suggestion->{suggestionid},
+                LibraryName             => C4::Context->preference("LibraryName"),
+                message_transport_type  => 'email',
             });
-        if (!$enqueued){warn "can't enqueue letter $letter";}
+            if (!$enqueued){warn "can't enqueue letter $letter";}
         }
     }
     return $status_update_table;
@@ -451,7 +459,7 @@ __END__
 
 =head1 AUTHOR
 
-Koha Developement team <info@koha.org>
+Koha Development Team <http://koha-community.org/>
 
 =cut