@@ -, +, @@ basket.pl neworderempty.pl orderreceive.pl parcel.pl --- C4/Suggestions.pm | 60 +++++++++++++++++++- acqui/basket.pl | 9 +++ acqui/neworderempty.pl | 7 ++- acqui/orderreceive.pl | 8 ++- acqui/parcel.pl | 13 ++++- .../intranet-tmpl/prog/en/modules/acqui/basket.tt | 6 ++ .../prog/en/modules/acqui/neworderempty.tt | 14 ++++- .../prog/en/modules/acqui/orderreceive.tt | 13 ++++ .../intranet-tmpl/prog/en/modules/acqui/parcel.tt | 12 ++++ t/db_dependent/Suggestions.t | 8 ++- 10 files changed, 141 insertions(+), 9 deletions(-) --- a/C4/Suggestions.pm +++ a/C4/Suggestions.pm @@ -40,6 +40,8 @@ our @EXPORT = qw< GetSuggestion GetSuggestionByStatus GetSuggestionFromBiblionumber + GetSuggestionInfoFromBiblionumber + GetSuggestionInfo ModStatus ModSuggestion NewSuggestion @@ -209,13 +211,65 @@ sub GetSuggestionFromBiblionumber { my $query = q{ SELECT suggestionid FROM suggestions - WHERE biblionumber=? + WHERE biblionumber=? LIMIT 1 }; my $dbh=C4::Context->dbh; my $sth = $dbh->prepare($query); $sth->execute($biblionumber); - my ($ordernumber) = $sth->fetchrow; - return $ordernumber; + my ($suggestionid) = $sth->fetchrow; + return $suggestionid; +} + +=head2 GetSuggestionInfoFromBiblionumber + +Get a suggestion and borrower's informations from it's biblionumber. + +return : +all informations (suggestion and borrower) of the suggestion which is related to the biblionumber given. + +=cut + +sub GetSuggestionInfoFromBiblionumber { + my ($biblionumber) = @_; + my $query = qq{ + SELECT suggestions.*, + U1.surname AS surnamesuggestedby, + U1.firstname AS firstnamesuggestedby, + U1.borrowernumber AS borrnumsuggestedby + FROM suggestions + LEFT JOIN borrowers AS U1 ON suggestedby=U1.borrowernumber + WHERE biblionumber = ? LIMIT 1 + }; + my $dbh = C4::Context->dbh; + my $sth = $dbh->prepare($query); + $sth->execute($biblionumber); + return $sth->fetchrow_hashref; +} + +=head2 GetSuggestionInfo + +Get a suggestion and borrower's informations from it's suggestionid + +return : +all informations (suggestion and borrower) of the suggestion which is related to the suggestionid given. + +=cut + +sub GetSuggestionInfo { + my ($suggestionid) = @_; + my $query = qq{ + SELECT suggestions.*, + U1.surname AS surnamesuggestedby, + U1.firstname AS firstnamesuggestedby, + U1.borrowernumber AS borrnumsuggestedby + FROM suggestions + LEFT JOIN borrowers AS U1 ON suggestedby=U1.borrowernumber + WHERE suggestionid = ? LIMIT 1 + }; + my $dbh = C4::Context->dbh; + my $sth = $dbh->prepare($query); + $sth->execute($suggestionid); + return $sth->fetchrow_hashref; } =head2 GetSuggestionByStatus --- a/acqui/basket.pl +++ a/acqui/basket.pl @@ -34,6 +34,8 @@ use C4::Debug; use C4::Biblio; use C4::Members qw/GetMember/; #needed for permissions checking for changing basketgroup of a basket use C4::Items; +use C4::Suggestions; + =head1 NAME basket.pl @@ -237,6 +239,7 @@ if ( $op eq 'delete_confirm' ) { my $qty_total; my @books_loop; + my $suggestion; for my $order ( @results ) { my $rrp = $order->{'listprice'} || 0; @@ -303,6 +306,12 @@ if ( $op eq 'delete_confirm' ) { } else { $line{'title'} = "Deleted bibliographic notice, can't find title."; } + + $suggestion = GetSuggestionInfoFromBiblionumber($line{biblionumber}); + $line{suggestionid} = $suggestion->{suggestionid}; + $line{surnamesuggestedby} = $suggestion->{surnamesuggestedby}; + $line{firstnamesuggestedby} = $suggestion->{firstnamesuggestedby}; + push @books_loop, \%line; } --- a/acqui/neworderempty.pl +++ a/acqui/neworderempty.pl @@ -204,6 +204,9 @@ else { #modify order $booksellerid = $data2->{'booksellerid'}; } +my $suggestion; +$suggestion = GetSuggestionInfo($suggestionid) if $suggestionid; + # get currencies (for change rates calcs if needed) my $active_currency = GetCurrency(); my $default_currency; @@ -359,7 +362,9 @@ $template->param( authorisedbyname => $basket->{'authorisedbyname'}, closedate => C4::Dates->new($basket->{'closedate'},'iso')->output, # order details - suggestionid => $suggestionid, + suggestionid => $suggestion->{suggestionid}, + surnamesuggestedby => $suggestion->{surnamesuggestedby}, + firstnamesuggestedby => $suggestion->{firstnamesuggestedby}, biblionumber => $biblionumber, uncertainprice => $data->{'uncertainprice'}, authorisedbyname => $borrower->{'firstname'} . " " . $borrower->{'surname'}, --- a/acqui/orderreceive.pl +++ a/acqui/orderreceive.pl @@ -75,6 +75,7 @@ use C4::Members; use C4::Branch; # GetBranches use C4::Items; use C4::Biblio; +use C4::Suggestions; my $input = new CGI; @@ -135,6 +136,8 @@ if ( $count == 1 ) { @$results[0]->{'unitprice'} = ''; } + my $suggestion = GetSuggestionInfoFromBiblionumber(@$results[0]->{'biblionumber'}); + my $authorisedby = @$results[0]->{'authorisedby'}; my $member = GetMember( borrowernumber => $authorisedby ); @@ -167,7 +170,10 @@ if ( $count == 1 ) { invoice => $invoice, datereceived => $datereceived->output(), datereceived_iso => $datereceived->output('iso'), - notes => $order->{notes} + notes => $order->{notes}, + suggestionid => $suggestion->{suggestionid}, + surnamesuggestedby => $suggestion->{surnamesuggestedby}, + firstnamesuggestedby => $suggestion->{firstnamesuggestedby}, ); } else { --- a/acqui/parcel.pl +++ a/acqui/parcel.pl @@ -67,6 +67,7 @@ use C4::Items; use CGI; use C4::Output; use C4::Dates qw/format_date format_date_in_iso/; +use C4::Suggestions; use JSON; my $input=new CGI; @@ -178,6 +179,11 @@ for (my $i = 0 ; $i < $countlines ; $i++) { $totalprice += $parcelitems[$i]->{'unitprice'}; $line{unitprice} = sprintf($cfstr, $parcelitems[$i]->{'unitprice'}); + my $suggestion = GetSuggestionInfoFromBiblionumber($line{biblionumber}); + $line{suggestionid} = $suggestion->{suggestionid}; + $line{surnamesuggestedby} = $suggestion->{surnamesuggestedby}; + $line{firstnamesuggestedby} = $suggestion->{firstnamesuggestedby}; + #double FIXME - totalfreight is redefined later. # FIXME - each order in a parcel holds the freight for the whole parcel. This means if you receive a parcel with items from multiple budgets, you'll see the freight charge in each budget.. @@ -230,7 +236,12 @@ for (my $i = 0 ; $i < $countpendings ; $i++) { $itemholds += $nb; } } - + + my $suggestion = GetSuggestionInfoFromBiblionumber($line{biblionumber}); + $line{suggestionid} = $suggestion->{suggestionid}; + $line{surnamesuggestedby} = $suggestion->{surnamesuggestedby}; + $line{firstnamesuggestedby} = $suggestion->{firstnamesuggestedby}; + # if the biblio is not in other orders and if there is no items elsewhere and no subscriptions and no holds we can then show the link "Delete order and Biblio" see bug 5680 $line{can_del_bib} = 1 if $countbiblio <= 1 && $itemcount == scalar @items && !(@subscriptions) && !($holds); $line{items} = ($itemcount) - (scalar @items); --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt @@ -283,6 +283,12 @@ [% IF ( books_loo.issn ) %] - [% books_loo.issn %][% END %] [% IF ( books_loo.publishercode ) %], [% books_loo.publishercode %][% END %] [% IF ( books_loo.publicationyear ) %], [% books_loo.publicationyear %][% END %] + [% IF ( books_loo.suggestionid ) %] +
+ Suggested by [% books_loo.surnamesuggestedby %] + [% IF ( books_loo.firstnamesuggestedby ) %], [% books_loo.firstnamesuggestedby %] [% END %] + (from suggestion #[% books_loo.suggestionid %]) + [% END %]

[% books_loo.rrp %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt @@ -166,7 +166,6 @@ $(document).ready(function() [% ELSE %] New order [% END %] - [% IF ( suggestionid ) %](defined from suggestion #[% suggestionid %])[% END %] [% IF ( basketno ) %] @@ -310,6 +309,19 @@ $(document).ready(function() [% END %] + + [% IF ( suggestionid ) %] +
+ Suggestion +
    +
  1. + Suggested by + [% surnamesuggestedby %][% IF ( firstnamesuggestedby ) %], [% firstnamesuggestedby %][% END %] (from suggestion #[% suggestionid %]) +
  2. +
+
+ [% END %] + [% IF ( items ) %]
Item --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt @@ -35,6 +35,19 @@ [% seriestitle %]
+ + [% IF ( suggestionid ) %] +
+ Suggestion +
    +
  1. + Suggested by + [% surnamesuggestedby %][% IF ( firstnamesuggestedby ) %], [% firstnamesuggestedby %][% END %] (from suggestion #[% suggestionid %]) +
  2. +
+
+ [% END %] + [% IF ( items ) %]
Item --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt @@ -241,6 +241,12 @@ [% IF ( loop_order.author ) %] by [% loop_order.author %][% END %] [% IF ( loop_order.isbn ) %] – [% loop_order.isbn %][% END %] [% IF ( loop_order.publishercode ) %]
Publisher :[% loop_order.publishercode %][% END %] + [% IF ( loop_order.suggestionid ) %] +
+ Suggested by [% loop_order.surnamesuggestedby %] + [% IF ( loop_order.firstnamesuggestedby ) %], [% loop_order.firstnamesuggestedby %] [% END %] + (from suggestion #[% loop_order.suggestionid %]) + [% END %] MARC | Card [% loop_order.quantity %] @@ -361,6 +367,12 @@ [% IF ( loop_receive.author ) %] / [% loop_receive.author %][% END %] [% IF ( loop_receive.isbn ) %] - [% loop_receive.isbn %][% END %] [% IF ( loop_receive.publishercode ) %]
Publisher :[% loop_receive.publishercode %][% END %] + [% IF ( loop_receive.suggestionid ) %] +
+ Suggested by [% loop_receive.surnamesuggestedby %] + [% IF ( loop_receive.firstnamesuggestedby ) %], [% loop_receive.firstnamesuggestedby %] [% END %] + (from suggestion #[% loop_receive.suggestionid %] + [% END %] MARC | Card [% loop_receive.quantityreceived %] --- a/t/db_dependent/Suggestions.t +++ a/t/db_dependent/Suggestions.t @@ -9,16 +9,20 @@ use Data::Dumper; use C4::Suggestions; -use Test::More tests =>6; +use Test::More tests =>9; BEGIN { use_ok('C4::Suggestions'); } -my ($suggestionid, $suggestion, $status); +my ($suggestionid, $suggestion, $status, $biblionumber); +$biblionumber = 1; ok($suggestionid= NewSuggestion( {title=>'Petit traité de philosohpie',author=>'Hubert de Chardassé',publishercode=>'Albin Michel'} ), "NewSuggestion OK"); ok($suggestion= GetSuggestion( $suggestionid), "GetSuggestion OK"); ok($status= ModSuggestion( {title=>'test Modif Simple', suggestionid=>$suggestionid} ), "ModSuggestion Simple OK"); ok($status= ModSuggestion( {STATUS=>'STALLED', suggestionid=>$suggestionid} ), "ModSuggestion Status OK"); +ok($status= ModSuggestion( {suggestionid => $suggestionid, biblionumber => $biblionumber } ), "ModSuggestion, set biblionumber OK" ); +ok($suggestion= GetSuggestionFromBiblionumber( $biblionumber ), "GetSuggestionFromBiblionumber OK"); +ok($suggestion= GetSuggestionInfoFromBiblionumber( $biblionumber ), "GetSuggestionInfoFromBiblionumber OK"); ok(@{SearchSuggestion( {STATUS=>'STALLED'} )}>0, "SearchSuggestion Status OK"); --