Bug 7736 [QA Followup] - Fix column headers, values and spelling
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
This commit is contained in:
Brendan A Gallagher
parent
fec34d29d5
commit
c2ec238d9f
5 changed files with 135 additions and 119 deletions
|
|
@ -51,27 +51,6 @@ if ( $op eq 'acct_form' ) {
|
|||
}
|
||||
);
|
||||
$template->param( vendors => \@vendors );
|
||||
$template->param(
|
||||
code_qualifiers => [
|
||||
{
|
||||
code => '14',
|
||||
description => 'EAN International',
|
||||
},
|
||||
{
|
||||
code => '31B',
|
||||
description => 'US SAN Agency',
|
||||
},
|
||||
{
|
||||
code => '91',
|
||||
description => 'Assigned by supplier',
|
||||
},
|
||||
{
|
||||
code => '92',
|
||||
description => 'Assigned by buyer',
|
||||
},
|
||||
]
|
||||
);
|
||||
|
||||
}
|
||||
elsif ( $op eq 'delete_confirm' ) {
|
||||
show_account();
|
||||
|
|
@ -129,6 +108,27 @@ else {
|
|||
$template->param( ediaccounts => \@ediaccounts );
|
||||
}
|
||||
|
||||
$template->param(
|
||||
code_qualifiers => [
|
||||
{
|
||||
code => '14',
|
||||
description => 'EAN International',
|
||||
},
|
||||
{
|
||||
code => '31B',
|
||||
description => 'US SAN Agency',
|
||||
},
|
||||
{
|
||||
code => '91',
|
||||
description => 'Assigned by supplier',
|
||||
},
|
||||
{
|
||||
code => '92',
|
||||
description => 'Assigned by buyer',
|
||||
},
|
||||
]
|
||||
);
|
||||
|
||||
output_html_with_http_headers( $input, $cookie, $template->output );
|
||||
|
||||
sub get_account {
|
||||
|
|
|
|||
|
|
@ -51,27 +51,6 @@ if ( $op eq 'ean_form' ) {
|
|||
}
|
||||
);
|
||||
$template->param( branches => \@branches );
|
||||
$template->param(
|
||||
code_qualifiers => [
|
||||
{
|
||||
code => '14',
|
||||
description => 'EAN International',
|
||||
},
|
||||
{
|
||||
code => '31B',
|
||||
description => 'US SAN Agency',
|
||||
},
|
||||
{
|
||||
code => '91',
|
||||
description => 'Assigned by supplier',
|
||||
},
|
||||
{
|
||||
code => '92',
|
||||
description => 'Assigned by buyer',
|
||||
},
|
||||
]
|
||||
);
|
||||
|
||||
}
|
||||
elsif ( $op eq 'delete_confirm' ) {
|
||||
show_ean();
|
||||
|
|
@ -100,6 +79,27 @@ else {
|
|||
$template->param( eans => \@eans );
|
||||
}
|
||||
|
||||
$template->param(
|
||||
code_qualifiers => [
|
||||
{
|
||||
code => '14',
|
||||
description => 'EAN International',
|
||||
},
|
||||
{
|
||||
code => '31B',
|
||||
description => 'US SAN Agency',
|
||||
},
|
||||
{
|
||||
code => '91',
|
||||
description => 'Assigned by supplier',
|
||||
},
|
||||
{
|
||||
code => '92',
|
||||
description => 'Assigned by buyer',
|
||||
},
|
||||
]
|
||||
);
|
||||
|
||||
output_html_with_http_headers( $input, $cookie, $template->output );
|
||||
|
||||
sub delsubmit {
|
||||
|
|
|
|||
|
|
@ -101,7 +101,7 @@
|
|||
<dt><a href="/cgi-bin/koha/admin/edi_accounts.pl">EDI Accounts</a></dt>
|
||||
<dd>Manage vendor EDI accounts for import/export</dd>
|
||||
<dt><a href="/cgi-bin/koha/admin/edi_ean_accounts.pl">EDI EANs</a></dt>
|
||||
<dd>Manage Branch EDI EANs</dd>
|
||||
<dd>Manage library EDI EANs</dd>
|
||||
</dl>
|
||||
|
||||
<h3>Additional parameters</h3>
|
||||
|
|
|
|||
|
|
@ -127,11 +127,11 @@
|
|||
[% FOREACH qualifier IN code_qualifiers %]
|
||||
[% IF qualifier.code == account.id_code_qualifier %]
|
||||
<option value="[% qualifier.code %]" selected="selected">
|
||||
[% qualifier.description %]
|
||||
[% qualifier.description %] ([% qualifier.code %])
|
||||
</option>
|
||||
[% ELSE %]
|
||||
<option value="[% qualifier.code %]">
|
||||
[% qualifier.description %]
|
||||
[% qualifier.description %] ([% qualifier.code %])
|
||||
</option>
|
||||
[% END %]
|
||||
[% END %]
|
||||
|
|
@ -174,7 +174,7 @@
|
|||
[% END %]
|
||||
</li>
|
||||
<li>
|
||||
<label for="auto_orders">Automatic ordring (Quotes generate orders without staff intervention): </label>
|
||||
<label for="auto_orders">Automatic ordering (Quotes generate orders without staff intervention): </label>
|
||||
[% IF account.auto_orders %]
|
||||
<input type="checkbox" name="auto_orders" id="auto_orders" value="[% account.auto_orders %]" checked />
|
||||
[% ELSE %]
|
||||
|
|
@ -233,8 +233,8 @@
|
|||
<th>Password</th>
|
||||
<th>Download Directory</th>
|
||||
<th>Upload Directory</th>
|
||||
<th>id_code_type</th>
|
||||
<th>id_code</th>
|
||||
<th>Qualifier</th>
|
||||
<th>SAN</th>
|
||||
<th>Quotes</th>
|
||||
<th>Orders</th>
|
||||
<th>Invoices</th>
|
||||
|
|
@ -252,10 +252,17 @@
|
|||
<td>[% account.transport %]</td>
|
||||
<td>[% account.host %]</td>
|
||||
<td>[% account.username %]</td>
|
||||
<td>[% IF account.password %]xxxxx[% END %]</td>
|
||||
<td>[% IF account.password %]*****[% END %]</td>
|
||||
<td>[% account.download_directory %]</td>
|
||||
<td>[% account.upload_directory %]</td>
|
||||
<td>[% account.id_code_qualifier %]</td>
|
||||
<td>
|
||||
[% FOREACH qualifier IN code_qualifiers %]
|
||||
[% IF qualifier.code == account.id_code_qualifier %]
|
||||
[% qualifier.description %]
|
||||
[% END %]
|
||||
[% END %]
|
||||
([% account.id_code_qualifier %])
|
||||
</td>
|
||||
<td>[% account.san %]</td>
|
||||
[% IF account.quotes_enabled %]
|
||||
<td>Y</td>
|
||||
|
|
|
|||
|
|
@ -2,9 +2,9 @@
|
|||
<title>Koha › Administration › EDI EANs</title>
|
||||
[% IF ean_form %]
|
||||
[% IF ean %]
|
||||
’ Modify branch EAN
|
||||
’ Modify library EAN
|
||||
[% ELSE %]
|
||||
’ Add new branch EAN
|
||||
’ Add new library EAN
|
||||
[% END %]
|
||||
[% END %]
|
||||
[% IF delete_confirm %]
|
||||
|
|
@ -23,14 +23,14 @@
|
|||
› <a href="/cgi-bin/koha/admin/edi_ean_accounts.pl">EDI EANs</a>
|
||||
[% IF ean_form %]
|
||||
[% IF ean %]
|
||||
› Modify branch EAN
|
||||
› Modify library EAN
|
||||
[% ELSE %]
|
||||
› Add new branch EAN
|
||||
› Add new library EAN
|
||||
[% END %]
|
||||
[% ELSIF delete_confirm %]
|
||||
› Confirm deletion of Ean
|
||||
[% ELSE %]
|
||||
› Branch EANs
|
||||
› Library EANs
|
||||
[% END %]
|
||||
</div>
|
||||
|
||||
|
|
@ -52,52 +52,53 @@
|
|||
<form action="/cgi-bin/koha/admin/edi_ean_accounts.pl" name="Eanform" method="post">
|
||||
<input type="hidden" name="op" value="save" />
|
||||
[% IF ean %]
|
||||
<input type="hidden" name="oldbranchcode" value="[% branchcode %]" />
|
||||
<input type="hidden" name="oldean" value="[% ean %]" />
|
||||
<input type="hidden" name="oldbranchcode" value="[% branchcode %]" />
|
||||
<input type="hidden" name="oldean" value="[% ean %]" />
|
||||
[% END %]
|
||||
|
||||
<fieldset class="rows">
|
||||
<legend>
|
||||
[% IF ean %]
|
||||
Modify EAN
|
||||
[% ELSE %]
|
||||
New EAN
|
||||
[% END %]
|
||||
</legend>
|
||||
<legend>
|
||||
[% IF ean %]
|
||||
Modify EAN
|
||||
[% ELSE %]
|
||||
New EAN
|
||||
[% END %]
|
||||
</legend>
|
||||
|
||||
<ol>
|
||||
<li>
|
||||
<label for="branchcode">Branchcode: </label>
|
||||
<select name="branchcode" id="branchcode">
|
||||
[% FOREACH branch IN branches %]
|
||||
[% IF branch.branchcode == ean.branch.branchcode %]
|
||||
<option value="[% branch.branchcode %]" selected="selected">[% branch.branchname %]</option>
|
||||
[% ELSE %]
|
||||
<option value="[% branch.branchcode %]">[% branch.branchname %]</option>
|
||||
[% END %]
|
||||
[% END %]
|
||||
</select>
|
||||
</li>
|
||||
<li>
|
||||
<label for="ean">EAN: </label>
|
||||
<input type="text" name="ean" id="ean`" size="20" maxlength="90" value="[% ean.ean %]" />
|
||||
</li>
|
||||
<li>
|
||||
<label for="id_code_qualifier">
|
||||
<select name="id_code_qualifier" id="id_code_qualifier">
|
||||
[% FOREACH qualifier IN code_qualifiers %]
|
||||
[% IF qualifier.code == ean.id_code_qualifier %]
|
||||
<option value="[% qualifier.code %]" selected="selected">
|
||||
[% qualifier.description %]
|
||||
</option>
|
||||
[% ELSE %]
|
||||
<option value="[% qualifier.code %]">
|
||||
[% qualifier.description %]
|
||||
</option>
|
||||
[% END %]
|
||||
[% END %]
|
||||
</li>
|
||||
|
||||
</ol>
|
||||
<ol>
|
||||
<li>
|
||||
<label for="branchcode">Library: </label>
|
||||
<select name="branchcode" id="branchcode">
|
||||
[% FOREACH branch IN branches %]
|
||||
[% IF branch.branchcode == ean.branch.branchcode %]
|
||||
<option value="[% branch.branchcode %]" selected="selected">[% branch.branchname %]</option>
|
||||
[% ELSE %]
|
||||
<option value="[% branch.branchcode %]">[% branch.branchname %]</option>
|
||||
[% END %]
|
||||
[% END %]
|
||||
</select>
|
||||
</li>
|
||||
<li>
|
||||
<label for="ean">EAN: </label>
|
||||
<input type="text" name="ean" id="ean`" size="20" maxlength="90" value="[% ean.ean %]" />
|
||||
</li>
|
||||
<li>
|
||||
<label for="id_code_qualifier">Qualifier: </label>
|
||||
<select name="id_code_qualifier" id="id_code_qualifier">
|
||||
[% FOREACH qualifier IN code_qualifiers %]
|
||||
[% IF qualifier.code == ean.id_code_qualifier %]
|
||||
<option value="[% qualifier.code %]" selected="selected">
|
||||
[% qualifier.description %] ([% qualifier.code %])
|
||||
</option>
|
||||
[% ELSE %]
|
||||
<option value="[% qualifier.code %]">
|
||||
[% qualifier.description %] ([% qualifier.code %])
|
||||
</option>
|
||||
[% END %]
|
||||
[% END %]
|
||||
</select>
|
||||
</li>
|
||||
</ol>
|
||||
</fieldset>
|
||||
|
||||
<fieldset class="action">
|
||||
|
|
@ -105,11 +106,11 @@
|
|||
<a href="/cgi-bin/koha/admin/edi_ean_accounts.pl" class="cancel">Cancel</a>
|
||||
</fieldset>
|
||||
</form>
|
||||
|
||||
[% END %]
|
||||
|
||||
[% IF delete_confirm %]
|
||||
<div class="dialog alert">
|
||||
<h3>Delete EAN [% ean.ean %] for branch [% ean.branch.branchname %]?</h3>
|
||||
<h3>Delete EAN [% ean.ean %] for [% ean.branch.branchname %]?</h3>
|
||||
<form action="/cgi-bin/koha/admin/edi_ean_accounts.pl" method="post">
|
||||
<input type="hidden" name="op" value="delete_confirmed" />
|
||||
<input type="hidden" name="branchcode" value="[% ean.branch.branchcode %]" />
|
||||
|
|
@ -121,26 +122,34 @@
|
|||
</form>
|
||||
</div>
|
||||
[% END %]
|
||||
|
||||
[% IF display %]
|
||||
<h2>Branch EANs</h2>
|
||||
<table>
|
||||
<tr>
|
||||
<th>Branch</th>
|
||||
<th>EAN</th>
|
||||
<th>Code Type</th>
|
||||
<th>Actions</th>
|
||||
</tr>
|
||||
[% FOREACH ean IN eans %]
|
||||
[% IF loop.even %]<tr>
|
||||
[% ELSE %]<tr class="highlight">
|
||||
[% END %]
|
||||
<td>[% ean.branch.branchname %]</td>
|
||||
<td>[% ean.ean %]</td>
|
||||
<td>[% ean.id_code_qualifier %]</td>
|
||||
<td align="center">
|
||||
<a href="/cgi-bin/koha/admin/edi_ean_accounts.pl?op=ean_form&branchcode=[% ean.branch.branchcode %]&ean=[% ean.ean %]">Edit</a> | <a href="/cgi-bin/koha/admin/edi_ean_accounts.pl?op=delete_confirm&branchcode=[% ean.branch.branchcode %]&ean=[% ean.ean %]">Delete</a></td>
|
||||
</tr>
|
||||
[% END %]
|
||||
<h2>Library EANs</h2>
|
||||
<table>
|
||||
<tr>
|
||||
<th>Library</th>
|
||||
<th>EAN</th>
|
||||
<th>Qualifier</th>
|
||||
<th>Actions</th>
|
||||
</tr>
|
||||
[% FOREACH ean IN eans %]
|
||||
[% IF loop.even %]<tr>[% ELSE %]<tr class="highlight">[% END %]
|
||||
<td>[% ean.branch.branchname %]</td>
|
||||
<td>[% ean.ean %]</td>
|
||||
<td>
|
||||
[% FOREACH qualifier IN code_qualifiers %]
|
||||
[% IF qualifier.code == ean.id_code_qualifier %]
|
||||
[% qualifier.description %] ([% qualifier.code %])
|
||||
[% END %]
|
||||
[% END %]
|
||||
</td>
|
||||
<td align="center">
|
||||
<a href="/cgi-bin/koha/admin/edi_ean_accounts.pl?op=ean_form&branchcode=[% ean.branch.branchcode %]&ean=[% ean.ean %]">Edit</a>
|
||||
|
|
||||
<a href="/cgi-bin/koha/admin/edi_ean_accounts.pl?op=delete_confirm&branchcode=[% ean.branch.branchcode %]&ean=[% ean.ean %]">Delete</a>
|
||||
</td>
|
||||
</tr>
|
||||
[% END %]
|
||||
</table>
|
||||
[% END %]
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue