From c2ec238d9f282612ef5a79a8e5bfa9600b7273f9 Mon Sep 17 00:00:00 2001 From: Kyle M Hall Date: Thu, 10 Mar 2016 19:35:02 +0000 Subject: [PATCH] Bug 7736 [QA Followup] - Fix column headers, values and spelling Signed-off-by: Kyle M Hall Signed-off-by: Brendan A Gallagher --- admin/edi_accounts.pl | 42 ++--- admin/edi_ean_accounts.pl | 42 ++--- .../prog/en/modules/admin/admin-home.tt | 2 +- .../prog/en/modules/admin/edi_accounts.tt | 21 ++- .../prog/en/modules/admin/edi_ean_accounts.tt | 147 ++++++++++-------- 5 files changed, 135 insertions(+), 119 deletions(-) diff --git a/admin/edi_accounts.pl b/admin/edi_accounts.pl index 83cc113f09..7d86af80d9 100755 --- a/admin/edi_accounts.pl +++ b/admin/edi_accounts.pl @@ -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 { diff --git a/admin/edi_ean_accounts.pl b/admin/edi_ean_accounts.pl index 35d90c01df..e9bf1d7e02 100755 --- a/admin/edi_ean_accounts.pl +++ b/admin/edi_ean_accounts.pl @@ -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 { diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt index 083902a79a..32bca5a45f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt @@ -101,7 +101,7 @@
EDI Accounts
Manage vendor EDI accounts for import/export
EDI EANs
-
Manage Branch EDI EANs
+
Manage library EDI EANs

Additional parameters

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_accounts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_accounts.tt index d7e46ee48d..732b4ec6b6 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_accounts.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_accounts.tt @@ -127,11 +127,11 @@ [% FOREACH qualifier IN code_qualifiers %] [% IF qualifier.code == account.id_code_qualifier %] [% ELSE %] [% END %] [% END %] @@ -174,7 +174,7 @@ [% END %]
  • - + [% IF account.auto_orders %] [% ELSE %] @@ -233,8 +233,8 @@ Password Download Directory Upload Directory - id_code_type - id_code + Qualifier + SAN Quotes Orders Invoices @@ -252,10 +252,17 @@ [% account.transport %] [% account.host %] [% account.username %] - [% IF account.password %]xxxxx[% END %] + [% IF account.password %]*****[% END %] [% account.download_directory %] [% account.upload_directory %] - [% account.id_code_qualifier %] + + [% FOREACH qualifier IN code_qualifiers %] + [% IF qualifier.code == account.id_code_qualifier %] + [% qualifier.description %] + [% END %] + [% END %] + ([% account.id_code_qualifier %]) + [% account.san %] [% IF account.quotes_enabled %] Y diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_ean_accounts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_ean_accounts.tt index 16219b2691..3191529eeb 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_ean_accounts.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_ean_accounts.tt @@ -2,9 +2,9 @@ Koha › Administration › EDI EANs [% 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 @@ › EDI EANs [% 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 %] @@ -52,52 +52,53 @@
    [% IF ean %] - - + + [% END %] -
    - - [% IF ean %] - Modify EAN - [% ELSE %] - New EAN - [% END %] - -
      -
    1. - - -
      2. -
    2. - - -
      3. -
    3. -
      4. +
    4. + + +
      5. +
    5. + + +
      6. +
    @@ -105,11 +106,11 @@ Cancel
    - [% END %] + [% IF delete_confirm %]
    -

    Delete EAN [% ean.ean %] for branch [% ean.branch.branchname %]?

    +

    Delete EAN [% ean.ean %] for [% ean.branch.branchname %]?

    @@ -121,26 +122,34 @@
    [% END %] + [% IF display %] -

    Branch EANs

    - - - - - - - - [% FOREACH ean IN eans %] - [% IF loop.even %] - [% ELSE %] - [% END %] - - - - - - [% END %] +

    Library EANs

    +
    BranchEANCode TypeActions
    [% ean.branch.branchname %][% ean.ean %][% ean.id_code_qualifier %] - Edit | Delete
    + + + + + + + [% FOREACH ean IN eans %] + [% IF loop.even %][% ELSE %][% END %] + + + + + + [% END %]
    LibraryEANQualifierActions
    [% ean.branch.branchname %][% ean.ean %] + [% FOREACH qualifier IN code_qualifiers %] + [% IF qualifier.code == ean.id_code_qualifier %] + [% qualifier.description %] ([% qualifier.code %]) + [% END %] + [% END %] + + Edit + | + Delete +
    [% END %] -- 2.39.5