Bugzilla – Attachment 183675 Details for
Bug 39572
Create EDIFACT order button no longer gives librarians chance to review
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 39572: Improve EDIFACT order confirmation message
Bug-39572-Improve-EDIFACT-order-confirmation-messa.patch (text/plain), 5.87 KB, created by
Kyle M Hall (khall)
on 2025-07-01 16:13:32 UTC
(
hide
)
Description:
Bug 39572: Improve EDIFACT order confirmation message
Filename:
MIME Type:
Creator:
Kyle M Hall (khall)
Created:
2025-07-01 16:13:32 UTC
Size:
5.87 KB
patch
obsolete
>From e5cefc975149f657d25faf3a6a460e9971a01612 Mon Sep 17 00:00:00 2001 >From: Emily Lamancusa <emily.lamancusa@montgomerycountymd.gov> >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 > >To test: >1. Set EDIFACT system preference to Enable >2. 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 >3. 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) >4. Find or create a basket for the same vendor that's on the EDI account >5. Add an order to the basket from any source >6. 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 >7. Click "No, don't close" >8. Apply patch and restart_all >9. Repeat step 6 >--> The confirmation page should now display both the basket and the > selected EAN >10. Click "Cancel" >--> Confirm that the basket is still open >11. Repeat step 6 >12. Click "Yes, generate order and close basket" >--> Confirm the basket is closed >13. 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> >--- > 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 @@ > <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 --> >-- >2.39.5 (Apple Git-154)
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 39572
:
183501
|
183632
| 183675