Quick Search:

Mode

Context

Displaying 3 lines of context. None | Less | More | Full

Other Diffs

Ignore

Blank Lines Whitespace:

Diff

732
 
733
 
733
 
shopping_cart.php
_> 11 <?php
  22 /*
<> 3 -  $Id: shopping_cart.php 732 2006-08-20 00:18:00Z hpdl $
   3+  $Id: shopping_cart.php 733 2006-08-20 15:32:32Z hpdl $
44 
  55   osCommerce, Open Source E-Commerce Solutions
  66   http://www.oscommerce.com
     
 !
759759     }
  760760 
  761761     function _calculate($set_shipping = true) {
<> 762 -      global $osC_Tax, $osC_Weight, $osC_Shipping, $osC_OrderTotal;
   762+      global $osC_Currencies, $osC_Tax, $osC_Weight, $osC_Shipping, $osC_OrderTotal;
763763 
  764764       $this->_sub_total = 0;
  765765       $this->_total = 0;
     
 !
776776           $tax = $osC_Tax->getTaxRate($data['tax_class_id'], $this->getTaxingAddress('country_id'), $this->getTaxingAddress('zone_id'));
  777777           $tax_description = $osC_Tax->getTaxRateDescription($data['tax_class_id'], $this->getTaxingAddress('country_id'), $this->getTaxingAddress('zone_id'));
  778778 
<> 779 -          $shown_price = tep_add_tax($data['final_price'], $tax) * $data['quantity'];
   779+          $shown_price = $osC_Currencies->formatRawWithTaxRate($data['final_price'], $tax, $data['quantity']);
<_ 780780           $this->_sub_total += $shown_price;
  781781           $this->_total += $shown_price;
  782782