Attachment 175027 Details for Bug 37993 – Bug 37993: Remove edi_ean page

[patch] Bug 37993: Remove edi_ean page

Bug-37993-Remove-ediean-page.patch (text/plain), 5.23 KB, created by David Nind on 2024-11-29 10:31:10 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: David Nind

Created: 2024-11-29 10:31:10 UTC

Size: 5.23 KB

patch

obsolete

>From 4c95b08248bbc244674222e5774c5ad95df5b14e Mon Sep 17 00:00:00 2001
>From: Martin Renvoize <martin.renvoize@ptfs-europe.com>
>Date: Fri, 29 Nov 2024 09:18:55 +0000
>Subject: [PATCH] Bug 37993: Remove edi_ean page
>
>In the previous patch we replace the only link to the edi_ean selection
>page with a select list embedded in the page.  As such, we no longer
>need this page at all.
>
>Signed-off-by: David Nind <david@davidnind.com>
>---
> acqui/edi_ean.pl                              | 60 ------------------
> .../prog/en/modules/acqui/edi_ean.tt          | 62 -------------------
> 2 files changed, 122 deletions(-)
> delete mode 100755 acqui/edi_ean.pl
> delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edi_ean.tt
>
>diff --git a/acqui/edi_ean.pl b/acqui/edi_ean.pl
>deleted file mode 100755
>index c8f41abbcb..0000000000
>--- a/acqui/edi_ean.pl
>+++ /dev/null
>@@ -1,60 +0,0 @@
>-#!/usr/bin/perl
>-
>-# Copyright 2012 Mark Gavillet & PTFS Europe Ltd
>-#
>-# This file is part of Koha.
>-#
>-# Koha is free software; you can redistribute it and/or modify it
>-# under the terms of the GNU General Public License as published by
>-# the Free Software Foundation; either version 3 of the License, or
>-# (at your option) any later version.
>-#
>-# Koha is distributed in the hope that it will be useful, but
>-# WITHOUT ANY WARRANTY; without even the implied warranty of
>-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
>-# GNU General Public License for more details.
>-#
>-# You should have received a copy of the GNU General Public License
>-# along with Koha; if not, see <http://www.gnu.org/licenses>.
>-
>-# This is an awkward construct and should probably be totally replaced
>-# but as all sites so far are single ordering ean its not clear what we should
>-# replace it with
>-#
>-use Modern::Perl;
>-
>-use C4::Auth qw( get_template_and_user );
>-use C4::Output qw( output_html_with_http_headers );
>-use Koha::Database;
>-use CGI;
>-my $schema = Koha::Database->new()->schema();
>-
>-my @eans = $schema->resultset('EdifactEan')->search(
>-    {},
>-    {
>-        join => 'branch',
>-    }
>-);
>-my $query    = CGI->new();
>-my $basketno = $query->param('basketno');
>-
>-if ( @eans == 1 ) {
>-    my $ean = $eans[0]->ean;
>-    print $query->redirect(
>-        "/cgi-bin/koha/acqui/basket.pl?basketno=$basketno&op=cud-ediorder&ean=$ean"
>-    );
>-}
>-else {
>-    my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
>-        {
>-            template_name   => 'acqui/edi_ean.tt',
>-            query           => $query,
>-            type            => 'intranet',
>-            flagsrequired   => { acquisition => 'order_manage' },
>-        }
>-    );
>-    $template->param( eans     => \@eans );
>-    $template->param( basketno => $basketno );
>-
>-    output_html_with_http_headers( $query, $cookie, $template->output );
>-}
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edi_ean.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edi_ean.tt
>deleted file mode 100644
>index 4b044af614..0000000000
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edi_ean.tt
>+++ /dev/null
>@@ -1,62 +0,0 @@
>-[% USE raw %]
>-[% PROCESS 'i18n.inc' %]
>-[% INCLUDE 'doc-head-open.inc' %]
>-<title>[% FILTER collapse %]
>-    [% tx("Basket {basketnumber}", { basketnumber = basketno }) | html %] &rsaquo;
>-    [% t("Acquisitions") | html %] &rsaquo;
>-    [% t("Koha") | html %]
>-[% END %]</title>
>-[% INCLUDE 'doc-head-close.inc' %]
>-
>-</head>
>-<body id="acq_edi_ean" class="acq">
>-[% WRAPPER 'header.inc' %]
>-    [% INCLUDE 'acquisitions-search.inc' %]
>-[% END %]
>-
>-[% WRAPPER 'sub-header.inc' %]
>-    [% WRAPPER breadcrumbs %]
>-        [% WRAPPER breadcrumb_item %]
>-            <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a>
>-        [% END %]
>-        [% WRAPPER breadcrumb_item bc_active= 1 %]
>-            <span>Basket ([% basketno | html %])</span>
>-        [% END %]
>-    [% END #/ WRAPPER breadcrumbs %]
>-[% END #/ WRAPPER sub-header.inc %]
>-
>-<div class="main container-fluid">
>-    <div class="row">
>-        <div class="col-md-10 order-md-2 order-sm-2">
>-            <main>
>-                [% INCLUDE 'messages.inc' %]
>-
>-    <h1>Select the library account submitting the EDI order</h1>
>-
>-    <div class="page-section">
>-        <form action="/cgi-bin/koha/acqui/basket.pl" method="post">
>-            [% INCLUDE 'csrf-token.inc' %]
>-            <p>Select ordering library account: </p>
>-            <select id="ean" name="ean">
>-                [% FOREACH eanacct IN eans %]
>-                    <option value="[% eanacct.ean | html %]">[% eanacct.branch.branchname | html %] ([% eanacct.ean | html %]) [% IF eanacct.description %][[% eanacct.description | html %]][% END %]</option>
>-                [% END %]
>-            </select>
>-            <input type="hidden" id="basketno" value="[% basketno | html %]" name="basketno" />
>-            <input type="hidden" value="cud-ediorder" name="op" />
>-            <p>
>-                <input type="submit" class="btn btn-primary" value="Send EDI order" />
>-            </p>
>-        </form>
>-    </div> 
>-</main>
>-</div> 
>-
>-<div class="col-md-2 order-sm-2 order-md-1">
>-    <aside>
>-        [% INCLUDE 'acquisitions-menu.inc' %]
>-    </aside>
>-</div> 
>-</div>
>-
>-[% INCLUDE 'intranet-bottom.inc' %]
>-- 
>2.39.5

Actions: View | Diff | Splinter Review

Attachments on bug 37993: 175024 | 175025 | 175026 | 175027 | 175042 | 175043 | 175044 | 175069 | 175070 | 175072 | 175073 | 175074 | 175075 | 175076 | 175081 | 175132