Changeset 22706 for branches/version-2_12-dev/data/class/SC_CartSession.php
- Timestamp:
- 2013/03/10 10:40:54 (11 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/version-2_12-dev/data/class/SC_CartSession.php
r22567 r22706 28 28 * @version $Id$ 29 29 */ 30 class SC_CartSession 30 class SC_CartSession 31 31 { 32 32 /** ユニークIDを指定する. */ … … 127 127 $price = $this->cartSession[$productTypeId][$i]['price']; 128 128 $quantity = $this->cartSession[$productTypeId][$i]['quantity']; 129 $incTax = SC_Helper_ DB_Ex::sfCalcIncTax($price);129 $incTax = SC_Helper_TaxRule_Ex::sfCalcIncTax($price, 0, $id[0]); 130 130 $total = $incTax * $quantity; 131 131 return $total; … … 194 194 $quantity = $this->cartSession[$productTypeId][$i]['quantity']; 195 195 196 $incTax = SC_Helper_DB_Ex::sfCalcIncTax($price); 196 $incTax = SC_Helper_TaxRule_Ex::sfCalcIncTax($price, 197 $this->cartSession[$productTypeId][$i]['productsClass']['product_id'], 198 $this->cartSession[$productTypeId][$i]['id'][0]); 197 199 $total+= ($incTax * $quantity); 198 200 } … … 209 211 $price = $this->cartSession[$productTypeId][$i]['price']; 210 212 $quantity = $this->cartSession[$productTypeId][$i]['quantity']; 211 $tax = SC_Helper_DB_Ex::sfTax($price); 213 $tax = SC_Helper_TaxRule_Ex::sfTax($price, 214 $this->cartSession[$productTypeId][$i]['productsClass']['product_id'], 215 $this->cartSession[$productTypeId][$i]['id'][0]); 212 216 $total+= ($tax * $quantity); 213 217 } … … 374 378 375 379 $quantity = $this->cartSession[$productTypeId][$i]['quantity']; 376 $incTax = SC_Helper_DB_Ex::sfCalcIncTax($price); 380 $incTax = SC_Helper_TaxRule_Ex::sfCalcIncTax($price, 381 $this->cartSession[$productTypeId][$i]['productsClass']['product_id'], 382 $this->cartSession[$productTypeId][$i]['id'][0]); 383 377 384 $total = $incTax * $quantity; 378 385 … … 571 578 if ($limit > 0) { 572 579 $this->setProductValue($arrItem['id'], 'quantity', $limit, $productTypeId); 573 $total_inctax = SC_Helper_DB_Ex::sfCalcIncTax($arrItem['price']) * $limit; 580 $total_inctax = $limit * SC_Helper_TaxRule_Ex::sfCalcIncTax($arrItem['price'], 581 $product['product_id'], 582 $arrItem['id'][0]); 574 583 $this->setProductValue($arrItem['id'], 'total_inctax', $total_inctax, $productTypeId); 575 584 $tpl_message .= '※「' . $product['name'] . '」は販売制限(または在庫が不足)しております。'; … … 652 661 $results['deliv_fee'] = 0; 653 662 654 $arr Info = SC_Helper_DB_Ex::sfGetBasisData();655 $results['order_tax_rate'] = $arr Info['tax'];656 $results['order_tax_rule'] = $arr Info['tax_rule'];663 $arrTaxInfo = SC_Helper_TaxRule_Ex::getTaxRule(); 664 $results['order_tax_rate'] = $arrTaxInfo['tax_rate']; 665 $results['order_tax_rule'] = $arrTaxInfo['calc_rule']; 657 666 658 667 // 商品ごとの送料を加算
Note: See TracChangeset
for help on using the changeset viewer.