[xoops-svn] SF.net SVN: xoops:[9916] XoopsModules/oledrion/branches/mamba/oledrion

[<be...@us...>]

Revision: 9916
          http://xoops.svn.sourceforge.net/xoops/?rev=9916&view=rev
Author:   beckmi
Date:     2012-07-23 23:14:15 +0000 (Mon, 23 Jul 2012)
Log Message:
-----------
Fixed: adding new discount didn't work

Modified Paths:
--------------
    XoopsModules/oledrion/branches/mamba/oledrion/admin/actions/discounts.php
    XoopsModules/oledrion/branches/mamba/oledrion/admin/actions/products.php
    XoopsModules/oledrion/branches/mamba/oledrion/admin/main.php
    XoopsModules/oledrion/branches/mamba/oledrion/class/oledrion_reductions.php
    XoopsModules/oledrion/branches/mamba/oledrion/docs/changelog.txt

Modified: XoopsModules/oledrion/branches/mamba/oledrion/admin/actions/discounts.php
===================================================================
--- XoopsModules/oledrion/branches/mamba/oledrion/admin/actions/discounts.php	2012-07-23 19:58:26 UTC (rev 9915)
+++ XoopsModules/oledrion/branches/mamba/oledrion/admin/actions/discounts.php	2012-07-23 23:14:15 UTC (rev 9916)
@@ -81,8 +81,9 @@
 	case 'add':		// Ajout d'une promotion
 	case 'edit':	// Edition d'une promo
 	// ****************************************************************************************************************
-        xoops_cp_header();
-//        oledrion_adminMenu(7);
+
+     xoops_cp_header();
+        //oledrion_adminMenu(7);
 		if($action == 'edit') {
 			$title = _AM_OLEDRION_EDIT_DISCOUNT;
 			$id = isset($_GET['id']) ? intval($_GET['id']) : 0;
@@ -103,8 +104,10 @@
 			$label_submit = _AM_OLEDRION_ADD;
 			$edit = false;
 		}
+
 		include_once XOOPS_ROOT_PATH.'/class/template.php';
-		$xoopsTpl = new XoopsTpl();
+        global $xoopsTpl;
+//		$xoopsTpl = new XoopsTpl();
 		$xoopsTpl->assign('formTitle', $title);
 		$xoopsTpl->assign('action', 'edit');
 		$xoopsTpl->assign('baseurl', $baseurl);
@@ -244,8 +247,11 @@
 		$xoopsTpl->assign('currencyName', oledrion_utils::getModuleOption('money_full'));
 		//$editor = oledrion_utils::getWysiwygForm(_AM_OLEDRION_DISCOUNT_DESCR, 'disc_description', $item->getVar('disc_description','e'), 15, 60, 'description_hidden');
 		//$xoopsTpl->assign('editor', $editor->render());
+
 		$xoopsTpl->display('db:oledrion_admin_discounts.html');
 		include_once 'admin_footer.php';
+
+
 		break;
 
 	// ****************************************************************************************************************

Modified: XoopsModules/oledrion/branches/mamba/oledrion/admin/actions/products.php
===================================================================
--- XoopsModules/oledrion/branches/mamba/oledrion/admin/actions/products.php	2012-07-23 19:58:26 UTC (rev 9915)
+++ XoopsModules/oledrion/branches/mamba/oledrion/admin/actions/products.php	2012-07-23 23:14:15 UTC (rev 9916)
@@ -756,7 +756,7 @@
 				echo "<tr>\n";
 			}
 			echo '</table>';
-        	//include_once 'admin_footer.php';
+        	include_once 'admin_footer.php';
 		}
 		break;
 }

Modified: XoopsModules/oledrion/branches/mamba/oledrion/admin/main.php
===================================================================
--- XoopsModules/oledrion/branches/mamba/oledrion/admin/main.php	2012-07-23 19:58:26 UTC (rev 9915)
+++ XoopsModules/oledrion/branches/mamba/oledrion/admin/main.php	2012-07-23 23:14:15 UTC (rev 9916)
@@ -111,5 +111,6 @@
 		oledrion_utils::redirect(_AM_OLEDRION_SAVE_OK, $baseurl, 2);
     	break;
 }
-xoops_cp_footer();
+//xoops_cp_footer();
+include_once 'admin_footer.php';
 ?>
\ No newline at end of file

Modified: XoopsModules/oledrion/branches/mamba/oledrion/class/oledrion_reductions.php
===================================================================
--- XoopsModules/oledrion/branches/mamba/oledrion/class/oledrion_reductions.php	2012-07-23 19:58:26 UTC (rev 9915)
+++ XoopsModules/oledrion/branches/mamba/oledrion/class/oledrion_reductions.php	2012-07-23 23:14:15 UTC (rev 9916)
@@ -411,7 +411,7 @@
 		$caddyCount = count($this->cart);
 
 		// Initialisation des totaux g\xE9n\xE9raux (ht, tva et frais de port)
-		$totalHT = $totalVAT = $totalShipping = $totalEcotaxe = 0.0;
+		$totalHT = $totalVAT = $totalShipping = $totalEcotaxe = $totalDiscountPrice = 0.0;
 
 		// Boucle sur tous les produits et sur chacune des r\xE8gles pour calculer le prix du produit (et ses frais de port) et voir si on doit y appliquer une r\xE9duction
 		foreach($this->cart as $cartProduct) {

Modified: XoopsModules/oledrion/branches/mamba/oledrion/docs/changelog.txt
===================================================================
--- XoopsModules/oledrion/branches/mamba/oledrion/docs/changelog.txt	2012-07-23 19:58:26 UTC (rev 9915)
+++ XoopsModules/oledrion/branches/mamba/oledrion/docs/changelog.txt	2012-07-23 23:14:15 UTC (rev 9916)
@@ -14,8 +14,9 @@
 
 TODO:
 - selecting Product Option should be reflected in total Price
-- Adding new Discount doesn't work
+- make sure that discounts are calculated properly
 
+
 ---------------------------------------
 2.31 Final 2009-11-08 (Hervet)
 ---------------------------------------

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