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

// Tax::initializeAddress =>Address::initialize

Browse Source
This commit is contained in:
fBrignoli
2011-09-21 15:43:12 +00:00
parent bb78773001
commit 7db8ef441e
4 changed files with 52 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/PaymentModule.php
+4 -4
View File
@@ -216,11 +216,11 @@ abstract class PaymentModuleCore extends Module
$tax_calculator = new TaxCalculator();
if (!Tax::excludeTaxeOption())
{
$address = Tax::initializeAddress($vat_address->id);
$address = Address::initialize($vat_address->id);
$id_tax_rules = (int)Product::getIdTaxRulesGroupByIdProduct((int)$product['id_product']);
$tax_manager = TaxManagerFactory::getManager($vat_address, $id_tax_rules);
$tax_calculator = $tax_manager->getTaxCalculator();
$tax_calculator = $tax_manager->getTaxCalculator();
}
$ecotaxTaxRate = 0;
@@ -298,7 +298,7 @@ abstract class PaymentModuleCore extends Module
OrderDetail::saveTaxCalculatorStatic($db->Insert_ID(), $tax_calculator);
unset($tax_calculator);
// Insert discounts from cart into order_discount table
$discounts = $cart->getDiscounts();
$discountsList = '';
classes/Product.php
+2 -1
View File
@@ -3308,7 +3308,7 @@ class ProductCore extends ObjectModel
public function getTaxesRate(Address $address = NULL)
{
if (!$address OR !$address->id_country)
$address = Tax::initializeAddress();
$address = Address::initialize();
$tax_manager = TaxManagerFactory::getManager($address, $this->id_tax_rules_group);
$tax_calculator = $tax_manager->getTaxCalculator();
@@ -3596,3 +3596,4 @@ class ProductCore extends ObjectModel
return isset($row['reference']);
}
}
classes/tax/Tax.php
+3 -30
View File
@@ -199,7 +199,7 @@ class TaxCore extends ObjectModel
*/
public static function getProductEcotaxRate($id_address = NULL)
{
$address = Tax::initializeAddress($id_address);
$address = Address::initialize($id_address);
$tax_manager = TaxManagerFactory::getManager($address, (int)Configuration::get('PS_ECOTAX_TAX_RULES_GROUP_ID'));
$tax_calculator = $tax_manager->getTaxCalculator();
@@ -215,7 +215,7 @@ class TaxCore extends ObjectModel
*/
public static function getCarrierTaxRate($id_carrier, $id_address = NULL)
{
$address = Tax::initializeAddress($id_address);
$address = Address::initialize($id_address);
$id_tax_rules = (int)Carrier::getIdTaxRulesGroupByIdCarrier((int)$id_carrier);
$tax_manager = TaxManagerFactory::getManager($address, $id_tax_rules);
@@ -224,33 +224,6 @@ class TaxCore extends ObjectModel
return $tax_calculator->getTotalRate();
}
/**
* Initiliaze an address corresponding to the id address if any or to the
* default shop configuration
*
* @param int $id_address
* @return Address address
*/
public static function initializeAddress($id_address = NULL)
{
// set the default address
$address = new Address();
$address->id_country = (int)Context::getContext()->country->id;
$address->id_state = 0;
$address->postcode = 0;
// if an id_address has been specified retrieve the address
if ($id_address)
{
$address = new Address((int)$id_address);
if (!Validate::isLoadedObject($address))
throw new Exception('Invalid address');
}
return $address;
}
/**
* Return the product tax rate using the tax rules system
*
@@ -282,7 +255,7 @@ class TaxCore extends ObjectModel
*/
public static function getProductTaxRate($id_product, $id_address = NULL)
{
$address = Tax::initializeAddress($id_address);
$address = Address::initialize($id_address);
$id_tax_rules = (int)Product::getIdTaxRulesGroupByIdProduct($id_product);
$tax_manager = TaxManagerFactory::getManager($address, $id_tax_rules);