use CGI qw ( -utf8 );
-use Encode qw( encode );
-use C4::Auth; # get_template_and_user
+use Encode;
+use C4::Auth qw( get_template_and_user );
use C4::Members;
-use C4::Koha;
-use C4::Output;
-use C4::Suggestions;
-use C4::Koha;
+use C4::Koha qw( GetAuthorisedValues );
+use C4::Output qw( output_html_with_http_headers );
+use C4::Suggestions qw(
+ DelSuggestion
+ MarcRecordFromNewSuggestion
+ NewSuggestion
+);
+use C4::Koha qw( GetAuthorisedValues );
use C4::Scrubber;
use C4::Search qw( FindDuplicate );
use Koha::Libraries;
use Koha::Patrons;
-use Koha::DateUtils qw( dt_from_string );
+use Koha::DateUtils qw( dt_from_string output_pref );
-my $input = new CGI;
-my $op = $input->param('op');
+my $input = CGI->new;
+my $op = $input->param('op') || 'else';
my $biblionumber = $input->param('biblionumber');
-my $suggestion = $input->Vars;
my $negcaptcha = $input->param('negcap');
my $suggested_by_anyone = $input->param('suggested_by_anyone') || 0;
+my $title_filter = $input->param('title_filter');
my $need_confirm = 0;
+my $suggestion = {
+ biblionumber => scalar $input->param('biblionumber'),
+ title => scalar $input->param('title'),
+ author => scalar $input->param('author'),
+ copyrightdate => scalar $input->param('copyrightdate'),
+ isbn => scalar $input->param('isbn'),
+ publishercode => scalar $input->param('publishercode'),
+ collectiontitle => scalar $input->param('collectiontitle'),
+ place => scalar $input->param('place'),
+ quantity => scalar $input->param('quantity'),
+ itemtype => scalar $input->param('itemtype'),
+ branchcode => scalar $input->param('branchcode'),
+ patronreason => scalar $input->param('patronreason'),
+ note => scalar $input->param('note'),
+};
+
# If a spambot accidentally populates the 'negcap' field in the sugesstions form, then silently skip and return.
if ($negcaptcha ) {
print $input->redirect("/cgi-bin/koha/opac-suggestions.pl");
exit;
-} else {
- # don't pass 'negcap' column to DB, else DBI::Class will error
- # DBIx::Class::Row::store_column(): No such column 'negcap' on Koha::Schema::Result::Suggestion at Koha/C4/Suggestions.pm
- delete $suggestion->{negcap};
}
#If suggestions are turned off we redirect to 404 error. This will also redirect guest suggestions
exit;
}
-delete $suggestion->{$_} foreach qw<op suggested_by_anyone confirm>;
-$op = 'else' unless $op;
-
my ( $template, $borrowernumber, $cookie, @messages );
my $deleted = $input->param('deleted');
my $submitted = $input->param('submitted');
-if ( C4::Context->preference("AnonSuggestions") or ( C4::Context->preference("OPACViewOthersSuggestions") and $op eq 'else' ) ) {
+if ( ( C4::Context->preference("AnonSuggestions") and Koha::Patrons->find( C4::Context->preference("AnonymousPatron") ) ) or ( C4::Context->preference("OPACViewOthersSuggestions") and $op eq 'else' ) ) {
( $template, $borrowernumber, $cookie ) = get_template_and_user(
{
template_name => "opac-suggestions.tt",
template_name => "opac-suggestions.tt",
query => $input,
type => "opac",
- authnotrequired => 0,
}
);
}
+my $suggested_by;
if ( $op eq 'else' ) {
if ( C4::Context->preference("OPACViewOthersSuggestions") ) {
if ( $borrowernumber ) {
# A logged in user is able to see suggestions from others
- $suggestion->{suggestedby} = $suggested_by_anyone
+ $suggested_by = $suggested_by_anyone
? undef
: $borrowernumber;
}
- else {
- # Non logged in user is able to see all suggestions
- $suggestion->{suggestedby} = undef;
- }
+ # else: Non logged in user is able to see all suggestions
}
else {
if ( $borrowernumber ) {
- $suggestion->{suggestedby} = $borrowernumber;
+ $suggested_by = $borrowernumber;
}
else {
- $suggestion->{suggestedby} = -1;
+ $suggested_by = -1;
}
}
} else {
if ( $borrowernumber ) {
- $suggestion->{suggestedby} = $borrowernumber;
+ $suggested_by = $borrowernumber;
}
else {
- $suggestion->{suggestedby} = C4::Context->preference("AnonymousPatron");
+ $suggested_by = C4::Context->preference("AnonymousPatron");
}
}
+$suggestion = {
+ map {
+ my $p = $suggestion->{$_};
+ # Keep parameters that are not an empty string
+ ( defined $p && $p ne '' ? ( $_ => $p ) : () )
+ } keys %$suggestion
+};
+$suggestion->{suggestedby} = $borrowernumber;
+
if ( $op eq "add_validate" && not $biblionumber ) { # If we are creating the suggestion from an existing record we do not want to search for duplicates
$op = 'add_confirm';
my $biblio = MarcRecordFromNewSuggestion($suggestion);
}
my $patrons_pending_suggestions_count = 0;
-if ( $borrowernumber && C4::Context->preference("MaxOpenSuggestions") ne '' ) {
- $patrons_pending_suggestions_count = scalar @{ SearchSuggestion( { suggestedby => $borrowernumber, STATUS => 'ASKED' } ) } ;
+my $patrons_total_suggestions_count = 0;
+if ( $borrowernumber ){
+ if ( C4::Context->preference("MaxTotalSuggestions") ne '' && C4::Context->preference("NumberOfSuggestionDays") ne '' ) {
+ my $suggesteddate_from = dt_from_string()->subtract(days=>C4::Context->preference("NumberOfSuggestionDays"));
+ $suggesteddate_from = output_pref({ dt => $suggesteddate_from, dateformat => 'iso', dateonly => 1 });
+ $patrons_total_suggestions_count = Koha::Suggestions->search({ suggestedby => $borrowernumber, suggesteddate => { '>=' => $suggesteddate_from } })->count;
+
+ }
+ if ( C4::Context->preference("MaxOpenSuggestions") ne '' ) {
+ $patrons_pending_suggestions_count = Koha::Suggestions->search({ suggestedby => $borrowernumber, STATUS => 'ASKED' } )->count ;
+ }
}
if ( $op eq "add_confirm" ) {
- my $suggestions_loop = &SearchSuggestion($suggestion);
- if ( C4::Context->preference("MaxOpenSuggestions") ne '' && $patrons_pending_suggestions_count >= C4::Context->preference("MaxOpenSuggestions") ) #only check limit for signed in borrowers
+ my $suggestions = Koha::Suggestions->search($suggestion);
+ if ( C4::Context->preference("MaxTotalSuggestions") ne '' && $patrons_total_suggestions_count >= C4::Context->preference("MaxTotalSuggestions") )
+ {
+ push @messages, { type => 'error', code => 'total_suggestions' };
+ }
+ elsif ( C4::Context->preference("MaxOpenSuggestions") ne '' && $patrons_pending_suggestions_count >= C4::Context->preference("MaxOpenSuggestions") ) #only check limit for signed in borrowers
{
push @messages, { type => 'error', code => 'too_many' };
}
- elsif ( @$suggestions_loop >= 1 ) {
+ elsif ( $suggestions->count >= 1 ) {
#some suggestion are answering the request Donot Add
- for my $suggestion (@$suggestions_loop) {
+ while ( my $suggestion = $suggestions->next ) {
push @messages,
{
type => 'error',
code => 'already_exists',
- id => $suggestion->{suggestionid}
+ id => $suggestion->suggestionid
};
last;
}
}
else {
+ for my $f ( split(/\s*\,\s*/, C4::Context->preference("OPACSuggestionUnwantedFields") ) ) {
+ delete $suggestion->{$f};
+ }
+
my $scrubber = C4::Scrubber->new();
foreach my $suggest ( keys %$suggestion ) {
}
$suggestion->{suggesteddate} = dt_from_string;
$suggestion->{branchcode} = $input->param('branchcode') || C4::Context->userenv->{"branch"};
+ $suggestion->{STATUS} = 'ASKED';
&NewSuggestion($suggestion);
$patrons_pending_suggestions_count++;
-
- # delete empty fields, to avoid filter in "SearchSuggestion"
- foreach my $field ( qw( title author publishercode copyrightdate place collectiontitle isbn STATUS ) ) {
- delete $suggestion->{$field}; #clear search filters (except borrower related) to show all suggestions after placing a new one
- }
- $suggestions_loop = &SearchSuggestion($suggestion);
+ $patrons_total_suggestions_count++;
push @messages, { type => 'info', code => 'success_on_inserted' };
$op = 'else';
}
-my $suggestions_loop = &SearchSuggestion({suggestedby => $suggestion->{suggestedby}});
+my $suggestions = [ Koha::Suggestions->search_limited(
+ {
+ $suggestion->{suggestedby}
+ ? ( suggestedby => $suggestion->{suggestedby} )
+ : (),
+ $title_filter
+ ? ( title => $title_filter )
+ : (),
+ }
+)->as_list ];
+
if ( $op eq "delete_confirm" ) {
my @delete_field = $input->multi_param("delete_field");
foreach my $delete_field (@delete_field) {
exit;
}
-map{
- my $s = $_;
- my $library = Koha::Libraries->find($s->{branchcodesuggestedby});
- $library ? $s->{branchcodesuggestedby} = $library->branchname : ()
-} @$suggestions_loop;
-
-foreach my $suggestion(@$suggestions_loop) {
- if($suggestion->{'suggestedby'} == $borrowernumber) {
- $suggestion->{'showcheckbox'} = $borrowernumber;
- } else {
- $suggestion->{'showcheckbox'} = 0;
- }
- if($suggestion->{'patronreason'}){
- my $av = Koha::AuthorisedValues->search({ category => 'OPAC_SUG', authorised_value => $suggestion->{patronreason} });
- $suggestion->{'patronreason'} = $av->count ? $av->next->opac_description : '';
- }
-}
-
-my $patron_reason_loop = GetAuthorisedValues("OPAC_SUG");
-
-# Is the person allowed to choose their branch
-if ( C4::Context->preference("AllowPurchaseSuggestionBranchChoice") ) {
- my $branchcode = $input->param('branchcode') || q{};
-
- if ( !$branchcode
- && C4::Context->userenv
- && C4::Context->userenv->{branch} )
- {
- $branchcode = C4::Context->userenv->{branch};
- }
-
- $template->param( branchcode => $branchcode );
-}
+my $patron_reason_loop = GetAuthorisedValues("OPAC_SUG", "opac");
my @mandatoryfields;
-{
- last unless ($op eq 'add');
+if ( $op eq 'add' ) {
my $fldsreq_sp = C4::Context->preference("OPACSuggestionMandatoryFields") || 'title';
- @mandatoryfields = sort split(/\s*\,\s*/, $fldsreq_sp);
+ @mandatoryfields = sort split(/\s*\|\s*/, $fldsreq_sp);
foreach (@mandatoryfields) {
$template->param( $_."_required" => 1);
}
if ( $biblionumber ) {
my $biblio = Koha::Biblios->find($biblionumber);
- $template->param(
+ $suggestion = {
biblionumber => $biblio->biblionumber,
title => $biblio->title,
author => $biblio->author,
publishercode => $biblio->biblioitem->publishercode,
collectiontitle => $biblio->biblioitem->collectiontitle,
place => $biblio->biblioitem->place,
- );
+ };
+ }
+}
+
+my @unwantedfields;
+{
+ last unless ($op eq 'add');
+ my $fldsreq_sp = C4::Context->preference("OPACSuggestionUnwantedFields");
+ @unwantedfields = sort split(/\s*\|\s*/, $fldsreq_sp);
+ foreach (@unwantedfields) {
+ $template->param( $_."_hidden" => 1);
}
}
$template->param(
%$suggestion,
- suggestions_loop => $suggestions_loop,
+ suggestions => $suggestions,
patron_reason_loop => $patron_reason_loop,
"op_$op" => 1,
$op => 1,
messages => \@messages,
suggestionsview => 1,
suggested_by_anyone => $suggested_by_anyone,
+ title_filter => $title_filter,
patrons_pending_suggestions_count => $patrons_pending_suggestions_count,
need_confirm => $need_confirm,
+ patrons_total_suggestions_count => $patrons_total_suggestions_count,
);
output_html_with_http_headers $input, $cookie, $template->output, undef, { force_no_caching => 1 };
projects / srvgit / blobdiff