use C4::Context;
use C4::Output;
-use C4::Dates qw(format_date);
+use C4::Dates qw(format_date format_date_in_iso);
use C4::SQLHelper qw(:all);
use C4::Debug;
use C4::Letters;
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 STATUS NOT IN ('CLAIMED')
+ WHERE 1=1
} , map {
if ( my $s = $suggestion->{$_} ) {
push @sql_params,'%'.$s.'%';
if ($userenv) {
if (($userenv->{flags} % 2) != 1 && !$suggestion->{branchcode}){
push @sql_params,$$userenv{branch};
- push @query,q{ and (branchcode = ? or branchcode ='')};
+ push @query,q{ and (suggestions.branchcode = ? or suggestions.branchcode ='')};
}
}
}
}
}
+ 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);