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

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 <david@davidnind.com>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize@openfifth.co.uk>
Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
(cherry picked from commit 0c9e5029b3)
Signed-off-by: Paul Derscheid <paul.derscheid@lmscloud.de>
This commit is contained in:
Emily Lamancusa 2025-06-25 10:14:14 -04:00 committed by Paul Derscheid
parent 5f8958d220
commit ea49cfb38b
No known key found for this signature in database
GPG Key ID: C25F9FD44CED595B
2 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
acqui/basket.pl
View File

@ -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;

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

@ -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 @@
<div id="closebasket_needsconfirmation" class="alert alert-warning">
<form action="/cgi-bin/koha/acqui/basket.pl" method="post">
[% INCLUDE 'csrf-token.inc' %]
<h1>Are you sure you want to generate an EDIFACT order and close basket [% basketname | html %]?</h1>
<h1>Are you sure you want to generate this EDIFACT order?</h1>
<ul>
<li> An EDIFACT order will be generated for <b> [% ean_branch | html %] ([% ean | html %]) [% IF ean_description %][% ean_description | html %][% END %]</b></li>
<li> The basket <b>[% basketname | html %]</b> will be closed </li>
</ul>
[% IF CAN_user_acquisition_group_manage %]
<p>
<label for="createbasketgroup">Attach this basket to a new basket group with the same name</label>
@ -1041,11 +1047,11 @@
<input type="hidden" name="booksellerid" value="[% booksellerid | html %]" />
<input type="hidden" name="confirm" value="1" />
<input type="hidden" name="basketgroupname" value="[% basketgroupname | html %]" />
<button type="submit" class="btn btn-default approve" accesskey="Y"><i class="fa fa-fw fa-check"></i> Yes, close (Y)</button>
<button type="submit" class="btn btn-default approve" accesskey="Y"><i class="fa fa-fw fa-check"></i> Yes, generate order and close basket (Y)</button>
</form>
<form action="/cgi-bin/koha/acqui/basket.pl" method="get">
<input type="hidden" name="basketno" value="[% basketno | html %]" />
<button type="submit" class="btn btn-default deny" accesskey="N"><i class="fa fa-fw fa-times"></i> No, don't close (N)</button>
<button type="submit" class="btn btn-default deny" accesskey="N"><i class="fa fa-fw fa-times"></i> Cancel (C)</button>
</form>
</div>
<!-- /#closebasket_needsconfirmation -->