dinislage/PrestaShop
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[-] BO : Missing add one after another type in admintaxrulesgroup

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8737 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
fBrignoli committed 2011-09-23 13:25:27 +00:00
1 parent 118338a5ea
commit 14a3e123db
1 file changed
+7 -3
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/tabs/AdminTaxRulesGroup.php
+7 -3
View File
@@ -261,7 +261,7 @@ EOT;
else else
{ {
echo $nbErrors.' '.$this->l('errors').'<br /><ol>'; echo $nbErrors.' '.$this->l('errors').'<br /><ol>';
foreach ($this->_errors_tax_rule AS $error) foreach ($this->_errors_tax_rule as $error)
echo '<li>'.$error.'</li>'; echo '<li>'.$error.'</li>';
echo '</ol>'; echo '</ol>';
} }
@@ -449,7 +449,7 @@ EOT;
$html = ''; $html = '';
$tax_rules = TaxRule::getTaxRulesByGroupId((int)$cookie->id_lang, (int)$id_rule_group); $tax_rules = TaxRule::getTaxRulesByGroupId((int)$cookie->id_lang, (int)$id_rule_group);
if (sizeof($tax_rules) == 0) if (count($tax_rules) == 0)
{ {
$html .= '<tr> $html .= '<tr>
<td colspan="7">'.$this->l('No rules defined').'</td> <td colspan="7">'.$this->l('No rules defined').'</td>
@@ -469,7 +469,11 @@ EOT;
} }
$tax = ((float)$tax_rule['rate'] == 0 ? '-' : (float)$tax_rule['rate'].'%'); $tax = ((float)$tax_rule['rate'] == 0 ? '-' : (float)$tax_rule['rate'].'%');
$behavior = ($tax_rule['behavior'] == 0 ? $this->l('This tax only') : $this->l('Compute with others')); $behavior = $this->l('This tax only');
if (TaxCalculator::COMBINE_METHOD == $tax_rule['behavior'])
$behavior = $this->l('Compute with others');
else if (TaxCalculator::ONE_AFTER_ANOTHER_METHOD == $tax_rule['behavior'])
$behavior = $this->l('One after another');
// render fields // render fields
$html .= '<tr> $html .= '<tr>