Thread: [Oscss-commit] SF.net SVN: oscss:[3894] trunk/catalog/includes

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Revision: 3894
          http://oscss.svn.sourceforge.net/oscss/?rev=3894&view=rev
Author:   oscim
Date:     2011-11-20 22:08:51 +0000 (Sun, 20 Nov 2011)
Log Message:
-----------
reecriture du process de commande, et basculement des etape en module 

Modified Paths:
--------------
    trunk/catalog/includes/classes/core_page/checkout.php
    trunk/catalog/includes/classes/order_total.php
    trunk/catalog/includes/classes/page.php
    trunk/catalog/includes/classes/payment.php
    trunk/catalog/includes/content/checkout_confirmation.php
    trunk/catalog/includes/content/checkout_payment.php
    trunk/catalog/includes/content/shopping_cart.php
    trunk/catalog/includes/js/checkout.js.php
    trunk/catalog/includes/languages/fr_FR/modules/payment/moneyorder.txt
    trunk/catalog/includes/modules/checkout/PrCgu.php
    trunk/catalog/includes/modules/payment/moneyorder.php
    trunk/catalog/includes/modules/shipping/item.php
    trunk/catalog/includes/modules/shipping/spu.php

Added Paths:
-----------
    trunk/catalog/includes/content/checkout_cgu.php
    trunk/catalog/includes/modules/checkout/PrConfirmation.php
    trunk/catalog/includes/modules/checkout/PrPayment.php
    trunk/catalog/includes/modules/checkout/PrShipping.php

Modified: trunk/catalog/includes/classes/core_page/checkout.php
===================================================================

--- trunk/catalog/includes/classes/core_page/checkout.php	2011-11-20 22:04:33 UTC (rev 3893)
+++ trunk/catalog/includes/classes/core_page/checkout.php	2011-11-20 22:08:51 UTC (rev 3894)
@@ -1,12 +1,12 @@
 <?php if (!defined('HTTP_SERVER')) die('You can not access this file directly!');
 /**
-  \licence GPL 2005-2010  The osCSS developers - osCSS Open Source E-commerce
-  \portion code Copyright (c) 2002 osCommerce
-  \package osCSS-2 <www http://www.oscss.org>
-  \version 2.1.0
-  \date  29/11/10, 11:33
-  \author oscim <mail aur...@os...> <www http://www.oscim.fr>
-  \encode UTF-8
+  @licence GPL 2005-2011  The osCSS developers - osCSS Open Source E-commerce
+  @portion code Copyright (c) 2002 osCommerce
+  @package osCSS-2 <www http://www.oscss.org>
+  @version 2.1.1
+  @date  20/11/11, 22:46
+  @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+  @encode UTF-8
 
   \class   home
   \brief prend en charge les modules de types home.
@@ -22,7 +22,7 @@
   /**
     Charge les module aca specifique au porduits
   */
-  function __construct() {
+  function __construct($step=false) {
 
     global $language, $page;
     $this->name='checkout';
@@ -33,30 +33,54 @@
     foreach(parent::initialise_type('MODULE_CHECKOUT_PROCESS_INSTALLED','checkout') as $class){
       $cl[$class]=new $class ();
       $list_mod[$class] = $cl[$class]->sort_order;
-      asort($list_mod);
-      foreach($list_mod as $class=>$s){
-	$this->modules[$class] =$cl[$class];
+
+
+    }
+
+    asort($list_mod);
+    foreach($list_mod as $class=>$s){
+      $this->modules[$class] =$cl[$class];
+    }
+    unset($cl);unset($list_mod);
+
+
+    if($step !=false) {
+      if($step == 'init'){
+	var_dump($step);
+	$this->ResetProcess();
       }
-      unset($cl);unset($list_mod);
+      elseif(isset($this->modules['Pr'.$step])){
+// 	var_dump('Pr'.$step);
+	$this->modules['Pr'.$step]->ResetProcess();
+// exit;
+      }
     }
 
 
+// var_dump( $this->etape);
+// var_dump( $this->process);
+    $etape = $this->ChkBeforeProcess();
 
-    /**
-      Preparation des etape disponible
-    */
-//     $BeforeProcess=$this->ChkBeforeProcess();
-//     if(in_array(false,array_values($BeforeProcess)) )
-//       $this->etape[1] = 'before' ;
-//
-//     if(tep_count_shipping_modules() > 0)
-//       $this->etape[2] = 'shipping' ;
-//
-//       $this->etape[3] = 'payment' ;
-//
-//       $this->etape[4] = 'confirmation' ;
-//
-//       $this->etape[5] = 'process' ;
+    /// force add etape confirmation and success
+//     $etape['PrConfirmation'] = true ;
+//     $etape['PrSuccess'] = true ;
+
+// var_dump($etape);
+
+    $i = 0;
+    foreach($etape as $key=>$row)
+      $this->etape[$i++] = $key;
+
+    $i = 0;
+    foreach($etape as $key=>$row)
+      if($this->modules[$key]->step)
+	$this->process[$i++] = false;
+      else
+	$this->process[$i++] = $row;
+
+// var_dump( $this->etape);
+// var_dump( $this->process);
+
   }
 
   public static function getInstance($full=false) {
@@ -71,8 +95,24 @@
 
 
 
+  /**
+    @brief retrun id current etape
+    @param $key string name etape current
+  */
+  public function GetCurrentEtape($key=''){
+    foreach($this->process as $k=>$row)
+      if($row)
+	return  $this->etape[$k];
 
+// var_dump( $this->etape);
+// var_dump( $this->process);
+    // if not found force reload step 0
+//     return $this->etape[0];
+	tep_redirect(tep_href_link('checkout.php'/*FILENAME_CHECKOUT_PAYMENT*/, 'step=init', 'SSL'));
+  }
 
+
+
 /** Obligatoire depend AbstractAcaModule */
 
  /**

Modified: trunk/catalog/includes/classes/order_total.php
===================================================================
--- trunk/catalog/includes/classes/order_total.php	2011-11-20 22:04:33 UTC (rev 3893)
+++ trunk/catalog/includes/classes/order_total.php	2011-11-20 22:08:51 UTC (rev 3894)
@@ -21,7 +21,7 @@
   /**
     Constructor
   */
-  function order_total() {
+  function __construct() {
     global $language,$customer_id, $page, $cart;
     $this->modules=array();
     $this->list_mod=array();

Modified: trunk/catalog/includes/classes/page.php
===================================================================
--- trunk/catalog/includes/classes/page.php	2011-11-20 22:04:33 UTC (rev 3893)
+++ trunk/catalog/includes/classes/page.php	2011-11-20 22:08:51 UTC (rev 3894)
@@ -119,7 +119,7 @@
             Page necessitant une identifcation obligatoire
     */
     /* Noyau */
-    $this->file_registered=$ContentRegistered;
+    $this->file_registered=$FileRegistered;
     /**
             Page de devant pas être indéxe dans le fils d'arianne (breadcrumb)
     */

Modified: trunk/catalog/includes/classes/payment.php
===================================================================
--- trunk/catalog/includes/classes/payment.php	2011-11-20 22:04:33 UTC (rev 3893)
+++ trunk/catalog/includes/classes/payment.php	2011-11-20 22:08:51 UTC (rev 3894)
@@ -1,39 +1,56 @@
 <?php if (!defined('HTTP_SERVER')) die('You can not access this file directly!');
 /**
-  \licence GPL 2005-2010  The osCSS developers - osCSS Open Source E-commerce
-  \portion code Copyright (c) 2002 osCommerce
-  \package osCSS-2 <www http://www.oscss.org>
-  \version 2.1.0
-  \date  29/11/10, 11:33
-  \author oscim <mail aur...@os...> <www http://www.oscim.fr>
-  \encode UTF-8
+  @licence GPL 2005-2011  The osCSS developers - osCSS Open Source E-commerce
+  @portion code Copyright (c) 2002 osCommerce
+  @package osCSS-2 <www http://www.oscss.org>
+  @version 2.1.1
+  @date  20/11/11, 22:45
+  @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+  @encode UTF-8
   \class payment
-  \file 
+  \file
   \dir includes/classes/
-  
-  \brief appel et init des modules de paiement 
+
+  \brief appel et init des modules de paiement
 */
 
-class payment extends AbstractAcaModule{
-  var $modules=array();
-  var $selected_module;
+class payment
+  extends AbstractAcaModule{
 
+  /**
+    @var
+  */
+  public $mod=array();
+  /**
+    @var
+  */
+  public $modules=array();
+  /**
+    @var
+  */
+  public static $selected_module = '';
+  /**
+    @var
+  */
   protected static $_instance;
 
+
+  /**
+    @brief constructor
+    @param $module specific load module
+  */
   function __construct($module='') {
     self::initialise($module);
   }
 
-  public static function getInstance($module='')
-  {
-      if(self::$_instance == null) {
-	  self::$_instance = new self($module);
-      }
-      return self::$_instance;
+  public static function getInstance($module=''){
+    if(self::$_instance == null || ( !empty($module) && empty(self::$selected_module) )) {
+	self::$_instance = new self($module);
+    }
+    return self::$_instance;
   }
 
-  public static function resetInstance()
-  {
+  public static function resetInstance(){
       self::$_instance = null;
       return self::getInstance();
   }
@@ -48,7 +65,7 @@
 
     $include_modules = array();
     if  (tep_not_null($module))  {
-      $this->selected_module = $module;
+      self::$selected_module = $module;
       foreach(parent::initialise_type('MODULE_PAYMENT_INSTALLED','payment') as $class){
 	if($class == $module) $include_modules[] = array('class' => $class, 'file' => $class . '.php');
       }
@@ -68,8 +85,8 @@
     foreach($include_modules as $imod){
       if( ( count($temp_payment_array)==0 || in_array($imod['file'], $temp_payment_array ) ) ){
 	if(!class_exists($imod['class'])) break;
-	$GLOBALS[$imod['class']] = new $imod['class'];
-	$this->modules[]=$imod['class'];
+	$this->modules[$imod['class']]=$GLOBALS[$imod['class']] = new $imod['class'];
+	$this->mod[]=$imod['class'];
       }
     }
 
@@ -77,10 +94,10 @@
     // checkout_confirmation.php the $payment variable is being assigned the
     // $_POST['payment'] value which will be empty (no radio button selection possible)
     if ( (tep_count_payment_modules() == 1) && (!isset($GLOBALS[$payment]) || (isset($GLOBALS[$payment]) && !is_object($GLOBALS[$payment]))) ) {
-	/*$this->selected_module=*/$payment = $include_modules[0]['class'];
+	/*self::$selected_module=*/$payment = $include_modules[0]['class'];
     }
 
-    if ( (tep_not_null($module)) && (in_array($module, $this->modules)) && (isset($GLOBALS[$module]->form_action_url)) ) {
+    if ( (tep_not_null($module)) && (in_array($module, $this->mod)) && (isset($GLOBALS[$module]->form_action_url)) ) {
       $this->form_action_url = $GLOBALS[$module]->form_action_url;
     }
 
@@ -88,7 +105,7 @@
 
   /**
     \ref catalog/checkout_confirmation.php
-    \brief 
+    \brief
     The following method is needed in the checkout_confirmation.php page
       due to a chicken and egg problem with the payment class and order class.
       The payment modules needs the order destination data for the dynamic status
@@ -98,10 +115,10 @@
       section. This should be looked into again post 2.2.
   */
   public function update_status() {
-    if (is_array($this->modules)) {
-      if (is_object($GLOBALS[$this->selected_module])) {
-	if (method_exists($GLOBALS[$this->selected_module], 'update_status')) {
-	$GLOBALS[$this->selected_module]->update_status();
+    if (is_array($this->mod)) {
+      if (is_object($GLOBALS[self::$selected_module])) {
+	if (method_exists($GLOBALS[self::$selected_module], 'update_status')) {
+	$GLOBALS[self::$selected_module]->update_status();
 	}
       }
     }
@@ -110,7 +127,7 @@
   public function javascript_validation() {
     global $page;
     $js = '';
-    if (is_array($this->modules)) {
+    if (is_array($this->mod)) {
       $js = '<script type="text/javascript"><!-- ' . "\n" .
 	    'function check_form() {' . "\n" .
 	    '  var error = 0;' . "\n" .
@@ -128,8 +145,8 @@
 	    '    payment_value = document.getElementById("checkout_payment").payment.value;' . "\n" .
 	    '  }' . "\n\n";
 
-      reset($this->modules);
-      foreach($this->modules as $class){
+      reset($this->mod);
+      foreach($this->mod as $class){
 	if (isset($GLOBALS[$class]) &&$GLOBALS[$class]->enabled)  $js .= $GLOBALS[$class]->javascript_validation();
       }
 
@@ -158,16 +175,18 @@
 
   /**
     \ref  catalog/checkout_payment.php
+    @return array
   */
   public function selection() {
     $selection_array = array();
 
-    if (is_array($this->modules)) {
-      reset($this->modules);
-      foreach($this->modules as $class){
+    if (is_array($this->mod)) {
+      reset($this->mod);
+      foreach($this->mod as $class){
 	if (isset($GLOBALS[$class]) && $GLOBALS[$class]->enabled) {
 	  $selection = $GLOBALS[$class]->selection();
-	  if (is_array($selection)) $selection_array[] = $selection;
+	  if (is_array($selection))
+	    $selection_array[] = $selection;
 	}
       }
     }
@@ -178,54 +197,54 @@
     \ref catalog/checkout_payment.php
   */
   public function pre_confirmation_check() {
-    if (is_array($this->modules)) {
-      if (is_object($GLOBALS[$this->selected_module]) && ($GLOBALS[$this->selected_module]->enabled) && method_exists($GLOBALS[$this->selected_module], 'pre_confirmation_check') ) {
-	$GLOBALS[$this->selected_module]->pre_confirmation_check();
+    if (is_array($this->mod)) {
+      if (is_object($GLOBALS[self::$selected_module]) && ($GLOBALS[self::$selected_module]->enabled) && method_exists($GLOBALS[self::$selected_module], 'pre_confirmation_check') ) {
+	$GLOBALS[self::$selected_module]->pre_confirmation_check();
       }
     }
 
   }
-  
+
   /**
     \ref catalog/checkout_confirmation.php
   */
   public function confirmation() {
-    if (is_array($this->modules)) {
-      if (is_object($GLOBALS[$this->selected_module]) && ($GLOBALS[$this->selected_module]->enabled) && method_exists($GLOBALS[$this->selected_module], 'confirmation') ) {
-	return $GLOBALS[$this->selected_module]->confirmation();
+    if (is_array($this->mod)) {
+      if (is_object($GLOBALS[self::$selected_module]) && ($GLOBALS[self::$selected_module]->enabled) && method_exists($GLOBALS[self::$selected_module], 'confirmation') ) {
+	return $GLOBALS[self::$selected_module]->confirmation();
       }
     }
   }
-  
+
   /**
     \ref catalog/checkout_confirmation.php
   */
   public function process_button() {
-    if (is_array($this->modules)) {
-      if (is_object($GLOBALS[$this->selected_module]) && ($GLOBALS[$this->selected_module]->enabled)&& method_exists($GLOBALS[$this->selected_module], 'process_button')  ) {
-	return $GLOBALS[$this->selected_module]->process_button();
+    if (is_array($this->mod)) {
+      if (is_object($GLOBALS[self::$selected_module]) && ($GLOBALS[self::$selected_module]->enabled)&& method_exists($GLOBALS[self::$selected_module], 'process_button')  ) {
+	return $GLOBALS[self::$selected_module]->process_button();
       }
     }
   }
-  
+
   /**
     \ref catalog/checkout_process.php
   */
   function before_process() {
-    if (is_array($this->modules)) {
-      if (is_object($GLOBALS[$this->selected_module]) && ($GLOBALS[$this->selected_module]->enabled)&& method_exists($GLOBALS[$this->selected_module], 'before_process')  ) {
-	return $GLOBALS[$this->selected_module]->before_process();
+    if (is_array($this->mod)) {
+      if (is_object($GLOBALS[self::$selected_module]) && ($GLOBALS[self::$selected_module]->enabled)&& method_exists($GLOBALS[self::$selected_module], 'before_process')  ) {
+	return $GLOBALS[self::$selected_module]->before_process();
       }
     }
   }
-  
+
   /**
     \ref catalog/checkout_process.php
   */
   public function after_process() {
-    if (is_array($this->modules)) {
-      if (is_object($GLOBALS[$this->selected_module]) && ($GLOBALS[$this->selected_module]->enabled)&& method_exists($GLOBALS[$this->selected_module], 'after_process')  ) {
-	return $GLOBALS[$this->selected_module]->after_process();
+    if (is_array($this->mod)) {
+      if (is_object($GLOBALS[self::$selected_module]) && ($GLOBALS[self::$selected_module]->enabled)&& method_exists($GLOBALS[self::$selected_module], 'after_process')  ) {
+	return $GLOBALS[self::$selected_module]->after_process();
       }
     }
   }
@@ -234,17 +253,17 @@
     \ref catalog/checkout_success.php
   */
   function payment_succes() {
-    if (is_array($this->modules)) {
-      if (is_object($GLOBALS[$this->selected_module]) && ($GLOBALS[$this->selected_module]->enabled)&& method_exists($GLOBALS[$this->selected_module], 'payment_succes')  ) {
-	return $GLOBALS[$this->selected_module]->payment_succes();
+    if (is_array($this->mod)) {
+      if (is_object($GLOBALS[self::$selected_module]) && ($GLOBALS[self::$selected_module]->enabled)&& method_exists($GLOBALS[self::$selected_module], 'payment_succes')  ) {
+	return $GLOBALS[self::$selected_module]->payment_succes();
       }
     }
   }
 
   public function get_error() {
-    if (is_array($this->modules)) {
-      if (is_object($GLOBALS[$this->selected_module]) && ($GLOBALS[$this->selected_module]->enabled)&& method_exists($GLOBALS[$this->selected_module], 'pre_confirmation_check')  ) {
-	return $GLOBALS[$this->selected_module]->get_error();
+    if (is_array($this->mod)) {
+      if (is_object($GLOBALS[self::$selected_module]) && ($GLOBALS[self::$selected_module]->enabled)&& method_exists($GLOBALS[self::$selected_module], 'pre_confirmation_check')  ) {
+	return $GLOBALS[self::$selected_module]->get_error();
       }
     }
   }

Added: trunk/catalog/includes/content/checkout_cgu.php
===================================================================
--- trunk/catalog/includes/content/checkout_cgu.php	                        (rev 0)
+++ trunk/catalog/includes/content/checkout_cgu.php	2011-11-20 22:08:51 UTC (rev 3894)
@@ -0,0 +1,46 @@
+<?php
+/**
+  @licence GPL 2005-2011  The osCSS developers - osCSS Open Source E-commerce
+  @portion code Copyright (c) 2002 osCommerce
+  @package osCSS-2 <www http://www.oscss.org>
+  @version 2.1.1
+  @date  09/09/11, 22:30
+  @author oscim <mail aur...@os...> <www http://www.oscim.fr>
+  @encode UTF-8
+*/
+?>
+<div id="checkout">
+
+  <?php /** call and draw boxes */ ?>
+    <?php $boxe =$page->oscss_boxes->_return('checkout_progressbar'); ?>
+    <?php echo unhtmlentities($boxe->content) ?>
+
+  <?php echo tep_draw_form('checkout_before', tep_href_link('checkout.php' /*FILENAME_CHECKOUT*/, '', 'SSL'), 'post', 'onsubmit="return check_form();"'); ?>
+
+  <?php foreach($display_view as $row): ?>
+
+  <h3><?php echo unhtmlentities($row->title) ?></h3>
+
+
+  <div>
+    <?php echo unhtmlentities($row->content) ?>
+  </div>
+
+  <?php endforeach; ?>
+
+  <fieldset>
+    <legend><?php echo CHECKOUT_CGV ;?></legend>
+
+    <label for="conditions"><?php printf(TEXT_CONDITIONS , tep_href_link(FILENAME_CONDITIONS, 'origin=checkout_payment') );?></label>
+    <input name="conditions" id="conditions" type="checkbox" <?php echo isset($_GET['consult_conditions']) ? 'checked="checked"' : '' ;?> />
+  </fieldset>
+
+    <p class="formBt ieExtractFieldset">
+      <?php echo TITLE_CONTINUE_CHECKOUT_PROCEDURE ;?>
+       <input type="submit" class="submitBt" value="<?php echo IMAGE_BUTTON_CONTINUE; ?>"  />
+      </p>
+
+  </form>
+
+
+</div>
\ No newline at end of file

Modified: trunk/catalog/includes/content/checkout_confirmation.php
===================================================================
--- trunk/catalog/includes/content/checkout_confirmation.php	2011-11-20 22:04:33 UTC (rev 3893)
+++ trunk/catalog/includes/content/checkout_confirmation.php	2011-11-20 22:08:51 UTC (rev 3894)
@@ -1,14 +1,24 @@
 <?php
 /**
-  @licence GPL 2005-2010  The osCSS developers - osCSS Open Source E-commerce
+  @licence GPL 2005-2011  The osCSS developers - osCSS Open Source E-commerce
   @portion code Copyright (c) 2002 osCommerce
   @package osCSS-2 <www http://www.oscss.org>
-  @version 2.1.0
-  @date  18/11/10, 21:53
+  @version 2.1.1
+  @date  20/11/11, 22:44
   @author oscim <mail aur...@os...> <www http://www.oscim.fr>
   @encode UTF-8
 */
+
+/**
+  @var object order total
+*/
+$ACA_ot=$page->return_object('order_total_modules');
+/**
+  @var array result order totals
+*/
 $order_totals=$page->the_var('order_totals');
+
+// var_dump($ACA_ot);
 ?>
 <div id="checkoutConfirmation">
   <?php $boxe =$page->oscss_boxes->_return('checkout_progressbar'); ?>
@@ -65,7 +75,7 @@
 
     <table class="invoice invoiceTotal" cellspacing="0">
       <tbody>
-      <?php  print $order_total_modules->output("<tr>%s</tr>", '<td class="otTtitle">%s</td><td class="otText totht">%s</td><td class="otText totttc">%s</td>'); ?>
+      <?php  print $ACA_ot->output("<tr>%s</tr>", '<td class="otTtitle">%s</td><td class="otText totht">%s</td><td class="otText totttc">%s</td>'); ?>
       </tbody>
    </table>
 

Modified: trunk/catalog/includes/content/checkout_payment.php
===================================================================
--- trunk/catalog/includes/content/checkout_payment.php	2011-11-20 22:04:33 UTC (rev 3893)
+++ trunk/catalog/includes/content/checkout_payment.php	2011-11-20 22:08:51 UTC (rev 3894)
@@ -17,7 +17,7 @@
 
   <h2 class="content title <?php echo $language ;?>"><?php echo HEADING_TITLE; ?></h2>
 
-  <?php echo tep_draw_form('checkout_payment', tep_href_link(FILENAME_CHECKOUT_CONFIRMATION, '', 'SSL'), 'post', 'onsubmit="return check_form();"'); ?>
+  <?php echo tep_draw_form('checkout_payment', tep_href_link('checkout.php'/*FILENAME_CHECKOUT_CONFIRMATION*/, '', 'SSL'), 'post', 'onsubmit="return check_form();"'); ?>
 
   <?php /** Retour des erreurs */
     if (isset($_GET['payment_error']) && is_object(${$_GET['payment_error']}) && ($error = ${$_GET['payment_error']}->get_error())) { ?>
@@ -104,12 +104,12 @@
 	<p id="checkoutcouponerror" class="warning"><?php if(isset($_GET['error_message'])) echo $_GET['error_message'] ?></p>
       <?php } ?>
 
-      <fieldset>
-        <legend><?php echo CHECKOUT_CGV ;?></legend>
+<!--      <fieldset>
+        <legend><?php //echo CHECKOUT_CGV ;?></legend>
 
-        <label for="conditions"><?php printf(TEXT_CONDITIONS , tep_href_link(FILENAME_CONDITIONS, 'origin=checkout_payment') );?></label>
-        <input name="conditions" id="conditions" type="checkbox" <?php echo isset($_GET['consult_conditions']) ? 'checked="checked"' : '' ;?> />
-      </fieldset>
+        <label for="conditions"><?php //printf(TEXT_CONDITIONS , tep_href_link(FILENAME_CONDITIONS, 'origin=checkout_payment') );?></label>
+        <input name="conditions" id="conditions" type="checkbox" <?php //echo isset($_GET['consult_conditions']) ? 'checked="checked"' : '' ;?> />
+      </fieldset>-->
 
     <p class="formBt ieExtractFieldset">
       <?php echo TITLE_CONTINUE_CHECKOUT_PROCEDURE ;?>

Modified: trunk/catalog/includes/content/shopping_cart.php
===================================================================
--- trunk/catalog/includes/content/shopping_cart.php	2011-11-20 22:04:33 UTC (rev 3893)
+++ trunk/catalog/includes/content/shopping_cart.php	2011-11-20 22:08:51 UTC (rev 3894)
@@ -77,12 +77,16 @@
 
     <div class="SubTotal">
       <ul id="TotCart">
-	  <?php foreach($cart->show_list_total() as $i=>$tot): ?>
-	    <li><?php printf('<span>%s </span> %s' ,$tot->text, $currencies->format($tot->value)); ?></li>
-	  <?php endforeach; ?>
-	<li id="ajaxcartWeight" class="cartWeight">
-	  <?php echo '<span>' . SUB_TITLE_WEIGHT_TOTAL .'</span>' . $cart->show_weight().' '.UNIT_WEIGHT_NAME; ?>
-	</li>
+	<?php foreach($cart->show_list_total() as $i=>$tot): ?>
+	  <li><?php printf('<span>%s </span> %s' ,$tot->text, $currencies->format($tot->value)); ?></li>
+	<?php endforeach; ?>
+
+	<?php if($cart->get_content_type() !='virtual'): ?>
+	  <li id="ajaxcartWeight" class="cartWeight">
+	    <?php echo '<span>' . SUB_TITLE_WEIGHT_TOTAL .'</span>' . $cart->show_weight().' '.UNIT_WEIGHT_NAME; ?>
+	  </li>
+	<?php endif; ?>
+
       </ul>
     </div>
 
@@ -106,7 +110,7 @@
 	  $back = sizeof($navigation->path)-2;
 	  if (isset($navigation->path[$back])) echo '<a class="Bt navBt link" href="' . tep_href_link($navigation->path[$back]['page'], tep_array_to_string($navigation->path[$back]['get'], array('action')), $navigation->path[$back]['mode']) . '">' . IMAGE_BUTTON_CONTINUE_SHOPPING . '</a>';
 	  else   echo '<a class="Bt navBt link" href="javascript:history.go(-1)">' . IMAGE_BUTTON_BACK . '</a>'; ?>
-	<?php echo '<a class="Bt navBt link" href="' . tep_href_link(FILENAME_CHECKOUT_SHIPPING, '', 'SSL') . '">' . IMAGE_BUTTON_CHECKOUT . '</a>'; ?>
+	<?php echo '<a class="Bt navBt link" href="' . tep_href_link('checkout.php'/*FILENAME_CHECKOUT_SHIPPING*/, 'step=init', 'SSL') . '">' . IMAGE_BUTTON_CHECKOUT . '</a>'; ?>
       </div>
 
 

Modified: trunk/catalog/includes/js/checkout.js.php
===================================================================
--- trunk/catalog/includes/js/checkout.js.php	2011-11-20 22:04:33 UTC (rev 3893)
+++ trunk/catalog/includes/js/checkout.js.php	2011-11-20 22:08:51 UTC (rev 3894)
@@ -1,4 +1,4 @@
-<?php error_reporting(E_ALL);;?>
+
 <script language="javascript"><!--
 function CVVPopUpWindow(url) {
 	window.open(url,'popupWindow','toolbar=no,location=no,directories=no,status=no,menubar=no,scrollbars=no,resizable=no,copyhistory=no,width=600,height=233,screenX=150,screenY=150,top=150,left=150')
@@ -8,333 +8,5 @@
 	window.open(url,'popupWindow','toolbar=no,location=no,directories=no,status=no,menubar=no,scrollbars=no,resizable=no,copyhistory=no,width=600,height=510,screenX=150,screenY=150,top=150,left=150')
 }
 
-// function init_go (){
-  var onePage =  checkout;//document.getElementById('checkout');
-  onePage.initializing = true;
-  onePage.ajaxCharset = '<?php echo CHARSET;?>';
-  onePage.loggedIn = <?php echo (isset($customer_id) ? 'true' : 'false');?>;
-  onePage.ccgvInstalled = <?php echo (_cst_bool('MODULE_ORDER_TOTAL_COUPON_STATUS') ? 'true' : 'false');?>;
-  //BOF KGT
-  onePage.kgtInstalled = <?php echo (_cst_bool('MODULE_ORDER_TOTAL_DISCOUNT_COUPON_STATUS') ? 'true' : 'false');?>;
-  //EOF KGT
-  onePage.shippingEnabled = <?php echo (@$onepage['shippingEnabled'] === true ? 'true' : 'false');?>;
-  onePage.pageLinks = {
-	  checkout: '<?php echo fixSeoLink(tep_href_link(FILENAME_CHECKOUT, session_name() . '=' . session_id() . '&rType=ajax', (_cst_bool('ENABLE_SSL')? 'SSL':'NONSSL') ));?>',
-	  shoppingCart: '<?php echo fixSeoLink(tep_href_link(FILENAME_SHOPPING_CART));?>'
-  }
-// }
-  function getFieldErrorCheck($element){
-	  var rObj = {};
-	  switch($element.attr('name')){
-		  case 'billing_firstname':
-		  case 'shipping_firstname':
-			  rObj.minLength = <?php echo addslashes(ENTRY_FIRST_NAME_MIN_LENGTH);?>;
-			  rObj.errMsg = '<?php echo addslashes(ENTRY_FIRST_NAME_ERROR);?>';
-		  break;
-		  case 'billing_lastname':
-		  case 'shipping_lastname':
-			  rObj.minLength = <?php echo addslashes(ENTRY_LAST_NAME_MIN_LENGTH);?>;
-			  rObj.errMsg = '<?php echo addslashes(ENTRY_LAST_NAME_ERROR);?>';
-		  break;
-		  case 'billing_email_address':
-			  rObj.minLength = <?php echo addslashes(ENTRY_EMAIL_ADDRESS_MIN_LENGTH);?>;
-			  rObj.errMsg = '<?php echo addslashes(ENTRY_EMAIL_ADDRESS_ERROR);?>';
-		  break;
-		  case 'billing_street_address':
-		  case 'shipping_street_address':
-			  rObj.minLength = <?php echo addslashes(ENTRY_STREET_ADDRESS_MIN_LENGTH);?>;
-			  rObj.errMsg = '<?php echo addslashes(ENTRY_STREET_ADDRESS_ERROR);?>';
-		  break;
-		  case 'billing_zipcode':
-		  case 'shipping_zipcode':
-			  rObj.minLength = <?php echo addslashes(ENTRY_POSTCODE_MIN_LENGTH);?>;
-			  rObj.errMsg = '<?php echo addslashes(ENTRY_POST_CODE_ERROR);?>';
-		  break;
-		  case 'billing_city':
-		  case 'shipping_city':
-			  rObj.minLength = <?php echo addslashes(ENTRY_CITY_MIN_LENGTH);?>;
-			  rObj.errMsg = '<?php echo addslashes(ENTRY_CITY_ERROR);?>';
-		  break;
-		  case 'billing_dob':
-			  rObj.minLength = <?php echo addslashes(ENTRY_DOB_MIN_LENGTH);?>;
-			  rObj.errMsg = '<?php echo addslashes(ENTRY_DATE_OF_BIRTH_ERROR);?>';
-		  break;
-		  case 'billing_telephone':
-			  rObj.minLength = <?php echo addslashes(ENTRY_TELEPHONE_MIN_LENGTH);?>;
-			  rObj.errMsg = '<?php echo addslashes(ENTRY_TELEPHONE_NUMBER_ERROR);?>';
-		  break;
-		  case 'billing_country':
-		  case 'shipping_country':
-			  rObj.errMsg = '<?php echo addslashes(ENTRY_COUNTRY_ERROR);?>';
-		  break;
-		  case 'billing_state':
-		  case 'shipping_state':
-			  rObj.minLength = <?php echo addslashes(ENTRY_STATE_MIN_LENGTH);?>;
-			  rObj.errMsg = '<?php echo addslashes(ENTRY_STATE_ERROR);?>';
-		  break;
-		  case 'password':
-		  case 'confirmation':
-			  rObj.minLength = <?php echo addslashes(ENTRY_PASSWORD_MIN_LENGTH);?>;
-			  rObj.errMsg = '<?php echo addslashes(ENTRY_PASSWORD_ERROR);?>';
-		  break;
-	  }
-	return rObj;
-  }
-
-$(document).ready(function (){
-	$('#pageContentContainer').show();
-	var loginBoxOpened = false;
-	$('#loginButton').click(function (){
-		if (loginBoxOpened){
-			$('#loginBox').dialog('open');
-			return false;
-		}
-		$('#loginBox').dialog({
-			resizable: false,
-			shadow: false,
-			open: function (){
-				var $dialog = this;
-				$('input', $dialog).keypress(function (e){
-					if (e.which == 13){
-						$('#loginWindowSubmit', $dialog).click();
-					}
-				});
-
-				$('#loginWindowSubmit', $dialog).hover(function (){
-					this.style.cursor = 'pointer';
-				}, function (){
-					this.style.cursor = 'default';
-				}).click(function (){
-					var $this = $(this);
-					$this.hide();
-					var email = $('input[name="email_address"]', $dialog).val();
-					var pass = $('input[name="password"]', $dialog).val();
-					onePage.queueAjaxRequest({
-						url: onePage.pageLinks.checkout,
-						data: 'action=processLogin&email=' + email + '&pass=' + pass,
-						dataType: 'json',
-						type: 'post',
-						beforeSend: function (){
-							onePage.showAjaxMessage('Refreshing Shopping Cart');
-							if ($('#loginStatus', $this.parent()).size() <= 0){
-								$('<div>')
-								.attr('id', 'loginStatus')
-								.html('Processing Login')
-								.attr('align', 'center')
-								.insertAfter($this);
-							}
-						},
-						success: function (data){
-							if (data.success == true){
-								$('#loginStatus', $dialog).html(data.msg);
-								$('#logInRow').hide();
-
-								$('#changeBillingAddressTable').show();
-								$('#changeShippingAddressTable').show();
-								$('#newAccountEmail').remove();
-								$('#diffShipping').parent().parent().parent().remove();
-
-								onePage.updateAddressHTML('billing');
-								onePage.updateAddressHTML('shipping');
-
-								$('#shippingAddress').show();
-
-								var updateTotals = true;
-								onePage.updateCartView();
-								onePage.updateFinalProductListing();
-								onePage.updatePaymentMethods();
-								if ($(':radio[name="payment"]:checked').size() > 0){
-									onePage.setPaymentMethod($(':radio[name="payment"]:checked'));
-									updateTotals = false;
-								}
-								onePage.updateShippingMethods();
-								if ($(':radio[name="shipping"]:checked').size() > 0){
-									//onePage.setShippingMethod($(':r...
 
[truncated message content]

Thread: [Oscss-commit] SF.net SVN: oscss:[3894] trunk/catalog/includes

E-Commerce Shopping Cart

oscss-commit