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

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>
Signed-off-by: Matt Blenkinsop <matt.blenkinsop@ptfs-europe.com>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
(cherry picked from commit 0146359332)
Signed-off-by: Paul Derscheid <paul.derscheid@lmscloud.de>
This commit is contained in:
Martin Renvoize 2024-11-29 09:18:55 +00:00 committed by Paul Derscheid
parent a7b9e08e02
commit 4dcaef65ca
No known key found for this signature in database
GPG Key ID: C25F9FD44CED595B
2 changed files with 0 additions and 122 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
acqui/edi_ean.pl
View File

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

62
koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edi_ean.tt
View File

@ -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> <!-- /.page-section -->
</main>
</div> <!-- /.col-md-10.order-md-2 -->
<div class="col-md-2 order-sm-2 order-md-1">
<aside>
[% INCLUDE 'acquisitions-menu.inc' %]
</aside>
</div> <!-- /.col-md-2.order-md-1 -->
</div>
[% INCLUDE 'intranet-bottom.inc' %]