From 2f3a68ee686d504c9b1ae6dd8d5fdf448bbd2d29 Mon Sep 17 00:00:00 2001 From: Emily Lamancusa Date: Wed, 25 Jun 2025 10:14:14 -0400 Subject: [PATCH] Bug 39572: Improve EDIFACT order confirmation message Add EAN account information to EDIFACT order confirmation message when the BasketConfirmations system preference is enabled. To test: 1. Set EDIFACT system preference to Enable 2. Set BasketConfirmations system preference to Enable 3. Create at least 2 EANs, one with a description and one without a description i. Go to Acquisitions > Library EANs ii. Click "New EAN" and fill in the fields 4. Create an EDI account i. Go to Acquisitions > EDI accounts ii. Click "New account" iii. Click Submit (for testing purposes you don't need to fill in the fields) 5. Find or create a basket for the same vendor that's on the EDI account 6. Add an order to the basket from any source 7. In the menu bar at the top of the basket screen, click "Create EDIFACT order" and select an EAN --> Note that the confirmation page doesn't tell you which EAN was selected 8. Click "No, don't close" 9. Apply patch and restart_all 10. Repeat step 7 --> The confirmation page should now display both the basket and the selected EAN 11. Click "Cancel" --> Confirm that the basket is still open 12. Repeat step 7 13. Click "Yes, generate order and close basket" --> Confirm the basket is closed 14. Click "EDIFACT messages" in the sidebar menu --> Confirm that you see a message with type ORDERS for that basket Signed-off-by: David Nind Signed-off-by: Kyle M Hall Signed-off-by: Martin Renvoize --- acqui/basket.pl | 10 +++++++--- .../intranet-tmpl/prog/en/modules/acqui/basket.tt | 12 +++++++++--- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/acqui/basket.pl b/acqui/basket.pl index 791acd32504..57621b4e7ac 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 b35ab760426..8561c5fe75d 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?

+
    +
  • An EDIFACT order will be generated for [% ean_branch | html %] ([% ean | html %]) [% IF ean_description %][% ean_description | html %][% END %]
  • +
  • The basket [% basketname | html %] will be closed
  • +
[% IF CAN_user_acquisition_group_manage %]

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

- +
-- 2.50.0