Attachment 48974 Details for Bug 7736 – Bug 7736 [QA Followup] - Fix column headers, values and spelling

[patch] Bug 7736 [QA Followup] - Fix column headers, values and spelling

Bug-7736-QA-Followup---Fix-column-headers-values-a.patch (text/plain), 4.08 KB, created by Kyle M Hall (khall) on 2016-03-10 19:45:41 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kyle M Hall (khall)

Created: 2016-03-10 19:45:41 UTC

Size: 4.08 KB

patch

obsolete

>From ed2ce03b99ae808ba1a0297d40a676c5b7f929f5 Mon Sep 17 00:00:00 2001
>From: Kyle M Hall <kyle@bywatersolutions.com>
>Date: Thu, 10 Mar 2016 19:35:02 +0000
>Subject: [PATCH] Bug 7736 [QA Followup] - Fix column headers, values and
> spelling
>
>---
> admin/edi_accounts.pl                              | 42 +++++++++++-----------
> .../prog/en/modules/admin/edi_accounts.tt          | 19 ++++++----
> 2 files changed, 34 insertions(+), 27 deletions(-)
>
>diff --git a/admin/edi_accounts.pl b/admin/edi_accounts.pl
>index 83cc113..7d86af8 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/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_accounts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/edi_accounts.tt
>index d7e46ee..fb20ba6 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 %]
>            <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>
>@@ -255,7 +255,14 @@
>       <td>[% IF account.password %]xxxxx[% 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.1.4

Actions: View | Diff | Splinter Review

Attachments on bug 7736: 8275 | 8276 | 8446 | 8635 | 10226 | 12398 | 12438 | 12467 | 13071 | 15304 | 15729 | 16538 | 16629 | 16649 | 16652 | 16667 | 16732 | 16761 | 16779 | 16792 | 16864 | 16865 | 16866 | 16867 | 16868 | 16869 | 16870 | 16871 | 16872 | 16873 | 16874 | 16882 | 16883 | 16884 | 16885 | 16886 | 17120 | 17121 | 20983 | 20984 | 21475 | 33953 | 33957 | 34332 | 34833 | 35030 | 35106 | 35716 | 35717 | 35718 | 36738 | 44079 | 44080 | 44081 | 44082 | 44083 | 44084 | 46996 | 47004 | 48623 | 48624 | 48625 | 48626 | 48971 | 48972 | 48973 | 48974 | 48975 | 48976 | 49037 | 49038 | 49039 | 49040 | 49041 | 49042 | 49307 | 49850 | 50002 | 50008