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 297-302 h4.local_collapse a { font-size : 80%; text-decoration: none; } fieldset.brief o Link Here
297
[% IF ( op_save ) %]
297
[% IF ( op_save ) %]
298
    <form id="add_edit" action="suggestion.pl" method="post">
298
    <form id="add_edit" action="suggestion.pl" method="post">
299
    <input type="hidden" name="redirect" id="redirect" value="[% redirect %]" />
299
    <input type="hidden" name="redirect" id="redirect" value="[% redirect %]" />
300
    <input type="hidden" name="borrowernumber" id="borrowernumber" value="[% borrowernumber %]" />
300
    [% IF ( suggestionid ) %]
301
    [% IF ( suggestionid ) %]
301
        <h1>Edit purchase suggestion #[% suggestionid %]</h1>
302
        <h1>Edit purchase suggestion #[% suggestionid %]</h1>
302
        <input type="hidden" name="suggestionid" value="[% suggestionid %]"/>
303
        <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 104-114 my ( $template, $borrowernumber, $cookie, $userflags ) = get_template_and_user( Link Here
104
        }
104
        }
105
    );
105
    );
106
106
107
$borrowernumber = $input->param('borrowernumber') if ( $input->param('borrowernumber') );
108
$template->param('borrowernumber' => $borrowernumber);
109
107
#########################################
110
#########################################
108
##  Operations
111
##  Operations
109
##
112
##
110
if ( $op =~ /save/i ) {
113
if ( $op =~ /save/i ) {
111
	if ( $$suggestion_ref{"STATUS"} ) {
114
        if ( $$suggestion_ref{"STATUS"} ) {
112
        if ( my $tmpstatus = lc( $$suggestion_ref{"STATUS"} ) =~ /ACCEPTED|REJECTED/i ) {
115
        if ( my $tmpstatus = lc( $$suggestion_ref{"STATUS"} ) =~ /ACCEPTED|REJECTED/i ) {
113
            $$suggestion_ref{ lc( $$suggestion_ref{"STATUS"}) . "date" } = C4::Dates->today;
116
            $$suggestion_ref{ lc( $$suggestion_ref{"STATUS"}) . "date" } = C4::Dates->today;
114
            $$suggestion_ref{ lc( $$suggestion_ref{"STATUS"}) . "by" }   = C4::Context->userenv->{number};
117
            $$suggestion_ref{ lc( $$suggestion_ref{"STATUS"}) . "by" }   = C4::Context->userenv->{number};
Lines 123-129 if ( $op =~ /save/i ) { Link Here
123
        my $suggestions_loop =
126
        my $suggestions_loop =
124
            SearchSuggestion( $suggestion_ref );
127
            SearchSuggestion( $suggestion_ref );
125
        if (@$suggestions_loop>=1){
128
        if (@$suggestions_loop>=1){
126
            #some suggestion are answering the request Donot Add	
129
            #some suggestion are answering the request Donot Add
127
        } 
130
        } 
128
        else {    
131
        else {    
129
            ## Adding some informations related to suggestion
132
            ## Adding some informations related to suggestion
Lines 134-141 if ( $op =~ /save/i ) { Link Here
134
    map{delete $$suggestion_ref{$_}} keys %$suggestion_ref;
137
    map{delete $$suggestion_ref{$_}} keys %$suggestion_ref;
135
    $op = 'else';
138
    $op = 'else';
136
139
137
    if( $redirect ) {
140
    if( $redirect eq 'purchase_suggestions' ) {
138
        print $input->redirect("/cgi-bin/koha/members/purchase-suggestions.pl?borrowernumber=$redirect");
141
        print $input->redirect("/cgi-bin/koha/members/purchase-suggestions.pl?borrowernumber=$borrowernumber");
139
    }
142
    }
140
143
141
}
144
}
Lines 160-179 elsif ($op eq "change" ) { Link Here
160
        $$suggestion_ref{"rejecteddate"}=C4::Dates->today;
163
        $$suggestion_ref{"rejecteddate"}=C4::Dates->today;
161
        $$suggestion_ref{"rejectedby"}=C4::Context->userenv->{number};
164
        $$suggestion_ref{"rejectedby"}=C4::Context->userenv->{number};
162
    }
165
    }
163
	if ($$suggestion_ref{"STATUS"}){
166
    if ($$suggestion_ref{"STATUS"}){
164
		$$suggestion_ref{"manageddate"}=C4::Dates->today;
167
        $$suggestion_ref{"manageddate"}=C4::Dates->today;
165
		$$suggestion_ref{"managedby"}=C4::Context->userenv->{number};
168
        $$suggestion_ref{"managedby"}=C4::Context->userenv->{number};
166
	}
169
    }
167
	if ( my $reason = $$suggestion_ref{"reason$tabcode"}){
170
    if ( my $reason = $$suggestion_ref{"reason$tabcode"}){
168
		if ( $reason eq "other" ) {
171
        if ( $reason eq "other" ) {
169
				$reason = $$suggestion_ref{"other_reason$tabcode"};
172
                $reason = $$suggestion_ref{"other_reason$tabcode"};
170
		}
173
        }
171
		$$suggestion_ref{'reason'}=$reason;
174
        $$suggestion_ref{'reason'}=$reason;
172
	}
175
    }
173
	delete $$suggestion_ref{$_} foreach ("reason$tabcode", "other_reason$tabcode");
176
    delete $$suggestion_ref{$_} foreach ("reason$tabcode", "other_reason$tabcode");
174
 	foreach (keys %$suggestion_ref){
177
     foreach (keys %$suggestion_ref){
175
		delete $$suggestion_ref{$_} unless ($$suggestion_ref{$_});
178
        delete $$suggestion_ref{$_} unless ($$suggestion_ref{$_});
176
	}
179
    }
177
    foreach my $suggestionid (@editsuggestions) {
180
    foreach my $suggestionid (@editsuggestions) {
178
        next unless $suggestionid;
181
        next unless $suggestionid;
179
        $$suggestion_ref{'suggestionid'}=$suggestionid;
182
        $$suggestion_ref{'suggestionid'}=$suggestionid;
Lines 277-283 $template->param( Link Here
277
280
278
if(defined($returnsuggested) and $returnsuggested ne "noone")
281
if(defined($returnsuggested) and $returnsuggested ne "noone")
279
{
282
{
280
	print $input->redirect("/cgi-bin/koha/members/moremember.pl?borrowernumber=".$returnsuggested."#suggestions");
283
    print $input->redirect("/cgi-bin/koha/members/moremember.pl?borrowernumber=".$returnsuggested."#suggestions");
281
}
284
}
282
285
283
####################
286
####################
Lines 365-377 for ( my $i = 0 ; $i < $count ; $i++ ) { Link Here
365
    my %line;
368
    my %line;
366
    $line{currcode} = $rates[$i]->{'currency'};
369
    $line{currcode} = $rates[$i]->{'currency'};
367
    $line{rate}     = $rates[$i]->{'rate'};
370
    $line{rate}     = $rates[$i]->{'rate'};
368
	$line{selected} = 1 if ($line{'currcode'} eq $selected_currency);
371
    $line{selected} = 1 if ($line{'currcode'} eq $selected_currency);
369
    push @loop_currency, \%line;
372
    push @loop_currency, \%line;
370
}
373
}
371
$template->param(
374
$template->param(
372
        loop_currency => \@loop_currency,
375
    loop_currency => \@loop_currency,
373
	price        => sprintf("%.2f", $$suggestion_ref{'price'}||0),
376
    price        => sprintf("%.2f", $$suggestion_ref{'price'}||0),
374
	total            => sprintf("%.2f", $$suggestion_ref{'total'}||0),
377
    total            => sprintf("%.2f", $$suggestion_ref{'total'}||0),
375
);
378
);
376
379
377
# lists of distinct values (without empty) for filters
380
# lists of distinct values (without empty) for filters
Lines 389-395 foreach my $field ( qw(managedby acceptedby suggestedby budgetid) ) { Link Here
389
    } @$values_list;
392
    } @$values_list;
390
    $hashlists{ lc($field) . "_loop" } = \@codes_list;
393
    $hashlists{ lc($field) . "_loop" } = \@codes_list;
391
}
394
}
392
$template->param(%hashlists);
393
395
394
$template->param(
396
$template->param(
395
    %hashlists,
397
    %hashlists,
396
- 

Return to bug 9261