View | Details | Raw Unified | Return to bug 12627
Collapse All | Expand All

(-)a/opac/opac-suggestions.pl (-1 / +3 lines)
Lines 29-34 use C4::Koha; Link Here
29
use C4::Dates;
29
use C4::Dates;
30
use C4::Scrubber;
30
use C4::Scrubber;
31
31
32
use Koha::DateUtils qw( dt_from_string );
33
32
my $input           = new CGI;
34
my $input           = new CGI;
33
my $allsuggestions  = $input->param('showall');
35
my $allsuggestions  = $input->param('showall');
34
my $op              = $input->param('op');
36
my $op              = $input->param('op');
Lines 91-97 if ( $op eq "add_confirm" ) { Link Here
91
		foreach my $suggest (keys %$suggestion){
93
		foreach my $suggest (keys %$suggestion){
92
		    $suggestion->{$suggest} = $scrubber->scrub($suggestion->{$suggest});
94
		    $suggestion->{$suggest} = $scrubber->scrub($suggestion->{$suggest});
93
		}
95
		}
94
		$$suggestion{'suggesteddate'}=C4::Dates->today;
96
        $suggestion->{suggesteddate} = dt_from_string;
95
		$$suggestion{'branchcode'}= $input->param('branch') || C4::Context->userenv->{"branch"};
97
		$$suggestion{'branchcode'}= $input->param('branch') || C4::Context->userenv->{"branch"};
96
98
97
		&NewSuggestion($suggestion);
99
		&NewSuggestion($suggestion);
(-)a/suggestion/suggestion.pl (-6 / +8 lines)
Lines 31-36 use C4::Search; Link Here
31
use C4::Dates qw(format_date);
31
use C4::Dates qw(format_date);
32
use C4::Members;
32
use C4::Members;
33
use C4::Debug;
33
use C4::Debug;
34
35
use Koha::DateUtils qw( dt_from_string );
36
34
use URI::Escape;
37
use URI::Escape;
35
38
36
sub Init{
39
sub Init{
Lines 123-132 $template->param('borrowernumber' => $borrowernumber); Link Here
123
if ( $op =~ /save/i ) {
126
if ( $op =~ /save/i ) {
124
        if ( $suggestion_only->{"STATUS"} ) {
127
        if ( $suggestion_only->{"STATUS"} ) {
125
        if ( my $tmpstatus = lc( $suggestion_only->{"STATUS"} ) =~ /ACCEPTED|REJECTED/i ) {
128
        if ( my $tmpstatus = lc( $suggestion_only->{"STATUS"} ) =~ /ACCEPTED|REJECTED/i ) {
126
            $suggestion_only->{ lc( $suggestion_only->{"STATUS"}) . "date" } = C4::Dates->today;
129
            $suggestion_only->{ lc( $suggestion_only->{"STATUS"}) . "date" } = dt_from_string;
127
            $suggestion_only->{ lc( $suggestion_only->{"STATUS"}) . "by" }   = C4::Context->userenv->{number};
130
            $suggestion_only->{ lc( $suggestion_only->{"STATUS"}) . "by" }   = C4::Context->userenv->{number};
128
        }
131
        }
129
        $suggestion_only->{"manageddate"} = C4::Dates->today;
132
        $suggestion_only->{manageddate} = dt_from_string;
130
        $suggestion_only->{"managedby"}   = C4::Context->userenv->{number};
133
        $suggestion_only->{"managedby"}   = C4::Context->userenv->{number};
131
    }
134
    }
132
    if ( $suggestion_only->{'suggestionid'} > 0 ) {
135
    if ( $suggestion_only->{'suggestionid'} > 0 ) {
Lines 167-180 elsif ($op eq "change" ) { Link Here
167
    # set accepted/rejected/managed informations if applicable
170
    # set accepted/rejected/managed informations if applicable
168
    # ie= if the librarian has choosen some action on the suggestions
171
    # ie= if the librarian has choosen some action on the suggestions
169
    if ($suggestion_only->{"STATUS"} eq "ACCEPTED"){
172
    if ($suggestion_only->{"STATUS"} eq "ACCEPTED"){
170
        $suggestion_only->{"accepteddate"}=C4::Dates->today;
173
        $suggestion_only->{accepteddate} = dt_from_string;
171
        $suggestion_only->{"acceptedby"}=C4::Context->userenv->{number};
174
        $suggestion_only->{"acceptedby"}=C4::Context->userenv->{number};
172
    } elsif ($suggestion_only->{"STATUS"} eq "REJECTED"){
175
    } elsif ($suggestion_only->{"STATUS"} eq "REJECTED"){
173
        $suggestion_only->{"rejecteddate"}=C4::Dates->today;
176
        $suggestion_only->{rejecteddate} = dt_from_string;
174
        $suggestion_only->{"rejectedby"}=C4::Context->userenv->{number};
177
        $suggestion_only->{"rejectedby"}=C4::Context->userenv->{number};
175
    }
178
    }
176
    if ($suggestion_only->{"STATUS"}){
179
    if ($suggestion_only->{"STATUS"}){
177
        $suggestion_only->{"manageddate"}=C4::Dates->today;
180
        $suggestion_only->{manageddate} = dt_from_string;
178
        $suggestion_only->{"managedby"}=C4::Context->userenv->{number};
181
        $suggestion_only->{"managedby"}=C4::Context->userenv->{number};
179
    }
182
    }
180
    if ( my $reason = $$suggestion_ref{"reason$tabcode"}){
183
    if ( my $reason = $$suggestion_ref{"reason$tabcode"}){
181
- 

Return to bug 12627