Thread: [Oscss-commit] SF.net SVN: oscss:[5215] trunk/catalog (Page 15)

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

Revision: 5215
          http://sourceforge.net/p/oscss/svn/5215
Author:   oscim
Date:     2014-08-21 12:30:37 +0000 (Thu, 21 Aug 2014)
Log Message:
-----------
[FO] Fix bug in propagation, customers_id in checkout_process
[BO] Fix bug filter in listing page 

Modified Paths:
--------------
    trunk/catalog/admin/includes/classes/ModTreePage.php
    trunk/catalog/admin/includes/modules/pages/orders.php
    trunk/catalog/checkout.php

Modified: trunk/catalog/admin/includes/classes/ModTreePage.php
===================================================================

--- trunk/catalog/admin/includes/classes/ModTreePage.php	2014-08-21 08:03:56 UTC (rev 5214)
+++ trunk/catalog/admin/includes/classes/ModTreePage.php	2014-08-21 12:30:37 UTC (rev 5215)
@@ -529,7 +529,9 @@
 	*/
 	public static function actionFilter(){
 
+		$tmp = $_SESSION['filters'][self::$code]; 
 		$_SESSION['filters'] =array();
+		$_SESSION['filters'][self::$code] = $tmp;
 
 		foreach($_POST['filters']['listfield'] as $key=>$row){
 			if( $row =='on' )

Modified: trunk/catalog/admin/includes/modules/pages/orders.php
===================================================================
--- trunk/catalog/admin/includes/modules/pages/orders.php	2014-08-21 08:03:56 UTC (rev 5214)
+++ trunk/catalog/admin/includes/modules/pages/orders.php	2014-08-21 12:30:37 UTC (rev 5215)
@@ -23,15 +23,6 @@
 class orders
   extends ModTreePage /// new abstract class for nextgen module
     implements
-// 			InterfaceModule
-// 			, ExtModConfig
-// 			, InterfacedTJsonS
-// 			, InterfacedInnerHtml 
-// 		
-// 			// Events Interface for display and exec all notification 
-// 			, EventMessInterface
-// 			, EventNotificationInterface
-
 		InterfaceModule
 	
 		// base module config structure
@@ -315,32 +306,7 @@
 		$mutli=array();
 		$mutli[] = '<span class="fleft">'.__('action multiple') . ' ' . tep_draw_pull_down_menu('status_multi', array_merge(array(array('id' => '', 'text' => __('text action multiple orders'))), orders::$orders_statuses) ) . __('export: ') . tep_draw_pull_down_menu('modeexport', orders::$export->mode ).'</span> <span class="fleft" style="margin-left:50px;"> '. tep_image_submit('button_confirm.gif', IMAGE_CONFIRM, '' ).'</span>' ;
 
-		/**
-			@remarks Active forms filter
-			@note
-				array[
-					// For normalised filter define on method ConvertInitVar
-					generic =>
-						array (
-							'string'
-							// , ....
-							);
-					mod =>
-						array(
-								'title'=>__('@products filter tab manufacturer'),
-								'content'=>tep_get_include_contents('manufacturers/filter.manufacturer'),
-							)
-				]
-		*/
-		$tab = array();
-		$tab['mod'][]=array(
-											'title'=>__('orders filter tab clause'),
-											'content'=>tep_get_include_contents(__CLASS__.'/filter.clause'),
-										);
-		$tab['mod'][]=array(
-											'title'=>__('orders filter products tab clause'),
-											'content'=>tep_get_include_contents(__CLASS__.'/filter.products'),
-										);
+
 	/**
 			@remarks this define menu master module in page
 			@note use $boutons[action][] = array(params)
@@ -355,15 +321,13 @@
 		*/
 		$boutons = array();
 
-
-
 				/**
 					@remarks  filter based on status orders
 				*/
 				$allclosed = array(DEFAULT_ORDERS_STATUS_COMPLETED =>'on' , DEFAULT_ORDERS_STATUS_ANNULATE =>'on');
 
 				if(self::$view =='allclosed'){
-					$_SESSION['filters'][__CLASS__]['viewstatus'] = $allclosed;
+					$_SESSION['filters'][self::$code]['viewstatus'] = $allclosed;
 				}
 				if(self::$view =='allnoclosed'){
 					$arr = array();
@@ -373,11 +337,11 @@
 						if( !in_array( $row['id'] , $rev ) )
 							$arr[$row['id']] = 'on' ;
 
-					$_SESSION['filters'][__CLASS__]['viewstatus'] = $arr;
+					$_SESSION['filters'][self::$code]['viewstatus'] = $arr;
 				}
 
-				if(isset($_SESSION['filters'][__CLASS__]['viewstatus']))
-					$_SESSION['filters']['viewstatus'] = $_SESSION['filters'] [__CLASS__]['viewstatus'];
+				if(isset($_SESSION['filters'][self::$code]['viewstatus']))
+					$_SESSION['filters']['viewstatus'] = $_SESSION['filters'] [self::$code]['viewstatus'];
 				else
 					$_SESSION['filters']['viewstatus']  =array();
 
@@ -395,22 +359,24 @@
 					/**
 						@remarks  filter based on date_purchased orders
 					*/
+
+					
 					if(self::$view =='thisday'){
-						$_SESSION['filters'][__CLASS__]['dates']['start'] = date('Y-m-d');
-						$_SESSION['filters'][__CLASS__]['dates']['end'] = date('Y-m-d');
+						$_SESSION['filters'][self::$code]['dates']['start'] = date('Y-m-d');
+						$_SESSION['filters'][self::$code]['dates']['end'] = date('Y-m-d');
 					}
 					elseif(self::$view =='thisweek'){
-						$_SESSION['filters'][__CLASS__]['dates']['start'] = date('Y-m-d', time() - (7 * 24 * 3600));
-						$_SESSION['filters'][__CLASS__]['dates']['end'] = date('Y-m-d');
+						$_SESSION['filters'][self::$code]['dates']['start'] = date('Y-m-d', time() - (7 * 24 * 3600));
+						$_SESSION['filters'][self::$code]['dates']['end'] = date('Y-m-d');
 					}
 					else {
-						if(isset($_SESSION['filters'][__CLASS__]['dates']['start']))
-							$_SESSION['filters']['dates']['start'] = $_SESSION['filters'][__CLASS__]['dates']['start'].' 00:00:00';
+						if(isset($_SESSION['filters'][self::$code]['dates']['start']))
+							$_SESSION['filters']['dates']['start'] = $_SESSION['filters'][self::$code]['dates']['start'].' 00:00:00';
 						else
 							$_SESSION['filters']['dates']['start'] = date('Y-m-d', strtotime('-60 days') ) .' 00:00:00';
 							
-						if(isset($_SESSION['filters'][__CLASS__]['dates']['end']))
-							$_SESSION['filters']['dates']['end'] = $_SESSION['filters'][__CLASS__]['dates']['end'].' 23:59:59';
+						if(isset($_SESSION['filters'][self::$code]['dates']['end']))
+							$_SESSION['filters']['dates']['end'] = $_SESSION['filters'][self::$code]['dates']['end'].' 23:59:59';
 						else
 							$_SESSION['filters']['dates']['end'] = date('Y-m-d').' 23:59:59';
 					}
@@ -426,11 +392,36 @@
 
 
 
-				if(isset($_SESSION['filters'][__CLASS__]['products']))
-					self::$InitInfo['adjust']['sWhere'] .=" AND op.products_id= '".tep_db_input($_SESSION['filters'][__CLASS__]['products'])."'";
+				if(isset($_SESSION['filters'][self::$code]['products']))
+					self::$InitInfo['adjust']['sWhere'] .=" AND op.products_id= '".tep_db_input($_SESSION['filters'][self::$code]['products'])."'";
 
+		/**
+			@remarks Active forms filter
+			@note
+				array[
+					// For normalised filter define on method ConvertInitVar
+					generic =>
+						array (
+							'string'
+							// , ....
+							);
+					mod =>
+						array(
+								'title'=>__('@products filter tab manufacturer'),
+								'content'=>tep_get_include_contents('manufacturers/filter.manufacturer'),
+							)
+				]
+		*/
+		$tab = array();
+		$tab['mod'][]=array(
+											'title'=>__('orders filter tab clause'),
+											'content'=>tep_get_include_contents(__CLASS__.'/filter.clause'),
+										);
+		$tab['mod'][]=array(
+											'title'=>__('orders filter products tab clause'),
+											'content'=>tep_get_include_contents(__CLASS__.'/filter.products'),
+										);
 
-
 		/**
 			Call Base Init and construct $InitInfo for process Filter
 				$listfield string list row in db
@@ -476,27 +467,27 @@
 			case 'filters':
 
 
+
 				// status orders restric list
+				$_SESSION['filters'][self::$code]['viewstatus'] = array(); 
 				foreach($_POST['filters']['viewstatus'] as $key=>$row){
 					if( $row =='on' )
-						$_SESSION['filters'][__CLASS__]['viewstatus'][$key] = 'on';
-					else
-						unset($_SESSION['filters'][__CLASS__]['viewstatus'][$key]);
+						$_SESSION['filters'][self::$code]['viewstatus'][$key] = 'on';
 				}
 
 				// date order
 				if(isset($_POST['filters']['dates']) ){
 					if( tep_not_null($_POST['filters']['dates']['start']))
-						$_SESSION['filters'][__CLASS__]['dates']['start'] = tep_date_raw(tep_db_prepare_input($_POST['filters']['dates']['start']));
+						$_SESSION['filters'][self::$code]['dates']['start'] = tep_date_raw(tep_db_prepare_input($_POST['filters']['dates']['start']));
 					if(tep_not_null($_POST['filters']['dates']['end']))
-						$_SESSION['filters'][__CLASS__]['dates']['end'] = tep_date_raw(tep_db_prepare_input($_POST['filters']['dates']['end']));
+						$_SESSION['filters'][self::$code]['dates']['end'] = tep_date_raw(tep_db_prepare_input($_POST['filters']['dates']['end']));
 				}
 
 
 				if(isset($_POST['filters']['products']) && $_POST['filters']['products'] > 0)
-						$_SESSION['filters'][__CLASS__]['products'] = tep_db_prepare_input($_POST['filters']['products']);
+						$_SESSION['filters'][self::$code]['products'] = tep_db_prepare_input($_POST['filters']['products']);
 				else
-						unset($_SESSION['filters'][__CLASS__]['products']);
+						unset($_SESSION['filters'][self::$code]['products']);
 
 				$actions = self::GenericAction();
 

Modified: trunk/catalog/checkout.php
===================================================================
--- trunk/catalog/checkout.php	2014-08-21 08:03:56 UTC (rev 5214)
+++ trunk/catalog/checkout.php	2014-08-21 12:30:37 UTC (rev 5215)
@@ -1,61 +1,110 @@
 <?php
 /**
-  @licence GPL 2005-2013  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:47
-  @author oscim <mail aur...@os...> <www http://www.oscim.fr>
-  @encode UTF-8
+ *\licence GPL 2005-2014  The osCSS developers - osCSS Open Source E-commerce
+ *\portion code Copyright (c) 2002 osCommerce
+ *\package osCSS-2 <www http://www.oscss.org>
+ *\version 2.2.2
+ *\date  31/10/10, 22:59
+ *\author oscim <mail aur...@os...> <www http://www.oscim.fr>
+ *\encode UTF-8
  *\file
- *\brief page pre-process order
+ *\brief process checkout , no display  ,
+ *    this file have not file child i dir content
 */
 
-  require('includes/application_top.php');
+  include('includes/application_top.php');
 
+  $page->init(basename(__FILE__),$language);
 
 
-  //! chargement order
-    $order = new order;
-    $page->add_object('order',$order);
+	if(($path_lg=$page->fix_file(DIR_WS_INCLUDES .'languages/'. $language . '/product.txt',true)) !=false)
+		$page->pile_file_lang($path_lg);
+	if(($path_lg=$page->fix_file(DIR_WS_INCLUDES .'languages/'. $language . '/checkout.txt',true)) !=false)
+		$page->pile_file_lang($path_lg);
 
 
-  $ACA =$page->new_class('checkout', @$_GET['step']);
+  $aca_modules = new checkout_process();
 
-  $Etape=$ACA->GetCurrentEtape();
-  $filepath = 'checkout_'.strtolower(substr($Etape, 2)).'.php';
+  //! ne prend les redirection liée au elements que si session not null ou  post et get null block
+  if (count($_SESSION)==0 || ( count($_POST)==0 && count($_GET)==0 ) ){
 
+    $page->is_registered();
 
-  $page->init($filepath,$language);
+    if (!tep_session_is_registered('sendto'))  tep_redirect(tep_href_link(FILENAME_CHECKOUT_PAYMENT, '', 'SSL'));
 
-	if(($path_lg=$page->fix_file(DIR_WS_INCLUDES .'languages/'. $language . '/product.txt',true)) !=false)
-		$page->pile_file_lang($path_lg);
-	if(($path_lg=$page->fix_file(DIR_WS_INCLUDES .'languages/'. $language . '/checkout.txt',true)) !=false)
-		$page->pile_file_lang($path_lg);
+    if (tep_not_null(MODULE_PAYMENT_INSTALLED) && (!tep_session_is_registered('payment')) )  tep_redirect(tep_href_link(FILENAME_CHECKOUT_PAYMENT, '', 'SSL'));
+  }
 
-  $page->force_content($filepath);
+  //! avoid hack attempts during the checkout procedure by checking the internal cartID
+  if (isset($cart->cartID) && tep_session_is_registered('cartID')) {
+    if ($cart->cartID != $cartID) {
+      tep_redirect(tep_href_link(FILENAME_CHECKOUT_SHIPPING, '', 'SSL'));
+    }
+  }
 
-  $page->is_registered();
+// load selected payment module
+  $payment_modules = payment::getInstance($payment);
+  
+  $order = new order;
+  
+// load the selected shipping module
+  $shipping_modules = shipping::getInstance();
 
 
-  if(isset($ACA->modules[$Etape])) {
 
-    $BeforeProcess=$ACA->modules[$Etape]->BeforeProcess();
+  /**
+    Before process module ACA
+  */
+  $aca_modules->before_process();
 
+  /**
+    load the before_process function from the payment modules
+    Execution ligne suivante si before_process !=false
+  */
+  if ( ($pay_mod = $payment_modules->before_process()) == false ){
+
+  // Search or load order total modules
+    if( ($order_total_modules=$page->return_object('order_total')) ==false){
+      $order_total_modules = new order_total;
+      $page->add_object('order_total_modules',$order_total_modules);
+    }
+    /**
+      Si la methode contient une redirection, le reste de de process n'est pas executés
+    */
+    $order_totals = $order_total_modules->process( $order , $price);
+
+    $res=$aca_modules->preventDuplicate( array('order_totals'=>$order_totals,'order'=>$order,'customer_id'=>$customer_id) );
+
+    $insert_id=$res['the_order_id'];
   }
+	else {
+    /**
+      Execution apres le before du module
+      et traitement des vars
+    */
+    if (isset($pay_mod) && is_array($pay_mod) ){
+       $insert_id = $pay_mod['insert_id'];
+       if(isset($pay_mod['order_totals'])) $order_totals= @$pay_mod['order_totals'];
+    }
 
+  }
 
-//   $page->breadcrumb->add(NAVBAR_TITLE_1, tep_href_link(constant('FILENAME_CHECKOUT_'.strtoupper(substr($Etape, 2))), '', 'SSL'));
-  $page->post_init(false);
+// load the after_process function from the payment modules
+  $payment_modules->after_process();
+  /**
+      Before process module ACA
+  */
+  $aca_modules->after_process();
 
 
-  $page->javascript->add_framework("ext/jquery/jquery.min.js");
-  $page->javascript->add_script("ext/jquery/jquery.validate.min.js", array('sort'=>30));
 
+	$ACA =$page->new_class('checkout', '');
+	$ACA->after_process();
 
-  include($page->path_gabarit());
+	
+  $cart->reset(true);
 
+  tep_redirect(tep_href_link(FILENAME_CHECKOUT_SUCCESS, '', 'SSL'));
 
   require(DIR_WS_INCLUDES . 'application_bottom.php');
-
 ?>
\ No newline at end of file

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.





Thread: [Oscss-commit] SF.net SVN: oscss:[5215] trunk/catalog (Page 15)

E-Commerce Shopping Cart

oscss-commit