From b5cb229ae8ad45c40ca2c16ca7629d282ff0de3b Mon Sep 17 00:00:00 2001 From: ftimme <ft@falkotimme.com> Date: Tue, 11 Dec 2012 06:44:28 -0500 Subject: [PATCH] - Added customer no. to client and reseller lists. --- interface/web/client/lib/lang/de_resellers_list.lng | 2 ++ interface/web/client/list/client.list.php | 11 ++++++++++- interface/web/client/templates/resellers_list.htm | 12 +++++++++--- interface/web/client/lib/lang/en_clients_list.lng | 1 + interface/web/client/lib/lang/de_clients_list.lng | 1 + interface/web/client/templates/clients_list.htm | 13 ++++++++----- interface/web/client/lib/lang/en_resellers_list.lng | 2 ++ interface/web/client/list/reseller.list.php | 18 ++++++++++++++++++ 8 files changed, 51 insertions(+), 9 deletions(-) diff --git a/interface/web/client/lib/lang/de_clients_list.lng b/interface/web/client/lib/lang/de_clients_list.lng index 44c42cd..58c0883 100644 --- a/interface/web/client/lib/lang/de_clients_list.lng +++ b/interface/web/client/lib/lang/de_clients_list.lng @@ -7,4 +7,5 @@ $wb['country_txt'] = 'Land'; $wb['add_new_record_txt'] = 'Kunden hinzufügen'; $wb['username_txt'] = 'Benutzername'; +$wb["customer_no_txt"] = 'Kundennummer'; ?> diff --git a/interface/web/client/lib/lang/de_resellers_list.lng b/interface/web/client/lib/lang/de_resellers_list.lng index f9084e0..6825b1c 100644 --- a/interface/web/client/lib/lang/de_resellers_list.lng +++ b/interface/web/client/lib/lang/de_resellers_list.lng @@ -6,4 +6,6 @@ $wb['city_txt'] = 'Ort'; $wb['country_txt'] = 'Land'; $wb['add_new_record_txt'] = 'Neuen Reseller hinzufügen'; +$wb["customer_no_txt"] = 'Kundennummer'; +$wb['username_txt'] = 'Benutzername'; ?> diff --git a/interface/web/client/lib/lang/en_clients_list.lng b/interface/web/client/lib/lang/en_clients_list.lng index 89764ab..c9156d5 100644 --- a/interface/web/client/lib/lang/en_clients_list.lng +++ b/interface/web/client/lib/lang/en_clients_list.lng @@ -7,4 +7,5 @@ $wb["city_txt"] = 'City'; $wb["country_txt"] = 'Country'; $wb["add_new_record_txt"] = 'Add new client'; +$wb["customer_no_txt"] = 'Customer No.'; ?> \ No newline at end of file diff --git a/interface/web/client/lib/lang/en_resellers_list.lng b/interface/web/client/lib/lang/en_resellers_list.lng index 523a467..a7d2537 100644 --- a/interface/web/client/lib/lang/en_resellers_list.lng +++ b/interface/web/client/lib/lang/en_resellers_list.lng @@ -6,4 +6,6 @@ $wb["city_txt"] = 'City'; $wb["country_txt"] = 'Country'; $wb["add_new_record_txt"] = 'Add new reseller'; +$wb["customer_no_txt"] = 'Customer No.'; +$wb["username_txt"] = 'Username'; ?> \ No newline at end of file diff --git a/interface/web/client/list/client.list.php b/interface/web/client/list/client.list.php index 900f753..0169810 100644 --- a/interface/web/client/list/client.list.php +++ b/interface/web/client/list/client.list.php @@ -72,7 +72,16 @@ 'prefix' => "%", 'suffix' => "%", 'width' => "", - 'value' => ""); + 'value' => ""); + +$liste["item"][] = array( 'field' => "customer_no", + 'datatype' => "VARCHAR", + 'formtype' => "TEXT", + 'op' => "like", + 'prefix' => "%", + 'suffix' => "%", + 'width' => "", + 'value' => ""); $liste["item"][] = array( 'field' => "username", 'datatype' => "VARCHAR", diff --git a/interface/web/client/list/reseller.list.php b/interface/web/client/list/reseller.list.php index e136864..67ae882 100644 --- a/interface/web/client/list/reseller.list.php +++ b/interface/web/client/list/reseller.list.php @@ -73,6 +73,24 @@ 'suffix' => "%", 'width' => "", 'value' => ""); + +$liste["item"][] = array( 'field' => "customer_no", + 'datatype' => "VARCHAR", + 'formtype' => "TEXT", + 'op' => "like", + 'prefix' => "%", + 'suffix' => "%", + 'width' => "", + 'value' => ""); + +$liste["item"][] = array( 'field' => "username", + 'datatype' => "VARCHAR", + 'formtype' => "TEXT", + 'op' => "like", + 'prefix' => "%", + 'suffix' => "%", + 'width' => "", + 'value' => ""); $liste["item"][] = array( 'field' => "city", 'datatype' => "VARCHAR", diff --git a/interface/web/client/templates/clients_list.htm b/interface/web/client/templates/clients_list.htm index 507303a..6164d3d 100644 --- a/interface/web/client/templates/clients_list.htm +++ b/interface/web/client/templates/clients_list.htm @@ -21,6 +21,7 @@ <th class="tbl_col_client_id" scope="col"><tmpl_var name="client_id_txt"></th> <th class="tbl_col_company_name" scope="col"><tmpl_var name="company_name_txt"></th> <th class="tbl_col_contact_name" scope="col"><tmpl_var name="contact_name_txt"></th> + <th class="tbl_col_customer_no" scope="col"><tmpl_var name="customer_no_txt"></th> <th class="tbl_col_username" scope="col"><tmpl_var name="username_txt"></th> <th class="tbl_col_city" scope="col"><tmpl_var name="city_txt"></th> <th class="tbl_col_country" scope="col"><tmpl_var name="country_txt"></th> @@ -28,10 +29,11 @@ </tr> <tr class="filter"> <td class="tbl_col_client_pid"><input type="text" name="search_client_id" value="{tmpl_var name='search_client_id'}" /></td> - <td class="tbl_col_company_name"><input type="text" name="search_company_name" value="{tmpl_var name='search_company_name'}" /></td> - <td class="tbl_col_contact_name"><input type="text" name="search_contact_name" value="{tmpl_var name='search_contact_name'}" /></td> - <td class="tbl_col_username"><input type="text" name="search_username" value="{tmpl_var name='search_username'}" /></td> - <td class="tbl_col_city"><input type="text" name="search_city" value="{tmpl_var name='search_city'}" /></td> + <td class="tbl_col_company_name"><input type="text" name="search_company_name" value="{tmpl_var name='search_company_name'}" size="10" /></td> + <td class="tbl_col_contact_name"><input type="text" name="search_contact_name" value="{tmpl_var name='search_contact_name'}" size="10" /></td> + <td class="tbl_col_customer_no"><input type="text" name="search_customer_no" value="{tmpl_var name='search_customer_no'}" size="10" /></td> + <td class="tbl_col_username"><input type="text" name="search_username" value="{tmpl_var name='search_username'}" size="10" /></td> + <td class="tbl_col_city"><input type="text" name="search_city" value="{tmpl_var name='search_city'}" size="10" /></td> <td class="tbl_col_country"><select name="search_country">{tmpl_var name='search_country'}</select></td> <td class="tbl_col_buttons"> <button type="button" class="button icons16 icoFilter" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" onclick="submitForm('pageForm','client/client_list.php');"><span>{tmpl_var name="filter_txt"}</span></button> @@ -44,6 +46,7 @@ <td class="tbl_col_client_pid"><a href="#" onclick="loadContent('client/client_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="client_id"}</a></td> <td class="tbl_col_company_name"><a href="#" onclick="loadContent('client/client_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="company_name"}</a></td> <td class="tbl_col_contact_name"><a href="#" onclick="loadContent('client/client_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="contact_name"}</a></td> + <td class="tbl_col_customer_no"><a href="#" onclick="loadContent('client/client_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="customer_no"}</a></td> <td class="tbl_col_username"><a href="#" onclick="loadContent('client/client_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="username"}</a></td> <td class="tbl_col_city"><a href="#" onclick="loadContent('client/client_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="city"}</a></td> <td class="tbl_col_country"><a href="#" onclick="loadContent('client/client_edit.php?id={tmpl_var name='id'}');"><div class="country-{tmpl_var name="countryiso"}" style="float:left"></div>{tmpl_var name="country"}</a></td> @@ -58,7 +61,7 @@ </tbody> <tfoot> <tr> - <td class="tbl_footer tbl_paging" colspan="7"><tmpl_var name="paging"></td> + <td class="tbl_footer tbl_paging" colspan="8"><tmpl_var name="paging"></td> </tr> </tfoot> </table> diff --git a/interface/web/client/templates/resellers_list.htm b/interface/web/client/templates/resellers_list.htm index e223bf2..2e5dfc7 100644 --- a/interface/web/client/templates/resellers_list.htm +++ b/interface/web/client/templates/resellers_list.htm @@ -21,14 +21,18 @@ <th class="tbl_col_client_id" scope="col"><tmpl_var name="client_id_txt"></th> <th class="tbl_col_company_name" scope="col"><tmpl_var name="company_name_txt"></th> <th class="tbl_col_contact_name" scope="col"><tmpl_var name="contact_name_txt"></th> + <th class="tbl_col_customer_no" scope="col"><tmpl_var name="customer_no_txt"></th> + <th class="tbl_col_username" scope="col"><tmpl_var name="username_txt"></th> <th class="tbl_col_city" scope="col"><tmpl_var name="city_txt"></th> <th class="tbl_col_country" scope="col"><tmpl_var name="country_txt"></th> <th class="tbl_col_limit" scope="col">{tmpl_var name='search_limit'}</th> </tr> <tr class="filter"> <td class="tbl_col_client_pid"><input type="text" name="search_client_id" value="{tmpl_var name='search_client_id'}" /></td> - <td class="tbl_col_company_name"><input type="text" name="search_company_name" value="{tmpl_var name='search_company_name'}" /></td> - <td class="tbl_col_contact_name"><input type="text" name="search_contact_name" value="{tmpl_var name='search_contact_name'}" /></td> + <td class="tbl_col_company_name"><input type="text" name="search_company_name" value="{tmpl_var name='search_company_name'}" size="10" /></td> + <td class="tbl_col_contact_name"><input type="text" name="search_contact_name" value="{tmpl_var name='search_contact_name'}" size="10" /></td> + <td class="tbl_col_customer_no"><input type="text" name="search_customer_no" value="{tmpl_var name='search_customer_no'}" size="10" /></td> + <td class="tbl_col_username"><input type="text" name="search_username" value="{tmpl_var name='search_username'}" size="10" /></td> <td class="tbl_col_city"><input type="text" name="search_city" value="{tmpl_var name='search_city'}" /></td> <td class="tbl_col_country"><select name="search_country">{tmpl_var name='search_country'}</select></td> <td class="tbl_col_buttons"> @@ -42,6 +46,8 @@ <td class="tbl_col_client_pid"><a href="#" onclick="loadContent('client/reseller_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="client_id"}</a></td> <td class="tbl_col_company_name"><a href="#" onclick="loadContent('client/reseller_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="company_name"}</a></td> <td class="tbl_col_contact_name"><a href="#" onclick="loadContent('client/reseller_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="contact_name"}</a></td> + <td class="tbl_col_customer_no"><a href="#" onclick="loadContent('client/client_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="customer_no"}</a></td> + <td class="tbl_col_username"><a href="#" onclick="loadContent('client/client_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="username"}</a></td> <td class="tbl_col_city"><a href="#" onclick="loadContent('client/reseller_edit.php?id={tmpl_var name='id'}');">{tmpl_var name="city"}</a></td> <td class="tbl_col_country"><a href="#" onclick="loadContent('client/reseller_edit.php?id={tmpl_var name='id'}');"><div class="country-{tmpl_var name="countryiso"}" style="float:left"></div>{tmpl_var name="country"}</a></td> <td class="tbl_col_buttons"> @@ -53,7 +59,7 @@ </tbody> <tfoot> <tr> - <td class="tbl_footer tbl_paging" colspan="6"><tmpl_var name="paging"></td> + <td class="tbl_footer tbl_paging" colspan="8"><tmpl_var name="paging"></td> </tr> </tfoot> </table> -- Gitblit v1.9.1