Bug 30952: Fix background color of dialogs (message, alert, error)

[koha-ffzg.git] / C4 / Suggestions.pm

diff --git a/C4/Suggestions.pm b/C4/Suggestions.pm
index ccc0c8e..dc92c15 100644 (file)
--- a/C4/Suggestions.pm
+++ b/C4/Suggestions.pm
@@ -5,47 +5,46 @@ package C4::Suggestions;
 #
 # This file is part of Koha.
 #
 #
 # This file is part of Koha.
 #

-# Koha is free software; you can redistribute it and/or modify it under the
-# terms of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
+# Koha is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.

 #
 #

-# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+# Koha is distributed in the hope that it will be useful, but
+# WITHOUT ANY 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.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# You should have received a copy of the GNU General Public License
+# along with Koha; if not, see <http://www.gnu.org/licenses>.

 
 

-
-use strict;
-#use warnings; FIXME - Bug 2505
-use CGI;
+use Modern::Perl;
+use CGI qw ( -utf8 );

 
 use C4::Context;
 use C4::Output;
 
 use C4::Context;
 use C4::Output;

-use C4::Dates qw(format_date format_date_in_iso);
-use C4::SQLHelper qw(:all);
-use C4::Debug;

 use C4::Letters;
 use C4::Letters;

-use List::MoreUtils qw<any>;
-use C4::Dates qw(format_date_in_iso);
+use C4::Biblio qw( GetMarcFromKohaField );
+use Koha::DateUtils qw( dt_from_string );
+use Koha::Suggestions;
+

 use base qw(Exporter);
 use base qw(Exporter);

-our $VERSION = 3.01;
-our @EXPORT  = qw<
-    ConnectSuggestionAndBiblio
-    CountSuggestion
-    DelSuggestion
-    GetSuggestion
-    GetSuggestionByStatus
-    GetSuggestionFromBiblionumber
-    ModStatus
-    ModSuggestion
-    NewSuggestion
-    SearchSuggestion
-    DelSuggestionsOlderThan
->;
+
+our @EXPORT  = qw(
+  ConnectSuggestionAndBiblio
+  DelSuggestion
+  GetSuggestion
+  GetSuggestionByStatus
+  GetSuggestionFromBiblionumber
+  GetSuggestionInfoFromBiblionumber
+  GetSuggestionInfo
+  ModStatus
+  ModSuggestion
+  NewSuggestion
+  DelSuggestionsOlderThan
+  GetUnprocessedSuggestions
+  MarcRecordFromNewSuggestion
+);

 
 =head1 NAME
 
 
 =head1 NAME
 


@@ -61,7 +60,7 @@ The functions in this module deal with the aqorders in OPAC and in librarian int
 
 A suggestion is done in the OPAC. It has the status "ASKED"
 
 
 A suggestion is done in the OPAC. It has the status "ASKED"
 

-When a librarian manages the suggestion, he can set the status to "REJECTED" or "ACCEPTED".
+When a librarian manages the suggestion, they can set the status to "REJECTED" or "ACCEPTED".

 
 When the book is ordered, the suggestion status becomes "ORDERED"
 
 
 When the book is ordered, the suggestion status becomes "ORDERED"
 


@@ -72,108 +71,11 @@ Suggestions done by other borrowers can be seen when not "AVAILABLE"
 
 =head1 FUNCTIONS
 
 
 =head1 FUNCTIONS
 

-=head2 SearchSuggestion
-
-(\@array) = &SearchSuggestion($suggestionhashref_to_search)
-
-searches for a suggestion
-
-return :
-C<\@array> : the aqorders found. Array of hash.
-Note the status is stored twice :
-* in the status field
-* as parameter ( for example ASKED => 1, or REJECTED => 1) . This is for template & translation purposes.
-
-=cut
-
-sub SearchSuggestion  {
-    my ($suggestion)=@_;
-    my $dbh = C4::Context->dbh;
-    my @sql_params;
-    my @query = (
-    q{ SELECT suggestions.*,
-        U1.branchcode   AS branchcodesuggestedby,
-        B1.branchname   AS branchnamesuggestedby,
-        U1.surname   AS surnamesuggestedby,
-        U1.firstname AS firstnamesuggestedby,
-        U1.email AS emailsuggestedby,
-        U1.borrowernumber AS borrnumsuggestedby,
-        U1.categorycode AS categorycodesuggestedby,
-        C1.description AS categorydescriptionsuggestedby,
-        U2.surname   AS surnamemanagedby,
-        U2.firstname AS firstnamemanagedby,
-        B2.branchname   AS branchnamesuggestedby,
-        U2.email AS emailmanagedby,
-        U2.branchcode AS branchcodemanagedby,
-        U2.borrowernumber AS borrnummanagedby
-    FROM suggestions
-    LEFT JOIN borrowers AS U1 ON suggestedby=U1.borrowernumber
-    LEFT JOIN branches AS B1 ON B1.branchcode=U1.branchcode
-    LEFT JOIN categories AS C1 ON C1.categorycode = U1.categorycode
-    LEFT JOIN borrowers AS U2 ON managedby=U2.borrowernumber
-    LEFT JOIN branches AS B2 ON B2.branchcode=U2.branchcode
-    LEFT JOIN categories AS C2 ON C2.categorycode = U2.categorycode
-    WHERE 1=1
-    } , map {
-        if ( my $s = $suggestion->{$_} ) {
-        push @sql_params,'%'.$s.'%'; 
-        " and suggestions.$_ like ? ";
-        } else { () }
-    } qw( title author isbn publishercode collectiontitle )
-    );
-
-    my $userenv = C4::Context->userenv;
-    if (C4::Context->preference('IndependantBranches')) {
-            if ($userenv) {
-                if (($userenv->{flags} % 2) != 1 && !$suggestion->{branchcode}){
-                push @sql_params,$$userenv{branch};
-                push @query,q{ and (suggestions.branchcode = ? or suggestions.branchcode ='')};
-                }
-            }
-    }
-
-    foreach my $field (grep { my $fieldname=$_;
-        any {$fieldname eq $_ } qw<
-    STATUS branchcode itemtype suggestedby managedby acceptedby
-    bookfundid biblionumber
-    >} keys %$suggestion
-    ) {
-        if ($$suggestion{$field}){
-            push @sql_params,$suggestion->{$field};
-            push @query, " and suggestions.$field=?";
-        } 
-        else {
-            push @query, " and (suggestions.$field='' OR suggestions.$field IS NULL)";
-        }
-    }
-
-    my $today = C4::Dates->today('iso');
-
-    foreach ( qw( suggesteddate manageddate accepteddate ) ) {
-        my $from = $_ . "_from";
-        my $to = $_ . "_to";
-        if ($$suggestion{$from} || $$suggestion{$to}) {
-            push @query, " AND suggestions.suggesteddate BETWEEN '" 
-                . (format_date_in_iso($$suggestion{$from}) || 0000-00-00) . "' AND '" . (format_date_in_iso($$suggestion{$to}) || $today) . "'";
-        } 
-    }
-
-    $debug && warn "@query";
-    my $sth=$dbh->prepare("@query");
-    $sth->execute(@sql_params);
-    my @results;
-    while ( my $data=$sth->fetchrow_hashref ){
-        $$data{$$data{STATUS}} = 1;
-        push(@results,$data);
-    }
-    return (\@results);
-}
-

 =head2 GetSuggestion
 
 =head2 GetSuggestion
 

-\%sth = &GetSuggestion($ordernumber)
+\%sth = &GetSuggestion($suggestionid)

 
 

-this function get the detail of the suggestion $ordernumber (input arg)
+this function get the detail of the suggestion $suggestionid (input arg)

 
 return :
     the result of the SQL query as a hash : $sth->fetchrow_hashref.
 
 return :
     the result of the SQL query as a hash : $sth->fetchrow_hashref.


@@ -181,16 +83,16 @@ return :
 =cut
 
 sub GetSuggestion {
 =cut
 
 sub GetSuggestion {

-    my ($ordernumber) = @_;
-    my $dbh = C4::Context->dbh;
-    my $query = "
+    my ($suggestionid) = @_;
+    my $dbh           = C4::Context->dbh;
+    my $query         = q{

         SELECT *
         FROM   suggestions
         WHERE  suggestionid=?
         SELECT *
         FROM   suggestions
         WHERE  suggestionid=?

-    ";
+    };

     my $sth = $dbh->prepare($query);
     my $sth = $dbh->prepare($query);

-    $sth->execute($ordernumber);
-    return($sth->fetchrow_hashref);
+    $sth->execute($suggestionid);
+    return ( $sth->fetchrow_hashref );

 }
 
 =head2 GetSuggestionFromBiblionumber
 }
 
 =head2 GetSuggestionFromBiblionumber


@@ -209,131 +111,126 @@ sub GetSuggestionFromBiblionumber {
     my $query = q{
         SELECT suggestionid
         FROM   suggestions
     my $query = q{
         SELECT suggestionid
         FROM   suggestions

-        WHERE  biblionumber=?
+        WHERE  biblionumber=? LIMIT 1

     };
     };

-    my $dbh=C4::Context->dbh;
+    my $dbh = C4::Context->dbh;

     my $sth = $dbh->prepare($query);
     $sth->execute($biblionumber);
     my $sth = $dbh->prepare($query);
     $sth->execute($biblionumber);

-    my ($ordernumber) = $sth->fetchrow;
-    return $ordernumber;
+    my ($suggestionid) = $sth->fetchrow;
+    return $suggestionid;

 }
 
 }
 

-=head2 GetSuggestionByStatus
+=head2 GetSuggestionInfoFromBiblionumber

 
 

-$aqorders = &GetSuggestionByStatus($status,[$branchcode])
-
-Get a suggestion from it's status
+Get a suggestion and borrower's informations from it's biblionumber.

 
 return :
 
 return :

-all the suggestion with C<$status>
+all informations (suggestion and borrower) of the suggestion which is related to the biblionumber given.

 
 =cut
 
 
 =cut
 

-sub GetSuggestionByStatus {
-    my $status = shift;
-    my $branchcode = shift;
+sub GetSuggestionInfoFromBiblionumber {
+    my ($biblionumber) = @_;
+    my $query = q{
+        SELECT suggestions.*,
+            U1.surname          AS surnamesuggestedby,
+            U1.firstname        AS firstnamesuggestedby,
+            U1.borrowernumber   AS borrnumsuggestedby
+        FROM suggestions
+            LEFT JOIN borrowers AS U1 ON suggestedby=U1.borrowernumber
+        WHERE biblionumber=?
+        LIMIT 1
+    };

     my $dbh = C4::Context->dbh;
     my $dbh = C4::Context->dbh;

-    my @sql_params=($status);  
-    my $query = qq(SELECT suggestions.*,
-                        U1.surname   AS surnamesuggestedby,
-                        U1.firstname AS firstnamesuggestedby,
-                        U1.branchcode AS branchcodesuggestedby,
-                        B1.branchname AS branchnamesuggestedby,
-                        U1.borrowernumber AS borrnumsuggestedby,
-                        U1.categorycode AS categorycodesuggestedby,
-                        C1.description AS categorydescriptionsuggestedby,
-                        U2.surname   AS surnamemanagedby,
-                        U2.firstname AS firstnamemanagedby,
-                        U2.borrowernumber AS borrnummanagedby
-                        FROM suggestions
-                        LEFT JOIN borrowers AS U1 ON suggestedby=U1.borrowernumber
-                        LEFT JOIN borrowers AS U2 ON managedby=U2.borrowernumber
-                        LEFT JOIN categories AS C1 ON C1.categorycode=U1.categorycode
-                        LEFT JOIN branches AS B1 on B1.branchcode = U1.branchcode
-                        WHERE status = ?);
-    if (C4::Context->preference("IndependantBranches") || $branchcode) {
-        my $userenv = C4::Context->userenv;
-        if ($userenv) {
-            unless ($userenv->{flags} % 2 == 1){
-                push @sql_params,$userenv->{branch};
-                $query .= " and (U1.branchcode = ? or U1.branchcode ='')";
-            }
-        }
-        if ($branchcode) {
-            push @sql_params,$branchcode;
-            $query .= " and (U1.branchcode = ? or U1.branchcode ='')";
-        }
-    }
-    

     my $sth = $dbh->prepare($query);
     my $sth = $dbh->prepare($query);

-    $sth->execute(@sql_params);
-    
-    my $results;
-    $results=  $sth->fetchall_arrayref({});
-    return $results;
+    $sth->execute($biblionumber);
+    return $sth->fetchrow_hashref;

 }
 
 }
 

-=head2 CountSuggestion
+=head2 GetSuggestionInfo

 
 

-&CountSuggestion($status)
+Get a suggestion and borrower's informations from it's suggestionid

 
 

-Count the number of aqorders with the status given on input argument.
-the arg status can be :
-
-=over 2
+return :
+all informations (suggestion and borrower) of the suggestion which is related to the suggestionid given.

 
 

-=item * ASKED : asked by the user, not dealed by the librarian
+=cut

 
 

-=item * ACCEPTED : accepted by the librarian, but not yet ordered
+sub GetSuggestionInfo {
+    my ($suggestionid) = @_;
+    my $query = q{
+        SELECT suggestions.*,
+            U1.surname          AS surnamesuggestedby,
+            U1.firstname        AS firstnamesuggestedby,
+            U1.borrowernumber   AS borrnumsuggestedby
+        FROM suggestions
+            LEFT JOIN borrowers AS U1 ON suggestedby=U1.borrowernumber
+        WHERE suggestionid=?
+        LIMIT 1
+    };
+    my $dbh = C4::Context->dbh;
+    my $sth = $dbh->prepare($query);
+    $sth->execute($suggestionid);
+    return $sth->fetchrow_hashref;
+}

 
 

-=item * REJECTED : rejected by the librarian (definitive status)
+=head2 GetSuggestionByStatus

 
 

-=item * ORDERED : ordered by the librarian (acquisition module)
+$aqorders = &GetSuggestionByStatus($status,[$branchcode])

 
 

-=back
+Get a suggestion from it's status

 
 return :
 
 return :

-the number of suggestion with this status.
+all the suggestion with C<$status>

 
 =cut
 
 
 =cut
 

-sub CountSuggestion {
-    my ($status) = @_;
-    my $dbh = C4::Context->dbh;
-    my $sth;
-    if (C4::Context->preference("IndependantBranches")){
+sub GetSuggestionByStatus {
+    my $status     = shift;
+    my $branchcode = shift;
+    my $dbh        = C4::Context->dbh;
+    my @sql_params = ($status);
+    my $query      = q{
+        SELECT suggestions.*,
+            U1.surname          AS surnamesuggestedby,
+            U1.firstname        AS firstnamesuggestedby,
+            U1.branchcode       AS branchcodesuggestedby,
+            B1.branchname       AS branchnamesuggestedby,
+            U1.borrowernumber   AS borrnumsuggestedby,
+            U1.categorycode     AS categorycodesuggestedby,
+            C1.description      AS categorydescriptionsuggestedby,
+            U2.surname          AS surnamemanagedby,
+            U2.firstname        AS firstnamemanagedby,
+            U2.borrowernumber   AS borrnummanagedby
+        FROM suggestions
+            LEFT JOIN borrowers     AS U1 ON suggestedby=U1.borrowernumber
+            LEFT JOIN borrowers     AS U2 ON managedby=U2.borrowernumber
+            LEFT JOIN categories    AS C1 ON C1.categorycode=U1.categorycode
+            LEFT JOIN branches      AS B1 on B1.branchcode=U1.branchcode
+        WHERE status = ?
+        ORDER BY suggestionid
+    };
+
+    # filter on branch
+    if ( C4::Context->preference("IndependentBranches") || $branchcode ) {

         my $userenv = C4::Context->userenv;
         my $userenv = C4::Context->userenv;

-        if ($userenv->{flags} % 2 == 1){
-            my $query = qq |
-                SELECT count(*)
-                FROM   suggestions
-                WHERE  STATUS=?
-            |;
-            $sth = $dbh->prepare($query);
-            $sth->execute($status);
+        if ($userenv) {
+            unless ( C4::Context->IsSuperLibrarian() ) {
+                push @sql_params, $userenv->{branch};
+                $query .= q{ AND (U1.branchcode = ? OR U1.branchcode ='') };
+            }

         }
         }

-        else {
-            my $query = qq |
-                SELECT count(*)
-                FROM suggestions LEFT JOIN borrowers ON borrowers.borrowernumber=suggestions.suggestedby
-                WHERE STATUS=?
-                AND (borrowers.branchcode='' OR borrowers.branchcode =?)
-            |;
-            $sth = $dbh->prepare($query);
-            $sth->execute($status,$userenv->{branch});
+        if ($branchcode) {
+            push @sql_params, $branchcode;
+            $query .= q{ AND (U1.branchcode = ? OR U1.branchcode ='') };

         }
     }
         }
     }

-    else {
-        my $query = qq |
-            SELECT count(*)
-            FROM suggestions
-            WHERE STATUS=?
-        |;
-        $sth = $dbh->prepare($query);
-        $sth->execute($status);
-    }
-    my ($result) = $sth->fetchrow;
-    return $result;
+
+    my $sth = $dbh->prepare($query);
+    $sth->execute(@sql_params);
+    my $results;
+    $results = $sth->fetchall_arrayref( {} );
+    return $results;

 }
 
 =head2 NewSuggestion
 }
 
 =head2 NewSuggestion


@@ -347,8 +244,62 @@ Insert a new suggestion on database with value given on input arg.
 
 sub NewSuggestion {
     my ($suggestion) = @_;
 
 sub NewSuggestion {
     my ($suggestion) = @_;

-    $suggestion->{STATUS}="ASKED" unless $suggestion->{STATUS};
-    return InsertInTable("suggestions",$suggestion); 
+
+    $suggestion->{STATUS} = "ASKED" unless $suggestion->{STATUS};
+
+    $suggestion->{suggesteddate} = dt_from_string unless $suggestion->{suggesteddate};
+
+    delete $suggestion->{branchcode}
+      if defined $suggestion->{branchcode} and $suggestion->{branchcode} eq '';
+
+    my $suggestion_object = Koha::Suggestion->new( $suggestion )->store;
+    my $suggestion_id = $suggestion_object->suggestionid;
+
+    my $emailpurchasesuggestions = C4::Context->preference("EmailPurchaseSuggestions");
+    if ($emailpurchasesuggestions) {
+        my $full_suggestion = GetSuggestion( $suggestion_id); # We should not need to refetch it!
+        if (
+            my $letter = C4::Letters::GetPreparedLetter(
+                module      => 'suggestions',
+                letter_code => 'NEW_SUGGESTION',
+                tables      => {
+                    'branches'    => $full_suggestion->{branchcode},
+                    'borrowers'   => $full_suggestion->{suggestedby},
+                    'suggestions' => $full_suggestion,
+                },
+            )
+        ){
+
+            my $toaddress;
+            if ( $emailpurchasesuggestions eq "BranchEmailAddress" ) {
+                my $library =
+                  Koha::Libraries->find( $full_suggestion->{branchcode} );
+                $toaddress = $library->inbound_email_address;
+            }
+            elsif ( $emailpurchasesuggestions eq "KohaAdminEmailAddress" ) {
+                $toaddress = C4::Context->preference('ReplytoDefault')
+                  || C4::Context->preference('KohaAdminEmailAddress');
+            }
+            else {
+                $toaddress =
+                     C4::Context->preference($emailpurchasesuggestions)
+                  || C4::Context->preference('ReplytoDefault')
+                  || C4::Context->preference('KohaAdminEmailAddress');
+            }
+
+            C4::Letters::EnqueueLetter(
+                {
+                    letter         => $letter,
+                    borrowernumber => $full_suggestion->{suggestedby},
+                    suggestionid   => $full_suggestion->{suggestionid},
+                    to_address     => $toaddress,
+                    message_transport_type => 'email',
+                }
+            ) or warn "can't enqueue letter $letter";
+        }
+    }
+
+    return $suggestion_id;

 }
 
 =head2 ModSuggestion
 }
 
 =head2 ModSuggestion


@@ -357,37 +308,59 @@ sub NewSuggestion {
 
 Modify the suggestion according to the hash passed by ref.
 The hash HAS to contain suggestionid
 
 Modify the suggestion according to the hash passed by ref.
 The hash HAS to contain suggestionid

-Data not defined is not updated unless it is a note or sort1 
+Data not defined is not updated unless it is a note or sort1

 Send a mail to notify the user that did the suggestion.
 
 Send a mail to notify the user that did the suggestion.
 

-Note that there is no function to modify a suggestion. 
+Note that there is no function to modify a suggestion.

 
 =cut
 
 sub ModSuggestion {
 
 =cut
 
 sub ModSuggestion {

-    my ($suggestion)=@_;
-    my $status_update_table=UpdateInTable("suggestions", $suggestion);
+    my ($suggestion) = @_;
+    return unless( $suggestion and defined($suggestion->{suggestionid}) );
+
+    my $suggestion_object = Koha::Suggestions->find( $suggestion->{suggestionid} );
+    eval { # FIXME Must raise an exception instead
+        $suggestion_object->set($suggestion)->store;
+    };
+    return 0 if $@;
+
+    if ( $suggestion->{STATUS} && $suggestion_object->suggestedby ) {

 
 

-    if ($suggestion->{STATUS}) {

         # fetch the entire updated suggestion so that we can populate the letter
         # 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";}
+        my $full_suggestion = GetSuggestion( $suggestion->{suggestionid} );
+
+        my $patron = Koha::Patrons->find( $full_suggestion->{suggestedby} );
+
+        my $transport = (C4::Context->preference("FallbackToSMSIfNoEmail")) && ($patron->smsalertnumber) && (!$patron->email) ? 'sms' : 'email';
+
+        if (
+            my $letter = C4::Letters::GetPreparedLetter(
+                module      => 'suggestions',
+                letter_code => $full_suggestion->{STATUS},
+                branchcode  => $full_suggestion->{branchcode},
+                lang        => $patron->lang,
+                tables      => {
+                    'branches'    => $full_suggestion->{branchcode},
+                    'borrowers'   => $full_suggestion->{suggestedby},
+                    'suggestions' => $full_suggestion,
+                    'biblio'      => $full_suggestion->{biblionumber},
+                },
+            )
+          )
+        {
+            C4::Letters::EnqueueLetter(
+                {
+                    letter         => $letter,
+                    borrowernumber => $full_suggestion->{suggestedby},
+                    suggestionid   => $full_suggestion->{suggestionid},
+                    LibraryName    => C4::Context->preference("LibraryName"),
+                    message_transport_type => $transport,
+                }
+            ) or warn "can't enqueue letter $letter";

         }
     }
         }
     }

-    return $status_update_table;
+    return 1; # No useful if the exception is raised earlier

 }
 
 =head2 ConnectSuggestionAndBiblio
 }
 
 =head2 ConnectSuggestionAndBiblio


@@ -399,65 +372,140 @@ connect a suggestion to an existing biblio
 =cut
 
 sub ConnectSuggestionAndBiblio {
 =cut
 
 sub ConnectSuggestionAndBiblio {

-    my ($suggestionid,$biblionumber) = @_;
-    my $dbh=C4::Context->dbh;
-    my $query = "
+    my ( $suggestionid, $biblionumber ) = @_;
+    my $dbh   = C4::Context->dbh;
+    my $query = q{

         UPDATE suggestions
         SET    biblionumber=?
         WHERE  suggestionid=?
         UPDATE suggestions
         SET    biblionumber=?
         WHERE  suggestionid=?

-    ";
+    };

     my $sth = $dbh->prepare($query);
     my $sth = $dbh->prepare($query);

-    $sth->execute($biblionumber,$suggestionid);
+    $sth->execute( $biblionumber, $suggestionid );

 }
 
 =head2 DelSuggestion
 
 &DelSuggestion($borrowernumber,$ordernumber)
 
 }
 
 =head2 DelSuggestion
 
 &DelSuggestion($borrowernumber,$ordernumber)
 

-Delete a suggestion. A borrower can delete a suggestion only if he is its owner.
+Delete a suggestion. A borrower can delete a suggestion only if they are its owner.

 
 =cut
 
 sub DelSuggestion {
 
 =cut
 
 sub DelSuggestion {

-    my ($borrowernumber,$suggestionid,$type) = @_;
+    my ( $borrowernumber, $suggestionid, $type ) = @_;

     my $dbh = C4::Context->dbh;
     my $dbh = C4::Context->dbh;

+

     # check that the suggestion comes from the suggestor
     # check that the suggestion comes from the suggestor

-    my $query = "
+    my $query = q{

         SELECT suggestedby
         FROM   suggestions
         WHERE  suggestionid=?
         SELECT suggestedby
         FROM   suggestions
         WHERE  suggestionid=?

-    ";
+    };

     my $sth = $dbh->prepare($query);
     $sth->execute($suggestionid);
     my ($suggestedby) = $sth->fetchrow;
     my $sth = $dbh->prepare($query);
     $sth->execute($suggestionid);
     my ($suggestedby) = $sth->fetchrow;

-    if ($type eq "intranet" || $suggestedby eq $borrowernumber ) {
-        my $queryDelete = "
+    $suggestedby //= '';
+    $borrowernumber //= '';
+    if ( defined $type && $type eq 'intranet' || $suggestedby eq $borrowernumber ) {
+        my $queryDelete = q{

             DELETE FROM suggestions
             WHERE suggestionid=?
             DELETE FROM suggestions
             WHERE suggestionid=?

-        ";
+        };

         $sth = $dbh->prepare($queryDelete);
         $sth = $dbh->prepare($queryDelete);

-        my $suggestiondeleted=$sth->execute($suggestionid);
-        return $suggestiondeleted;  
+        my $suggestiondeleted = $sth->execute($suggestionid);
+        return $suggestiondeleted;

     }
 }
 
 =head2 DelSuggestionsOlderThan
     &DelSuggestionsOlderThan($days)
     }
 }
 
 =head2 DelSuggestionsOlderThan
     &DelSuggestionsOlderThan($days)

-    
+

     Delete all suggestions older than TODAY-$days , that have be accepted or rejected.
     Delete all suggestions older than TODAY-$days , that have be accepted or rejected.

-    
+    We do now allow a negative number. If you want to delete all suggestions, just use Koha::Suggestions->delete or so.
+

 =cut
 =cut

+

 sub DelSuggestionsOlderThan {
     my ($days) = @_;
 sub DelSuggestionsOlderThan {
     my ($days) = @_;

-    return if not $days;
+    return unless $days && $days > 0;

     my $dbh = C4::Context->dbh;
     my $dbh = C4::Context->dbh;

-    
-    my $sth = $dbh->prepare("
-        DELETE FROM suggestions WHERE STATUS <> 'ASKED' AND date < ADDDATE(NOW(), ?);
-    ");
+    my $sth = $dbh->prepare(
+        q{
+        DELETE FROM suggestions
+        WHERE STATUS<>'ASKED'
+            AND manageddate < ADDDATE(NOW(), ?)
+    }
+    );

     $sth->execute("-$days");
 }
 
     $sth->execute("-$days");
 }
 

+sub GetUnprocessedSuggestions {
+    my ( $number_of_days_since_the_last_modification ) = @_;
+
+    $number_of_days_since_the_last_modification ||= 0;
+
+    my $dbh = C4::Context->dbh;
+
+    my $s = $dbh->selectall_arrayref(q|
+        SELECT *
+        FROM suggestions
+        WHERE STATUS = 'ASKED'
+            AND budgetid IS NOT NULL
+            AND CAST(NOW() AS DATE) - INTERVAL ? DAY = CAST(suggesteddate AS DATE)
+    |, { Slice => {} }, $number_of_days_since_the_last_modification );
+    return $s;
+}
+
+=head2 MarcRecordFromNewSuggestion
+
+    $record = MarcRecordFromNewSuggestion ( $suggestion )
+
+This function build a marc record object from a suggestion
+
+=cut
+
+sub MarcRecordFromNewSuggestion {
+    my ($suggestion) = @_;
+    my $record = MARC::Record->new();
+
+    if (my $isbn = $suggestion->{isbn}) {
+        for my $field (qw(biblioitems.isbn biblioitems.issn)) {
+            my ($tag, $subfield) = GetMarcFromKohaField($field);
+            $record->append_fields(
+                MARC::Field->new($tag, ' ', ' ', $subfield => $isbn)
+            );
+        }
+    }
+    else {
+        my ($title_tag, $title_subfield) = GetMarcFromKohaField('biblio.title');
+        $record->append_fields(
+            MARC::Field->new($title_tag, ' ', ' ', $title_subfield => $suggestion->{title})
+        );
+
+        my ($author_tag, $author_subfield) = GetMarcFromKohaField('biblio.author');
+        if ($record->field( $author_tag )) {
+            $record->field( $author_tag )->add_subfields( $author_subfield => $suggestion->{author} );
+        }
+        else {
+            $record->append_fields(
+                MARC::Field->new($author_tag, ' ', ' ', $author_subfield => $suggestion->{author})
+            );
+        }
+    }
+
+    my ($it_tag, $it_subfield) = GetMarcFromKohaField('biblioitems.itemtype');
+    if ($record->field( $it_tag )) {
+        $record->field( $it_tag )->add_subfields( $it_subfield => $suggestion->{itemtype} );
+    }
+    else {
+        $record->append_fields(
+            MARC::Field->new($it_tag, ' ', ' ', $it_subfield => $suggestion->{itemtype})
+        );
+    }
+
+    return $record;
+}
+

 1;
 __END__
 
 1;
 __END__