gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug 39723: (follow-up) only use the suggestion object in template params 

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
This commit is contained in:
Baptiste Wojtkowski 2026-03-03 15:48:53 +00:00 committed by Lucas Gass
parent df21bc24eb
commit 713b525d1f
No known key found for this signature in database
GPG Key ID: 60B447398B0D36CA
4 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
acqui/basket.pl
View File

@ -659,9 +659,7 @@ sub get_order_infos {
}
my $suggestion = Koha::Suggestions->search( { biblionumber => $line{biblionumber} } )->single;
$line{suggestionid} = $suggestion->suggestionid;
$line{surnamesuggestedby} = $suggestion->suggester->surname;
$line{firstnamesuggestedby} = $suggestion->suggester->firstname;
$line{suggestion} = $suggestion;
$line{estimated_delivery_date} = $order->{estimated_delivery_date};

4
acqui/parcel.pl
View File

@ -151,9 +151,7 @@ for my $order (@orders) {
$total_tax_included += get_rounded_price( $line{unitprice_tax_included} ) * $line{quantity};
my $suggestion = Koha::Suggestions->search( { biblionumber => $line{biblionumber} } )->single;
$line{suggestionid} = $suggestion->suggestionid;
$line{surnamesuggestedby} = $suggestion->suggester->surname;
$line{firstnamesuggestedby} = $suggestion->suggester->firstname;
$line{suggestion} = $suggestion;
if ( $line{parent_ordernumber} != $line{ordernumber} ) {
if ( grep { $_->{ordernumber} == $line{parent_ordernumber} } @orders ) {

10
koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt
View File

@ -834,12 +834,10 @@
[% books_loo.copyrightdate | html %]
[% END -%]
[%- IF ( books_loo.editionstatement ) %], [% books_loo.editionstatement | html %][% END -%]
[%- IF ( books_loo.suggestionid ) %]
[%- IF ( books_loo.suggestion ) %]
<br />
Suggested by: [% books_loo.surnamesuggestedby | html %][% IF ( books_loo.firstnamesuggestedby ) %], [% books_loo.firstnamesuggestedby | html %][% END %] (<a
href="/cgi-bin/koha/suggestion/suggestion.pl?suggestionid=[% books_loo.suggestionid | uri %]&amp;op=show"
>suggestion #[% books_loo.suggestionid | html %]</a
>)
Suggested by: [% books_loo.suggestion.suggester.surname | html %][% IF ( books_loo.suggestion.suggester.firstname ) %], [% books_loo.suggestion.suggester.firstname | html %][% END %]
(<a href="/cgi-bin/koha/suggestion/suggestion.pl?suggestionid=[% books_loo.suggestion.suggestionid | uri %]&amp;op=show">suggestion #[% books_loo.suggestion.suggestionid | html %]</a>)
[% END %]
</p>
[% IF ( books_loo.order_internalnote ) %]
@ -962,7 +960,7 @@
<a href="#" class="transfer_order" data-ordernumber="[% books_loo.ordernumber | html %]">Transfer</a>
<br />
[% END %]
[% UNLESS ( books_loo.suggestionid ) %]
[% UNLESS ( books_loo.suggestion.suggestionid ) %]
<a
data-action="/cgi-bin/koha/acqui/newordersuggestion.pl"
data-booksellerid="[% booksellerid | html %]"

4
koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt
View File

@ -238,9 +238,9 @@
[% order.copyrightdate | html %]
[% END %]
[% END %]
[% IF ( order.suggestionid ) %]
[% IF ( order.suggestion ) %]
<br />
Suggested by: [% order.surnamesuggestedby | html %][% IF ( order.firstnamesuggestedby ) %], [% order.firstnamesuggestedby | html %][% END %] (<a
Suggested by: [% order.suggestion.suggester.surname | html %][% IF ( order.suggestion.suggester.firstname ) %], [% order.suggestion.suggester.firstname | html %][% END %] (<a
href="/cgi-bin/koha/suggestion/suggestion.pl?suggestionid=[% order.suggestionid | uri %]&amp;op=show"
>suggestion #[% order.suggestionid | html %]</a
>)