return ($criteriumvalue eq 'ASKED'?"Pending":ucfirst(lc( $criteriumvalue))) if ($displayby =~/status/i);
return (GetBranchName($criteriumvalue)) if ($displayby =~/branchcode/);
return (GetSupportName($criteriumvalue)) if ($displayby =~/itemtype/);
- if ($displayby =~/managedby/||$displayby =~/acceptedby/){
+ if ($displayby =~/suggestedby/||$displayby =~/managedby/||$displayby =~/acceptedby/){
my $borr=C4::Members::GetMember(borrowernumber=>$criteriumvalue);
return "" unless $borr;
- return $$borr{firstname} . ", " . $$borr{surname};
+ return $$borr{surname} . ", " . $$borr{firstname};
}
if ( $displayby =~ /budgetid/) {
my $budget = GetBudget($criteriumvalue);
#########################################
## Operations
##
-if ($op =~/save/i){
- if ($$suggestion_ref{'suggestionid'}>0){
- &ModSuggestion($suggestion_ref);
- }
- else {
+if ( $op =~ /save/i ) {
+ if ( $$suggestion_ref{"STATUS"} ) {
+ if ( my $tmpstatus = lc( $$suggestion_ref{"STATUS"} ) =~ /ACCEPTED|REJECTED/i ) {
+ $$suggestion_ref{ lc( $$suggestion_ref{"STATUS"}) . "date" } = C4::Dates->today;
+ $$suggestion_ref{ lc( $$suggestion_ref{"STATUS"}) . "by" } = C4::Context->userenv->{number};
+ }
+ $$suggestion_ref{"manageddate"} = C4::Dates->today;
+ $$suggestion_ref{"managedby"} = C4::Context->userenv->{number};
+ }
+ if ( $$suggestion_ref{'suggestionid'} > 0 ) {
+ &ModSuggestion($suggestion_ref);
+ } else {
###FIXME:Search here if suggestion already exists.
my $suggestions_loop =
SearchSuggestion( $suggestion_ref );
$op ='save';
}
elsif ($op eq "change" ) {
+ # set accepted/rejected/managed informations if applicable
+ # ie= if the librarian has choosen some action on the suggestions
+ if ($$suggestion_ref{"STATUS"} eq "ACCEPTED"){
+ $$suggestion_ref{"accepteddate"}=C4::Dates->today;
+ $$suggestion_ref{"acceptedby"}=C4::Context->userenv->{number};
+ } elsif ($$suggestion_ref{"STATUS"} eq "REJECTED"){
+ $$suggestion_ref{"rejecteddate"}=C4::Dates->today;
+ $$suggestion_ref{"rejectedby"}=C4::Context->userenv->{number};
+ }
if ($$suggestion_ref{"STATUS"}){
- if (my $tmpstatus=lc($$suggestion_ref{"STATUS"}) =~/ACCEPTED|REJECTED/i){
- $$suggestion_ref{"$tmpstatus"."date"}=C4::Dates->today;
- $$suggestion_ref{"$tmpstatus"."by"}=C4::Context->userenv->{number};
- }
$$suggestion_ref{"manageddate"}=C4::Dates->today;
$$suggestion_ref{"managedby"}=C4::Context->userenv->{number};
}
my $suggestions = &SearchSuggestion($suggestion_ref);
foreach my $suggestion (@$suggestions){
- $suggestion->{budget_name}=GetBudget($suggestion->{budgetid})->{budget_name} if $suggestion->{budgetid};
+ if($suggestion->{budgetid}) {
+ my $budget = GetBudget($suggestion->{budgetid});
+ $suggestion->{budget_name}=$budget->{budget_name} if $budget;
+ }
foreach my $date qw(suggesteddate manageddate accepteddate){
if ($suggestion->{$date} ne "0000-00-00" && $suggestion->{$date} ne "" ){
$suggestion->{$date}=format_date($suggestion->{$date}) ;
$template->param(patron_reason_loop=>$patron_reason_loop);
#Budgets management
-my $searchbudgets={ budget_branchcode=>$branchfilter} if $branchfilter;
-my $budgets = GetBudgets($searchbudgets);
+my $budgets = [];
+if ($branchfilter) {
+ my $searchbudgets = { budget_branchcode => $branchfilter };
+ $budgets = GetBudgets($searchbudgets);
+} else {
+ $budgets = GetBudgets(undef);
+}
-foreach my $budget (@$budgets){
+foreach my $budget ( @{$budgets} ) {
+## Please see file perltidy.ERR
$budget->{'selected'}=1 if ($$suggestion_ref{'budgetid'} && $budget->{'budget_id'} eq $$suggestion_ref{'budgetid'})
};
# get currencies and rates
my @rates = GetCurrencies();
my $count = scalar @rates;
+my $active_currency = GetCurrency();
+my $selected_currency;
+if ($$suggestion_ref{'currency'}) {
+ $selected_currency = $$suggestion_ref{'currency'};
+}
+else {
+ $selected_currency = $active_currency->{currency};
+}
my @loop_currency = ();
for ( my $i = 0 ; $i < $count ; $i++ ) {
my %line;
$line{currcode} = $rates[$i]->{'currency'};
$line{rate} = $rates[$i]->{'rate'};
- $line{selected} = 1 if ($$suggestion_ref{'currency'} && $line{'currcode'} eq $$suggestion_ref{'currency'});
+ $line{selected} = 1 if ($line{'currcode'} eq $selected_currency);
push @loop_currency, \%line;
}