Changeset 22623 for branches/camp/camp-2_13-tax
- Timestamp:
- 2013/03/09 15:44:57 (11 years ago)
- Location:
- branches/camp/camp-2_13-tax/data/class
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/camp/camp-2_13-tax/data/class/SC_Product.php
r22593 r22623 29 29 * @version $Id$ 30 30 */ 31 class SC_Product 31 class SC_Product 32 32 { 33 33 … … 304 304 $arrClassCats2['price01'] 305 305 = strlen($arrProductsClass['price01']) 306 ? number_format(SC_Helper_ DB_Ex::sfCalcIncTax($arrProductsClass['price01']))306 ? number_format(SC_Helper_TaxRule_Ex::sfCalcIncTax($arrProductsClass['price01'], $productId, $arrProductsClass['product_class_id'])) 307 307 : ''; 308 308 309 309 $arrClassCats2['price02'] 310 310 = strlen($arrProductsClass['price02']) 311 ? number_format(SC_Helper_ DB_Ex::sfCalcIncTax($arrProductsClass['price02']))311 ? number_format(SC_Helper_TaxRule_Ex::sfCalcIncTax($arrProductsClass['price02'], $productId, $arrProductsClass['product_class_id'])) 312 312 : ''; 313 313 -
branches/camp/camp-2_13-tax/data/class/helper/SC_Helper_TaxRule.php
r22621 r22623 40 40 function sfCalcIncTax($price, $product_id = 0, $product_class_id = 0, $pref_id =0, $country_id = 0) 41 41 { 42 $arrTaxRule = SC_Helper_TaxRule_Ex: ;getTaxRule($product_id, $product_class_id, $pref_id, $country_id);42 $arrTaxRule = SC_Helper_TaxRule_Ex::getTaxRule($product_id, $product_class_id, $pref_id, $country_id); 43 43 44 return SC_Helper_TaxRule_Ex::sfTax($price, $arrTaxRule['tax_rate'], $arrTaxRule['tax_rule'], $arrTaxRule['tax_adjust']);44 return $price + SC_Helper_TaxRule_Ex::sfTax($price, $arrTaxRule['tax_rate'], $arrTaxRule['tax_rule'], $arrTaxRule['tax_adjust']); 45 45 } 46 46
Note: See TracChangeset
for help on using the changeset viewer.