Quick Search:

Mode

Context

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

Other Diffs

Ignore

Blank Lines Whitespace:

Diff

437
 
439
 
439
 
order_total.php
_> 11 <?php
  22 /*
<> 3 -  $Id: order_total.php 437 2006-02-16 10:41:13Z hpdl $
   3+  $Id: order_total.php 439 2006-02-19 16:33:18Z hpdl $
44 
  55   osCommerce, Open Source E-Commerce Solutions
  66   http://www.oscommerce.com
     
 !
1212 
  1313   class osC_OrderTotal {
  1414     var $_modules = array(),
<>  15+        $_data = array(),
1516         $_group = 'order_total';
  1617 
  1718 // class constructor
  1819     function osC_OrderTotal() {
  1920       global $osC_Database, $osC_Language;
  2021 
<> 21 -      if (isset($_SESSION['osC_OrderTotal_data']) === false) {
  22 -        $_SESSION['osC_OrderTotal_data'] = array('cartID' => null,
  23 -                                                 'output' => array());
  24 -      }
  25 -
  26 -      $this->_data =& $_SESSION['osC_OrderTotal_data'];
  27 -
2822       $Qmodules = $osC_Database->query('select code from :table_templates_boxes where modules_group = "order_total"');
  2923       $Qmodules->bindTable(':table_templates_boxes', TABLE_TEMPLATES_BOXES);
  3024       $Qmodules->setCache('modules-order_total');
     
 !
3933       $osC_Language->load('modules-order_total');
  4034 
  4135       foreach ($this->_modules as $module) {
<> 42 -        include('includes/modules/order_total/' . $module . '.' . substr(basename(__FILE__), (strrpos(basename(__FILE__), '.')+1)));
  43 -
4436         $module_class = 'osC_OrderTotal_' . $module;
  4537 
<>  38+        if (class_exists($module_class) === false) {
   39+          include('includes/modules/order_total/' . $module . '.' . substr(basename(__FILE__), (strrpos(basename(__FILE__), '.')+1)));
   40+        }
   41+
4642         $GLOBALS[$module_class] = new $module_class();
  4743       }
  4844 
     
 !
7066       return $this->_sort_order;
  7167     }
  7268 
<> 73 -    function getResult() {
   69+    function &getResult() {
7470       global $osC_ShoppingCart;
  7571 
<> 76 -      if ($this->_data['cartID'] != $osC_ShoppingCart->getCartID()) {
  77 -        $this->_data['cartID'] = $osC_ShoppingCart->getCartID();
   72+      $this->_data = array();
7873 
<> 79 -        $this->_data['output'] = array();
   74+      foreach ($this->_modules as $module) {
   75+        $module = 'osC_OrderTotal_' . $module;
8076 
<> 81 -        foreach ($this->_modules as $module) {
  82 -          $module = 'osC_OrderTotal_' . $module;
   77+        if ($GLOBALS[$module]->getStatus() === true) {
   78+          $GLOBALS[$module]->process();
8379 
<> 84 -          if ($GLOBALS[$module]->getStatus() === true) {
  85 -            $GLOBALS[$module]->process();
  86 -
  87 -            foreach ($GLOBALS[$module]->output as $output) {
  88 -              if (tep_not_null($output['title']) && tep_not_null($output['text'])) {
  89 -                $this->_data['output'][] = array('code' => $GLOBALS[$module]->getCode(),
  90 -                                                 'title' => $output['title'],
  91 -                                                 'text' => $output['text'],
  92 -                                                 'value' => $output['value'],
  93 -                                                 'sort_order' => $GLOBALS[$module]->getSortOrder());
  94 -              }
   80+          foreach ($GLOBALS[$module]->output as $output) {
   81+            if (tep_not_null($output['title']) && tep_not_null($output['text'])) {
   82+              $this->_data[] = array('code' => $GLOBALS[$module]->getCode(),
   83+                                     'title' => $output['title'],
   84+                                     'text' => $output['text'],
   85+                                     'value' => $output['value'],
   86+                                     'sort_order' => $GLOBALS[$module]->getSortOrder());
9587             }
  9688           }
  9789         }
  9890       }
  9991 
<> 100 -      return $this->_data['output'];
   92+      return $this->_data;
<_ 10193     }
  10294 
  10395     function hasActive() {