Attachment 148976 Details for Bug 31722 – Bug 31722: Fixed EDIFACT message to only display if EDIFACT is turned on

[patch] Bug 31722: Fixed EDIFACT message to only display if EDIFACT is turned on

Bug-31722-Fixed-EDIFACT-message-to-only-display-if.patch (text/plain), 5.44 KB, created by ByWater Sandboxes on 2023-03-30 12:31:39 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: ByWater Sandboxes

Created: 2023-03-30 12:31:39 UTC

Size: 5.44 KB

patch

obsolete

>From 46a03f0235eeac89df1b9fdd068b03631786047c Mon Sep 17 00:00:00 2001
>From: Philip Orr <philip.orr@lmscloud.de>
>Date: Thu, 30 Mar 2023 10:09:32 +0000
>Subject: [PATCH] Bug 31722: Fixed EDIFACT message to only display if EDIFACT
> is turned on
>
>This patch makes a small change to the display of the note
>"No EDIFACT configuration for..." on the basket group page to
>only display if the system preference EDIFACT is set to "Enable".
>
>To Test:
>1. apply patch
>2. navigate to a vendor over Acquisitions -> Vendor e.g. My Vendor
>3. create a basket group (doesn't have to have any baskets, an empty one will do)
>4. close the basket group
>5. set system preference "EDIFACT" to "Enable"
>6. navigate to Administration -> EDI Accounts and make sure the vendor doesn't have
>   an EDI account configured
>7. navigate to your vendor's closed basket groups
>   over Acquisitions -> Vendor -> Basket groups (left panel) -> Tab "Closed"
>8. you should see a message "No EDIFACT configuration for (name of vendor)" in the
>   Action column
>9. set system preference "EDIFACT" to "Disable"
>10. go back to your vendor's closed basket groups
>11. you shouldn't see the message "No EDIFACT configuration for (name of vendor)"
>
>Signed-off-by: Laura Escamilla <laura.escamilla@bywatersolutions.com>
>---
> .../prog/en/modules/acqui/basketgroup.tt          | 15 +++++++++------
> 1 file changed, 9 insertions(+), 6 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt
>index ce72d07c75..15fe88b224 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt
>@@ -2,6 +2,7 @@
> [% USE Asset %]
> [% USE Branches %]
> [% USE Price %]
>+[% USE Koha %]
> [% INCLUDE 'doc-head-open.inc' %]
> <title>Basket grouping for [% booksellername | html %] &rsaquo; Koha</title>
> [% INCLUDE 'doc-head-close.inc' %]
>@@ -323,7 +324,7 @@
>                         <div class="btn-group"><a href="/cgi-bin/koha/acqui/basketgroup.pl?op=add&amp;booksellerid=[% booksellerid | uri %]" class="btn btn-default" id="newbasketgroup"><i class="fa fa-plus"></i> New basket group</a></div>
>                     </div>
>                     <h1>Basket grouping for <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid | uri %]">[% booksellername | html %]</a></h1>
>-                    [% IF (NoEDIMessage) %]<div><strong>No EDIFACT configuration for [% booksellername | html %]</strong></div>[% END %]
>+                    [% IF (NoEDIMessage && Koha.Preference('EDIFACT')) %]<div><strong>No EDIFACT configuration for [% booksellername | html %]</strong></div>[% END %]
> 
>                     [% WRAPPER tabs id= "basket_groups" %]
>                         [% WRAPPER tabs_nav %]
>@@ -403,11 +404,13 @@
>                                                         <form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get"><input type="hidden" name="op" value="reopen" /><input type="hidden" name="booksellerid" value="[% basketgroup.booksellerid | html %]" /><input type="hidden" name="basketgroupid" value="[% basketgroup.id | html %]" /><input type="submit" class="btn btn-primary" value="Reopen" /></form>
>                                                         <form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get"><input type="hidden" name="op" value="print" /><input type="hidden" name="basketgroupid" value="[% basketgroup.id | html %]" /><input type="submit" class="btn btn-primary" value="Export as PDF" /></form>
>                                                         <form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get"><input type="hidden" name="op" value="export" /><input type="hidden" name="basketgroupid" value="[% basketgroup.id | html %]" /><input type="submit" class="btn btn-primary" value="Export as CSV" /></form>
>-                                                [% IF (ediaccount) %]
>-                                                        <form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get"><input type="hidden" name="op" value="ediprint" /><input type="hidden" name="basketgroupid" value="[% basketgroup.id | html %]" /><input type="submit" class="btn btn-primary" value="Generate EDIFACT order" /></form>
>-                                                [% ELSE %]
>-                                                        <div>No EDIFACT configuration for [% booksellername | html %]</div>
>-                                                [% END %]
>+                                                        [% IF Koha.Preference('EDIFACT') %]
>+                                                            [% IF (ediaccount) %]
>+                                                                 <form action="/cgi-bin/koha/acqui/basketgroup.pl" method="get"><input type="hidden" name="op" value="ediprint" /><input type="hidden" name="basketgroupid" value="[% basketgroup.id | html %]" /><input type="submit" class="btn btn-primary" value="Generate EDIFACT order" /></form>
>+                                                            [% ELSE %]
>+                                                                <div>No EDIFACT configuration for [% booksellername | html %]</div>
>+                                                            [% END %]
>+                                                        [% END %]
>                                                     </td>
>                                                 </tr>
>                                             [% END %]
>-- 
>2.30.2

Actions: View | Diff | Splinter Review

Attachments on bug 31722: 148972 | 148976 | 149354