From 2e005e3c6ae31541afd55da6f1105beb32aec42b Mon Sep 17 00:00:00 2001 From: fBrignoli Date: Fri, 25 Nov 2011 12:53:34 +0000 Subject: [PATCH] // Improved tax rules display git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10660 b9a71923-0436-4b27-9f14-aed3839534dd --- admin-dev/themes/template/tax_rules/list_content.tpl | 6 ++++++ controllers/admin/AdminTaxRulesGroupController.php | 4 ---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/admin-dev/themes/template/tax_rules/list_content.tpl b/admin-dev/themes/template/tax_rules/list_content.tpl index d027983e7..8f6b3fcbd 100644 --- a/admin-dev/themes/template/tax_rules/list_content.tpl +++ b/admin-dev/themes/template/tax_rules/list_content.tpl @@ -99,6 +99,12 @@ {/if} {elseif $key == 'rate'} {$tr.$key|string_format:"%.2f"}% + {elseif $key == 'zipcode'} + {if $tr.$key == '0 - 0'} + -- + {else} + {$tr.$key|escape:'htmlall':'UTF-8'} + {/if} {else} {$tr.$key|escape:'htmlall':'UTF-8'} {/if} diff --git a/controllers/admin/AdminTaxRulesGroupController.php b/controllers/admin/AdminTaxRulesGroupController.php index f9add7ef3..58142b699 100644 --- a/controllers/admin/AdminTaxRulesGroupController.php +++ b/controllers/admin/AdminTaxRulesGroupController.php @@ -82,10 +82,6 @@ class AdminTaxRulesGroupControllerCore extends AdminController $this->list_no_link = true; $this->fieldsDisplay = array( - 'id_tax_rule' => array( - 'title' => $this->l('ID'), - 'width' => 25 - ), 'country_name' => array( 'title' => $this->l('Country'), 'width' => 140