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

// Context part 2

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7598 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
tDidierjean
2011-07-12 12:50:00 +00:00
parent 39d0acc30b
commit 25b1bceffd
21 changed files with 221 additions and 230 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/Tax.php
+5 -5
View File
@@ -279,7 +279,7 @@ class TaxCore extends ObjectModel
*/
public static function getProductTaxRate($id_product, $id_address = NULL)
{
$id_country = (int)Country::getDefaultCountryId();
$id_country = (int)Context::getContext()->country->id;
$id_state = 0;
$id_county = 0;
$rate = 0;
@@ -288,7 +288,7 @@ class TaxCore extends ObjectModel
$address_infos = Address::getCountryAndState($id_address);
if ($address_infos['id_country'])
{
$id_country = (int)($address_infos['id_country']);
$id_country = (int)($address_infos['id_country']);
$id_state = (int)$address_infos['id_state'];
$id_county = (int)County::getIdCountyByZipCode($address_infos['id_state'], $address_infos['postcode']);
}
@@ -305,7 +305,7 @@ class TaxCore extends ObjectModel
public static function getProductEcotaxRate($id_address = NULL)
{
$id_country = (int)Country::getDefaultCountryId();
$id_country = (int)Context::getContext()->country->id;
$id_state = 0;
$id_county = 0;
$rate = 0;
@@ -350,7 +350,7 @@ class TaxCore extends ObjectModel
public static function getCarrierTaxRate($id_carrier, $id_address = NULL)
{
$id_country = (int)Country::getDefaultCountryId();
$id_country = (int)Context::getContext()->country->id;
$id_state = 0;
$id_county = 0;
if (!empty($id_address))
@@ -358,7 +358,7 @@ class TaxCore extends ObjectModel
$address_infos = Address::getCountryAndState($id_address);
if ($address_infos['id_country'])
{
$id_country = (int)($address_infos['id_country']);
$id_country = (int)($address_infos['id_country']);
$id_state = (int)$address_infos['id_state'];
$id_county = (int)County::getIdCountyByZipCode($address_infos['id_state'], $address_infos['postcode']);
}