From 24c6226a05b4ba6b97a82075ab6a4c2f758e84d6 Mon Sep 17 00:00:00 2001 From: Martin Renvoize 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 Signed-off-by: Matt Blenkinsop Signed-off-by: Martin Renvoize --- 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 c8f41abbcb2..00000000000 --- 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 . - -# 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 4b044af614b..00000000000 --- 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' %] -[% FILTER collapse %] - [% tx("Basket {basketnumber}", { basketnumber = basketno }) | html %] › - [% t("Acquisitions") | html %] › - [% t("Koha") | html %] -[% END %] -[% INCLUDE 'doc-head-close.inc' %] - - - -[% WRAPPER 'header.inc' %] - [% INCLUDE 'acquisitions-search.inc' %] -[% END %] - -[% WRAPPER 'sub-header.inc' %] - [% WRAPPER breadcrumbs %] - [% WRAPPER breadcrumb_item %] - Acquisitions - [% END %] - [% WRAPPER breadcrumb_item bc_active= 1 %] - Basket ([% basketno | html %]) - [% END %] - [% END #/ WRAPPER breadcrumbs %] -[% END #/ WRAPPER sub-header.inc %] - -

- [% INCLUDE 'messages.inc' %] - -

Select the library account submitting the EDI order

- -

- -[% INCLUDE 'intranet-bottom.inc' %] -- 2.47.1