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

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc (-1 / +1 lines)
Lines 83-89 Link Here
83
    [% IF EnableBorrowerFiles %]
83
    [% IF EnableBorrowerFiles %]
84
        [% IF ( borrower_files ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/files.pl?borrowernumber=[% borrowernumber %]">Files</a></li>
84
        [% IF ( borrower_files ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/files.pl?borrowernumber=[% borrowernumber %]">Files</a></li>
85
    [% END %]
85
    [% END %]
86
    [% IF (  suggestions ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/purchase-suggestions.pl?borrowernumber=[% borrowernumber %]">Purchase suggestions</a></li>
86
    [% IF (  suggestions ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/purchase-suggestions.pl?borrowernumber=[% borrowernumber %]">Purchase<br/>suggestions</a></li>
87
</ul></div>
87
</ul></div>
88
[% END %]
88
[% END %]
89
89
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/purchase-suggestions.tt (-3 / +1 lines)
Lines 11-18 Link Here
11
<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.dataTables.min.js"></script>
11
<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.dataTables.min.js"></script>
12
[% INCLUDE 'datatables-strings.inc' %]
12
[% INCLUDE 'datatables-strings.inc' %]
13
<script type="text/javascript" src="[% themelang %]/js/datatables.js"></script>
13
<script type="text/javascript" src="[% themelang %]/js/datatables.js"></script>
14
[% INCLUDE 'calendar.inc' %]
15
<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.tablesorter.min.js"></script>
16
<script type="text/javascript">
14
<script type="text/javascript">
17
    $(document).ready(function() {
15
    $(document).ready(function() {
18
        $("#suggestions").dataTable($.extend(true, {}, dataTablesDefaults, {
16
        $("#suggestions").dataTable($.extend(true, {}, dataTablesDefaults, {
Lines 46-52 Link Here
46
44
47
                <div id="toolbar">
45
                <div id="toolbar">
48
                    <ul class="toolbar">
46
                    <ul class="toolbar">
49
                        <li><a id="newsuggestion" href="/cgi-bin/koha/suggestion/suggestion.pl?op=add&suggestedby=[% borrowernumber %]&redirect=[% borrowernumber %]">New purchase suggestion</a></li>
47
                        <li><a id="newsuggestion" href="/cgi-bin/koha/suggestion/suggestion.pl?op=add&suggestedby=[% borrowernumber %]&redirect=purchase_suggestions&borrowernumber=[% borrowernumber %]">New purchase suggestion</a></li>
50
                    </ul>
48
                    </ul>
51
                </div>
49
                </div>
52
50
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt (+1 lines)
Lines 257-262 $(document).ready(function() { calcNewsuggTotal(); }); Link Here
257
[% IF ( op_save ) %]
257
[% IF ( op_save ) %]
258
    <form id="add_edit" action="suggestion.pl" method="post">
258
    <form id="add_edit" action="suggestion.pl" method="post">
259
    <input type="hidden" name="redirect" id="redirect" value="[% redirect %]" />
259
    <input type="hidden" name="redirect" id="redirect" value="[% redirect %]" />
260
    <input type="hidden" name="borrowernumber" id="borrowernumber" value="[% borrowernumber %]" />
260
    [% IF ( suggestionid ) %]
261
    [% IF ( suggestionid ) %]
261
        <h1>Edit purchase suggestion #[% suggestionid %]</h1>
262
        <h1>Edit purchase suggestion #[% suggestionid %]</h1>
262
        <input type="hidden" name="suggestionid" value="[% suggestionid %]"/>
263
        <input type="hidden" name="suggestionid" value="[% suggestionid %]"/>
(-)a/members/purchase-suggestions.pl (-1 / +1 lines)
Lines 30-36 use C4::Suggestions; Link Here
30
my $input = new CGI;
30
my $input = new CGI;
31
31
32
my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
32
my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
33
    {   template_name   => "members/purchase-suggestions.tmpl",
33
    {   template_name   => "members/purchase-suggestions.tt",
34
        query           => $input,
34
        query           => $input,
35
        type            => "intranet",
35
        type            => "intranet",
36
        authnotrequired => 0,
36
        authnotrequired => 0,
(-)a/suggestion/suggestion.pl (-25 / +26 lines)
Lines 100-111 my ( $template, $borrowernumber, $cookie, $userflags ) = get_template_and_user( Link Here
100
            flagsrequired   => { catalogue => 1 },
100
            flagsrequired   => { catalogue => 1 },
101
        }
101
        }
102
    );
102
    );
103
    
104
$borrowernumber = $input->param('borrowernumber') if ( $input->param('borrowernumber') );
105
$template->param('borrowernumber' => $borrowernumber);
103
106
104
#########################################
107
#########################################
105
##  Operations
108
##  Operations
106
##
109
##
107
if ( $op =~ /save/i ) {
110
if ( $op =~ /save/i ) {
108
	if ( $$suggestion_ref{"STATUS"} ) {
111
        if ( $$suggestion_ref{"STATUS"} ) {
109
        if ( my $tmpstatus = lc( $$suggestion_ref{"STATUS"} ) =~ /ACCEPTED|REJECTED/i ) {
112
        if ( my $tmpstatus = lc( $$suggestion_ref{"STATUS"} ) =~ /ACCEPTED|REJECTED/i ) {
110
            $$suggestion_ref{ lc( $$suggestion_ref{"STATUS"}) . "date" } = C4::Dates->today;
113
            $$suggestion_ref{ lc( $$suggestion_ref{"STATUS"}) . "date" } = C4::Dates->today;
111
            $$suggestion_ref{ lc( $$suggestion_ref{"STATUS"}) . "by" }   = C4::Context->userenv->{number};
114
            $$suggestion_ref{ lc( $$suggestion_ref{"STATUS"}) . "by" }   = C4::Context->userenv->{number};
Lines 120-126 if ( $op =~ /save/i ) { Link Here
120
        my $suggestions_loop =
123
        my $suggestions_loop =
121
            SearchSuggestion( $suggestion_ref );
124
            SearchSuggestion( $suggestion_ref );
122
        if (@$suggestions_loop>=1){
125
        if (@$suggestions_loop>=1){
123
            #some suggestion are answering the request Donot Add	
126
            #some suggestion are answering the request Donot Add
124
        } 
127
        } 
125
        else {    
128
        else {    
126
            ## Adding some informations related to suggestion
129
            ## Adding some informations related to suggestion
Lines 131-138 if ( $op =~ /save/i ) { Link Here
131
    map{delete $$suggestion_ref{$_}} keys %$suggestion_ref;
134
    map{delete $$suggestion_ref{$_}} keys %$suggestion_ref;
132
    $op = 'else';
135
    $op = 'else';
133
136
134
    if( $redirect ) {
137
    if( $redirect eq 'purchase_suggestions' ) {
135
        print $input->redirect("/cgi-bin/koha/members/purchase-suggestions.pl?borrowernumber=$redirect");
138
        print $input->redirect("/cgi-bin/koha/members/purchase-suggestions.pl?borrowernumber=$borrowernumber");
136
    }
139
    }
137
            
140
            
138
}
141
}
Lines 157-176 elsif ($op eq "change" ) { Link Here
157
        $$suggestion_ref{"rejecteddate"}=C4::Dates->today;
160
        $$suggestion_ref{"rejecteddate"}=C4::Dates->today;
158
        $$suggestion_ref{"rejectedby"}=C4::Context->userenv->{number};
161
        $$suggestion_ref{"rejectedby"}=C4::Context->userenv->{number};
159
    }
162
    }
160
	if ($$suggestion_ref{"STATUS"}){
163
    if ($$suggestion_ref{"STATUS"}){
161
		$$suggestion_ref{"manageddate"}=C4::Dates->today;
164
        $$suggestion_ref{"manageddate"}=C4::Dates->today;
162
		$$suggestion_ref{"managedby"}=C4::Context->userenv->{number};
165
        $$suggestion_ref{"managedby"}=C4::Context->userenv->{number};
163
	}
166
    }
164
	if ( my $reason = $$suggestion_ref{"reason$tabcode"}){
167
    if ( my $reason = $$suggestion_ref{"reason$tabcode"}){
165
		if ( $reason eq "other" ) {
168
        if ( $reason eq "other" ) {
166
				$reason = $$suggestion_ref{"other_reason$tabcode"};
169
                $reason = $$suggestion_ref{"other_reason$tabcode"};
167
		}
170
        }
168
		$$suggestion_ref{'reason'}=$reason;
171
        $$suggestion_ref{'reason'}=$reason;
169
	}
172
    }
170
	delete $$suggestion_ref{$_} foreach ("reason$tabcode", "other_reason$tabcode");
173
    delete $$suggestion_ref{$_} foreach ("reason$tabcode", "other_reason$tabcode");
171
 	foreach (keys %$suggestion_ref){
174
     foreach (keys %$suggestion_ref){
172
		delete $$suggestion_ref{$_} unless ($$suggestion_ref{$_});
175
        delete $$suggestion_ref{$_} unless ($$suggestion_ref{$_});
173
	}
176
    }
174
    foreach my $suggestionid (@editsuggestions) {
177
    foreach my $suggestionid (@editsuggestions) {
175
        next unless $suggestionid;
178
        next unless $suggestionid;
176
        $$suggestion_ref{'suggestionid'}=$suggestionid;
179
        $$suggestion_ref{'suggestionid'}=$suggestionid;
Lines 274-280 $template->param( Link Here
274
277
275
if(defined($returnsuggested) and $returnsuggested ne "noone")
278
if(defined($returnsuggested) and $returnsuggested ne "noone")
276
{
279
{
277
	print $input->redirect("/cgi-bin/koha/members/moremember.pl?borrowernumber=".$returnsuggested."#suggestions");
280
    print $input->redirect("/cgi-bin/koha/members/moremember.pl?borrowernumber=".$returnsuggested."#suggestions");
278
}
281
}
279
282
280
####################
283
####################
Lines 362-374 for ( my $i = 0 ; $i < $count ; $i++ ) { Link Here
362
    my %line;
365
    my %line;
363
    $line{currcode} = $rates[$i]->{'currency'};
366
    $line{currcode} = $rates[$i]->{'currency'};
364
    $line{rate}     = $rates[$i]->{'rate'};
367
    $line{rate}     = $rates[$i]->{'rate'};
365
	$line{selected} = 1 if ($line{'currcode'} eq $selected_currency);
368
    $line{selected} = 1 if ($line{'currcode'} eq $selected_currency);
366
    push @loop_currency, \%line;
369
    push @loop_currency, \%line;
367
}
370
}
368
$template->param(
371
$template->param(
369
        loop_currency => \@loop_currency,
372
    loop_currency => \@loop_currency,
370
	price        => sprintf("%.2f", $$suggestion_ref{'price'}||0),
373
    price        => sprintf("%.2f", $$suggestion_ref{'price'}||0),
371
	total            => sprintf("%.2f", $$suggestion_ref{'total'}||0),
374
    total            => sprintf("%.2f", $$suggestion_ref{'total'}||0),
372
);
375
);
373
376
374
# lists of distinct values (without empty) for filters
377
# lists of distinct values (without empty) for filters
Lines 386-392 foreach my $field ( qw(managedby acceptedby suggestedby budgetid) ) { Link Here
386
    } @$values_list;
389
    } @$values_list;
387
    $hashlists{ lc($field) . "_loop" } = \@codes_list;
390
    $hashlists{ lc($field) . "_loop" } = \@codes_list;
388
}
391
}
389
$template->param(%hashlists);
390
392
391
$template->param(
393
$template->param(
392
    %hashlists,
394
    %hashlists,
393
- 

Return to bug 9261