diff --git a/acqui/basket.pl b/acqui/basket.pl index 791acd3250..57621b4e7a 100755 --- a/acqui/basket.pl +++ b/acqui/basket.pl @@ -613,16 +613,20 @@ sub edi_close_and_order { } exit; } else { + + my $ean_description = $query->param('ean_description'); + my $ean_branch = $query->param('ean_branch'); + $template->param( edi_confirm => 1, booksellerid => $booksellerid, basketno => $basket->{basketno}, basketname => $basket->{basketname}, basketgroupname => $basket->{basketname}, + ean => $ean ? $ean : '', + ean_description => $ean_description ? $ean_description : '', + ean_branch => $ean_branch ? $ean_branch : '', ); - if ($ean) { - $template->param( ean => $ean ); - } } return; diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt index b35ab76042..8561c5fe75 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt @@ -150,6 +150,8 @@ class="btn btn-default btn-xs submit-form-link" href="#" data-ean="[% eanacct.ean | html %]" + data-ean_description="[% eanacct.description | html %]" + data-ean_branch="[% eanacct.branch.branchname | html %]" data-basketno="[% basketno | html %]" data-action="basket.pl" data-method="post" @@ -1028,7 +1030,11 @@
[% INCLUDE 'csrf-token.inc' %] -

Are you sure you want to generate an EDIFACT order and close basket [% basketname | html %]?

+

Are you sure you want to generate this EDIFACT order?

+ [% IF CAN_user_acquisition_group_manage %]

@@ -1041,11 +1047,11 @@ - +

- +