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

[*] BO #PSFV-94 : Added AdminTaxRulesGroupController

Browse Source
This commit is contained in:
lLefevre
2011-11-03 09:46:58 +00:00
parent fd797d873a
commit b776d6cc4f
11 changed files with 818 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/tax/TaxRule.php
+10 -10
View File
@@ -51,17 +51,17 @@ class TaxRuleCore extends ObjectModel
public function getFields()
{
$this->validateFields();
$fields['id_tax_rules_group'] = (int)$this->id_tax_rules_group;
$fields['id_country'] = (int)$this->id_country;
$fields['id_state'] = (int)$this->id_state;
$fields['zipcode_from'] = (int)$this->zipcode_from;
$fields['zipcode_to'] = (int)$this->zipcode_to;
$fields['behavior'] = (int)$this->behavior;
$fields['id_tax'] = (int)$this->id_tax;
$fields['description'] = $this->description;
$this->validateFields();
$fields['id_tax_rules_group'] = (int)$this->id_tax_rules_group;
$fields['id_country'] = (int)$this->id_country;
$fields['id_state'] = (int)$this->id_state;
$fields['zipcode_from'] = (int)$this->zipcode_from;
$fields['zipcode_to'] = (int)$this->zipcode_to;
$fields['behavior'] = (int)$this->behavior;
$fields['id_tax'] = (int)$this->id_tax;
$fields['description'] = $this->description;
return $fields;
return $fields;
}
public static function deleteByGroupId($id_group)
classes/tax/TaxRulesGroup.php
+9 -9
View File
@@ -31,14 +31,14 @@ class TaxRulesGroupCore extends ObjectModel
public $name;
/** @var bool active state */
public $active;
public $active;
protected $fieldsRequired = array('name');
protected $fieldsSize = array('name' => 64);
protected $fieldsValidate = array('name' => 'isGenericName');
protected $fieldsRequired = array('name');
protected $fieldsSize = array('name' => 64);
protected $fieldsValidate = array('name' => 'isGenericName');
protected $table = 'tax_rules_group';
protected $identifier = 'id_tax_rules_group';
protected $table = 'tax_rules_group';
protected $identifier = 'id_tax_rules_group';
protected static $_taxes = array();
@@ -46,7 +46,7 @@ class TaxRulesGroupCore extends ObjectModel
{
$this->validateFields();
$fields['name'] = ($this->name);
$fields['active'] = (int)($this->active);
$fields['active'] = (int)$this->active;
return $fields;
}
@@ -85,7 +85,7 @@ class TaxRulesGroupCore extends ObjectModel
);
$res = array();
foreach ($rows AS $row)
foreach ($rows as $row)
$res[$row['id_tax_rules_group']] = $row['rate'];
return $res;
@@ -113,7 +113,7 @@ class TaxRulesGroupCore extends ObjectModel
{
Tools::displayAsDeprecated();
$rate = 0;
foreach (TaxRulesGroup::getTaxes($id_tax_rules_group, $id_country, $id_state, $zipcode) AS $tax)
foreach (TaxRulesGroup::getTaxes($id_tax_rules_group, $id_country, $id_state, $zipcode) as $tax)
$rate += (float)$tax->rate;
return $rate;