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

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

Revision: 9923
          http://xoops.svn.sourceforge.net/xoops/?rev=9923&view=rev
Author:   beckmi
Date:     2012-07-24 22:09:33 +0000 (Tue, 24 Jul 2012)
Log Message:
-----------
Fixing Total price calculations

Modified Paths:
--------------
    XoopsModules/oledrion/branches/mamba/oledrion/class/oledrion_reductions.php
    XoopsModules/oledrion/branches/mamba/oledrion/templates/oledrion_admin_discounts.html

Modified: XoopsModules/oledrion/branches/mamba/oledrion/class/oledrion_reductions.php
===================================================================
--- XoopsModules/oledrion/branches/mamba/oledrion/class/oledrion_reductions.php	2012-07-24 22:00:17 UTC (rev 9922)
+++ XoopsModules/oledrion/branches/mamba/oledrion/class/oledrion_reductions.php	2012-07-24 22:09:33 UTC (rev 9923)
@@ -707,7 +707,7 @@
         $xoopsTpl->assign('totalEcotaxe', $totalEcotaxe);
 
 		$vatAmount = $totalVAT;
-		$commandAmountTTC = $totalHT + $totalVAT + $totalShipping + $totalEcotaxe;
+		$commandAmountTTC = $discountAmount + $totalVAT + $totalShipping + $totalEcotaxe;
 		
 		$cartForTemplate = $this->cartForTemplate;
 		return true;

Modified: XoopsModules/oledrion/branches/mamba/oledrion/templates/oledrion_admin_discounts.html
===================================================================
--- XoopsModules/oledrion/branches/mamba/oledrion/templates/oledrion_admin_discounts.html	2012-07-24 22:00:17 UTC (rev 9922)
+++ XoopsModules/oledrion/branches/mamba/oledrion/templates/oledrion_admin_discounts.html	2012-07-24 22:09:33 UTC (rev 9923)
@@ -5,10 +5,10 @@
 		<input type='hidden' name='op' id='op' value='discounts' />
 		<input type='hidden' name='action' id='action' value='saveedit' />
 		<input type='hidden' name='disc_id' id='disc_id' value='<{$discount.disc_id}>' />
-		<div class="center"><h3><{$formTitle}></h3>
+		<div align="center"><h3><{$formTitle}></h3>
 		<table width='100%' class='outer' cellspacing='1'>
 		<tr>
-			<th colspan="2" class="center"><{$smarty.const._AM_OLEDRION_DISCOUNT_INFORMATION}></th>	<{* Informations sur la r\xE9duction *}>
+			<th colspan="2" align="center"><{$smarty.const._AM_OLEDRION_DISCOUNT_INFORMATION}></th>	<{* Informations sur la r\xE9duction *}>
 		</tr>
 		<tr>
 			<td class='head'><label for="disc_title"><{$smarty.const._AM_OLEDRION_DISCOUNT_TITLE}></label></td>
@@ -24,7 +24,7 @@
 		</tr>
 
 		<tr>	<{* A qui ou selon quoi appliquer la r\xE9duction ? *}>
-			<th colspan="2" class="center"><{$smarty.const._AM_OLEDRION_DISCOUNT_WHOWHAT}></th>
+			<th colspan="2" align="center"><{$smarty.const._AM_OLEDRION_DISCOUNT_WHOWHAT}></th>
 		</tr>
 		<tr>
 			<td class='head'><label for="disc_group"><{$smarty.const._AM_OLEDRION_DISCOUNT_XOOPS_GROUP}></label></td>
@@ -47,7 +47,7 @@
 		</tr>
 
 		<tr>	<{* R\xE9duction sur le prix du produit ou le montant de la commande *}>
-			<th colspan="2" class="center"><{$smarty.const._AM_OLEDRION_DISCOUNT_REDUCTION_PRICE}></th>
+			<th colspan="2" align="center"><{$smarty.const._AM_OLEDRION_DISCOUNT_REDUCTION_PRICE}></th>
 		</tr>
 		<tr>
 			<td class='head' vclass="top"><{$smarty.const._AM_OLEDRION_DISCOUNT_REDUCTION_TYPE}></td>
@@ -111,7 +111,7 @@
 			</td>
 		</tr>
 		<tr>
-			<th colspan="2" class="center"><{$smarty.const._AM_OLEDRION_DISCOUNT_SHIPPING_REDUCTIONS}></th>	<{* R\xE9ductions sur les frais de port *}>
+			<th colspan="2" align="center"><{$smarty.const._AM_OLEDRION_DISCOUNT_SHIPPING_REDUCTIONS}></th>	<{* R\xE9ductions sur les frais de port *}>
 		</tr>
 		<tr>
 			<td class='head' vclass='top'><{$smarty.const._AM_OLEDRION_DISCOUNT_SHIPPINGS_ARE}></td>
@@ -178,4 +178,4 @@
 		</tr>
 		</table>
 	</form>
-<{/if}>
+<{/if}>
\ No newline at end of file

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