[xoops-svn] SF.net SVN: xoops-svn:[11056] XoopsModules/oledrion/branches/voltan/ oledrion

[<vo...@us...>]

Revision: 11056
          http://sourceforge.net/p/xoops/svn/11056
Author:   voltan1
Date:     2013-02-16 11:02:52 +0000 (Sat, 16 Feb 2013)
Log Message:
-----------
Improve module

Modified Paths:
--------------
    XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/dashboard.php
    XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/orders.php
    XoopsModules/oledrion/branches/voltan/oledrion/templates/admin/oledrion_order_print.html

Modified: XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/dashboard.php
===================================================================
--- XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/dashboard.php	2013-02-15 23:11:35 UTC (rev 11055)
+++ XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/dashboard.php	2013-02-16 11:02:52 UTC (rev 11056)
@@ -32,8 +32,20 @@
       oledrion_adminMenu(0);
 		oledrion_utils::htitle(_MI_OLEDRION_ADMENU10, 4);
 		$indexAdmin = new ModuleAdmin();
+		$indexAdmin->addConfigBoxLine(OLEDRION_UPLOAD_PATH, 'folder');
+      $indexAdmin->addConfigBoxLine(array(OLEDRION_UPLOAD_PATH, '777'), 'chmod');
+      $indexAdmin->addConfigBoxLine(OLEDRION_ATTACHED_FILES_PATH, 'folder');
+      $indexAdmin->addConfigBoxLine(array(OLEDRION_ATTACHED_FILES_PATH, '777'), 'chmod');
+      $indexAdmin->addConfigBoxLine(OLEDRION_PICTURES_PATH, 'folder');
+      $indexAdmin->addConfigBoxLine(array(OLEDRION_PICTURES_PATH, '777'), 'chmod');
+      $indexAdmin->addConfigBoxLine(OLEDRION_CSV_PATH, 'folder');
+      $indexAdmin->addConfigBoxLine(array(OLEDRION_CSV_PATH, '777'), 'chmod');
+      $indexAdmin->addConfigBoxLine(OLEDRION_CACHE_PATH, 'folder');
+      $indexAdmin->addConfigBoxLine(array(OLEDRION_CACHE_PATH, '777'), 'chmod');
+      
       echo $indexAdmin->addNavigation('index.php');
       echo $indexAdmin->renderIndex();
+      
 		$itemsCount = 5;	// Nombre d'éléments à afficher
 		if($h_oledrion_products->getCount() > 0) {
 			echo "<table border='0' width='100%' cellpadding='2' cellspacing='2'>";

Modified: XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/orders.php
===================================================================
--- XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/orders.php	2013-02-15 23:11:35 UTC (rev 11055)
+++ XoopsModules/oledrion/branches/voltan/oledrion/admin/actions/orders.php	2013-02-16 11:02:52 UTC (rev 11056)
@@ -233,7 +233,10 @@
 		foreach($caddy as $itemCaddy) {
 			$productForTemplate = $tblJoin = $productManufacturers = $productAttributes = array();
 			$product = $products[$itemCaddy->getVar('caddy_product_id')];
-			$productForTemplate = $product->toArray();	// Produit
+			$productForTemplate = $product->toArray();	// Produit
+			// Get cat title
+			$cat = $h_oledrion_cat->get($productForTemplate['product_cid'])->toArray();
+			$productForTemplate['product_cat_title'] = $cat['cat_title'];
 			// Est-ce qu'il y a des attributs ?
 			if($handlers->h_oledrion_caddy_attributes->getAttributesCountForCaddy($itemCaddy->getVar('caddy_id')) > 0) {
 		        $productAttributes = $handlers->h_oledrion_caddy_attributes->getFormatedAttributesForCaddy($itemCaddy->getVar('caddy_id'), $product);
@@ -260,11 +263,11 @@
 			}
 			$productForTemplate['product_caddy']['caddy_price_t'] = $oledrion_Currency->amountForDisplay($discount);	
 			$xoopsTpl->append('products', $productForTemplate);
-			/* 
+         /*
 			echo '<pre>';
 			print_r($productForTemplate);
 			echo '</pre>';
-			*/
+         */
 		}
 		$order = $order->toArray();
 		$xoopsTpl->assign('order', $order);

Modified: XoopsModules/oledrion/branches/voltan/oledrion/templates/admin/oledrion_order_print.html
===================================================================
--- XoopsModules/oledrion/branches/voltan/oledrion/templates/admin/oledrion_order_print.html	2013-02-15 23:11:35 UTC (rev 11055)
+++ XoopsModules/oledrion/branches/voltan/oledrion/templates/admin/oledrion_order_print.html	2013-02-16 11:02:52 UTC (rev 11056)
@@ -53,7 +53,7 @@
 		<{if count($product.product_attributes) > 0}>
 		<tr>
 			<td rowspan="<{math equation='x + y' x=$product.product_attributes_count y=1}>" class="center"><{$product.product_extraid}></td>
-			<td rowspan="<{math equation='x + y' x=$product.product_attributes_count y=1}>" class="center"><{$product.product_joined_manufacturers}> <{$product.product_title}></td>
+			<td rowspan="<{math equation='x + y' x=$product.product_attributes_count y=1}>" class="center"><{$product.product_cat_title}> <{$product.product_title}></td>
 			<td rowspan="<{math equation='x + y' x=$product.product_attributes_count y=1}>" class="center"><{$product.product_id}></td>
 			<td class="center" style="border-bottom-color: #fff;"></td>
 			<td class="center" style="border-bottom-color: #fff;"></td>
@@ -109,7 +109,9 @@
 			</tr>
 		</table>
 		<div class="moreinfo"><span class="bold">زمان ارسال</span> :‌ </div>
-		<div class="moreinfo"><span class="bold">سایر توضیحات</span> :‌ </div>
+		<div class="moreinfo"><span class="bold">سایر توضیحات</span> :‌ </div>
+		<div class="moreinfo"><span class="bold">شماره کارت ( ۴ رقم )</span> :‌ </div>
+		<div class="moreinfo"><span class="bold">شماره پیگیری</span> :‌ </div>
 	</div>
 	
 	 <{if $order.cmd_text_fordisplay != ''}>