// CHANGELOG

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13296 b9a71923-0436-4b27-9f14-aed3839534dd

address.php

@@ -25,11 +25,14 @@
 *  International Registered Trademark & Property of PrestaShop SA
 */
 
+/**
+ * This file will be removed in 1.6
+ * You have to use index.php?controller=page_name instead of this page
+ *
+ * @deprecated 1.5.0
+ */
+
 require(dirname(__FILE__).'/config/config.inc.php');
 Tools::displayFileAsDeprecated();
 
-// init front controller in order to use Tools::redirect
-$controller = new FrontController();
-$controller->init();
-
-Tools::redirect('index.php?controller=address'.(($_SERVER['QUERY_STRING']) ? '&'.$_SERVER['QUERY_STRING'] : ''));
+Tools::redirect('index.php?controller=address'.($_REQUEST ? '&'.http_build_query($_REQUEST) : ''), __PS_BASE_URI__, null, 'HTTP/1.1 301 Moved Permanently');

addresses.php

@@ -25,11 +25,14 @@
 *  International Registered Trademark & Property of PrestaShop SA
 */
 
+/**
+ * This file will be removed in 1.6
+ * You have to use index.php?controller=page_name instead of this page
+ *
+ * @deprecated 1.5.0
+ */
+
 require(dirname(__FILE__).'/config/config.inc.php');
 Tools::displayFileAsDeprecated();
 
-// init front controller in order to use Tools::redirect
-$controller = new FrontController();
-$controller->init();
-
-Tools::redirect('index.php?controller=addresses'.(($_SERVER['QUERY_STRING']) ? '&'.$_SERVER['QUERY_STRING'] : ''));
+Tools::redirect('index.php?controller=addresses'.($_REQUEST ? '&'.http_build_query($_REQUEST) : ''), __PS_BASE_URI__, null, 'HTTP/1.1 301 Moved Permanently');

admin-dev/ajax-tab.php

@@ -38,6 +38,5 @@ if (!isset($_REQUEST['controller']) && isset($_REQUEST['tab']))
 	$_REQUEST['controller'] = strtolower($_REQUEST['tab']);
 // Retrocompatibility with 1.4
 $_REQUEST['ajaxMode'] = $_POST['ajaxMode'] = $_GET['ajaxMode'] = $_REQUEST['ajax'] = $_POST['ajax'] = $_GET['ajax'] = 1;
-	
-Dispatcher::getInstance()->setControllerDirectories(array(_PS_ADMIN_DIR_.'/tabs/', _PS_ADMIN_CONTROLLER_DIR_));
+
 Dispatcher::getInstance()->dispatch();

admin-dev/ajax.php

@@ -71,124 +71,14 @@ function displayJavascriptAlert($s)
 	echo '<script type="text/javascript">alert(\''.addslashes($s).'\');</script>';
 }
 
-if (Tools::isSubmit('ajaxProductManufacturers'))
-{
-	AdminTab::$currentIndex = 'index.php?tab=AdminCatalog';
-	$manufacturers = Manufacturer::getManufacturers();
-	if ($manufacturers)
-	{
-		$jsonArray = array();
-		foreach ($manufacturers AS $manufacturer)
-			$jsonArray[] = '{"optionValue": "'.$manufacturer['id_manufacturer'].'", "optionDisplay": "'.htmlspecialchars(trim($manufacturer['name'])).'"}';
-		die('['.implode(',', $jsonArray).']');
-	}
-}
-
-
 if (Tools::isSubmit('ajaxReferrers'))
 {
 	require(_PS_CONTROLLER_DIR_.'admin/AdminReferrersController.php');
 }
 
-if (Tools::isSubmit('ajaxProductSuppliers'))
-{
-	AdminTab::$currentIndex = 'index.php?tab=AdminCatalog';
-	$suppliers = Supplier::getSuppliers();
-	if ($suppliers)
-	{
-		$jsonArray = array();
-		foreach ($suppliers AS $supplier)
-			$jsonArray[] = '{"optionValue": "'.$supplier['id_supplier'].'", "optionDisplay": "'.htmlspecialchars(trim($supplier['name'])).'"}';
-		die('['.implode(',', $jsonArray).']');
-	}
-}
-
-if (Tools::isSubmit('ajaxProductAccessories'))
-{
-	AdminTab::$currentIndex = 'index.php?tab=AdminCatalog';
-	$jsonArray = array();
-
-	$products = Db::getInstance()->executeS('
-	SELECT p.`id_product`, pl.`name`
-	FROM `'._DB_PREFIX_.'product` p
-	NATURAL LEFT JOIN `'._DB_PREFIX_.'product_lang` pl
-	WHERE pl.`id_lang` = '.(int)(Tools::getValue('id_lang')).'
-	'.Context::getContext()->shop->addSqlRestrictionOnLang('pl').'
-	AND p.`id_product` != '.(int)(Tools::getValue('id_product')).'
-	AND p.`id_product` NOT IN (
-		SELECT a.`id_product_2`
-		FROM `'._DB_PREFIX_.'accessory` a
-		WHERE a.`id_product_1` = '.(int)(Tools::getValue('id_product')).')
-	ORDER BY pl.`name`');
-
-	foreach ($products AS $accessory)
-		$jsonArray[] = '{"value: "'.(int)($accessory['id_product']).'-'.addslashes($accessory['name']).'", "text":"'.(int)($accessory['id_product']).' - '.addslashes($accessory['name']).'"}';
-	die('['.implode(',', $jsonArray).']');
-}
-
-if (Tools::isSubmit('ajaxDiscountCustomers'))
-{
-	AdminTab::$currentIndex = 'index.php?tab=AdminDiscounts';
-	$jsonArray = array();
-	$filter = Tools::getValue('filter');
-
-	if (Validate::isBool_Id($filter))
-		$filterArray = explode('_', $filter);
-
-	$customers = Db::getInstance()->executeS('
-	SELECT `id_customer`, `email`, CONCAT(`lastname`, \' \', `firstname`) as name
-	FROM `'._DB_PREFIX_.'customer`
-	WHERE `deleted` = 0 AND is_guest = 0
-	AND '.(Validate::isUnsignedInt($filter) ? '`id_customer` = '.(int)($filter) : '(`email` LIKE "%'.pSQL($filter).'%"
-	'.((Validate::isBool_Id($filter) AND $filterArray[0] == 0) ? 'OR `id_customer` = '.(int)($filterArray[1]) : '').'
-	'.(Validate::isUnsignedInt($filter) ? '`id_customer` = '.(int)($filter) : '').'
-	OR CONCAT(`firstname`, \' \', `lastname`) LIKE "%'.pSQL($filter).'%"
-	OR CONCAT(`lastname`, \' \', `firstname`) LIKE "%'.pSQL($filter).'%")').'
-	ORDER BY CONCAT(`lastname`, \' \', `firstname`) ASC
-	LIMIT 50');
-
-	$groups = Db::getInstance()->executeS('
-	SELECT g.`id_group`, gl.`name`
-	FROM `'._DB_PREFIX_.'group` g
-	LEFT JOIN `'._DB_PREFIX_.'group_lang` AS gl ON (g.`id_group` = gl.`id_group` AND gl.`id_lang` = '.(int)($context->language->id).')
-	WHERE '.(Validate::isUnsignedInt($filter) ? 'g.`id_group` = '.(int)($filter) : 'gl.`name` LIKE "%'.pSQL($filter).'%"
-	'.((Validate::isBool_Id($filter) AND $filterArray[0] == 1) ? 'OR g.`id_group` = '.(int)($filterArray[1]) : '')).'
-	ORDER BY gl.`name` ASC
-	LIMIT 50');
-
-	$json = '{"customers" : ';
-	foreach ($customers AS $customer)
-		$jsonArray[] = '{"value":"0_'.(int)($customer['id_customer']).'", "text":"'.addslashes($customer['name']).' ('.addslashes($customer['email']).')"}';
-	$json .= '['.implode(',', $jsonArray).'],
-		"groups" : ';
-	$jsonArray = array();
-	foreach ($groups AS $group)
-		$jsonArray[] = '{"value":"1_'.(int)($group['id_group']).'", "text":"'.addslashes($group['name']).'"}';
-	$json .= '['.implode(',', $jsonArray).']}';
-	die($json);
-}
-
 if (Tools::getValue('page') == 'prestastore' AND @fsockopen('addons.prestashop.com', 80, $errno, $errst, 3))
 	readfile('http://addons.prestashop.com/adminmodules.php?lang='.$context->language->iso_code);
 
-if ($step = (int)(Tools::getValue('ajaxProductTab')))
-{
-	require_once(dirname(__FILE__).'/tabs/AdminCatalog.php');
-	$catalog = new AdminCatalog();
-	$admin = new AdminProducts();
-
-	$languages = Language::getLanguages(false);
-	$defaultLanguage = (int)(Configuration::get('PS_LANG_DEFAULT'));
-	$product = new Product((int)(Tools::getValue('id_product')));
-	if (!Validate::isLoadedObject($product))
-		die (Tools::displayError('Product cannot be loaded'));
-
-	$switchArray = array(3 => 'displayFormPrices', 4 => 'displayFormAttributes', 5 => 'displayFormFeatures', 6 => 'displayFormCustomization', 7 => 'displayFormAttachments');
-	AdminTab::$currentIndex = 'index.php?tab=AdminCatalog';
-	if (key_exists($step, $switchArray))
-		$admin->{$switchArray[$step]}($product, $languages, $defaultLanguage);
-}
-
 if (Tools::isSubmit('getAvailableFields') AND Tools::isSubmit('entity'))
 {
 	$jsonArray = array();
@@ -240,7 +130,7 @@ if (Tools::isSubmit('ajaxCategoriesPositions'))
 	{
 		if (isset($position) && $category->updatePosition($way, $position))
 		{
-			Hook::exec('categoryUpdate');
+			Hook::exec('actionCategoryUpdate');
 			die(true);
 		}
 		else
@@ -325,11 +215,11 @@ if (Tools::isSubmit('ajaxProductsPositions'))
 			{
 				if ($product = new Product((int)$pos[2]))
 					if (isset($position) && $product->updatePosition($way, $position))
-						echo "ok position $position for product $pos[2]\r\n";
+						echo "ok position ".(int)$position." for product ".(int)$pos[2]."\r\n";
 					else
-						echo '{"hasError" : true, "errors" : "Can not update product '. $id_product . ' to position '.$position.' "}';
+						echo '{"hasError" : true, "errors" : "Can not update product '. (int)$id_product . ' to position '.(int)$position.' "}';
 				else
-					echo '{"hasError" : true, "errors" : "This product ('.$id_product.') can t be loaded"}';
+					echo '{"hasError" : true, "errors" : "This product ('.(int)$id_product.') can t be loaded"}';
 
 				break;
 			}
@@ -543,18 +433,6 @@ if (Tools::isSubmit('toggleScreencast'))
 	}
 }
 
-if (Tools::isSubmit('helpAccess'))
-{
-	$item = Tools::getValue('item');
-	$isoUser = Tools::getValue('isoUser');
-	$country = Tools::getValue('country');
-	$version = Tools::getValue('version');
-
-	if (isset($item) AND isset($isoUser) AND isset($country))
-		die(HelpAccess::displayHelp($item, $isoUser,  $country, $version));
-	die('{nohelp}');
-}
-
 if (Tools::isSubmit('getHookableList'))
 {
 	/* PrestaShop demo mode */
@@ -562,11 +440,11 @@ if (Tools::isSubmit('getHookableList'))
 		die('{"hasError" : true, "errors" : ["Live Edit : This functionnality has been disabled"]}');
 	/* PrestaShop demo mode*/
 
-	if (!strlen(Tools::getValue('hooks_list')))
+	if (!count(Tools::getValue('hooks_list')))
 		die('{"hasError" : true, "errors" : ["Live Edit : no module on this page"]}');
 
-	$modules_list = explode(',', Tools::getValue('modules_list'));
-	$hooks_list = explode(',', Tools::getValue('hooks_list'));
+	$modules_list = Tools::getValue('modules_list');
+	$hooks_list = Tools::getValue('hooks_list');
 	$hookableList = array();
 
 	foreach ($modules_list as $module)
@@ -621,42 +499,48 @@ if (Tools::isSubmit('saveHook'))
 	/* PrestaShop demo mode */
 	if (_PS_MODE_DEMO_)
 		die('{"hasError" : true, "errors" : ["Live Edit : This functionnality has been disabled"]}');
-	/* PrestaShop demo mode*/
 
 	$hooks_list = explode(',', Tools::getValue('hooks_list'));
 	$id_shop = (int)Tools::getValue('id_shop');
-	if ($id_shop)
+	if (!$id_shop)
+		$id_shop = Context::getContext()->shop->getId(true);
+
+	$res = true;
+	$hookableList = array();
+	// $_POST['hook'] is an array of id_module
+	$hooks_list = Tools::getValue('hook');
+	foreach ($hooks_list as $id_hook => $modules)
 	{
-		$hookableList = array();
-		foreach ($hooks_list as $hook)
+		// 1st, drop all previous hooked modules
+		$sql = 'DELETE FROM `'._DB_PREFIX_.'hook_module`
+			WHERE `id_hook` =  '.(int)$id_hook.'
+			AND id_shop = '.$id_shop;
+		$res &= Db::getInstance()->execute($sql);
+
+		$i = 1;
+		$value = '';
+		$ids = array();
+		// then prepare sql query to rehook all chosen modules(id_module, id_shop, id_hook, position)
+		// position is i (autoincremented)
+		foreach ($modules as $id_module)
 		{
-			$hook = trim($hook);
-			if (!$hook)
-				continue;
-
-			$sql = 'DELETE FROM '._DB_PREFIX_.'hook_module
-					WHERE id_hook = (SELECT id_hook FROM '._DB_PREFIX_.'hook WHERE `name` = \''.pSQL($hook).'\' LIMIT 1)
-						AND id_shop = '.$id_shop;
-			Db::getInstance()->execute($sql);
-			$hookedModules = explode(',', Tools::getValue($hook));
-			$i = 1;
-			$value = '';
-			$ids = array();
-			foreach ($hookedModules as $module)
+			if (!in_array($id_module, $ids))
 			{
-				$id = explode('_', $module);
-				if (!in_array($id[1], $ids))
-				{
-					$ids[] = $id[1];
-					$value .= '('.(int)$id[1].', (SELECT id_hook FROM `'._DB_PREFIX_.'hook` WHERE `name` = \''.pSQL($hook).'\' LIMIT 0, 1), '.(int)$i.'),';
-				}
-				$i++;
+				$ids[] = $id_module;
+				$value .= '('.(int)$id_module.', '.$id_shop.', '.(int)$id_hook.', '.$i.'),';
 			}
-			$value = rtrim($value, ',');
-			Db::getInstance()->execute('INSERT INTO  '._DB_PREFIX_.'hook_module (id_module, id_shop, id_hook, position) VALUES '.$value);
-
+			$i++;
 		}
+		$value = rtrim($value, ',');
+		$res &= Db::getInstance()->execute('INSERT INTO  `'._DB_PREFIX_.'hook_module`
+			(id_module, id_shop, id_hook, position)
+			VALUES '.$value);
+
 	}
+	if ($res)
+		$hasError = true;
+	else
+		$hasError = false;
 	die('{"hasError" : false, "errors" : ""}');
 }
 
@@ -670,13 +554,13 @@ if (Tools::isSubmit('getAdminHomeElement'))
 	$stream_context = @stream_context_create(array('http' => array('method'=> 'GET', 'timeout' => 5)));
 
 	// SCREENCAST
-	if (@fsockopen('www.prestashop.com', 80, $errno, $errst, 3))
+	if (@fsockopen('api.prestashop.com', 80, $errno, $errst, 3))
 		$result['screencast'] = 'OK';
 	else
 		$result['screencast'] = 'NOK';
 
 	// PREACTIVATION
-	$content = @file_get_contents($protocol.'://www.prestashop.com/partner/preactivation/preactivation-block.php?version=1.0&shop='.urlencode(Configuration::get('PS_SHOP_NAME')).'&protocol='.$protocol.'&url='.urlencode($_SERVER['HTTP_HOST']).'&iso_country='.$isoCountry.'&iso_lang='.Tools::strtolower($isoUser).'&id_lang='.(int)Context::getContext()->language->id.'&email='.urlencode(Configuration::get('PS_SHOP_EMAIL')).'&date_creation='._PS_CREATION_DATE_.'&v='._PS_VERSION_.'&security='.md5(Configuration::get('PS_SHOP_EMAIL')._COOKIE_IV_), false, $stream_context);
+	$content = @file_get_contents($protocol.'://api.prestashop.com/partner/preactivation/preactivation-block.php?version=1.0&shop='.urlencode(Configuration::get('PS_SHOP_NAME')).'&protocol='.$protocol.'&url='.urlencode($_SERVER['HTTP_HOST']).'&iso_country='.$isoCountry.'&iso_lang='.Tools::strtolower($isoUser).'&id_lang='.(int)Context::getContext()->language->id.'&email='.urlencode(Configuration::get('PS_SHOP_EMAIL')).'&date_creation='._PS_CREATION_DATE_.'&v='._PS_VERSION_.'&security='.md5(Configuration::get('PS_SHOP_EMAIL')._COOKIE_IV_), false, $stream_context);
 	if (!$content)
 		$result['partner_preactivation'] = 'NOK';
 	else
@@ -702,7 +586,7 @@ if (Tools::isSubmit('getAdminHomeElement'))
 	}
 
 	// PREACTIVATION PAYPAL WARNING
-	$content = @file_get_contents('https://www.prestashop.com/partner/preactivation/preactivation-warnings.php?version=1.0&partner=paypal&iso_country='.Tools::strtolower(Context::getContext()->country->iso_code).'&iso_lang='.Tools::strtolower(Context::getContext()->language->iso_code).'&id_lang='.(int)Context::getContext()->language->id.'&email='.urlencode(Configuration::get('PS_SHOP_EMAIL')).'&security='.md5(Configuration::get('PS_SHOP_EMAIL')._COOKIE_IV_), false, $stream_context);
+	$content = @file_get_contents('https://api.prestashop.com/partner/preactivation/preactivation-warnings.php?version=1.0&partner=paypal&iso_country='.Tools::strtolower(Context::getContext()->country->iso_code).'&iso_lang='.Tools::strtolower(Context::getContext()->language->iso_code).'&id_lang='.(int)Context::getContext()->language->id.'&email='.urlencode(Configuration::get('PS_SHOP_EMAIL')).'&security='.md5(Configuration::get('PS_SHOP_EMAIL')._COOKIE_IV_), false, $stream_context);
 	$content = explode('|', $content);
 	if ($content[0] == 'OK' && Validate::isCleanHtml($content[1]))
 		Configuration::updateValue('PS_PREACTIVATION_PAYPAL_WARNING', $content[1]);
@@ -710,7 +594,7 @@ if (Tools::isSubmit('getAdminHomeElement'))
 		Configuration::updateValue('PS_PREACTIVATION_PAYPAL_WARNING', '');
 
 	// DISCOVER PRESTASHOP
-	$content = @file_get_contents($protocol.'://www.prestashop.com/partner/prestashop/prestashop-link.php?iso_country='.$isoCountry.'&iso_lang='.Tools::strtolower($isoUser).'&id_lang='.(int)Context::getContext()->language->id, false, $stream_context);
+	$content = @file_get_contents($protocol.'://api.prestashop.com/partner/prestashop/prestashop-link.php?iso_country='.$isoCountry.'&iso_lang='.Tools::strtolower($isoUser).'&id_lang='.(int)Context::getContext()->language->id, false, $stream_context);
 	if (!$content)
 		$result['discover_prestashop'] = 'NOK';
 	else
@@ -721,10 +605,10 @@ if (Tools::isSubmit('getAdminHomeElement'))
 		else
 			$result['discover_prestashop'] = 'NOK';
 
-		if (@fsockopen('www.prestashop.com', 80, $errno, $errst, 3))
-			$result['discover_prestashop'] .= '<iframe frameborder="no" style="margin: 0px; padding: 0px; width: 315px; height: 290px;" src="'.$protocol.'://www.prestashop.com/rss/news2.php?v='._PS_VERSION_.'&lang='.$isoUser.'"></iframe>';
+		if (@fsockopen('api.prestashop.com', 80, $errno, $errst, 3))
+			$result['discover_prestashop'] .= '<iframe frameborder="no" style="margin: 0px; padding: 0px; width: 315px; height: 290px;" src="'.$protocol.'://api.prestashop.com/rss/news2.php?v='._PS_VERSION_.'&lang='.$isoUser.'"></iframe>';
 
-		$content = @file_get_contents($protocol.'://www.prestashop.com/partner/paypal/paypal-tips.php?protocol='.$protocol.'&iso_country='.$isoCountry.'&iso_lang='.Tools::strtolower($isoUser).'&id_lang='.(int)Context::getContext()->language->id, false, $stream_context);
+		$content = @file_get_contents($protocol.'://api.prestashop.com/partner/paypal/paypal-tips.php?protocol='.$protocol.'&iso_country='.$isoCountry.'&iso_lang='.Tools::strtolower($isoUser).'&id_lang='.(int)Context::getContext()->language->id, false, $stream_context);
 		$content = explode('|', $content);
 		if ($content[0] == 'OK' && Validate::isCleanHtml($content[1]))
 			$result['discover_prestashop'] .= $content[1];
@@ -733,9 +617,9 @@ if (Tools::isSubmit('getAdminHomeElement'))
 	die(Tools::jsonEncode($result));
 }
 
-if (Tools::isSubmit('getChildrenCategories') && Tools::getValue('id_category_parent'))
+if (Tools::isSubmit('getChildrenCategories') && Tools::isSubmit('id_category_parent'))
 {
-	$children_categories = Category::getChildrenWithNbSelectedSubCat(Tools::getValue('id_category_parent'), Tools::getValue('selectedCat'), Context::getContext()->language->id);
+	$children_categories = Category::getChildrenWithNbSelectedSubCat(Tools::getValue('id_category_parent'), Tools::getValue('selectedCat'), Context::getContext()->language->id, null, Tools::getValue('use_shop_context'));
 	die(Tools::jsonEncode($children_categories));
 }
 
@@ -854,11 +738,11 @@ if (Tools::isSubmit('ajaxAttributesPositions'))
 			{
 				if ($attribute = new Attribute((int)$pos[2]))
 					if (isset($position) && $attribute->updatePosition($way, $position))
-						echo "ok position $position for attribute $pos[2]\r\n";
+						echo "ok position ".(int)$position." for attribute ".(int)$pos[2]."\r\n";
 					else
-						echo '{"hasError" : true, "errors" : "Can not update attribute '. $id_attribute . ' to position '.$position.' "}';
+						echo '{"hasError" : true, "errors" : "Can not update attribute '. (int)$id_attribute . ' to position '.(int)$position.' "}';
 				else
-					echo '{"hasError" : true, "errors" : "This attribute ('.$id_attribute.') can t be loaded"}';
+					echo '{"hasError" : true, "errors" : "This attribute ('.(int)$id_attribute.') can t be loaded"}';
 
 				break;
 			}
@@ -886,11 +770,11 @@ if (Tools::isSubmit('ajaxGroupsAttributesPositions'))
 		{
 			if ($group_attribute = new AttributeGroup((int)$pos[1]))
 				if (isset($position) && $group_attribute->updatePosition($way, $position))
-					echo "ok position $position for group attribute $pos[1]\r\n";
+					echo "ok position ".(int)$position." for group attribute ".(int)$pos[1]."\r\n";
 				else
-					echo '{"hasError" : true, "errors" : "Can not update group attribute '. $id_attribute_group . ' to position '.$position.' "}';
+					echo '{"hasError" : true, "errors" : "Can not update group attribute '. (int)$id_attribute_group . ' to position '.(int)$position.' "}';
 			else
-				echo '{"hasError" : true, "errors" : "This group attribute ('.$id_attribute_group.') can t be loaded"}';
+				echo '{"hasError" : true, "errors" : "This group attribute ('.(int)$id_attribute_group.') can t be loaded"}';
 
 			break;
 		}
@@ -918,11 +802,11 @@ if (Tools::isSubmit('ajaxFeaturesPositions'))
 		{
 			if ($feature = new Feature((int)$pos[2]))
 				if (isset($position) && $feature->updatePosition($way, $position))
-					echo "ok position $position for feature $pos[1]\r\n";
+					echo "ok position ".(int)$position." for feature ".(int)$pos[1]."\r\n";
 				else
-					echo '{"hasError" : true, "errors" : "Can not update feature '. $id_feature . ' to position '.$position.' "}';
+					echo '{"hasError" : true, "errors" : "Can not update feature '. (int)$id_feature . ' to position '.(int)$position.' "}';
 			else
-				echo '{"hasError" : true, "errors" : "This feature ('.$id_feature.') can t be loaded"}';
+				echo '{"hasError" : true, "errors" : "This feature ('.(int)$id_feature.') can t be loaded"}';
 
 			break;
 		}
@@ -945,11 +829,11 @@ if (Tools::isSubmit('ajaxCarriersPositions'))
 		{
 			if ($carrier = new Carrier((int)$pos[2]))
 				if (isset($position) && $carrier->updatePosition($way, $position))
-					echo "ok position $position for carrier $pos[1]\r\n";
+					echo "ok position ".(int)$position." for carrier ".(int)$pos[1]."\r\n";
 				else
-					echo '{"hasError" : true, "errors" : "Can not update carrier '. $id_carrier . ' to position '.$position.' "}';
+					echo '{"hasError" : true, "errors" : "Can not update carrier '. (int)$id_carrier . ' to position '.(int)$position.' "}';
 			else
-				echo '{"hasError" : true, "errors" : "This carrier ('.$id_carrier.') can t be loaded"}';
+				echo '{"hasError" : true, "errors" : "This carrier ('.(int)$id_carrier.') can t be loaded"}';
 
 			break;
 		}
@@ -996,3 +880,16 @@ if (Tools::isSubmit('ajaxUpdateTaxRule'))
 	die(Tools::jsonEncode($output));
 }
 
+if (Tools::isSubmit('getZones'))
+{
+	$zones = Zone::getZones();
+	$html = '<select id="zone_to_affect" name="zone_to_affect">';
+	foreach ($zones as $z)
+	{
+		$html .= '<option value="'.$z['id_zone'].'">'.$z['name'].'</option>';
+	}
+	$html .= '</select>';
+	$array = array('hasError' => false, 'errors' => '', 'data' => $html);
+	die(Tools::jsonEncode($html));
+}
+

admin-dev/ajax_category_list.php

@@ -1,83 +0,0 @@
-<?php
-/*
-* 2007-2011 PrestaShop
-*
-* NOTICE OF LICENSE
-*
-* This source file is subject to the Open Software License (OSL 3.0)
-* that is bundled with this package in the file LICENSE.txt.
-* It is also available through the world-wide-web at this URL:
-* http://opensource.org/licenses/osl-3.0.php
-* If you did not receive a copy of the license and are unable to
-* obtain it through the world-wide-web, please send an email
-* to license@prestashop.com so we can send you a copy immediately.
-*
-* DISCLAIMER
-*
-* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
-* versions in the future. If you wish to customize PrestaShop for your
-* needs please refer to http://www.prestashop.com for more information.
-*
-*  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2011 PrestaShop SA
-*  @version  Release: $Revision: 6844 $
-*  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
-*  International Registered Trademark & Property of PrestaShop SA
-*/
-
-define('_PS_ADMIN_DIR_', getcwd());
-include_once('../config/config.inc.php');
-include_once('tabs/AdminCatalog.php');
-include_once('tabs/AdminProducts.php');
-include_once('init.php');
-
-if (Tools::getValue('token') != Tools::getAdminTokenLite('AdminCatalog'))
-	die(1);
-
-$catalog = new AdminCatalog();
-$adminProducts = new AdminProducts();
-
-echo '			<tr>
-					<td class="col-left"><label for="id_category_default" class="t">'.$adminProducts->getL('Default category:').'</label></td>
-					<td>
-						<select id="id_category_default" name="id_category_default" onchange="checkDefaultCategory(this.value);">';
-	$categories = Category::getCategories(Context::getContext()->language->id, false);
-	Category::recurseCategory($categories, $categories[0][1], 1, (int)(Tools::getValue('id_category_default')));
-	echo '			</select>
-					</td>
-				</tr>
-				<tr>
-					<td class="col-left">'.$adminProducts->getL('Catalog:').'</td>
-					<td>
-						<div style="overflow: auto; min-height: 300px; padding-top: 0.6em;" id="categoryList">
-							<script type="text/javascript">
-							$(document).ready(function() {
-								$(\'div#categoryList input.categoryBox\').click(function (){
-									if ($(this).is(\':not(:checked)\') && $(\'div#categoryList input.id_category_default\').val() == $(this).val())
-										alert(\''.utf8_encode(html_entity_decode($adminProducts->getL('Consider changing the default category.'))).'\');
-								});
-							});
-							</script>
-							<table cellspacing="0" cellpadding="0" class="table">
-								<tr>
-									<th><input type="checkbox" name="checkme" class="noborder" onclick="checkDelBoxes(this.form, \'categoryBox[]\', this.checked)" /></th>
-									<th>'.$adminProducts->getL('ID').'</th>
-									<th style="width: 600px">'.$adminProducts->getL('Name').'</th>
-								</tr>';
-		$done = array();
-		$index = array();
-
-		$categoryBox = Tools::getValue('categoryBox');
-		if ($categoryBox != '')
-		{
-			$categoryBox = @unserialize($categoryBox);
-			foreach ($categoryBox AS $k => $row)
-				$index[] = $row;
-		}
-		elseif ((int)Tools::getValue('id_product'))
-			$index = Product::getProductCategories((int)Tools::getValue('id_product'));
-		$adminProducts->recurseCategoryForInclude((int)(Tools::getValue('id_product')), $index, $categories, $categories[0][1], 1, (int)(Tools::getValue('id_category_default')));
-		echo '				</table>
-							<p style="padding:0px; margin:0px 0px 10px 0px;">'.$adminProducts->getL('Mark all checkbox(es) of categories in which product is to appear').'<sup> *</sup></p>
-						</div>
-				</tr>';

admin-dev/ajax_lang_packs.php

@@ -1,50 +0,0 @@
-<?php
-/*
-* 2007-2011 PrestaShop 
-*
-* NOTICE OF LICENSE
-*
-* This source file is subject to the Open Software License (OSL 3.0)
-* that is bundled with this package in the file LICENSE.txt.
-* It is also available through the world-wide-web at this URL:
-* http://opensource.org/licenses/osl-3.0.php
-* If you did not receive a copy of the license and are unable to
-* obtain it through the world-wide-web, please send an email
-* to license@prestashop.com so we can send you a copy immediately.
-*
-* DISCLAIMER
-*
-* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
-* versions in the future. If you wish to customize PrestaShop for your
-* needs please refer to http://www.prestashop.com for more information.
-*
-*  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2011 PrestaShop SA
-*  @version  Release: $Revision: 6844 $
-*  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
-*  International Registered Trademark & Property of PrestaShop SA
-*/
-
-define('_PS_ADMIN_DIR_', getcwd());
-include(_PS_ADMIN_DIR_.'/../config/config.inc.php');
-/* Getting cookie or logout */
-require_once(dirname(__FILE__).'/init.php');
-	
-if(!isset($_GET['iso_lang']) OR empty($_GET['iso_lang']))
-	die('fail:0');
-if(!isset($_GET['ps_version']) OR empty($_GET['ps_version']))
-	die('fail:0');
-if(@fsockopen('www.prestashop.com', 80))
-{
-	// Get all iso code available
-	$lang_packs = Tools::file_get_contents('http://www.prestashop.com/download/lang_packs/get_language_pack.php?version='.(string)$_GET['ps_version'].'&iso_lang='.(string)$_GET['iso_lang']);
-	
-	if ($lang_packs !== '' && Tools::jsonDecode($lang_packs) !== NULL)
-	{
-		echo $lang_packs;
-	}
-	else
-		die('fail:2');
-}
-else
-	die('offline');

admin-dev/ajax_send_mail_test.php

@@ -30,18 +30,19 @@ include_once(dirname(__FILE__).'/../config/config.inc.php');
 /* Getting cookie or logout */
 require_once(dirname(__FILE__).'/init.php');
 
-$smtpChecked = (trim($_GET['mailMethod']) ==  'smtp');
-$smtpServer = $_GET['smtpSrv'];
-$content = $_GET['testMsg'];
-$subject = $_GET['testSubject'];
+$smtpChecked = (trim($_POST['mailMethod']) ==  'smtp');
+$smtpServer = $_POST['smtpSrv'];
+$content = urldecode($_POST['testMsg']);
+$subject = urldecode($_POST['testSubject']);
 $type = 'text/html';
-$to =  $_GET['testEmail'];
+$to =  $_POST['testEmail'];
 $from = Configuration::get('PS_SHOP_EMAIL');
-$smtpLogin = $_GET['smtpLogin'];
-$smtpPassword = $_GET['smtpPassword'];
-$smtpPort = $_GET['smtpPort'];
-$smtpEncryption = $_GET['smtpEnc'];
+$smtpLogin = $_POST['smtpLogin'];
+$smtpPassword = (!empty($_POST['smtpPassword'])) ? urldecode($_POST['smtpPassword']) : Configuration::get('PS_MAIL_PASSWD');
+$smtpPort = $_POST['smtpPort'];
+$smtpEncryption = $_POST['smtpEnc'];
 
 $result = Mail::sendMailTest(Tools::htmlentitiesUTF8($smtpChecked), Tools::htmlentitiesUTF8($smtpServer), Tools::htmlentitiesUTF8($content), Tools::htmlentitiesUTF8($subject), Tools::htmlentitiesUTF8($type), Tools::htmlentitiesUTF8($to), Tools::htmlentitiesUTF8($from), Tools::htmlentitiesUTF8($smtpLogin), Tools::htmlentitiesUTF8($smtpPassword), Tools::htmlentitiesUTF8($smtpPort), Tools::htmlentitiesUTF8($smtpEncryption));
 die($result === true ? 'ok' : $result);
 
+

admin-dev/ajaxfilemanager/inc/config.tinymce.php

@@ -8,7 +8,6 @@
 	 */
 	
 
-error_reporting(E_ALL);	
 //error_reporting(E_ALL ^ E_NOTICE);	
 	
 	
@@ -128,4 +127,4 @@ error_reporting(E_ALL);
 	//LANGAUGAE DECLARATIONNS
 	define('CONFIG_LANG_INDEX', 'language'); //the index in the session
 	define('CONFIG_LANG_DEFAULT', (CONFIG_QUERY_STRING_ENABLE && !empty($_GET['language']) && file_exists(DIR_LANG . secureFileName($_GET['language'] . '.php'))?secureFileName($_GET['language']):'en')); //change it to be your language file base name, such en
-?>
+?>

admin-dev/ajaxfilemanager/inc/function.base.php

@@ -1017,7 +1017,7 @@ function getRootPath() {
 					
 						
 
-			// START ANDR<EFBFBD> SILVA DOWNLOAD CODE
+			// START ANDRE SILVA DOWNLOAD CODE
 			// required for IE, otherwise Content-disposition is ignored
 			if(ini_get('zlib.output_compression'))
 			  ini_set('zlib.output_compression', 'Off');
@@ -1033,7 +1033,7 @@ function getRootPath() {
 		
 			readfile($path);
 			exit();
-			// END ANDR<EFBFBD> SILVA DOWNLOAD CODE												
+			// END ANDRE SILVA DOWNLOAD CODE												
 				}
 		
 		}

admin-dev/csv.php

@@ -0,0 +1,85 @@
+<?php
+/*
+* 2007-2011 PrestaShop
+*
+* NOTICE OF LICENSE
+*
+* This source file is subject to the Open Software License (OSL 3.0)
+* that is bundled with this package in the file LICENSE.txt.
+* It is also available through the world-wide-web at this URL:
+* http://opensource.org/licenses/osl-3.0.php
+* If you did not receive a copy of the license and are unable to
+* obtain it through the world-wide-web, please send an email
+* to license@prestashop.com so we can send you a copy immediately.
+*
+* DISCLAIMER
+*
+* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+* versions in the future. If you wish to customize PrestaShop for your
+* needs please refer to http://www.prestashop.com for more information.
+*
+*  @author PrestaShop SA <contact@prestashop.com>
+*  @copyright  2007-2011 PrestaShop SA
+*  @version  Release: $Revision$
+*  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*/
+
+/**
+ * @since 1.5.0
+ */
+
+define('_PS_ADMIN_DIR_', getcwd());
+include(_PS_ADMIN_DIR_.'/../config/config.inc.php');
+
+if (!Context::getContext()->employee->id)
+	Tools::redirectAdmin('index.php?controller=AdminLogin');
+
+/*
+ * Functions allowed
+ */
+$functions = array(
+	'id_supply_order' => 'exportSupplyOrder',
+);
+
+/*
+ * Depending on $_GET, call the corresponding function
+ */
+foreach ($functions as $var => $function)
+{
+	if (isset($_GET[$var]))
+	{
+		call_user_func($function);
+		die;
+	}
+}
+
+/**
+ * Function used for SupplyOrder
+ */
+function exportSupplyOrder()
+{
+	//@TODO Checks if employee has enough access to export
+	if (!isset($_GET['id_supply_order']))
+		die (Tools::displayError('Missing supply order ID'));
+
+	$id_supply_order = (int)$_GET['id_supply_order'];
+	$supply_order = new SupplyOrder($id_supply_order);
+
+	if (!Validate::isLoadedObject($supply_order))
+		die(Tools::displayError('Cannot find this supply order in the database'));
+
+    $details = $supply_order->getEntriesCollection($supply_order->id_lang);
+    exportCSV($details, 'supply_order_'.$supply_order->reference.'_details');
+}
+
+/**
+ * Main function to export CSV
+ * @param object|Array $object
+ * @param string $template
+ */
+function exportCSV(&$object, $filename)
+{
+    $csv = new CSV($object, $filename);
+    $csv->export();
+}

admin-dev/footer.inc.php

@@ -27,7 +27,7 @@
 
 echo '			</div>
 			</div>
-			'.Hook::exec('backOfficeFooter').'
+			'.Hook::exec('displayBackOfficeFooter').'
 			<div id="footer">
 				<div style="float:left;margin-left:10px;padding-top:6px">
 					<a href="http://www.prestashop.com/" target="_blank" style="font-weight:700;color:#666666">PrestaShop&trade; '._PS_VERSION_.'</a><br />

admin-dev/functions.php

@@ -30,7 +30,7 @@ require_once(dirname(__FILE__).'/../images.inc.php');
 function bindDatepicker($id, $time)
 {
 	if ($time)
-	echo '
+		echo '
 		var dateObj = new Date();
 		var hours = dateObj.getHours();
 		var mins = dateObj.getMinutes();
@@ -42,7 +42,7 @@ function bindDatepicker($id, $time)
 
 	echo '
 	$(function() {
-		$("#'.$id.'").datepicker({
+		$("#'.Tools::htmlentitiesUTF8($id).'").datepicker({
 			prevText:"",
 			nextText:"",
 			dateFormat:"yy-mm-dd"'.($time ? '+time' : '').'});
@@ -62,7 +62,7 @@ function includeDatepicker($id, $time = false)
 	echo '<script type="text/javascript" src="'.__PS_BASE_URI__.'js/jquery/jquery-ui-1.8.10.custom.min.js"></script>';
 	$iso = Db::getInstance()->getValue('SELECT iso_code FROM '._DB_PREFIX_.'lang WHERE `id_lang` = '.(int)Context::getContext()->language->id);
 	if ($iso != 'en')
-		echo '<script type="text/javascript" src="'.__PS_BASE_URI__.'js/jquery/ui/i18n/jquery.ui.datepicker-'.$iso.'.js"></script>';
+		echo '<script type="text/javascript" src="'.__PS_BASE_URI__.'js/jquery/ui/i18n/jquery.ui.datepicker-'.Tools::htmlentitiesUTF8($iso).'.js"></script>';
 	echo '<script type="text/javascript">';
 		if (is_array($id))
 			foreach ($id as $id2)
@@ -93,7 +93,6 @@ function	rewriteSettingsFile($baseUrls = NULL, $theme = NULL, $arrayDB = NULL)
 	$defines['_DB_USER_'] = (($arrayDB AND isset($arrayDB['_DB_USER_'])) ? $arrayDB['_DB_USER_'] : _DB_USER_);
 	$defines['_DB_PREFIX_'] = (($arrayDB AND isset($arrayDB['_DB_PREFIX_'])) ? $arrayDB['_DB_PREFIX_'] : _DB_PREFIX_);
 	$defines['_DB_PASSWD_'] = (($arrayDB AND isset($arrayDB['_DB_PASSWD_'])) ? $arrayDB['_DB_PASSWD_'] : _DB_PASSWD_);
-	$defines['_DB_TYPE_'] = (($arrayDB AND isset($arrayDB['_DB_TYPE_'])) ? $arrayDB['_DB_TYPE_'] : _DB_TYPE_);
 	$defines['_COOKIE_KEY_'] = addslashes(_COOKIE_KEY_);
 	$defines['_COOKIE_IV_'] = addslashes(_COOKIE_IV_);
 	if (defined('_RIJNDAEL_KEY_'))
@@ -162,9 +161,9 @@ function getPath($urlBase, $id_category, $path = '', $highlight = '', $categoryT
 			$nCategories = (int)sizeof($categories);
 			foreach ($categories AS $category)
 			{
-				$edit = '<a href="'.$urlBase.'&id_category='.(int)$category['id_category'].'&'.(($category['id_category'] == 1 || $home) ? 'viewcategory' : 'addcategory').'&token='.Tools::getAdminToken('AdminCatalog'.(int)(Tab::getIdFromClassName('AdminCatalog')).(int)$context->employee->id).'" title="'.($category['id_category'] == 1 ? 'Home' : 'Modify').'"><img src="../img/admin/'.(($category['id_category'] == 1  || $home) ? 'home' : 'edit').'.gif" alt="" /></a> ';
+				$edit = '<a href="'.$urlBase.'&id_category='.(int)$category['id_category'].'&'.(($category['id_category'] == 1 || $home) ? 'viewcategory' : 'updatecategory').'&token='.Tools::getAdminToken('AdminCategories'.(int)(Tab::getIdFromClassName('AdminCategories')).(int)$context->employee->id).'" title="'.($category['id_category'] == 1 ? 'Home' : 'Modify').'"><img src="../img/admin/'.(($category['id_category'] == 1  || $home) ? 'home' : 'edit').'.gif" alt="" /></a> ';
 				$fullPath .= $edit.
-				($n < $nCategories ? '<a href="'.$urlBase.'&id_category='.(int)$category['id_category'].'&viewcategory&token='.Tools::getAdminToken('AdminCatalog'.(int)(Tab::getIdFromClassName('AdminCatalog')).(int)$context->employee->id).'" title="'.htmlentities($category['name'], ENT_NOQUOTES, 'UTF-8').'">' : '').
+				($n < $nCategories ? '<a href="'.$urlBase.'&id_category='.(int)$category['id_category'].'&viewcategory&token='.Tools::getAdminToken('AdminCategories'.(int)(Tab::getIdFromClassName('AdminCategories')).(int)$context->employee->id).'" title="'.htmlentities($category['name'], ENT_NOQUOTES, 'UTF-8').'">' : '').
 				(!empty($highlight) ? str_ireplace($highlight, '<span class="highlight">'.htmlentities($highlight, ENT_NOQUOTES, 'UTF-8').'</span>', $category['name']) : $category['name']).
 				($n < $nCategories ? '</a>' : '').
 				(($n++ != $nCategories OR !empty($path)) ? ' > ' : '');

admin-dev/header.inc.php

@@ -40,7 +40,7 @@ echo '
 		<link type="text/css" rel="stylesheet" href="'._PS_JS_DIR_.'jquery/datepicker/datepicker.css" />
 		<link type="text/css" rel="stylesheet" href="'._PS_CSS_DIR_.'admin.css" />
 		<link type="text/css" rel="stylesheet" href="'._PS_CSS_DIR_.'jquery.cluetip.css" />
-		<link type="text/css" rel="stylesheet" href="themes/'.Context::getContext()->employee->bo_theme.'/admin.css" />
+		<link type="text/css" rel="stylesheet" href="themes/'.Context::getContext()->employee->bo_theme.'/css/admin.css" />
 		<title>PrestaShop&trade; - '.translate('Administration panel').'</title>
 		<script type="text/javascript">
 			var helpboxes = '.Configuration::get('PS_HELPBOX').';
@@ -54,7 +54,7 @@ echo '
 		<script type="text/javascript" src="'._PS_JS_DIR_.'tools.js"></script>
 		<script type="text/javascript" src="'._PS_JS_DIR_.'ajax.js"></script>
 		<link rel="shortcut icon" href="'._PS_IMG_.'favicon.ico" />
-		'.Hook::exec('backOfficeHeader').'
+		'.Hook::exec('displayBackOfficeHeader').'
 		<!--[if IE]>
 		<link type="text/css" rel="stylesheet" href="'._PS_CSS_DIR_.'admin-ie.css" />
 		<![endif]-->
@@ -65,73 +65,81 @@ echo '
 		</style>
 		<script type="text/javascript">
 		function getPush()
-		{
-			$.post("ajax.php",{"getNotifications" : "1"}, function(data) {
-				if (data)
-				{
-					json = jQuery.parseJSON(data);
+			{
 
-					// Add orders notifications to the list
-					html = "";
-					nb_notifs = 0;
-					$.each(json.order, function(property, value) {
-						html += "<li>'.translate('A new order has been made on your shop.').'<br />'.translate('Order number : ').'<strong>#" + parseInt(value.id_order) + "</strong><br />'.translate('Total : ').'<strong>" + value.total_paid_real + "</strong><br />'.translate('From : ').'<strong>" + value.customer_name + "</strong><br /><a href=\"index.php?controller=AdminOrders&token='.Tools::getAdminTokenLite('AdminOrders').'&vieworder&id_order=" + parseInt(value.id_order) + "\">'.translate('Click here to see that order').'</a></li>";
-					});
-					if (html != "")
+				$.post("ajax.php",{"getNotifications" : "1"}, function(data) {
+					if (data)
 					{
-						$("#list_orders_notif").prev("p").hide();
-						$("#list_orders_notif").empty().append(html);
-						nb_notifs = $("#list_orders_notif li").length;
-						$("#orders_notif_value").text(nb_notifs);
-						$("#orders_notif_number_wrapper").show();
-					}
-					else
-					{
-						$("#orders_notif_number_wrapper").hide();
-					}
 
-					// Add customers notifications to the list
-					html = "";
-					nb_notifs = 0;
-					$.each(json.customer, function(property, value) {
-						html += "<li>'.translate('A new customer registered on your shop.').'<br />'.translate('Customer name : ').'<strong>" + value.customer_name + "</strong><br /><a href=\"index.php?controller=AdminCustomers&token='.Tools::getAdminTokenLite('AdminCustomers').'&viewcustomer&id_customer=" + parseInt(value.id_customer) + "\">'.translate('Click here to see that customer').'</a></li>";
-					});
-					if (html != "")
-					{
-						$("#list_customers_notif").prev("p").hide();
-						$("#list_customers_notif").empty().append(html);
-						nb_notifs = $("#list_customers_notif li").length;
-						$("#customers_notif_value").text(nb_notifs);
-						$("#customers_notif_number_wrapper").show();
-					}
-					else
-					{
-						$("#customers_notif_number_wrapper").hide();
-					}
+						json = jQuery.parseJSON(data);
 
-					// Add messages notifications to the list
-					html = "";
-					nb_notifs = 0;
-					$.each(json.message, function(property, value) {
-						html += "<li>'.translate('A new message posted on your shop.').'<br />'.translate('From : ').'<strong>" + value.customer_name + "</strong><br />'.translate('Excerpt : ').'<strong>" + value.message_customer + "</strong><br /><a href=\"index.php?controller=AdminOrders&token='.Tools::getAdminTokenLite('AdminOrders').'&vieworder&id_order=" + parseInt(value.id_order) + "\">'.translate('Click here to see that message').'</a></li>";
-					});
-					if (html != "")
-					{
-						$("#list_messages_notif").prev("p").hide();
-						$("#list_messages_notif").empty().append(html);
-						nb_notifs = $("#list_messages_notif li").length;
-						$("#messages_notif_value").text(nb_notifs);
-						$("#messages_notif_number_wrapper").show();
-					}
-					else
-					{
-						$("#messages_notif_number_wrapper").hide();
-					}
+						// Add orders notifications to the list
+						html = "";
+						nb_notifs = 0;
+						$.each(json.order, function(property, value) {
+							html += "<li>'.translate('A new order has been made on your shop.').'<br />'.translate('Order number : ').'<strong>#" + parseInt(value.id_order) + "</strong><br />'.translate('Total : ').'<strong>" + value.total_paid_real + "</strong><br />'.translate('From : ').'<strong>" + value.customer_name + "</strong><br /><a href=\"index.php?tab=AdminOrders&token='.Tools::getAdminTokenLite('AdminOrders').'&vieworder&id_order=" + parseInt(value.id_order) + "\">'.translate('Click here to see that order').'</a></li>";
+						});
 
-				}
-				setTimeout("getPush()",60000);
-			});
-		}
+						if (html != "")
+						{
+
+							$("#list_orders_notif").prev("p").hide();
+							$("#list_orders_notif").empty().append(html);
+							nb_notifs = $("#list_orders_notif li").length;
+							$("#orders_notif_value").text(nb_notifs);
+							$("#orders_notif_number_wrapper").show();
+						}
+						else
+						{
+							$("#orders_notif_number_wrapper").hide();
+						}
+						
+						// Add customers notifications to the list
+						html = "";
+						nb_notifs = 0;
+						$.each(json.customer, function(property, value) {
+							html += "<li>'.translate('A new customer registered on your shop.').'<br />'.translate('Customer name : ').'<strong>" + value.customer_name + "</strong><br /><a href=\"index.php?tab=AdminCustomers&token='.Tools::getAdminTokenLite('AdminCustomers').'&viewcustomer&id_customer=" + parseInt(value.id_customer) + "\">'.translate('Click here to see that customer').'</a></li>";
+						});
+						if (html != "")
+						{
+							$("#list_customers_notif").prev("p").hide();
+							$("#list_customers_notif").empty().append(html);
+							nb_notifs = $("#list_customers_notif li").length;
+							$("#customers_notif_value").text(nb_notifs);
+							$("#customers_notif_number_wrapper").show();
+						}
+
+						else
+						{
+
+							$("#customers_notif_number_wrapper").hide();
+						}
+
+
+						// Add messages notifications to the list
+						html = "";
+						nb_notifs = 0;
+						$.each(json.customer_message, function(property, value) {
+							html += "<li>'.translate('A new message posted on your shop.').'<br />'.translate('From : ').'<strong>" + value.customer_name + "</strong><br /><a href=\"index.php?tab=AdminCustomerThreads&token='.Tools::getAdminTokenLite('AdminCustomerThreads').'&viewcustomer_thread&id_customer_thread=" + parseInt(value.id_customer_thread) + "\">'.translate('Click here to see that message').'</a></li>";
+						});
+
+						if (html != "")
+						{
+
+							$("#list_customer_messages_notif").prev("p").hide();
+							$("#list_customer_messages_notif").empty().append(html);
+							nb_notifs = $("#list_customer_messages_notif li").length;
+							$("#customer_messages_notif_value").text(nb_notifs);
+							$("#customer_messages_notif_number_wrapper").show();
+						}
+						else
+						{
+							$("#customer_messages_notif_number_wrapper").hide();
+						}
+					}
+					setTimeout("getPush()",60000);
+				});
+			}
 
 		$().ready(function()
 		{
@@ -193,7 +201,7 @@ echo '		var html = "";
 								<h3>'.translate('Last orders').'</h3>
 								<p class="no_notifs">'.translate('No new orders has been made on your shop').'</p>
 								<ul id="list_orders_notif"></ul>
-								<p><a href="index.php?controller=AdminOrders&token='.Tools::getAdminTokenLite('AdminOrders').'">'.translate('Show all orders').'</a></p>
+								<p><a href="index.php?tab=AdminOrders&token='.Tools::getAdminTokenLite('AdminOrders').'">'.translate('Show all orders').'</a></p>
 							</div>
 						</div>';
 				}
@@ -204,23 +212,23 @@ echo '		var html = "";
 								<h3>'.translate('Last customers').'</h3>
 								<p class="no_notifs">'.translate('No new customers registered on your shop').'</p>
 								<ul id="list_customers_notif"></ul>
-								<p><a href="index.php?controller=AdminCustomers&token='.Tools::getAdminTokenLite('AdminCustomers').'">'.translate('Show all customers').'</a></p>
+								<p><a href="index.php?tab=AdminCustomers&token='.Tools::getAdminTokenLite('AdminCustomers').'">'.translate('Show all customers').'</a></p>
 							</div>
 						</div>';
 				}
 				if (Configuration::get('PS_SHOW_NEW_MESSAGES') == 1)
 				{
-					echo '<div id="messages_notif" class="notifs"><span id="messages_notif_number_wrapper" class="number_wrapper"><span id="messages_notif_value">0</span></span>
-							<div id="messages_notif_wrapper" class="notifs_wrapper">
+					echo '<div id="customer_messages_notif" class="notifs"><span id="customer_messages_notif_number_wrapper" class="number_wrapper"><span id="customer_messages_notif_value">0</span></span>
+							<div id="customer_messages_notif_wrapper" class="notifs_wrapper">
 								<h3>'.translate('Last messages').'</h3>
 								<p class="no_notifs">'.translate('No new messages posted on your shop').'</p>
-								<ul id="list_messages_notif"></ul>
-								<p><a href="index.php?controller=AdminMessages&token='.Tools::getAdminTokenLite('AdminMessages').'">'.translate('Show all messages').'</a></p>
+								<ul id="list_customer_messages_notif"></ul>
+								<p><a href="index.php?tab=AdminCustomerThreads&token='.Tools::getAdminTokenLite('AdminCustomerThreads').'">'.translate('Show all messages').'</a></p>
 							</div>
 						</div>';
 				}
 	echo		'</div><span id="employee_links">
-				<a href="index.php?controller=AdminEmployees&id_employee='.(int)Context::getContext()->employee->id.'&updateemployee&token='.Tools::getAdminTokenLite('AdminEmployees').'" class="employee" alt="">'.translate('My preferences').'</a>
+				<a href="index.php?controller=AdminEmployees&id_employee='.(int)Context::getContext()->employee->id.'&updateemployee&token='.Tools::getAdminTokenLite('AdminEmployees').'" class="employee">'.translate('My preferences').'</a>
 				<span class="separator"></span>
 				<span class="employee_name">
 				'.Tools::substr(Context::getContext()->employee->firstname, 0, 1).'.&nbsp;'.htmlentities(Context::getContext()->employee->lastname, ENT_COMPAT, 'UTF-8').'
@@ -275,7 +283,7 @@ echo '			</select>
 			echo '<div id="header_shoplist">'.translate('Select your shop:').' '.generateShopList().'</div>';
 
 		echo '</div>';
-			echo Hook::exec('backOfficeTop');
+			echo Hook::exec('displayBackOfficeTop');
 			echo '<ul id="menu">';
 
 if (empty($tab))
@@ -289,7 +297,7 @@ $echoLis = '';
 $mainsubtablist = '';
 
 foreach ($tabs AS $t)
-	if (checkTabRights($t['id_tab']) === true)
+	if (checkTabRights($t['id_tab']) === true AND (bool)$t['active'])
 	{
 		$img = (Tools::file_exists_cache(_PS_ADMIN_DIR_.'/themes/'.Context::getContext()->employee->bo_theme.'/img/t/'.$t['class_name'].'.gif') ? 'themes/'.Context::getContext()->employee->bo_theme.'/img/' : _PS_IMG_).'t/'.$t['class_name'].'.gif';
 		if (trim($t['module']) != '')
@@ -308,13 +316,13 @@ foreach ($tabs AS $t)
 			array_unshift($subTabs, $t);
 
 		foreach ($subTabs AS $t2)
-			if (checkTabRights($t2['id_tab']) === true)
+			if (checkTabRights($t2['id_tab']) === true AND (bool)$t2['active'])
 				echo '<li><a href="index.php?controller='.$t2['class_name'].'&token='.Tools::getAdminTokenLite($t2['class_name']).'">'.$t2['name'].'</a></li>';
 
 		echo '</ul></li>';
 		$echoLi = '';
 		foreach ($subTabs AS $t2)
-			if (checkTabRights($t2['id_tab']) === true)
+			if (checkTabRights($t2['id_tab']) === true AND (bool)$t2['active'])
 				$echoLi .= '<li class="subitem"><a href="index.php?controller='.$t2['class_name'].'&token='.Tools::getAdminTokenLite($t2['class_name']).'">'.$t2['name'].'</a></li>';
 
 		if ($current)

admin-dev/index.php

@@ -38,7 +38,4 @@ if (!isset($_REQUEST['controller']) && isset($_REQUEST['tab']))
 	$_REQUEST['controller'] = strtolower($_REQUEST['tab']);
 
 // Prepare and trigger admin dispatcher
-Dispatcher::getInstance()->setDefaultController('AdminHome');
-Dispatcher::getInstance()->setControllerNotFound('AdminNotFound');
-Dispatcher::getInstance()->setControllerDirectories(array(_PS_ADMIN_DIR_.'/tabs/', _PS_ADMIN_CONTROLLER_DIR_));
 Dispatcher::getInstance()->dispatch();

admin-dev/init.php

@@ -31,69 +31,86 @@ $timerStart = microtime(true);
 //	$_GET['tab'] = $_GET['controller'];
 //	$_POST['tab'] = $_POST['controller'];
 //	$_REQUEST['tab'] = $_REQUEST['controller'];
-
-$context = Context::getContext();
-if (isset($_GET['logout']))
-	$context->employee->logout();
-
-if (!isset($context->employee) || !$context->employee->isLoggedBack())
-	Tools::redirectAdmin('index.php?controller=AdminLogin&redirect='.$_SERVER['REQUEST_URI']);
-
-// Set current index
-$currentIndex = $_SERVER['SCRIPT_NAME'].(($controller = Tools::getValue('controller')) ? '?controller='.$controller: '');
-
-if ($back = Tools::getValue('back'))
-	$currentIndex .= '&back='.urlencode($back);
-AdminTab::$currentIndex = $currentIndex;
-
-$iso = $context->language->iso_code;
-include(_PS_TRANSLATIONS_DIR_.$iso.'/errors.php');
-include(_PS_TRANSLATIONS_DIR_.$iso.'/fields.php');
-include(_PS_TRANSLATIONS_DIR_.$iso.'/admin.php');
-
-/* Server Params */
-$protocol_link = (Configuration::get('PS_SSL_ENABLED')) ? 'https://' : 'http://';
-$protocol_content = (isset($useSSL) AND $useSSL AND Configuration::get('PS_SSL_ENABLED')) ? 'https://' : 'http://';
-$link = new Link($protocol_link, $protocol_content);
-$context->link = $link;
-define('_PS_BASE_URL_', Tools::getShopDomain(true));
-define('_PS_BASE_URL_SSL_', Tools::getShopDomainSsl(true));
-
-$path = dirname(__FILE__).'/themes/';
-if (empty($context->employee->bo_theme) OR !file_exists($path.$context->employee->bo_theme.'/admin.css'))
+try
 {
-	if (file_exists($path.'oldschool/admin.css'))
-		$context->employee->bo_theme = 'oldschool';
-	elseif (file_exists($path.'origins/admin.css'))
-		$context->employee->bo_theme = 'origins';
-	else
-		foreach (scandir($path) as $theme)
-			if ($theme[0] != '.' AND file_exists($path.$theme.'/admin.css'))
-			{
-				$employee->bo_theme = $theme;
-				break;
-			}
-	$context->employee->update();
-}
+	$context = Context::getContext();
+	if (isset($_GET['logout']))
+		$context->employee->logout();
 
-// Change shop context ?
-if (Shop::isFeatureActive() && Tools::getValue('setShopContext') !== false)
+	if (!isset($context->employee) || !$context->employee->isLoggedBack())
+		Tools::redirectAdmin('index.php?controller=AdminLogin&redirect='.$_SERVER['REQUEST_URI']);
+
+	// Set current index
+	// @deprecated global will be removed in 1.6
+	global $currentIndex; // retrocompatibility;
+	$currentIndex = $_SERVER['SCRIPT_NAME'].(($controller = Tools::getValue('controller')) ? '?controller='.$controller: '');
+
+	if ($back = Tools::getValue('back'))
+		$currentIndex .= '&back='.urlencode($back);
+	AdminTab::$currentIndex = $currentIndex;
+
+	$iso = $context->language->iso_code;
+	include(_PS_TRANSLATIONS_DIR_.$iso.'/errors.php');
+	include(_PS_TRANSLATIONS_DIR_.$iso.'/fields.php');
+	include(_PS_TRANSLATIONS_DIR_.$iso.'/admin.php');
+
+	/* Server Params */
+	$protocol_link = (Configuration::get('PS_SSL_ENABLED')) ? 'https://' : 'http://';
+	$protocol_content = (isset($useSSL) AND $useSSL AND Configuration::get('PS_SSL_ENABLED')) ? 'https://' : 'http://';
+	$link = new Link($protocol_link, $protocol_content);
+	$context->link = $link;
+	define('_PS_BASE_URL_', Tools::getShopDomain(true));
+	define('_PS_BASE_URL_SSL_', Tools::getShopDomainSsl(true));
+
+	$path = dirname(__FILE__).'/themes/';
+	// if the current employee theme is not valid (check layout.tpl presence), 
+	// reset to default theme
+	if (empty($context->employee->bo_theme) ||
+		!file_exists($path.$context->employee->bo_theme.'/template/layout.tpl'))
+	{
+		// default admin theme is "default".
+		$context->employee->bo_theme = '';
+		if (file_exists($path.'default/template/layout.tpl'))
+			$context->employee->bo_theme = 'default';
+		else
+		{
+			// if default theme doesn't exists, try to find one, otherwise throw exception
+			foreach (scandir($path) as $theme)
+				if ($theme[0] != '.' && file_exists($path.$theme.'/template/layout.tpl'))
+				{
+					$context->employee->bo_theme = $theme;
+					break;
+				}
+			// if no theme is found, admin can't work.
+			if (empty($context->employee->bo_theme))
+				throw new PrestaShopException('Unable to load theme for employee, and no valid theme found');
+		}
+		$context->employee->update();
+	}
+
+	// Change shop context ?
+	if (Shop::isFeatureActive() && Tools::getValue('setShopContext') !== false)
+	{
+		$context->cookie->shopContext = Tools::getValue('setShopContext');
+		$url = parse_url($_SERVER['REQUEST_URI']);
+		$query = (isset($url['query'])) ? $url['query'] : '';
+		parse_str($query, $parseQuery);
+		unset($parseQuery['setShopContext']);
+		Tools::redirectAdmin($url['path'] . '?' . http_build_query($parseQuery));
+	}
+
+	$context->currency = new Currency(Configuration::get('PS_CURRENCY_DEFAULT'));
+
+	$shopID = '';
+	if ($context->cookie->shopContext)
+	{
+		$split = explode('-', $context->cookie->shopContext);
+		if (count($split) == 2 && $split[0] == 's')
+			$shopID = (int)$split[1];
+	}
+	$context->shop = new Shop($shopID);
+}
+catch(PrestaShopException $e)
 {
-	$context->cookie->shopContext = Tools::getValue('setShopContext');
-	$url = parse_url($_SERVER['REQUEST_URI']);
-	$query = (isset($url['query'])) ? $url['query'] : '';
-	parse_str($query, $parseQuery);
-	unset($parseQuery['setShopContext']);
-	Tools::redirectAdmin($url['path'] . '?' . http_build_query($parseQuery));
+	$e->displayMessage();
 }
-
-$context->currency = new Currency(Configuration::get('PS_CURRENCY_DEFAULT'));
-
-$shopID = '';
-if ($context->cookie->shopContext)
-{
-	$split = explode('-', $context->cookie->shopContext);
-	if (count($split) == 2 && $split[0] == 's')
-		$shopID = (int)$split[1];
-}
-$context->shop = new Shop($shopID);

admin-dev/pdf.php

@@ -32,10 +32,11 @@ include(_PS_ADMIN_DIR_.'/../config/config.inc.php');
 if (!Context::getContext()->employee->id)
 	Tools::redirectAdmin('index.php?controller=AdminLogin');
 
-$functionArray = array(
+$function_array = array(
 	'pdf' => 'generateInvoicePDF',
 	'id_order_slip' => 'generateOrderSlipPDF',
 	'id_delivery' => 'generateDeliverySlipPDF',
+	'delivery' => 'generateDeliverySlipPDF',
 	'invoices' => 'generateInvoicesPDF',
 	'invoices2' => 'generateInvoicesPDF2',
 	'slips' => 'generateOrderSlipsPDF',
@@ -43,7 +44,7 @@ $functionArray = array(
 	'id_supply_order' => 'generateSupplyOrderFormPDF'
 );
 
-foreach ($functionArray as $var => $function)
+foreach ($function_array as $var => $function)
 	if (isset($_GET[$var]))
 	{
 		call_user_func($function);
@@ -52,24 +53,24 @@ foreach ($functionArray as $var => $function)
 
 function generateSupplyOrderFormPDF()
 {
-	if (!isset($_GET['id_supply_order']))
+	if (!Tools::isSubmit('id_supply_order'))
 		die (Tools::displayError('Missing supply order ID'));
 
-	$id_supply_order = (int)$_GET['id_supply_order'];
+	$id_supply_order = (int)Tools::getValue('id_supply_order');
 	$supply_order = new SupplyOrder($id_supply_order);
 
 	if (!Validate::isLoadedObject($supply_order))
 		die(Tools::displayError('Cannot find this supply order in the database'));
 
-    generatePDF($supply_order, PDF::TEMPLATE_SUPPLY_ORDER_FORM);
+	generatePDF($supply_order, PDF::TEMPLATE_SUPPLY_ORDER_FORM);
 }
 
 function generateInvoicePDF()
 {
-    if (Tools::isSubmit('id_order'))
-    	generateInvoicePDFByIdOrder(Tools::getValue('id_order'));
-    elseif (Tools::isSubmit('id_order_invoice'))
-    	generateInvoicePDFByIdOrderInvoice(Tools::getValue('id_order_invoice'));
+	if (Tools::isSubmit('id_order'))
+		generateInvoicePDFByIdOrder(Tools::getValue('id_order'));
+	elseif (Tools::isSubmit('id_order_invoice'))
+		generateInvoicePDFByIdOrderInvoice(Tools::getValue('id_order_invoice'));
 	else
 		die (Tools::displayError('Missing order ID or invoice order ID'));
 	exit;
@@ -77,95 +78,119 @@ function generateInvoicePDF()
 
 function generateInvoicePDFByIdOrder($id_order)
 {
-	$order = new Order($id_order);
+	$order = new Order((int)$id_order);
 	if (!Validate::isLoadedObject($order))
 		die(Tools::displayError('Cannot find order in database'));
 
-	generatePDF($order->getInvoicesCollection(), PDF::TEMPLATE_INVOICE);
+	$order_invoice_list = $order->getInvoicesCollection();
+	Hook::exec('actionPDFInvoiceRender', array('order_invoice_list' => $order_invoice_list));
+	generatePDF($order_invoice_list, PDF::TEMPLATE_INVOICE);
 }
 
 function generateInvoicePDFByIdOrderInvoice($id_order_invoice)
 {
-	$order_invoice = new OrderInvoice($id_order_invoice);
+	$order_invoice = new OrderInvoice((int)$id_order_invoice);
 	if (!Validate::isLoadedObject($order_invoice))
 		die(Tools::displayError('Cannot find order invoice in database'));
 
+	Hook::exec('actionPDFInvoiceRender', array('order_invoice_list' => array($order_invoice)));
 	generatePDF($order_invoice, PDF::TEMPLATE_INVOICE);
 }
 
 function generateOrderSlipPDF()
 {
-	$orderSlip = new OrderSlip((int)($_GET['id_order_slip']));
-	$order = new Order((int)($orderSlip->id_order));
+	$orderSlip = new OrderSlip((int)Tools::getValue('id_order_slip'));
+	$order = new Order((int)$orderSlip->id_order);
 	if (!Validate::isLoadedObject($order))
 		die(Tools::displayError('Cannot find order in database'));
 	$order->products = OrderSlip::getOrdersSlipProducts($orderSlip->id, $order);
-	$tmp = NULL;
 
-   generatePDF($orderSlip, PDF::TEMPLATE_ORDER_SLIP);
+	generatePDF($orderSlip, PDF::TEMPLATE_ORDER_SLIP);
 }
 
 function generateDeliverySlipPDF()
 {
-	$order = Order::getByDelivery((int)($_GET['id_delivery']));
-	if (!Validate::isLoadedObject($order))
-		die(Tools::displayError('Cannot find order in database'));
+	if (Tools::isSubmit('id_order'))
+		generateDeliverySlipPDFByIdOrder((int)Tools::getValue('id_order'));
+	elseif (Tools::isSubmit('id_order_invoice'))
+		generateDeliverySlipPDFByIdOrderInvoice((int)Tools::getValue('id_order_invoice'));
+	elseif (Tools::isSubmit('id_delivery'))
+	{
+		$order = Order::getByDelivery((int)Tools::getValue('id_delivery'));
+		generateDeliverySlipPDFByIdOrder((int)$order->id);
+	}
+	else
+		die (Tools::displayError('Missing order ID or invoice order ID'));
+	exit;
+}
 
-    generatePDF($order, PDF::TEMPLATE_DELIVERY_SLIP);
+function generateDeliverySlipPDFByIdOrder($id_order)
+{
+	$order = new Order((int)$id_order);
+	if (!Validate::isLoadedObject($order))
+		throw new PrestaShopException('Can\'t load Order object');
+
+	$order_invoice_collection = $order->getInvoicesCollection();
+	generatePDF($order_invoice_collection, PDF::TEMPLATE_DELIVERY_SLIP);
+}
+
+function generateDeliverySlipPDFByIdOrderInvoice($id_order_invoice)
+{
+	$order_invoice = new OrderInvoice((int)$id_order_invoice);
+	if (!Validate::isLoadedObject($order_invoice))
+		throw new PrestaShopException('Can\'t load Order Invoice object');
+
+	generatePDF($order_invoice, PDF::TEMPLATE_DELIVERY_SLIP);
 }
 
 function generateInvoicesPDF()
 {
-	$id_orders_list = Order::getOrdersIdInvoiceByDate($_GET['date_from'], $_GET['date_to'], NULL, 'invoice');
-	if (!is_array($id_orders_list))
-		die (Tools::displayError('No invoices found'));
+	$order_invoice_collection = OrderInvoice::getByDateInterval(Tools::getValue('date_from'), Tools::getValue('date_to'));
 
-    $orders = array();
-    foreach ($id_orders_list as $id_order)
-        $orders[] = new Order((int)$id_order);
+	if (!count($order_invoice_collection))
+		die(Tools::displayError('No invoices found'));
 
-    generatePDF($orders, PDF::TEMPLATE_INVOICE);
+	generatePDF($order_invoice_collection, PDF::TEMPLATE_INVOICE);
 }
 
 function generateInvoicesPDF2()
 {
-	$id_orders_list = array();
+	$order_invoice_collection = array();
 	foreach (explode('-', Tools::getValue('id_order_state')) as $id_order_state)
-		if (is_array($id_orders = Order::getOrderIdsByStatus((int)$id_order_state)))
-			$id_orders_list = array_merge($id_orders_list, $id_orders);
+		if (is_array($order_invoices = OrderInvoice::getByStatus((int)$id_order_state)))
+			$order_invoice_collection = array_merge($order_invoices, $order_invoice_collection);
 
-    $orders = array();
-    foreach ($id_orders_list as $id_order)
-        $orders[] = new Order((int)$id_order);
+	if (!count($order_invoice_collection))
+		die(Tools::displayError('No invoices found'));
 
-    generatePDF($orders, PDF::TEMPLATE_INVOICE);
+	generatePDF($order_invoice_collection, PDF::TEMPLATE_INVOICE);
 }
 
 function generateOrderSlipsPDF()
 {
-	$id_order_slips_list = OrderSlip::getSlipsIdByDate($_GET['date_from'], $_GET['date_to']);
+	$id_order_slips_list = OrderSlip::getSlipsIdByDate(Tools::getValue('date_from'), Tools::getValue('date_to'));
 	if (!count($id_order_slips_list))
 		die (Tools::displayError('No order slips found'));
 
-    $order_slips = array();
-    foreach ($id_order_slips_list as $id_order_slips)
-        $order_slips[] = new OrderSlip((int)$id_order_slips);
+	$order_slips = array();
+	foreach ($id_order_slips_list as $id_order_slips)
+		$order_slips[] = new OrderSlip((int)$id_order_slips);
 
-    generatePDF($order_slips, PDF::TEMPLATE_ORDER_SLIP);
+	generatePDF($order_slips, PDF::TEMPLATE_ORDER_SLIP);
 }
 
 function generateDeliverySlipsPDF()
 {
-	$slips = unserialize(urldecode($_GET['deliveryslips']));
-	if (is_array($slips))
-        generatePDF($slips, PDF::TEMPLATE_DELIVERY_SLIP);
-}
+	$order_invoice_collection = OrderInvoice::getByDeliveryDateInterval(Tools::getValue('date_from'), Tools::getValue('date_to'));
 
+	if (!count($order_invoice_collection))
+		die(Tools::displayError('No invoices found'));
+
+	generatePDF($order_invoice_collection, PDF::TEMPLATE_DELIVERY_SLIP);
+}
 
 function generatePDF($object, $template)
 {
-    global $smarty;
-    $pdf = new PDF($object, $template, $smarty);
-    $pdf->render();
-}
-
+	$pdf = new PDF($object, $template, Context::getContext()->smarty);
+	$pdf->render();
+}

admin-dev/tabs/AdminMessages.php

@@ -1,170 +0,0 @@
-<?php
-/*
-* 2007-2011 PrestaShop 
-*
-* NOTICE OF LICENSE
-*
-* This source file is subject to the Open Software License (OSL 3.0)
-* that is bundled with this package in the file LICENSE.txt.
-* It is also available through the world-wide-web at this URL:
-* http://opensource.org/licenses/osl-3.0.php
-* If you did not receive a copy of the license and are unable to
-* obtain it through the world-wide-web, please send an email
-* to license@prestashop.com so we can send you a copy immediately.
-*
-* DISCLAIMER
-*
-* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
-* versions in the future. If you wish to customize PrestaShop for your
-* needs please refer to http://www.prestashop.com for more information.
-*
-*  @author PrestaShop SA <contact@prestashop.com>
-*  @copyright  2007-2011 PrestaShop SA
-*  @version  Release: $Revision: 7310 $
-*  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
-*  International Registered Trademark & Property of PrestaShop SA
-*/
-
-class AdminMessages extends AdminTab
-{
-	public function __construct()
-	{
-		$this->table = 'order';
-	 	$this->className = 'Order';
-	 	$this->view = 'noActionColumn';
-		$this->colorOnBackground = true;
-		$this->context = Context::getContext();
-		$start = 0;
-		$this->_defaultOrderBy = 'date_add';
-
-		/* Manage default params values */
-		if (empty($limit))
-			$limit = ((!isset($this->context->cookie->{$this->table.'_pagination'})) ? $this->_pagination[0] : $limit = $this->context->cookie->{$this->table.'_pagination'});
-
-		if (!Validate::isTableOrIdentifier($this->table))
-			die (Tools::displayError('Table name is invalid:').' "'.$this->table.'"');
-
-		if (empty($orderBy))
-			$orderBy = Tools::getValue($this->table.'Orderby', $this->_defaultOrderBy);
-		elseif ($orderBy == 'id_order')
-			$orderBy = 'm.id_order';
-		
-		if (empty($orderWay))
-			$orderWay = Tools::getValue($this->table.'Orderway', 'ASC');		
-
-		$limit = (int)(Tools::getValue('pagination', $limit));
-		$this->context->cookie->{$this->table.'_pagination'} = $limit;
-
-		/* Check params validity */
-		if (!Validate::isOrderBy($orderBy) OR !Validate::isOrderWay($orderWay)
-			OR !is_numeric($start) OR !is_numeric($limit))
-			die(Tools::displayError('get list params is not valid'));
-
-		if ($orderBy == 'id_order')
-			$orderBy = 'm.id_order';
-		
-		/* Determine offset from current page */
-		if ((isset($_POST['submitFilter'.$this->table]) OR
-		isset($_POST['submitFilter'.$this->table.'_x']) OR
-		isset($_POST['submitFilter'.$this->table.'_y'])) AND
-		!empty($_POST['submitFilter'.$this->table]) AND
-		is_numeric($_POST['submitFilter'.$this->table]))
-			$start = (int)($_POST['submitFilter'.$this->table] - 1) * $limit;
-
-		$this->_list = Db::getInstance()->executeS('
-		SELECT SQL_CALC_FOUND_ROWS m.id_message, m.id_cart, m.id_employee, IF(m.id_order > 0, m.id_order, \'--\') id_order, m.message, m.private, m.date_add, CONCAT(LEFT(c.`firstname`, 1), \'. \', c.`lastname`) AS customer,
-		c.id_customer, count(m.id_message) nb_messages, (SELECT message FROM '._DB_PREFIX_.'message WHERE id_order = m.id_order ORDER BY date_add DESC LIMIT 1) last_message,
-		(SELECT COUNT(m2.id_message) FROM '._DB_PREFIX_.'message m2 WHERE 1 AND m2.id_customer != 0 AND m2.id_order = m.id_order AND m2.id_message NOT IN 
-		(SELECT mr2.id_message FROM '._DB_PREFIX_.'message_readed mr2 WHERE mr2.id_employee = '.(int)$this->context->employee->id.') GROUP BY m2.id_order) nb_messages_not_read_by_me
-		FROM '._DB_PREFIX_.'message m
-		LEFT JOIN '._DB_PREFIX_.'orders o ON (o.id_order = m.id_order)
-		LEFT JOIN '._DB_PREFIX_.'customer c ON (c.id_customer = m.id_customer)
-		GROUP BY m.id_order
-		ORDER BY '.(isset($orderBy) ? pSQL($orderBy) : 'date_add') .' '.(isset($orderWay) ? pSQL($orderWay) : 'DESC').'
-		LIMIT '.(int)($start).','.(int)($limit));
-		$this->_listTotal = Db::getInstance()->getValue('SELECT FOUND_ROWS()');
-
- 		$this->fieldsDisplay = array(
-		'id_order' => array('title' => $this->l('Order ID'), 'align' => 'center', 'width' => 30),
-		'id_customer' => array('title' => $this->l('Customer ID'), 'align' => 'center', 'width' => 30),
-		'customer' => array('title' => $this->l('Customer'), 'width' => 100, 'filter_key' => 'customer', 'tmpTableFilter' => true),
-		'last_message' => array('title' => $this->l('Last message'), 'width' => 400, 'orderby' => false),
-		'nb_messages_not_read_by_me' => array('title' => $this->l('Unread message(s)'), 'width' =>30, 'align' => 'center'),
-		'nb_messages' => array('title' => $this->l('Number of messages'), 'width' => 30, 'align' => 'center'));
-
-		parent::__construct();
-	}
-
-	public function display()
-	{
-		if (isset($_GET['ajax']) && !empty($_GET['id_cart']))
-		{
-			ob_clean();
-			
-			$messages = Message::getMessagesByCartId(Tools::getValue('id_cart'), true);
-			
-			echo '
-			<style type="text/css">
-				* {
-					font-size: 12px;
-					font-family: Arial,Verdana,Helvetica,sans-serif;
-				}
-			</style>
-			<p style="color: #CC0000; font-weight: bold;">'.$this->l('This customer has not finalized their order, however here are their messages:').'</p>';
-			
-			foreach ($messages AS $message)
-			{				
-				echo '
-				<table cellpadding="5" border="1">
-					<tr>
-						<td>'.$this->l('Cart ID:').'</td>
-						<td>'.(int)$message['id_cart'].'</td>
-					</tr>
-					<tr>
-						<td>'.$this->l('Customer ID:').'</td>
-						<td>'.(int)$message['id_customer'].'</td>
-					</tr>
-					<tr>
-						<td>'.$this->l('Date:').'</td>
-						<td>'.Tools::displayDate($message['date_add'], $this->context->language->id, true).'</td>
-					</tr>
-				</table>
-				<p>'.$this->l('Message:').' '.Tools::htmlentitiesUTF8($message['message']).'</p>
-				<hr size="1" noshade style="margin-bottom: 15px;" />';
-			}
-
-			die;
-		}
-		elseif (isset($_GET['view'.$this->table]) AND !empty($_GET['id_order']) AND $_GET['id_order'] != '--')
-			Tools::redirectAdmin('index.php?tab=AdminOrders&id_order='.(int)($_GET['id_order']).'&vieworder'.'&token='.Tools::getAdminToken('AdminOrders'.(int)(Tab::getIdFromClassName('AdminOrders')).(int)$this->context->employee->id));
-		else
-		{
-			if (isset($_GET['id_order']) AND (empty($_GET['id_order']) OR $_GET['id_order'] == '--'))
-			{
-				echo '<p class="warning bold"><img src="../img/admin/warning.gif" alt="" class="middle" /> &nbsp;'.
-				Tools::displayError('Cannot display this message because the customer has not finalized their order.').'</p>';
-			}	
-					
-			foreach ($this->_list AS $k => &$item)
-				if (Tools::strlen($item['last_message']) > 150 + Tools::strlen('...'))
-					$this->_list[$k]['last_message'] = Tools::substr(html_entity_decode($item['last_message'], ENT_QUOTES, 'UTF-8'), 0, 150, 'UTF-8').'...';
-					
-			foreach ($this->_list AS $k => &$item)
-				if ($item['id_order'] == '--')
-					$this->_list[$k]['last_message'] .= ' <a class="iframe" onclick="$(this).parent().attr(\'onclick\', \'return false\');" href="'.self::$currentIndex.'&token='.Tools::getAdminToken('AdminMessages'.(int)(Tab::getIdFromClassName('AdminMessages')).(int)$this->context->employee->id).'&ajax=1&id_cart='.(int)$this->_list[$k]['id_cart'].'" title="'.$this->l('View details').'"><img src="../img/admin/details.gif" alt="'.$this->l('View details').'" /></a>';
-					
-			echo '
-			<link href="'._PS_CSS_DIR_.'jquery.fancybox-1.3.4.css" rel="stylesheet" type="text/css" media="screen" />
-			<script type="text/javascript" src="'._PS_JS_DIR_.'jquery/jquery.fancybox-1.3.4.js"></script>
-			<script type="text/javascript">
-				$(document).ready(function()
-				{
-					$(\'a.iframe\').fancybox();
-				});
-			</script>';
-					
-			$this->displayList();
-			$this->displayOptionsList();
-		}
-	}
-}

admin-dev/themes/default/admin.css

@@ -1,270 +0,0 @@
-body {font-family: Arial, Helvetica, sans-serif;}
-
-
-h1, h2, h3, h4  { font-family: Arial, Helvetica, sans-serif; margin-bottom:.5em; line-height:1.4em; }
-h2  { font-size:1.7em; }
-h3  { font-size:1.25em; }
-h4  { font-size:1.05em; }
-h6  { font-size:1em; }
-
-
-/*LIST*/
-ul,ol {list-style:none; margin: 0; padding: 0;}
-
-/*FORM*/
-label {color:#585a69;text-shadow:0 1px 0#fff;}
-fieldset{background-color:#EBEDF4; border:1px solid #CCCED7;font-size:1.1em;margin:0;padding:1em}
-legend{background:#EBEDF4;border:1px solid #CCCED7;font-weight:700;margin:0;padding:.2em .5em;text-align:left}
-input[type="text"],input[type="password"],input[type="file"],textarea {border:1px solid #ccc;}
-select { border:1px solid #ccc;}
-select[disabled="disabled"], input[disabled="disabled"],textarea[disabled="disabled"] {border: 1px solid #CCCCCC;color: #AAAAAA}
-.header_module{background:url(header_module.png);padding-left: 0.5em;padding-top: 0.8em;height:20px;color: #812143;border:solid 1px #CCC;}
-.double_select select{width:300px;height:160px;}
-.double_select a{text-align:center;display:block;border:1px solid #aaa;text-decoration:none;background-color:#fafafa;color:#123456;margin:2px;padding:2px}
-
-/*BUTTON*/
-.button{background: -moz-linear-gradient(center top , #F9F9F9, #E3E3E3) repeat scroll 0 0 transparent; 
-	background: -webkit-gradient(linear, center top ,center bottom, from(#F9F9F9), to(#E3E3E3)) repeat scroll 0 0 transparent;
-	border-color: #CCCCCC #BBBBBB #A0A0A0;border-left: 1px solid #BBBBBB;border-radius: 3px 3px 3px 3px;border-right: 1px solid #BBBBBB;border-style: solid;border-width: 1px;color: #000000;margin: 0; outline: medium none;padding: 3px 8px;text-align: center;vertical-align: middle;white-space: nowrap;}
-.button[disabled=disabled]{color:#8C8C8C}
-input.button[disabled=disabled]:hover{background-color:#FFF6D3}
-.button:hover{border:1px solid #939393;}
-.button:active{border:1px solid #939393;}
-
-#top_container{margin:0;padding:0}
-
-/*HEADER*/
-#header { background-color: #394049; height:114px; }
-#header #header_infos{ position:relative; margin: 0; padding:0; height:84px; }
-#header #header_shopname {float: left; margin:15px 20px 0 20px;}
-#header #employee_links {float: right; display:block; margin:15px 15px 0 15px; }
-#header #employee_links a{ float:left; color:#fff; text-transform:capitalize;}
-#header #employee_links .employee_name { float:left; color:#fff;}
-#header .separator { background: transparent url(separator.png) no-repeat scroll center top; display: block;float: left;height: 19px; width: 16px;}
-#header #header_infos #header_shopname span{display:block; font-size:24px; height:28px; overflow:hidden;margin:0; color:#fff; text-shadow: 0 1px 0 #000000;}
-#header #header_infos #header_logout { background: transparent url(logout.png) no-repeat scroll left top; float:left; padding-left:20px; color:#fff !important; }
-#header #header_infos #header_logout a { color:#fff !important;}
-#header #header_infos #header_logout a span {color:#fff;}
-#header #header_infos #header_foaccess{ text-decoration:none; color:#fff;}
-#header #header_infos #header_foaccess a {color:#fff !important;}
-#header #header_search{ float:left; margin-top:15px; }
-#header #header_search #bo_query{float:left;background: none repeat scroll 0 0 #fff;  border-color: #666666 #CCCCCC #CCCCCC;
-    border-style:solid dotted solid solid;
-    border-width: 1px; color: #333; font: 13px Arial,sans-serif; padding: 4px 1px 4px 4px; width: 180px;
-    box-shadow: 0 1px 0 #444444;}
-#header #header_search #bo_search_type{float:left; margin:0; padding:3px 0 4px; vertical-align:middle;width:auto; border-color: #666666 #CCCCCC #CCCCCC;
-    border-style:solid solid solid none; height:25px;
-    border-width: 1px;}
-#header #header_search #bo_search_submit { border-color: #CCCCCC #BBBBBB; float:left; font-weight:normal; margin:0; padding: 4px 8px 3px;  cursor:pointer; text-shadow: 0 1px 0 #fff; border-bottom-left-radius: 0; border-left: 0 none; border-top-left-radius: 0; }
-#header #header_quick{float:right; display:block; margin-top:15px;}
-#header #header_quick #quick_select{margin:0; padding:3px 0 4px; vertical-align:middle;width:140px; height:25px;}
-#header #header_shoplist{ background-image:none; clear:both; float: right; color:#fff; margin-top:10px; margin-right:15px;}
-#header #header_shoplist span { float:left; padding:3px;}
-#header #header_myaccount{background:url(bg-lang.png) no-repeat;display:block;float:right;height:16px;margin:8px 1px 0 0;width:16px}
-
-
-.path_bar {display:none;}
-#notifs_icon_wrapper {float: left;position: relative;margin:15px 10px 0; width:90px;}
-.notifs { float: left;position: relative;cursor: pointer;margin:0; padding:5px; width: 18px;height: 16px;}
-#orders_notif {background: url("notif_order.png") no-repeat center top;}
-#customers_notif {background: url("notif_customer.png") no-repeat center top;}
-#messages_notif {background: url("notif_message.png") no-repeat center top;}
-#orders_notif.open_notifs,
-#customers_notif.open_notifs,
-#messages_notif.open_notifs { background-color: #FFFFFF;border: 1px solid #000000; position: relative; display: block; background-position:center bottom; }
-
-
-.number_wrapper {color: white;display: none;font-size: 13px;font-weight: bold;position: absolute; right: -8px;top: -10px;z-index: 101;padding: 2px 5px;}
-.number_wrapper span {background-color: #F03D25; font-size:11px; display: block; padding: 1px 3px;border-color: -moz-use-text-color #DD3822 #DD3822;border-radius: 2px 2px 2px 2px;border-right: 1px solid #DD3822;border-style: none solid solid;border-width: 0 0px;}
-.notifs_wrapper {background: none repeat scroll 0 0 #FFFFFF; border: 1px solid #000; border-top:none;display: none; cursor:auto; position: absolute; top: 25px; left: -1px; width:300px; padding: 10px;color: black; z-index:9999;}
-.notifs_wrapper h3 {font-size: 14px;padding-bottom:8px;margin:0;border-bottom: 1px solid #E5E5E5;}
-.notifs_wrapper ul {padding:6px 0;margin:0;}
-.notifs_wrapper ul li {text-decoration: none;list-style: none;font-size:12px;padding:5px 0;}
-#header_infos .notifs_wrapper a {font-weight: bold; font-size:11px; color: black; float:right;}
-.notifs_wrapper p {font-size: 12px;padding-top:8px;margin:0;border-top: 1px solid #E5E5E5;}
-.notifs_wrapper p.no_notifs {border: none;}
-
-
-/*MENU*/
-#header #menu{ background-color: #f8f8f8; border-bottom:1px solid #e5e5e5; float:left;line-height:normal;margin:0;padding:0;width:100%;}
-#header #menu li.maintab{float:left;height:29px;list-style:none;margin:0 1px 0 0;list-style:none;display:block; border-left:1px solid #fff; border-right:1px solid #ccc;}
-#header #menu li#maintab1 { margin-left:20px;}
-#header #menu li.submenu_size .title{cursor:default;color:#000;display:block; padding:8px 6px 4px 0;font-weight:normal;font-size:12px;}
-#header #menu li.submenu_size .title{_display:inline;_padding:6px 5px 4px 0}
-#header #menu li{_height:32px;_padding-top:3px}
-#header #menu img{display:inline;padding:0 3px 0 6px; margin-top:-4px; vertical-align:middle;width:16px;height:16px}
-#header #menu li.active, #header #menu li:hover{background-position:0 -38px;white-space:nowrap;}
-#header #menu li.active a{}
-#header #menu li:hover, #header #menu li.active {background-color:#49B2FF; }
-#header #menu li.active span.title, #header #menu li:hover span.title {color:#fff; text-shadow: -1px -1px 0 #3293D6;}
-#header #menu .withLeftBorder{background:transparent url(separator_subnav.png) no-repeat 0 5px}
-#header #menu .submenu{background:#f8f8f8;clear:both;margin:0;padding:0;border:1px solid #d9d9d9;z-index:9999; box-shadow: 1px 5px 10px #CCCCCC; -moz-box-shadow:1px 5px 10px #CCCCCC; -webkit-box-shadow:1px 5px 10px #CCCCCC;}
-#header #menu .submenu li{list-style:none;margin:0;padding:0;display:block;}
-#header #menu .submenu li a{ font-size:12px;display:block;padding: 5px 15px 5px 10px; color:#666666;border-top:1px solid #fff; border-bottom:1px solid #ccc;}
-#header #menu .submenu li a:hover { background-color:#eee; text-shadow:0 1px 0 #fff;}
-
-/*SEPARATION*/
-.separation { background-color:#ccc;border-bottom:1px solid #fff; width:100%; height:1px; margin:10px 0;}
-
-/*TABLE*/
-.table_grid {width:100%;}
-.table{ background-color:#fff;border:1px solid #ccc;padding:0: border-radius:3px; -moz-border-radius:3px;-webkit-border-radius:3px;}
-.filter {background-color:#f1f9ff;}
-.table th a{text-decoration:underline}
-.table a:hover{text-decoration:none}
-.table tr th{ background-color: #F1F1F1; text-shadow:0 1px 0 #fff; padding:4px 6px;
-	background-image: -moz-linear-gradient(center top , #F9F9F9, #ECECEC);
-	background: -webkit-gradient(linear, center top ,center bottom, from(#F9F9F9), to(#ECECEC)) repeat scroll 0 0 transparent;}
-.table tr td{border-bottom:1px solid #ccc;color:#333;font-size:11px;padding: 2px 4px 2px 6px}
-.table tr.action_details td{background:#FAFAFA;}
-.table tr.alt_row.action_details td{background:#E8E8E8;}
-.table tr td.empty{border-bottom:none;background:white!important}
-.table tr td.first{border-left:1px solid #DEDEDE}
-.table tr td.last{border-right:1px solid #DEDEDE}
-.table tr.small td{height:15px}
-.table tr.last td{border-bottom:none}
-td.col-left {vertical-align:top; padding-right:10px;}
-td.col-left label { display:block; width:100%; text-align:right;}
-.alt_row{background-color:#f8f8f8}
-.path_bar{background-color:#E2EBEE;border:1px solid #999999;font-family:Trebuchet,Arial,Helvetica,sans-serif;font-size:13px;margin-bottom:20px;padding:5px}
-.path_bar a{font-weight:700}
-.cat_bar{background-color:#F4E8CD;border:1px solid #999999;font-family:Trebuchet,Arial,Helvetica,sans-serif;font-size:12px;font-weight:700;margin-bottom:20px;padding:5px}
-.cat_bar a{font-weight:700}
-
-a.action_module{color: #268CCD;text-decoration: underline;}
-a.header_module_toggle{font-weight: bold;color: #268CCD;display:block;}
-a.module_toggle_all{color: #268CCD;}
-.nbr_module{float:right;margin-right:10px;font-style:italic;font-size:12px;color: #268CCD;}
-
-.autoupgradeSteps div {  line-height: 30px; }
-.upgradestep { margin-right: 5px;padding-left: 10px; padding-right: 5px;}
-#upgradeNow.stepok, .autoupgradeSteps a.stepok { background-image: url("../img/admin/enabled.gif");background-position: left center;background-repeat: no-repeat;padding-left: 15px;}
-#upgradeNow {-moz-border-bottom-colors: none;-moz-border-image: none;-moz-border-left-colors: none;-moz-border-right-colors: none;-moz-border-top-colors: none;border-color: #FFF6D3 #DFD5AF #DFD5AF #FFF6D3;border-right: 1px solid #DFD5AF;border-style: solid;border-width: 1px;color: #268CCD;font-size: medium;padding: 5px;}
-.button-autoupgrade {-moz-border-bottom-colors: none;-moz-border-image: none;-moz-border-left-colors: none;-moz-border-right-colors: none;-moz-border-top-colors: none;border-color: #FFF6D3 #DFD5AF #DFD5AF #FFF6D3;border-right: 1px solid #DFD5AF;border-style: solid;border-width: 1px;color: #268CCD;font-size: medium;padding: 5px;}
-.processing {overflow: auto;}
-
-/*TABLE STATUS COMMANDE*/
-.table td span.color_field { font-size:11px; padding:2px 5px; border-radius:3px; text-transform:uppercase; color:#fff; border-radius:3px; -moz-border-radius:3px; -webkit-border-radius:3px;}
-
-/*toolbarBox*/
-.toolbarBox { background-color: #F8F8F8; border: 1px solid #CCCCCC; margin-bottom:10px; padding: 10px 0; border-radius:3px; -moz-border-radius:3px; -webkit-border-radius:3px;}
-.toolbarBox .pageTitle { margin-left:10px; line-height:48px}
-.toolbarBox .pageTitle h3 {font-size: 2em; font-weight: normal; line-height: 48px; margin: 0; padding: 0;}
-.toolbarBox ul.cc_button {float:right;margin:0;padding:0;}
-.toolbarBox ul.cc_button li {color: #666666; float: left; height: 48px; list-style: none outside none; padding: 1px 1px 3px 4px; text-align: center;}
-.toolbarBox a.toolbar_btn {   border-width: 1px;font-size:11px;cursor: pointer; display: block; float: left; padding: 1px 5px; white-space: nowrap; text-shadow: 0 1px 0 #ffffff;;}
-.toolbarBox a.toolbar_btn:hover {}
-.toolbarBox .toolbar_btn span{ display: block;float: none;height: 32px;margin: 0 auto;width: 32px;}
-.toolbarBox .process-icon-delete { background-image: url(process-icon-delete.png);}
-.toolbarBox .process-icon-duplicate { background-image: url(process-icon-duplicate.png);}
-.toolbarBox .process-icon-preview { background-image: url(process-icon-preview.png);}
-.toolbarBox .process-icon-stats { background-image: url(process-icon-stats.png);}
-.toolbarBox .process-icon-cancel { background-image: url(process-icon-cancel.png);}
-.toolbarBox .process-icon-new, .toolbarBox .process-icon-newAttributes{ background-image: url(process-icon-new.png);}
-.toolbarBox .process-icon-save, .toolbarBox .process-icon-save-settings { background-image: url(process-icon-save.png);}
-.toolbarBox .process-icon-save-and-stay { background-image: url(process-icon-save-and-stay.png);}
-.toolbarBox .process-icon-edit { background-image: url(process-icon-edit.png);}
-.toolbarBox .process-icon-back { background-image: url(process-icon-back.png);}
-.toolbarBox .process-icon-refresh-index  { background-image: url(process-icon-refresh-index.png);}
-.toolbarBox .process-icon-refresh-cache  { background-image: url(process-icon-refresh-cache.png);}
-.toolbarBox .process-icon-save-calendar { background-image: url(process-icon-save-calendar.png);}
-.toolbarBox .process-icon-new-module { background-image: url(process-icon-new-module.png);}
-.toolbarBox .process-icon-new-module-addon { background-image: url(process-icon-new-module-addon.png);}
-.toolbarBox .process-icon-save-and-preview { background-image: url(process-icon-preview.png);}
-
-div.fix-toolbar {border-bottom: 1px solid #E0E0E0;position:fixed;top:0;opacity:0.9;z-index:1;}
-
-/*button upload files*/
-.qq-upload-button {background: -moz-linear-gradient(center top , #F9F9F9, #E3E3E3) repeat scroll 0 0 transparent;
-		background: -webkit-gradient(linear, center top ,center bottom, from(#F9F9F9), to(#E3E3E3)) repeat scroll 0 0 transparent;
-	border-color: #CCCCCC #BBBBBB #A0A0A0;border-left: 1px solid #BBBBBB;border-radius: 3px 3px 3px 3px;border-right: 1px solid #BBBBBB;border-style: solid;border-width: 1px;color: #000000;}
-.qq-upload-button:hover { border:1px solid #939393;}
-/*leadin*/
-.leadin { padding:10px;}
-
-/*productBox*/
-#productBox { position:relative; width:100%; float:left;}
-
-/*tab-pane*/
-form#product_form, form#access_form, form#cart_rule_form {   background-color:#ebedf4; border:1px solid #ccced7; min-height:300px; padding: 5px 10px 10px; margin-left:140px;}
-/*form.defaultForm{   background-color:#ebedf4; border:1px solid #ccced7; min-height:300px; padding: 5px 10px 10px;}*/
-.tab-row {}
-.tab-row .tab {background:#EFEFEF;width:100px;}
-.tab-row .tab-page.selected {}
-.tab-row .tab-page {}
-.productTabs{ background-color:#fafafa; border:1px solid #ccced7; border-right:none; float:left; width:140px;}
-.productTabs ul{padding:0;margin:0;}
-.productTabs ul li.tab-row { border:none; }
-.productTabs ul li.tab-row:first-child  a {border-top:none;}
-.productTabs ul li.tab-row a { display:block; font-weight:normal; color:#666;padding: 7px 10px; border-top:1px solid #CCCED7; border-right:1px solid #CCCED7;}
-.productTabs ul li.tab-row a.selected { background-color:#EBEDF4;font-weight:bold;color:#000; border-right:none;}
-.product-tab-content h4.tab { display:none;}
-
-
-/*FILTER MODULE*/
-.filter-module { background-color:#ebedf4; border:1px solid #c2c4d9; margin-top:10px; padding:10px; display:block; min-height:25px;}
-.filter-module #filternameForm {float:left; margin-right:30px;}
-.filter-module label {width:auto;}
-.filter-module .select-filter { float:left;}
-.filter-module .button-filter { float:right;}
-
-/*FILTER STOCK*/
-.filter-stock { background-color:#ebedf4; border:1px solid #c2c4d9; margin-bottom:15px; padding:10px; display:block; min-height:25px;}
-.filter-stock #stock_cover {float:left; margin-right:30px;}
-.filter-stock #stock_instant_state {float:left; margin-right:30px;}
-.filter-stock label {width:auto;}
-.filter-stock .select-filter { float:left;}
-.filter-stock .button-filter { float:right;}
-
-/*ADDONS LOGIN*/
-#addons_login_div { background: #EBEDF4 url(lock.png) no-repeat scroll left 5px;}
-#addons_login_div form#addons_login_form { float:right;}
-#addons_login_div p {float:left; font-size:16px; color:#585A69; line-height:24px; text-shadow: 0 1px 0 #fff; margin:0; padding-left:25px;}
-#addons_login_div label {}
-#addons_login_div input { float:left; margin-right:10px;}
-#addons_login_div input#addons_login_button { margin-right: 0px; }
-
-
-/*SIDEBAR*/
-.sidebar { position:relative; float:left; width:220px; display:inline;}
-.sidebar h3 { background-color:#ebedf4; font-weight:bold; display:block; padding:5px;}
-.sidebar .subHeadline { font-weight:bold; float:right; margin-top:-28px; margin-right:5px;}
-.sidebar ul.categorieList {}
-.sidebar ul.categorieList li { border-top:1px solid #ccc; position:relative; line-height:20px;}
-.sidebar ul.categorieList li:first-child { border-top:none;}
-.sidebar ul.categorieList li a {color:#3a6ea7;}
-.sidebar ul.categorieList li div.categorieWidth { width:180px; margin-left:5px; overflow:hidden;}
-.sidebar ul.categorieList li div.count{ position:absolute; top:0; right:5px;}
-.sidebar .categorieStatus { display:none;}
-
-/*MODULECONTAINER*/
-#moduleContainer { margin-left:220px; padding:13px 0 0 20px;}
-#moduleContainer .table tr th { height:40px;}
-#moduleContainer .table tr td { vertical-align:top; padding: 5px 7px 0; border-top:1px dotted #ccc; border-bottom:none;}
-#moduleContainer .table tr:first-child {border-top:1px solid #ccc}
-#moduleContainer .table tr td .imgm {width:32px;}
-#moduleContainer .moduleDesc { font-size:12px; position:relative; margin-bottom:10px;}
-#moduleContainer .moduleDesc h3 { color:#3A6EA7; margin:0;}
-#moduleContainer .moduleDesc .metadata  { float:left; display:block; margin:5px 0;}
-#moduleContainer .moduleDesc .metadata dl { float:left; margin:0; padding-right:10px;}
-#moduleContainer .moduleDesc .metadata dl dt, .moduleDesc .metadata dl dd { float:left; margin:0; padding:0;}
-#moduleContainer .moduleDesc .metadata dl dd { padding-right:10px;}
-#moduleContainer .moduleDesc .metadata dl dt { font-weight:bold; padding-right:5px;}
-#moduleContainer .moduleDesc p.desc { color:#666; font-size:12px; display:block; clear:both;}
-#moduleContainer .setup  {background-color:#6db300; font-size:10px; color:#fff; text-transform:uppercase; position:relative; left:10px; padding:0px 4px; display: inline-block; border-radius:3px;}
-#moduleContainer .setup.non-install { background-color:#ec7000;}
-#moduleContainer .setup.off{ background-color:#ccc;}
-#moduleContainer .row-actions-module span { padding-right:5px;}
-#moduleContainer .row-actions-module span a { font-size:12px;}
-#moduleContainer .button.uninstalled,
-#moduleContainer .button.installed { float:right; clear:both; margin-top:15px; font-size:12px;}
-#moduleContainer ul.listing-grid-module { position:relative; margin:0; padding:0;}
-#moduleContainer ul.listing-grid-module li { float:left; border:1px solid #ccc; width:400px; min-height:30px; margin:10px; padding:5px; border-radius:4px;}
-#moduleContainer .moduleGridDesc { position:relative; display:block; height:30px;}
-#moduleContainer .moduleGridDesc h3 { color:#3A6EA7; margin:0;}
-#moduleContainer ul.listing-grid-module li select { position:absolute; top:0; right:0px; }
-
-
-/*FOOTER*/
-#footer {height:40px; font-size:12px;clear:both;font-size:0.9em;color:#666666}
-#footer .footer_link, #footer .footer_link:hover {color:#D41958;}

admin-dev/themes/default/css/admin.css

@@ -0,0 +1,465 @@
+body {font-family: Arial, Helvetica, sans-serif;}
+
+
+h1, h2, h3, h4  { font-family: Arial, Helvetica, sans-serif; margin-bottom:.5em; line-height:1.4em; }
+h2  { font-size:1.7em; }
+h3  { font-size:1.25em; }
+h4  { font-size:1.05em; }
+h6  { font-size:1em; }
+
+
+/*LIST*/
+ul,ol {list-style:none; margin: 0; padding: 0;}
+ul li {color:#585A69;}
+
+/*FORM*/
+label {color:#585a69;text-shadow:0 1px 0#fff;}
+fieldset{background-color:#EBEDF4; border:1px solid #CCCED7; color:#585A69; font-size:1.1em;margin:0;padding:1em}
+.Bloc {background-color:#EBEDF4; border:1px solid #CCCED7;font-size:1.1em;margin:0;padding:1em}
+legend{background:#EBEDF4;border:1px solid #CCCED7;font-weight:700;margin:0;padding:.2em .5em;text-align:left}
+input[type="text"],input[type="password"],input[type="file"],textarea {border:1px solid #ccc; background-color:#fff;}
+select { border:1px solid #ccc; font-size: 12px;}
+select[disabled="disabled"], input[disabled="disabled"],textarea[disabled="disabled"], option[disabled="disabled"] {border: 1px solid #CCCCCC;color: #AAAAAA}
+.header_module{background:url('../img/header_module.png');padding-left: 0.5em;padding-top: 0.8em;height:20px;color: #812143;border:solid 1px #CCC;}
+.double_select select{width:300px;height:160px;}
+.double_select a{text-align:center;display:block;border:1px solid #aaa;text-decoration:none;background-color:#fafafa;color:#123456;margin:2px;padding:2px}
+
+/*BUTTON*/
+.button{
+	background: #e3e3e3 url('../img/bg-button-degrade.png') repeat-x scroll left top;
+	background: -moz-linear-gradient(center top , #F9F9F9, #E3E3E3) repeat scroll 0 0 transparent;
+	background: -webkit-gradient(linear, center top ,center bottom, from(#F9F9F9), to(#E3E3E3)) repeat scroll 0 0 transparent;
+	border-color: #CCCCCC #BBBBBB #A0A0A0;border-left: 1px solid #BBBBBB;border-radius: 3px 3px 3px 3px;border-right: 1px solid #BBBBBB;border-style: solid;border-width: 1px;color: #000000;margin: 0; outline: medium none;padding: 3px 8px;text-align: center;vertical-align: middle;white-space: nowrap; text-shadow:0 1px 0 #fff;}
+.button[disabled=disabled]{color:#8C8C8C}
+.button.bt-icon { display:inline-block; margin-bottom:7px;}
+.button.bt-icon span {padding-left:5px;}
+input.button[disabled=disabled]:hover{background-color:#FFF6D3}
+.button:hover{border:1px solid #939393;}
+.button:active{border:1px solid #939393;}
+.button.export-csv span{ background: transparent url('../img/export-csv.png') no-repeat scroll left top; padding:1px 0 1px 20px}
+
+
+#top_container{margin:0;padding:0}
+
+/*HEADER*/
+#header { background-color: #394049; height:114px; }
+#header #header_infos{ position:relative; margin: 0; padding:0; height:84px; }
+#header #header_shopname {float: left; margin:15px 20px 0 20px;}
+#header #employee_links {float: right; display:block; margin:15px 15px 0 15px; }
+#header #employee_links a{ float:left; color:#BABABA; text-transform:capitalize;}
+#header #employee_links a:hover {color:#fff;}
+#header #employee_links .employee_name { float:left; color:#fff;}
+#header .separator { background: transparent url('../img/separator.png') no-repeat scroll center top; display: block;float: left;height: 19px; width: 16px;}
+#header #header_infos #header_shopname span{display:block; font-size:24px; height:28px; overflow:hidden;margin:0; color:#fff; text-shadow: 0 1px 0 #000000;}
+#header #header_infos a#header_logout { background: transparent url('../img/logout.png') no-repeat scroll left top; float:left; padding-left:20px; color:#bababa;}
+#header #header_infos a#header_logout:hover {color:#fff;}
+#header #header_infos #header_logout a span {color:#bababa}
+#header #header_infos #header_foaccess{ text-decoration:none; color:#bababa;}
+#header #header_infos #header_foaccess a {color:#bababa !important;}
+#header #header_infos a#header_foaccess:hover { color:#fff;}
+#header #header_search{ float:left; margin-top:15px; position:relative;  }
+#header #header_search #bo_query{ font: 13px Arial,sans-serif; float:left;background: none repeat scroll 0 0 #fff;  border:1px solid #000; border-radius:4px;  padding: 5px 25px 5px 4px; width: 180px; box-shadow: 0 1px 0 #666;}
+#header #header_search #bo_search_type{ font-size:13px; float:left; margin:0 10px 0 0; padding:3px 0 4px; vertical-align:middle;width:auto; border-color: #666666 #CCCCCC #CCCCCC;border-style:solid solid solid none; height:27px; border-width: 1px;}
+#header #header_search #bo_search_submit { background: transparent url('../img/icon-search.png') no-repeat scroll center; border:none; width:27px; height:27px; float:left; font-weight:normal; margin:0; padding:0;  cursor:pointer; text-indent:-9999em; position:absolute; right:0; display:block; /*hacking ie7*/ font-size:0 !ie7; color: transparent !ie;}
+#header #header_quick{float:right; display:block; margin-top:15px;}
+#header #header_quick #quick_select{ font-size:13px; margin:0 10px 0 0; padding:3px 0 4px; vertical-align:middle;width:140px; height:27px;}
+#header #header_shoplist{ background-image:none; clear:both; float: right; color:#fff; margin-top:10px; margin-right:15px;}
+#header #header_shoplist span { float:left; padding:3px;}
+#header #header_myaccount{background:url('../img/bg-lang.png') no-repeat;display:block;float:right;height:16px;margin:8px 1px 0 0;width:16px}
+
+
+.path_bar {display:none;}
+#notifs_icon_wrapper {float: left;position: relative;margin:15px 10px 0; width:90px;}
+.notifs { float: left;position: relative;cursor: pointer;margin:0; padding:5px; width: 18px;height: 16px;}
+#orders_notif {background: url('../img/notif_order.png') no-repeat center top;}
+#customers_notif {background: url('../img/notif_customer.png') no-repeat center top;}
+#customer_messages_notif {background: url('../img/notif_message.png') no-repeat center top;}
+#orders_notif.open_notifs,
+#customers_notif.open_notifs,
+#customer_messages_notif.open_notifs { background-color: #FFFFFF;border: 1px solid #000000; position: relative; display: block; background-position:center bottom; }
+
+
+.number_wrapper {color: white;display: none;font-size: 13px;font-weight: bold;position: absolute; right: -8px;top: -10px;z-index: 101;padding: 2px 5px;}
+.number_wrapper span {background-color: #F03D25; font-size:11px; display: block; padding: 1px 3px;border-color: -moz-use-text-color #DD3822 #DD3822;border-radius: 2px 2px 2px 2px;border-right: 1px solid #DD3822;border-style: none solid solid;border-width: 0 0px;}
+.notifs_wrapper {background: none repeat scroll 0 0 #FFFFFF; border: 1px solid #000; border-top:none;display: none; cursor:auto; position: absolute; top: 25px; left: -1px; width:300px; padding: 10px;color: black; z-index:9999;}
+.notifs_wrapper h3 {font-size: 14px;padding-bottom:8px;margin:0;border-bottom: 1px solid #E5E5E5;}
+.notifs_wrapper ul {padding:6px 0;margin:0;}
+.notifs_wrapper ul li {text-decoration: none;list-style: none;font-size:12px;padding:5px 0;}
+#header_infos .notifs_wrapper a {font-weight: bold; font-size:11px; color: black; float:right;}
+.notifs_wrapper p {font-size: 12px;padding-top:8px;margin:0;border-top: 1px solid #E5E5E5;}
+.notifs_wrapper p.no_notifs {border: none;}
+
+
+/*MENU*/
+#header #menu{ background-color: #f8f8f8; border-bottom:1px solid #e5e5e5; float:left;line-height:normal;margin:0;padding:0;width:100%;}
+#header #menu li.maintab{float:left;height:29px;list-style:none;margin:0 1px 0 0;list-style:none;display:block; border-left:1px solid #fff; border-right:1px solid #ccc;}
+#header #menu li:first-child { margin-left:15px;}
+#header #menu li.submenu_size .title{cursor:default;color:#000;display:block; padding:8px 6px 4px 0;font-weight:normal;font-size:12px;}
+#header #menu li.submenu_size .title{_display:inline;_padding:6px 5px 4px 0}
+#header #menu li{_height:32px;_padding-top:3px}
+#header #menu img{display:inline;padding:0 3px 0 6px; margin-top:-4px; vertical-align:middle;width:16px;height:16px}
+#header #menu li.active, #header #menu li:hover{background-position:0 -38px;white-space:nowrap;}
+#header #menu li.active a{}
+#header #menu li:hover, #header #menu li.active {background-color:#49B2FF;}
+#header #menu li.maintab:hover, #header #menu li.active {border-left:1px solid #49B2FF;border-right:1px solid #49B2FF;}
+#header #menu li.active span.title, #header #menu li:hover span.title {color:#fff; text-shadow: -1px -1px 0 #3293D6;}
+#header #menu .withLeftBorder{background:transparent url('../img/separator_subnav.png') no-repeat 0 5px}
+#header #menu .submenu{background:#f8f8f8;clear:both;margin:0;padding:0;border:1px solid #d9d9d9;z-index:9999; box-shadow: 1px 5px 5px #CCCCCC; -moz-box-shadow:1px 5px 10px #CCCCCC; -webkit-box-shadow:1px 5px 10px #CCCCCC;}
+#header #menu .submenu li{list-style:none;margin:0;padding:0;display:block;}
+#header #menu .submenu li a{ font-size:12px;display:block;padding: 5px 15px 5px 10px; color:#666666;border-top:1px solid #fff; border-bottom:1px solid #ccc;}
+#header #menu .submenu li a:hover { background-color:#eee; text-shadow:0 1px 0 #fff;}
+
+/*SEPARATION*/
+.separation { background-color:#ccc;border-bottom:1px solid #fff; width:100%; height:1px; margin:10px 0;}
+
+/*TABLE*/
+.table_grid {width:100%;}
+.table{ background-color:#fff;border:1px solid #ccc;padding:0: border-radius:3px; -moz-border-radius:3px;-webkit-border-radius:3px;}
+.filter {background-color:#f1f9ff;}
+.table th a{text-decoration:underline}
+.table a:hover{text-decoration:none}
+.table tr th{ background-color: #F1F1F1; text-shadow:0 1px 0 #fff; padding:4px 6px;
+	background: #ececec url('../img/bg-degrade-table.png') repeat-x scroll left top;
+	background-image: -moz-linear-gradient(center top , #F9F9F9, #ECECEC);
+	background: -webkit-gradient(linear, center top ,center bottom, from(#F9F9F9), to(#ECECEC)) repeat scroll 0 0 transparent;
+	font-size:13px; text-align:left; color:#333;}
+.table tr th.right { text-align:center;}
+.table tr td{border-bottom:1px solid #ccc;color:#333;font-size:12px;padding: 4px 4px 4px 6px;}
+.table tr.row_hover:hover td{background:#fff1b5}
+.table tr.row_hover.filter:hover td{background:#F1F9FF}
+.table tr td.row_hover:hover table tr td{background:none}
+.table tr.action_details td{background:#FAFAFA;}
+.table tr.alt_row.action_details td{background:#E8E8E8;}
+.table tr td.empty{border-bottom:none;background:white!important}
+.table tr td.first{border-left:1px solid #DEDEDE}
+.table tr td.last{border-right:1px solid #DEDEDE}
+.table tr.small td{height:15px}
+.table tr.last td{border-bottom:none}
+td.col-left {vertical-align:top; padding-right:10px;}
+#tabPane1 td.col-left { width:200px;}
+#product-tab-content-wait{display:block;background:url('../img/bg_loaderSpace.png');position:absolute;width:100%;z-index:100;min-height:600px;padding:5px 10px 10px;}
+div#loading{height:128px;width:128px;background:url('../img/ajax-loader.gif');display:block;text-indent:-9999px;margin:100px auto;}
+td.col-left label { display:block; width:100%; text-align:right;}
+.alt_row{background-color:#f8f8f8}
+.path_bar{background-color:#E2EBEE;border:1px solid #999999;font-family:Trebuchet,Arial,Helvetica,sans-serif;font-size:13px;margin-bottom:20px;padding:5px}
+.path_bar a{font-weight:700}
+.cat_bar{background-color:#F4E8CD;border:1px solid #999999;font-family:Trebuchet,Arial,Helvetica,sans-serif;font-size:12px;font-weight:700;margin-bottom:20px;padding:5px}
+.cat_bar a{font-weight:700}
+
+a.action_module{color: #268CCD;text-decoration: underline;}
+a.header_module_toggle{font-weight: bold;color: #268CCD;display:block;}
+a.module_toggle_all{color: #268CCD;}
+.nbr_module{float:right;margin-right:10px;font-style:italic;font-size:12px;color: #268CCD;}
+
+.autoupgradeSteps div {  line-height: 30px; }
+.upgradestep { margin-right: 5px;padding-left: 10px; padding-right: 5px;}
+#upgradeNow.stepok, .autoupgradeSteps a.stepok { background-image: url('../img/admin/enabled.gif');background-position: left center;background-repeat: no-repeat;padding-left: 15px;}
+#upgradeNow {-moz-border-bottom-colors: none;-moz-border-image: none;-moz-border-left-colors: none;-moz-border-right-colors: none;-moz-border-top-colors: none;border-color: #FFF6D3 #DFD5AF #DFD5AF #FFF6D3;border-right: 1px solid #DFD5AF;border-style: solid;border-width: 1px;color: #268CCD;font-size: medium;padding: 5px;}
+.button-autoupgrade {-moz-border-bottom-colors: none;-moz-border-image: none;-moz-border-left-colors: none;-moz-border-right-colors: none;-moz-border-top-colors: none;border-color: #FFF6D3 #DFD5AF #DFD5AF #FFF6D3;border-right: 1px solid #DFD5AF;border-style: solid;border-width: 1px;color: #268CCD;font-size: medium;padding: 5px;}
+.processing {overflow: auto;}
+
+/*UI ACCORDEON*/
+.ui-accordion-header { background-color: #ccc; color:#000;}
+
+/*BLOC*/
+.Bloc { background: none repeat scroll 0 0 #EBEDF4;}
+
+
+/*TABLE STATUS COMMANDE*/
+.table td span.color_field { font-size:11px; padding:2px 5px; border-radius:3px; text-transform:uppercase; color:#fff; border-radius:3px; -moz-border-radius:3px; -webkit-border-radius:3px;}
+
+/*toolbarBox*/
+.toolbarBox { background-color: #F8F8F8; border: 1px solid #CCCCCC; margin-bottom:10px; padding: 10px 0; border-radius:3px; -moz-border-radius:3px; -webkit-border-radius:3px;}
+.toolbarBox .pageTitle { margin-left:10px; line-height:48px}
+.toolbarBox .pageTitle h3 {font-size: 2em; font-weight: normal; line-height: 52px; margin: 0; padding: 0; text-shadow:0 1px 0 #fff;}
+.toolbarBox ul.cc_button {float:right;margin:0 5px 0 0;padding:0;}
+.toolbarBox ul.cc_button li {color: #666666; float: left; height: 48px; list-style: none outside none; padding: 1px 1px 3px 4px; text-align: center;}
+.toolbarBox a.toolbar_btn {   border:1px solid #f8f8f8; min-width:50px; border-width: 1px; font-size:11px;cursor: pointer; display: block; float: left; padding: 3px 5px; white-space: nowrap; text-shadow: 0 1px 0 #ffffff;}
+.toolbarBox a.toolbar_btn:hover { background-color:#fff; border:1px inset #ccc; border-radius:3px;}
+.toolbarBox .toolbar_btn span{ display: block;float: none;height: 32px;margin: 0 auto;width: 32px; /*hacking ie7*/ margin:0 !ie; position:relative !ie;}
+.toolbarBox .process-icon-delete { background-image: url('../img/process-icon-delete.png');}
+.toolbarBox .process-icon-duplicate { background-image: url('../img/process-icon-duplicate.png');}
+.toolbarBox .process-icon-preview { background-image: url('../img/process-icon-preview.png');}
+.toolbarBox .process-icon-stats { background-image: url('../img/process-icon-stats.png');}
+.toolbarBox .process-icon-cancel, .toolbarBox .toolbar-cancel { background-image: url('../img/process-icon-cancel.png');}
+.toolbarBox .process-icon-new, .toolbarBox .toolbar-new{ background-image: url('../img/process-icon-new.png');}
+.toolbarBox .process-icon-save { background-image: url('../img/process-icon-save.png');}
+.toolbarBox .process-icon-save-and-stay { background-image: url('../img/process-icon-save-and-stay.png');}
+.toolbarBox .process-icon-edit { background-image: url('../img/process-icon-edit.png');}
+.toolbarBox .process-icon-back { background-image: url('../img/process-icon-back.png');}
+.toolbarBox .process-icon-refresh-index  { background-image: url('../img/process-icon-refresh-index.png');}
+.toolbarBox .process-icon-refresh-cache  { background-image: url('../img/process-icon-refresh-cache.png');}
+.toolbarBox .process-icon-save-calendar { background-image: url('../img/process-icon-save-calendar.png');}
+.toolbarBox .process-icon-new-module { background-image: url('../img/process-icon-new-module.png');}
+.toolbarBox .process-icon-new-url { background-image: url('../img/process-icon-new-url.png');}
+.toolbarBox .process-icon-new-module-addon { background-image: url('../img/process-icon-new-module-addon.png');}
+.toolbarBox .process-icon-save-and-preview { background-image: url('../img/process-icon-preview.png');}
+.toolbarBox .process-icon-export { background-image: url('../img/process-icon-export-csv.png');}
+.toolbarBox .process-icon-export-all { background-image: url('../img/process-icon-export-csv-details.png');}
+.toolbarBox .process-icon-export-stock-state-quantities-csv { background-image: url('../img/process-icon-export-csv.png');}
+.toolbarBox .process-icon-export-stock-state-prices-csv { background-image: url('../img/process-icon-export-csv-details.png');}
+.toolbarBox .process-icon-export-csv-orders { background-image: url('../img/process-icon-export-csv.png');}
+.toolbarBox .process-icon-export-csv-details { background-image: url('../img/process-icon-export-csv-details.png');}
+.toolbarBox .process-icon-export-stock-mvt-csv { background-image: url('../img/process-icon-export-csv.png');}
+.toolbarBox .process-icon-newAttributes, .toolbarBox .toolbar-new{ background-image: url('../img/process-icon-new.png');}
+.toolbarBox .process-icon-new.add_product{ background-image: url('../img/process-icon-addProduct.png');}
+.toolbarBox .process-icon-partialRefund{ background-image: url('../img/process-icon-partial-refund.png');}
+.toolbarBox .process-icon-standardRefund{ background-image: url('../img/process-icon-standard-refund.png');}
+.toolbarBox .process-icon-help{ background-image: url('../img/process-icon-help.png');}
+.toolbarBox .process-icon-help-new{ background-image: url('../img/process-icon-help-new.png');}
+
+div.fix-toolbar {border-bottom: 1px solid #E0E0E0;position:fixed;top:0;opacity:0.9;z-index:1;}
+
+/*button upload files*/
+.qq-upload-button {
+		background: #e4e4e4 url('../img/bg-button-degrade.png') repeat-x scroll left top;
+		background: -moz-linear-gradient(center top , #F9F9F9, #E3E3E3) repeat scroll 0 0 transparent;
+		background: -webkit-gradient(linear, center top ,center bottom, from(#F9F9F9), to(#E3E3E3)) repeat scroll 0 0 transparent;
+		color:#333; width:180px; font-weight:bold; text-shadow: 0 1px 0 #fff;
+	border-color: #CCCCCC #BBBBBB #A0A0A0;border-left: 1px solid #BBBBBB;border-radius: 3px 3px 3px 3px;border-right: 1px solid #BBBBBB;border-style: solid;border-width: 1px;color: #000000;}
+.qq-upload-button:hover { border:1px solid #939393;}
+
+/*leadin*/
+.leadin {}
+.leadin .bloc-leadin{ padding:10px 3px;}
+
+/*productBox*/
+#productBox { position:relative; width:100%; float:left;}
+
+/*tab-pane*/
+form#product_form, form#access_form, form#cart_rule_form { background-color:#ebedf4; border:1px solid #ccced7; min-height:404px; padding: 5px 10px 10px; margin-left:140px;}
+#content form.adminstockmanagement {margin-left:0px;}
+form#product_form h3 { font-size:14px; font-weight:normal;}
+form#product_form h4 { font-size:18px; font-weight:normal;}
+.tab-row {}
+.tab-row .tab {background:#EFEFEF;width:100px;}
+.tab-row .tab-page.selected {}
+.tab-row .tab-page {}
+.productTabs{ background-color:#fafafa; border:1px solid #ccced7; border-right:none; float:left; width:140px;}
+.productTabs ul{padding:0;margin:0;}
+.productTabs ul li.tab-row { border:none; }
+.productTabs ul li.tab-row:first-child  a {border-top:none;}
+.productTabs ul li.tab-row a { display:block; font-weight:normal; color:#666;padding: 7px 10px; border-top:1px solid #CCCED7; border-right:1px solid #CCCED7;}
+.productTabs ul li.tab-row a.selected { background-color:#EBEDF4;font-weight:bold;color:#000; border-right:none;}
+.product-tab-content h4.tab { display:none;}
+#product_list {margin-bottom:0.5em}
+
+#categories-treeview { }
+#product-tab-content-3-Associations .Association td.col-left  { width:200px;}
+
+/*FILTER MODULE*/
+.filter-module { background-color:#ebedf4; border:1px solid #c2c4d9; margin-top:10px; padding:10px; display:block; min-height:25px;}
+.filter-module #filternameForm {float:left; margin-right:30px;}
+.filter-module label {width:auto;}
+.filter-module .select-filter { float:left;}
+.filter-module .button-filter { float:right;}
+
+/*FILTER STOCK*/
+.filter-stock { background-color:#ebedf4; border:1px solid #c2c4d9; margin-bottom:15px; padding:10px; display:block; min-height:25px;}
+.filter-stock #stock_instant_state {float:left; margin-right:30px;}
+.filter-stock label {width:auto;}
+.filter-stock .select-filter { float:left;}
+.filter-stock .button-filter { float:right;}
+.filter-stock-extended { background-color:#ebedf4; border:1px solid #c2c4d9; margin-bottom:15px; padding:10px; display:block; min-height:65px;}
+.filter-stock-extended #stock_cover {float:left; margin-right:30px;}
+.filter-stock-extended #supply_orders {float:left; margin-right:30px;}
+.filter-stock-extended label {width:auto;}
+.filter-stock-extended .select-filter { float:left;}
+.filter-stock-extended .button-filter { float:right;}
+
+/*ADDONS LOGIN*/
+#addons_login_div { background: #EBEDF4 url('../img/lock.png') no-repeat scroll left 5px;}
+#addons_login_div form#addons_login_form { float:right;}
+#addons_login_div p {float:left; font-size:16px; color:#585A69; line-height:24px; text-shadow: 0 1px 0 #fff; margin:0; padding-left:25px;}
+#addons_login_div label {}
+#addons_login_div input { float:left; margin-right:10px;}
+#addons_login_div input#addons_login_button { margin-right: 0px; }
+
+/*SIDEBAR*/
+.sidebar { position:relative; float:left; width:220px; display:inline;}
+.sidebar h3 { background-color:#ebedf4; font-weight:bold; display:block; padding:5px;}
+.sidebar.navigation h3 {margin:0;}
+.sidebar .subHeadline { font-weight:bold; float:right; margin-top:-28px; margin-right:5px;}
+.sidebar ul.categorieList {}
+.sidebar ul.categorieList li { border-top:1px solid #ccc; position:relative; line-height:20px;}
+.sidebar ul.categorieList li:first-child { border-top:none;}
+.sidebar ul.categorieList li a {color:#3a6ea7; display:block; padding-left:5px;}
+.sidebar ul.categorieList li a:hover { background-color: #EBEDF4;}
+.sidebar ul.categorieList li div.categorieWidth { width:180px; margin-left:5px; overflow:hidden;}
+.sidebar ul.categorieList li div.count{ position:absolute; top:0; right:5px;}
+.sidebar .categorieStatus { display:none;}
+
+/*NAVIGATION ENGINE*/
+.blocEngine { background-color:#eee;}
+.blocEngine .rowForm {    display: block;float: left;margin: 0; padding: 5px 0; }
+.blocEngine .rowForm label { font-weight:normal;}
+.blocEngine .rowForm label,
+.blocEngine .rowForm select {width:220px; float:left; text-align:left;}
+
+.blocEngine p { margin-top:10px;display:block; float:left;}
+
+/*STATCONTAINER*/
+#statsContainer {margin-left:220px; padding:0 0 0 20px;}
+#statsContainer #calendar,
+#referrersContainer #calendar{   background-color: #EEEEEE;border-top: 1px solid #CCCCCC; display: block; margin: 10px 0;min-height: 25px; padding: 5px;}
+#statsContainer #calendar form,
+#referrersContainer #calendar form {float:left;}
+#statsContainer #calendar input, #statsContainer #calendar p,
+#referrersContainer #calendar input, #referrersContainer #calendar p { float:left;}
+#statsContainer #calendar input.submitDateDay, #referrersContainer #calendar input.submitDateDay { border-top-right-radius: 0px; border-bottom-right-radius:0px; border-right:none;}
+#statsContainer #calendar input.submitDateMonth, #statsContainer #calendar input.submitDateMonth,
+#referrersContainer #calendar input.submitDateMonth, #referrersContainer #calendar input.submitDateMonth { border-radius:0px;}
+#statsContainer #calendar input.submitDateYear,
+#referrersContainer #calendar input.submitDateYear { border-top-left-radius: 0px; border-bottom-left-radius:0px; border-left:none; margin-right:10px;}
+#statsContainer #calendar input.submitDateDayPrev,
+#referrersContainer #calendar input.submitDateDayPrev { border-top-right-radius: 0px; border-bottom-right-radius:0px; border-right:none;}
+#statsContainer #calendar input.submitDateMonthPrev,
+#referrersContainer #calendar input.submitDateMonthPrev { border-radius:0px;}
+#statsContainer #calendar input.submitDateYearPrev,
+#referrersContainer #calendar input.submitDateYearPrev { border-top-left-radius: 0px; border-bottom-left-radius:0px; border-left:none; margin-right:10px;}
+#statsContainer #calendar p, #referrersContainer #calendar p { margin:2px;}
+#statsContainer #calendar p span, #referrersContainer #calendar p span { float:left; display:block; padding:3px;}
+#statsContainer .blocStats { background-color: #EBEDF4;border: 1px solid #C2C4D9; display: block; position:relative; padding: 10px;}
+#statsContainer .blocStats h2 { font-weight:normal; margin:0;}
+#statsContainer .blocStats h2.icon-statsproduct span,
+#statsContainer .blocStats h2.icon-statsbestsuppliers span,
+#statsContainer .blocStats h2.icon-statsforecast span,
+#statsContainer .blocStats h2.icon-pagesnotfound span,
+#statsContainer .blocStats h2.icon-sekeywords span,
+#statsContainer .blocStats h2.icon-guide span,
+#statsContainer .blocStats h2.icon-statsequipment span,
+#statsContainer .blocStats h2.icon-statsvisits span,
+#statsContainer .blocStats h2.icon-statssales span,
+#statsContainer .blocStats h2.icon-statsregistrations span,
+#statsContainer .blocStats h2.icon-statspersonalinfos span,
+#statsContainer .blocStats h2.icon-statscatalog span,
+#statsContainer .blocStats h2.icon-basket-delete span,
+#statsContainer .blocStats h2.icon-statsbestcustomers span,
+#statsContainer .blocStats h2.icon-statsorigin span,
+#statsContainer .blocStats h2.icon-statsbestproducts span,
+#statsContainer .blocStats h2.icon-statsbestvouchers span,
+#statsContainer .blocStats h2.icon-statsbestcategories span,
+#statsContainer .blocStats h2.icon-statscarrier span,
+#statsContainer .blocStats h2.icon-statssearch span,
+#statsContainer .blocStats h2.icon-statsstock span,
+#statsContainer .blocStats h2.icon-conversion span,
+#statsContainer .blocStats h2.icon-payment span,
+#statsContainer .blocStats h2.icon-category span,
+#statsContainer .blocStats h2.icon-currency span,
+#statsContainer .blocStats h2.icon-language span,
+#statsContainer .blocStats h2.icon-attribute span { background: transparent url('../img/icon-sprites-title.png') no-repeat scroll left top; width:16px; height:16px; padding-right:18px; margin-right:3px;}
+
+#statsContainer .blocStats h2.icon-statsproduct span { background-position :2px 2px;}
+#statsContainer .blocStats h2.icon-statsforecast span { background-position :-18px 2px;}
+#statsContainer .blocStats h2.icon-guide span { background-position :-36px 2px;}
+#statsContainer .blocStats h2.icon-statsbestsuppliers span { background-position :-54px 2px;}
+#statsContainer .blocStats h2.icon-pagesnotfound span { background-position :-72px 2px;}
+#statsContainer .blocStats h2.icon-sekeywords span { background-position :-90px 2px;}
+#statsContainer .blocStats h2.icon-statsequipment span { background-position :-108px 2px;}
+#statsContainer .blocStats h2.icon-statsvisits span { background-position :-126px 2px;}
+#statsContainer .blocStats h2.icon-statsregistrations span { background-position :-147px 2px;}
+#statsContainer .blocStats h2.icon-statssales span { background-position : 0 -16px;}
+#statsContainer .blocStats h2.icon-statspersonalinfos span { background-position : -18px -16px;}
+#statsContainer .blocStats h2.icon-statscatalog span { background-position : -36px -16px;}
+#statsContainer .blocStats h2.icon-category span { background-position : -36px -16px;}
+#statsContainer .blocStats h2.icon-basket-delete span { background-position : -54px -16px;}
+#statsContainer .blocStats h2.icon-statsbestcustomers span { background-position : -72px -16px;}
+#statsContainer .blocStats h2.icon-statsorigin span { background-position : -90px -16px;}
+#statsContainer .blocStats h2.icon-statsbestproducts span { background-position : -108px -16px;}
+#statsContainer .blocStats h2.icon-statsbestvouchers span { background-position : -126px -16px;}
+#statsContainer .blocStats h2.icon-statsbestcategories span { background-position : -147px -17px;}
+#statsContainer .blocStats h2.icon-statscarrier span { background-position : 2px -36px;}
+#statsContainer .blocStats h2.icon-statssearch span { background-position : -18px -36px;}
+#statsContainer .blocStats h2.icon-statsstock span { background-position : -36px -36px;}
+#statsContainer .blocStats h2.icon-conversion span { background-position : -54px -36px;}
+#statsContainer .blocStats h2.icon-payment span { background-position : -72px -36px;}
+#statsContainer .blocStats h2.icon-currency span { background-position : -90px -36px;}
+#statsContainer .blocStats h2.icon-language span { background-position : -106px -36px;}
+#statsContainer .blocStats h2.icon-attribute span { background-position : -126px -36px;}
+#statsContainer .blocStats form { position:absolute; top:10px; right:5px;}
+#statsContainer .blocStats form.checkup { position:relative; top:0; left:0;}
+#statsContainer .totalStats { font-size:16px; font-weight:bold;}
+#statsContainer .blocStats .blocConversion { display:block; display:inline-table; min-height:80px !ie; }
+
+/*MODULECONTAINER*/
+#moduleContainer { margin-left:220px; padding:13px 0 0 20px;}
+#moduleContainer .table tr th { height:40px;}
+#moduleContainer .table tr td { vertical-align:top; padding: 5px 7px 0; border-top:1px dotted #ccc; border-bottom:none;}
+#moduleContainer .table tr:first-child {border-top:1px solid #ccc}
+#moduleContainer .table tr td .imgm {width:32px;}
+#moduleContainer .moduleDesc { font-size:12px; position:relative; margin-bottom:10px;}
+#moduleContainer .moduleDesc h3 { color:#3A6EA7; margin:0;}
+#moduleContainer .moduleDesc .metadata  { float:left; display:block; margin:5px 0;}
+#moduleContainer .moduleDesc .metadata dl { float:left; margin:0; padding-right:10px;}
+#moduleContainer .moduleDesc .metadata dl dt, .moduleDesc .metadata dl dd { float:left; margin:0; padding:0;}
+#moduleContainer .moduleDesc .metadata dl dd { padding-right:10px;}
+#moduleContainer .moduleDesc .metadata dl dt { font-weight:bold; padding-right:5px;}
+#moduleContainer .moduleDesc p.desc { color:#666; font-family: Georgia; font-style: italic;  font-size:12px; display:block; clear:both;}
+#moduleContainer .setup  {background-color:#6db300; font-weight:bold; font-size:10px; color:#fff; text-transform:uppercase; position:relative; left:10px; padding:0px 4px; display: inline-block; border-radius:3px;}
+#moduleContainer .setup.non-install { background-color:#ec7000;}
+#moduleContainer .setup.off{ background-color:#ccc;}
+#moduleContainer .row-actions-module span { padding-right:5px;}
+#moduleContainer .row-actions-module span a { font-size:12px;}
+#moduleContainer .button.uninstalled,
+#moduleContainer .button.installed { float:right; clear:both; margin-top:15px; font-size:12px;}
+#moduleContainer ul.listing-grid-module { position:relative; margin:0; padding:0;}
+#moduleContainer ul.listing-grid-module li { float:left; border:1px solid #ccc; width:400px; min-height:30px; margin:10px; padding:5px; border-radius:4px;}
+#moduleContainer .moduleGridDesc { position:relative; display:block; height:30px;}
+#moduleContainer .moduleGridDesc h3 { color:#3A6EA7; margin:0;}
+#moduleContainer ul.listing-grid-module li select { position:absolute; top:0; right:0px; }
+
+/*MODULE POSITION*/
+.blocLiveEdit { float:right; clear:right;  background-color: #EBEDF4; border: 1px solid #C2C4D9;display: block;  width:250px;}
+.blocLiveEdit h2 { background: transparent url('../img/live_edit.png') no-repeat scroll 10px 10px; height: 40px; line-height: 50px;margin: 0; padding: 0 10px; text-indent: 40px;}
+.blocLiveEdit p { padding: 0 10px;}
+.blocLiveEdit a.button {float: left; margin:10px; display: inline-block;}
+
+
+#modulePosition { width:100%; float:left; clear:left;}
+#modulePosition .table tr th { height:40px;}
+#modulePosition form{ margin-right:270px;}
+#modulePosition .lab_modules_positions h3 { color:#3A6EA7; margin:0 0 0 10px; float:left;}
+#modulePosition .lab_modules_positions p { font-family:Georgia; font-style: italic; font-size:12px; padding-left:40px;}
+#modulePosition .lab_modules_positions span { font-size:12px; padding-left:5px;}
+
+select#show_modules { font-size:12px;}
+
+label.text { padding:1px 12px 0 0;}
+label.radioCheck {font-weight:normal; padding:0; float:none; margin:0 1em 0 0.25em}
+
+.listForm {}
+ul.listForm {}
+ul.listForm li {padding-bottom:3px;}
+
+
+/*FOOTER*/
+#footer {height:40px; font-size:12px;clear:both;font-size:0.9em;color:#666666}
+#footer .footerLeft { float:left; margin-left:10px;}
+#footer .footerRight {float:right; margin-right:10px;}
+#footer .footer_link, #footer .footer_link:hover { color:#268CCD;}
+
+/*DASHBOARD*/
+.pageTitleHome { font-size: 1.6em; font-weight: normal; margin:0; padding:10px 0;}
+.pageTitleHome h3 { font-weight: normal; margin:0;}
+#dashboard {  background-color: #EBEDF4; border: 1px solid #C2C4D9; display: block; padding: 10px; position: relative; min-width:1200px;}
+#dashboard h2 {font-size: 1.4em; font-weight:normal; margin:0 0 15px 0;}
+#iframe {}
+#iframe #video-content { float:left;}
+#iframe {position:relative; display:block; min-height:180px;}
+#adminpresentation #video { float:left; padding-right:15px; min-height:150px;}
+#adminpresentation #video a { position:relative; height:128px; width:220px; display:block; padding:6px; }
+#adminpresentation #video a img { }
+#adminpresentation #video a span {background: transparent url("../img/play.png") no-repeat scroll left top; height:128px; width:220px; position:absolute; top:0; left:0; z-index:1; display:block; border:6px solid #fff; border-radius:3px; }
+#adminpresentation #video a span:hover {background-position:left bottom;border:6px solid #C2C4D9; transition:background 0.5s;}
+#adminpresentation #video-content { padding-left:10px; min-height:150px;  }
+#adminpresentation #video-content p { font-size:20px; line-height: 26px; color:#585A69; text-shadow: 0 1px 0 #fff;}
+
+.view-modules { float:right; margin: 10px 0;}
+.view-modules li { float:left;}
+.view-modules li img { padding-right:5px;}
+.view-modules li.normal-view-disabled {     background: -moz-linear-gradient(center top ,#cccccc, #F9F9F9 ) repeat scroll 0 0 transparent; border-bottom-right-radius: 0; border-right: 1px solid #ccc; border-top-right-radius: 0; color:#999;  }
+.view-modules li.favorites-view-disabled {     background: -moz-linear-gradient(center top ,#cccccc, #F9F9F9 ) repeat scroll 0 0 transparent; border-bottom-left-radius: 0; border-left: 1px solid #fff; border-top-left-radius: 0; color:#999;  }
+.view-modules li.normal-view-disabled:hover,
+.view-modules li.favorites-view-disabled:hover {border-color: #CCCCCC #BBBBBB #A0A0A0;}
+.view-modules li.favorites-view   {border-bottom-left-radius: 0;border-left: 1px solid #fff; border-top-left-radius: 0;}
+.view-modules li.normal-view  {border-bottom-right-radius: 0;border-right: 1px solid #ccc; border-top-right-radius: 0;}

admin-dev/themes/default/css/index.php

@@ -0,0 +1,36 @@
+<?php
+/*
+* 2007-2011 PrestaShop 
+*
+* NOTICE OF LICENSE
+*
+* This source file is subject to the Open Software License (OSL 3.0)
+* that is bundled with this package in the file LICENSE.txt.
+* It is also available through the world-wide-web at this URL:
+* http://opensource.org/licenses/osl-3.0.php
+* If you did not receive a copy of the license and are unable to
+* obtain it through the world-wide-web, please send an email
+* to license@prestashop.com so we can send you a copy immediately.
+*
+* DISCLAIMER
+*
+* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+* versions in the future. If you wish to customize PrestaShop for your
+* needs please refer to http://www.prestashop.com for more information.
+*
+*  @author PrestaShop SA <contact@prestashop.com>
+*  @copyright  2007-2011 PrestaShop SA
+*  @version  Release: $Revision: 8667 $
+*  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*/
+				    	
+header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
+header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
+						
+header("Cache-Control: no-store, no-cache, must-revalidate");
+header("Cache-Control: post-check=0, pre-check=0", false);
+header("Pragma: no-cache");
+						
+header("Location: ../");
+exit;

admin-dev/themes/default/css/modules.css

@@ -18,7 +18,7 @@ legend{background:#EBEDF4;border:1px solid #CCCED7;font-weight:700;margin:0;padd
 input[type="text"],input[type="password"],input[type="file"],textarea {border:1px solid #ccc;}
 select { border:1px solid #ccc;}
 select[disabled="disabled"], input[disabled="disabled"],textarea[disabled="disabled"] {border: 1px solid #CCCCCC;color: #AAAAAA}
-.header_module{background:url(header_module.png);padding-left: 0.5em;padding-top: 0.8em;height:20px;color: #812143;border:solid 1px #CCC;}
+.header_module{background:url('../img/header_module.png');padding-left: 0.5em;padding-top: 0.8em;height:20px;color: #812143;border:solid 1px #CCC;}
 
 /*BUTTON*/
 .button{background: -moz-linear-gradient(center top , #F9F9F9, #E3E3E3) repeat scroll 0 0 transparent; 
@@ -38,9 +38,9 @@ input.button[disabled=disabled]:hover{background-color:#FFF6D3}
 #header #employee_links {float: right; display:block; margin:15px 15px 0 15px; }
 #header #employee_links a{ float:left; color:#fff; text-transform:capitalize;}
 #header #employee_links .employee_name { float:left; color:#fff;}
-#header .separator { background: transparent url(separator.png) no-repeat scroll center top; display: block;float: left;height: 19px; width: 16px;}
+#header .separator { background: transparent url('../img/separator.png') no-repeat scroll center top; display: block;float: left;height: 19px; width: 16px;}
 #header #header_infos #header_shopname span{display:block; font-size:24px; height:28px; overflow:hidden;margin:0; color:#fff; text-shadow: 0 1px 0 #000000;}
-#header #header_infos #header_logout { background: transparent url(logout.png) no-repeat scroll left top; float:left; padding-left:20px; color:#fff !important; }
+#header #header_infos #header_logout { background: transparent url('../img/logout.png') no-repeat scroll left top; float:left; padding-left:20px; color:#fff !important; }
 #header #header_infos #header_logout a { color:#fff !important;}
 #header #header_infos #header_logout a span {color:#fff;}
 #header #header_infos #header_foaccess{ text-decoration:none; color:#fff;}
@@ -58,15 +58,15 @@ input.button[disabled=disabled]:hover{background-color:#FFF6D3}
 #header #header_quick #quick_select{margin:0; padding:3px 0 4px; vertical-align:middle;width:140px; height:25px;}
 #header #header_shoplist{ background-image:none; clear:both; float: right; color:#fff; margin-top:10px; margin-right:15px;}
 #header #header_shoplist span { float:left; padding:3px;}
-#header #header_myaccount{background:url(bg-lang.png) no-repeat;display:block;float:right;height:16px;margin:8px 1px 0 0;width:16px}
+#header #header_myaccount{background:url('../img/bg-lang.png') no-repeat;display:block;float:right;height:16px;margin:8px 1px 0 0;width:16px}
 
 
 .path_bar {display:none;}
 #notifs_icon_wrapper {float: left;position: relative;margin:15px 10px 0; width:90px;}
 .notifs { float: left;position: relative;cursor: pointer;margin:0; padding:5px; width: 18px;height: 16px;}
-#orders_notif {background: url("notif_order.png") no-repeat center top;}
-#customers_notif {background: url("notif_customer.png") no-repeat center top;}
-#messages_notif {background: url("notif_message.png") no-repeat center top;}
+#orders_notif {background: url('../img/notif_order.png') no-repeat center top;}
+#customers_notif {background: url('../img/notif_customer.png') no-repeat center top;}
+#messages_notif {background: url('../img/notif_message.png') no-repeat center top;}
 #orders_notif.open_notifs,
 #customers_notif.open_notifs,
 #messages_notif.open_notifs { background-color: #FFFFFF;border: 1px solid #000000; position: relative; display: block; background-position:center bottom; }
@@ -95,7 +95,7 @@ input.button[disabled=disabled]:hover{background-color:#FFF6D3}
 #header #menu li.active a{}
 #header #menu li:hover, #header #menu li.active {background-color:#49B2FF; }
 #header #menu li.active span.title, #header #menu li:hover span.title {color:#fff; text-shadow: -1px -1px 0 #3293D6;}
-#header #menu .withLeftBorder{background:transparent url(separator_subnav.png) no-repeat 0 5px}
+#header #menu .withLeftBorder{background:transparent url('../img/separator_subnav.png') no-repeat 0 5px}
 #header #menu .submenu{background:#f8f8f8;clear:both;margin:0;padding:0;border:1px solid #d9d9d9;z-index:9999; box-shadow: 1px 5px 10px #CCCCCC; -moz-box-shadow:1px 5px 10px #CCCCCC; -webkit-box-shadow:1px 5px 10px #CCCCCC;}
 #header #menu .submenu li{list-style:none;margin:0;padding:0;display:block;}
 #header #menu .submenu li a{ font-size:12px;display:block;padding: 5px 15px 5px 10px; color:#666666;border-top:1px solid #fff; border-bottom:1px solid #ccc;}
@@ -136,7 +136,7 @@ a.module_toggle_all{color: #268CCD;}
 
 .autoupgradeSteps div {  line-height: 30px; }
 .upgradestep { margin-right: 5px;padding-left: 10px; padding-right: 5px;}
-#upgradeNow.stepok, .autoupgradeSteps a.stepok { background-image: url("../img/admin/enabled.gif");background-position: left center;background-repeat: no-repeat;padding-left: 15px;}
+#upgradeNow.stepok, .autoupgradeSteps a.stepok { background-image: url('../img/admin/enabled.gif');background-position: left center;background-repeat: no-repeat;padding-left: 15px;}
 #upgradeNow {-moz-border-bottom-colors: none;-moz-border-image: none;-moz-border-left-colors: none;-moz-border-right-colors: none;-moz-border-top-colors: none;border-color: #FFF6D3 #DFD5AF #DFD5AF #FFF6D3;border-right: 1px solid #DFD5AF;border-style: solid;border-width: 1px;color: #268CCD;font-size: medium;padding: 5px;}
 .button-autoupgrade {-moz-border-bottom-colors: none;-moz-border-image: none;-moz-border-left-colors: none;-moz-border-right-colors: none;-moz-border-top-colors: none;border-color: #FFF6D3 #DFD5AF #DFD5AF #FFF6D3;border-right: 1px solid #DFD5AF;border-style: solid;border-width: 1px;color: #268CCD;font-size: medium;padding: 5px;}
 .processing {overflow: auto;}
@@ -153,21 +153,21 @@ a.module_toggle_all{color: #268CCD;}
 .toolbarBox a.toolbar_btn {   border-width: 1px;font-size:11px;cursor: pointer; display: block; float: left; padding: 1px 5px; white-space: nowrap; text-shadow: 0 1px 0 #ffffff;;}
 .toolbarBox a.toolbar_btn:hover {}
 .toolbarBox .toolbar_btn span{ display: block;float: none;height: 32px;margin: 0 auto;width: 32px;}
-.toolbarBox .process-icon-delete { background-image: url(process-icon-delete.png);}
-.toolbarBox .process-icon-duplicate { background-image: url(process-icon-duplicate.png);}
-.toolbarBox .process-icon-preview { background-image: url(process-icon-preview.png);}
-.toolbarBox .process-icon-stats { background-image: url(process-icon-stats.png);}
-.toolbarBox .process-icon-cancel { background-image: url(process-icon-cancel.png);}
-.toolbarBox .process-icon-new, .toolbarBox .process-icon-newAttributes{ background-image: url(process-icon-new.png);}
-.toolbarBox .process-icon-save, .toolbarBox .process-icon-save-settings { background-image: url(process-icon-save.png);}
-.toolbarBox .process-icon-save-and-stay { background-image: url(process-icon-save-and-stay.png);}
-.toolbarBox .process-icon-edit { background-image: url(process-icon-edit.png);}
-.toolbarBox .process-icon-back { background-image: url(process-icon-back.png);}
-.toolbarBox .process-icon-refresh-index  { background-image: url(process-icon-refresh-index.png);}
-.toolbarBox .process-icon-refresh-cache  { background-image: url(process-icon-refresh-cache.png);}
-.toolbarBox .process-icon-save-calendar { background-image: url(process-icon-save-calendar.png);}
-.toolbarBox .process-icon-new-module { background-image: url(process-icon-new-module.png);}
-.toolbarBox .process-icon-new-module-addon { background-image: url(process-icon-new-module-addon.png);}
+.toolbarBox .process-icon-delete { background-image: url('../img/process-icon-delete.png');}
+.toolbarBox .process-icon-duplicate { background-image: url('../img/process-icon-duplicate.png');}
+.toolbarBox .process-icon-preview { background-image: url('../img/process-icon-preview.png');}
+.toolbarBox .process-icon-stats { background-image: url('../img/process-icon-stats.png');}
+.toolbarBox .process-icon-cancel { background-image: url('../img/process-icon-cancel.png');}
+.toolbarBox .process-icon-new, .toolbarBox .process-icon-newAttributes{ background-image: url('../img/process-icon-new.png');}
+.toolbarBox .process-icon-save, .toolbarBox .process-icon-save-settings { background-image: url('../img/process-icon-save.png');}
+.toolbarBox .process-icon-save-and-stay { background-image: url('../img/process-icon-save-and-stay.png');}
+.toolbarBox .process-icon-edit { background-image: url('../img/process-icon-edit.png');}
+.toolbarBox .process-icon-back { background-image: url('../img/process-icon-back.png');}
+.toolbarBox .process-icon-refresh-index  { background-image: url('../img/process-icon-refresh-index.png');}
+.toolbarBox .process-icon-refresh-cache  { background-image: url('../img/process-icon-refresh-cache.png');}
+.toolbarBox .process-icon-save-calendar { background-image: url('../img/process-icon-save-calendar.png');}
+.toolbarBox .process-icon-new-module { background-image: url('../img/process-icon-new-module.png');}
+.toolbarBox .process-icon-new-module-addon { background-image: url('../img/process-icon-new-module-addon.png');}
 
 div.fix-toolbar {border-bottom: 1px solid #E0E0E0;position:fixed;top:0;opacity:0.9;z-index:1;}
 

admin-dev/themes/default/img/index.php

@@ -0,0 +1,36 @@
+<?php
+/*
+* 2007-2011 PrestaShop 
+*
+* NOTICE OF LICENSE
+*
+* This source file is subject to the Open Software License (OSL 3.0)
+* that is bundled with this package in the file LICENSE.txt.
+* It is also available through the world-wide-web at this URL:
+* http://opensource.org/licenses/osl-3.0.php
+* If you did not receive a copy of the license and are unable to
+* obtain it through the world-wide-web, please send an email
+* to license@prestashop.com so we can send you a copy immediately.
+*
+* DISCLAIMER
+*
+* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+* versions in the future. If you wish to customize PrestaShop for your
+* needs please refer to http://www.prestashop.com for more information.
+*
+*  @author PrestaShop SA <contact@prestashop.com>
+*  @copyright  2007-2011 PrestaShop SA
+*  @version  Release: $Revision: 8667 $
+*  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*/
+				    	
+header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
+header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
+						
+header("Cache-Control: no-store, no-cache, must-revalidate");
+header("Cache-Control: post-check=0, pre-check=0", false);
+header("Pragma: no-cache");
+						
+header("Location: ../");
+exit;

admin-dev/themes/default/template/content.tpl

@@ -0,0 +1,29 @@
+{*
+* 2007-2011 PrestaShop 
+*
+* NOTICE OF LICENSE
+*
+* This source file is subject to the Academic Free License (AFL 3.0)
+* that is bundled with this package in the file LICENSE.txt.
+* It is also available through the world-wide-web at this URL:
+* http://opensource.org/licenses/afl-3.0.php
+* If you did not receive a copy of the license and are unable to
+* obtain it through the world-wide-web, please send an email
+* to license@prestashop.com so we can send you a copy immediately.
+*
+* DISCLAIMER
+*
+* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+* versions in the future. If you wish to customize PrestaShop for your
+* needs please refer to http://www.prestashop.com for more information.
+*
+*  @author PrestaShop SA <contact@prestashop.com>
+*  @copyright  2007-2011 PrestaShop SA
+*  @version  Release: $Revision$
+*  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*}
+
+{if isset($content)}
+	{$content}
+{/if}

admin-dev/themes/default/template/controllers/access/helpers/form/form.tpl

@@ -0,0 +1,391 @@
+{*
+* 2007-2011 PrestaShop
+*
+* NOTICE OF LICENSE
+*
+* This source file is subject to the Academic Free License (AFL 3.0)
+* that is bundled with this package in the file LICENSE.txt.
+* It is also available through the world-wide-web at this URL:
+* http://opensource.org/licenses/afl-3.0.php
+* If you did not receive a copy of the license and are unable to
+* obtain it through the world-wide-web, please send an email
+* to license@prestashop.com so we can send you a copy immediately.
+*
+* DISCLAIMER
+*
+* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+* versions in the future. If you wish to customize PrestaShop for your
+* needs please refer to http://www.prestashop.com for more information.
+*
+*  @author PrestaShop SA <contact@prestashop.com>
+*  @copyright  2007-2011 PrestaShop SA
+*  @version  Release: $Revision: 8971 $
+*  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*}
+<script type="text/javascript">
+	$(document).ready(function() {
+
+		$('div.productTabs').find('a').each(function() {
+			$(this).attr('href', '#');
+		});
+
+		$('div.productTabs a').click(function() {
+			var id = $(this).attr('id');
+			$('.nav-profile').removeClass('selected');
+			$(this).addClass('selected');
+			$('.tab-profile').hide()
+			$('.'+id).show();
+		});
+
+		$('.ajaxPower').change(function(){
+			var tout = $(this).attr('rel').split('||');
+			var id_tab = tout[0];
+			var id_profile = tout[1];
+			var perm = tout[2];
+			var enabled = $(this).is(':checked')? 1 : 0;
+			var tabsize = tout[3];
+			var tabnumber = tout[4];
+			var table = 'table#table_'+id_profile;
+
+			perfect_access_js_gestion(this, perm, id_tab, tabsize, tabnumber, table);
+			
+			$.ajax({
+				url: "{$link->getAdminLink('AdminAccess')}",
+				cache: false,
+				data : {
+					ajaxMode : '1',
+					id_tab: id_tab,
+					id_profile: id_profile,
+					perm: perm,
+					enabled: enabled,
+					submitAddAccess: '1',
+					action: 'updateAccess',
+					ajax: '1',
+					token: '{getAdminToken tab='AdminAccess'}',
+				},
+				success : function(res,textStatus,jqXHR)
+				{
+					try
+					{
+						if (res == 'ok')
+							showSuccessMessage("{l s='Update successful'}");
+						else
+							showErrorMessage("{l s='Update error'}");
+					}
+					catch(e)
+					{
+						jAlert('Technical error');
+					}
+				}
+			});
+		});
+
+		$(".changeModuleAccess").change(function(){
+			var tout = $(this).attr('rel').split('||');
+			var id_module = tout[0];
+			var perm = tout[1];
+			var id_profile = tout[2];
+			var enabled = $(this).is(':checked')? 1 : 0;
+			var table = 'table#table_module_'+id_profile;
+
+			if (id_module == -1)
+				$(table+' .ajax-ma-'+perm).each(function(key, value) {
+					$(this).attr("checked", enabled);
+				});
+			else if (!enabled)
+				$(table+' #ajax-ma-'+perm+'-master').each(function(key, value) {
+					$(this).attr("checked", enabled);
+				});
+
+			$.ajax({
+				url: "{$link->getAdminLink('AdminAccess')}",
+				cache: false,
+				data : {
+					ajaxMode: '1',
+					id_module: id_module,
+					perm: perm,
+					enabled: enabled,
+					id_profile: id_profile,
+					changeModuleAccess: '1',
+					action: 'updateModuleAccess',
+					ajax: '1',
+					token: '{getAdminToken tab='AdminAccess'}',
+				},
+				success : function(res,textStatus,jqXHR)
+				{
+					try
+					{
+						if (res == 'ok')
+							showSuccessMessage("{l s='Update successful'}");
+						else
+							showErrorMessage("{l s='Update error'}");
+					}
+					catch(e)
+					{
+						jAlert('Technical error');
+					}
+				}
+			});
+		});
+
+	});
+
+</script>
+
+
+<div class="toolbarBox">
+{if $show_toolbar}
+	{include file="toolbar.tpl" toolbar_btn=$toolbar_btn}
+	<div class="pageTitle">
+	<h3>{block name=pageTitle}
+		<span id="current_obj" style="font-weight: normal;">{$title|default:'&nbsp;'}</span>
+		{/block}</h3>
+	</div>
+{/if}
+	<div class="leadin">{block name="leadin"}{/block}</div>
+</div>
+
+<div class="productTabs">
+	<ul class="tab">
+	{foreach $profiles as $profile}
+		<li class="tab-row">
+			<a class="nav-profile {if $profile.id_profile == $current_profile}selected{/if}" id="profile-{$profile.id_profile}" href="{$current}&token={$token}&id_profile={$profile.id_profile}">{$profile.name}</a>
+		</li>
+	{/foreach}
+	</ul>
+</div>
+
+<form id="{$table}_form" class="defaultForm" action="{$current}&{$submit_action}=1&token={$token}" method="post" enctype="multipart/form-data">
+	{if $form_id}
+		<input type="hidden" name="id_{$table}" id="id_{$table}" value="{$form_id}" />
+	{/if}
+
+	{assign var=tabsize value=count($tabs)}
+	{foreach $tabs AS $tab}
+		{if $tab.id_tab > $tabsize}
+			{assign var=tabsize value=$tab.id_tab}
+		{/if}
+	{/foreach}
+
+	{foreach $profiles as $profile}
+
+		<div class="profile-{$profile.id_profile} tab-profile" style="display:{if $profile.id_profile == $current_profile}block{else}none{/if}">
+
+			{if $profile.id_profile != $admin_profile}
+				<table class="table float" cellspacing="0" style="margin-right:50px" id="table_{$profile.id_profile}">
+					<tr>
+						<th class="center">
+							{l s='Tabs'}
+						</th>
+						<th class="center">
+							<input type="checkbox" name="1" id="viewall"
+								{if $access_edit == 1}
+									rel="-1||{$profile.id_profile}||view||{$tabsize}||{count($tabs)}" class="ajaxPower"
+								{else}
+									disabled="disabled"
+								{/if} />
+							{l s='View'}
+						</th>
+						<th class="center">
+							<input type="checkbox" name="1" id="addall"
+								{if $access_edit == 1}
+									rel="-1||{$profile.id_profile}||add||{$tabsize}||{count($tabs)}" class="ajaxPower"
+								{else}
+									disabled="disabled"
+								{/if} />
+							{l s='Add'}
+						</th>
+						<th class="center">
+							<input type="checkbox" name="1" id="editall"
+								{if $access_edit == 1}
+									rel="-1||{$profile.id_profile}||edit||{$tabsize}||{count($tabs)}" class="ajaxPower"
+								{else}
+									disabled="disabled"
+								{/if} />
+							{l s='Edit'}
+						</th>
+						<th class="center">
+							<input type="checkbox" name="1" id="deleteall"
+								{if $access_edit == 1}
+									rel="-1||{$profile.id_profile}||delete||{$tabsize}||{count($tabs)}" class="ajaxPower"
+								{else}
+									disabled="disabled"
+								{/if} />
+							{l s='Delete'}
+						</th>
+						<th class="center">
+							<input type="checkbox" name="1" id="allall"
+								{if $access_edit == 1}
+									rel="-1||{$profile.id_profile}||all||{$tabsize}||{count($tabs)}" class="ajaxPower"
+								{else}
+									disabled="disabled"
+								{/if} />
+							{l s='All'}
+						</th>
+					</tr>
+					{if !count($tabs)}
+						<tr>
+							<td colspan="6">{l s='No tab'}</td>
+						</tr>
+					{else}
+						{foreach $tabs AS $tab}
+
+							{assign var=access value=$accesses[$profile.id_profile]}
+
+							{if !$tab.id_parent OR $tab.id_parent == -1}
+								{assign var=is_child value=false}
+								{assign var=result_accesses value=0}
+								<tr>
+									<td{if !$is_child} class="bold"{/if}>{if $is_child} &raquo; {/if}<strong>{$tab.name}</strong></td>
+									{foreach $perms as $perm}
+										{if $access_edit == 1}
+											<td>
+												<input type="checkbox"
+													id="{$perm}{$access[$tab.id_tab]['id_tab']}"
+													rel="{$access[$tab.id_tab]['id_tab']}||{$profile.id_profile}||{$perm}||{$tabsize}||{count($tabs)}"
+													class="ajaxPower {$perm} {$access[$tab.id_tab]['id_tab']}"
+													{if $access[$tab.id_tab][$perm] == 1}checked="checked"{/if}/>
+											</td>
+										{else}
+											<td>
+												<input type="checkbox"
+													disabled="disabled"
+													{if $access[$tab.id_tab][$perm] == 1}checked="checked"{/if}/>
+											</td>
+										{/if}
+										{assign var=result_accesses value=$result_accesses + $access[$tab.id_tab][$perm]}
+									{/foreach}
+									<td>
+										<input type="checkbox"
+											id='all{$access[$tab.id_tab]['id_tab']}'
+											{if $access_edit == 1}
+												rel="{$access[$tab.id_tab]['id_tab']}||{$profile.id_profile}||all||{$tabsize}||{count($tabs)}"
+												class="ajaxPower all {$access[$tab.id_tab]['id_tab']}"
+											{else}
+												class="all {$access[$tab.id_tab]['id_tab']}"
+												disabled="disabled"
+											{/if}
+											{if $result_accesses == 4}checked="checked"{/if}/>
+									</td>
+								</tr>
+
+								{foreach $tabs AS $child}
+									{if $child.id_parent === $tab.id_tab}
+										{if isset($access[$child.id_tab])}
+											{assign var=is_child value=true}
+											{assign var=result_accesses value=0}
+											<tr>
+												<td{if !$is_child} class="bold"{/if}>{if $is_child} &raquo; {/if}<strong>{$child.name}</strong></td>
+												{foreach $perms as $perm}
+													{if $access_edit == 1}
+														<td>
+															<input type="checkbox"
+																id="{$perm}{$access[$child.id_tab]['id_tab']}"
+																rel="{$access[$child.id_tab]['id_tab']}||{$profile.id_profile}||{$perm}||{$tabsize}||{count($tabs)}"
+																class="ajaxPower {$perm} {$access[$child.id_tab]['id_tab']}"
+																{if $access[$child.id_tab][$perm] == 1}checked="checked"{/if}/>
+														</td>
+													{else}
+														<td>
+															<input type="checkbox"
+																disabled="disabled"
+																{if $access[$child.id_tab][$perm] == 1}checked="checked"{/if}/>
+														</td>
+													{/if}
+													{assign var=result_accesses value=$result_accesses + $access[$child.id_tab][$perm]}
+												{/foreach}
+												<td>
+													<input type="checkbox"
+														id='all{$access[$child.id_tab]['id_tab']}'
+														{if $access_edit == 1}
+															rel="{$access[$child.id_tab]['id_tab']}||{$profile.id_profile}||all||{$tabsize}||{count($tabs)}"
+															class="ajaxPower all {$access[$child.id_tab]['id_tab']}"
+														{else}
+															class="all {$access[$child.id_tab]['id_tab']}"
+															disabled="disabled"
+														{/if}
+														{if $result_accesses == 4}checked="checked"{/if}/>
+												</td>
+											</tr>
+										{/if}
+									{/if}
+								{/foreach}
+
+							{/if}
+
+						{/foreach}
+					{/if}
+				</table>
+
+				<table class="table" cellspacing="0" style="margin-left:20px" id="table_module_{$profile.id_profile}">
+					<tr>
+						<th>{l s='Modules'}</th>
+						<th class="center">
+							<input type="checkbox"
+								id="ajax-ma-view-master"
+								{if $access_edit == 1}
+									class="changeModuleAccess" rel="-1||view||{$profile.id_profile}"
+								{else}
+									disabled="disabled"
+								{/if} /> {l s='View'}
+						</th>
+						<th class="center">
+							<input type="checkbox"
+								id="ajax-ma-configure-master"
+								{if $access_edit == 1}
+									class="changeModuleAccess" rel="-1||configure||{$profile.id_profile}"
+								{else}
+									disabled="disabled"
+								{/if} /> {l s='Configure'}</th>
+					</tr>
+					
+					{if !count($modules)}
+						<tr>
+							<td colspan="3">{l s='No modules installed'}</td>
+						</tr>
+					{else}
+						{foreach $modules[$profile.id_profile] AS $module}
+							<tr>
+								<td>&raquo; {$module.name}</td>
+								<td>
+									<input type="checkbox"
+										value="1"
+										{if $module.view == true}checked="checked"{/if}
+										{if $access_edit == 1}
+											class="ajax-ma-view changeModuleAccess"
+											rel="{$module.id_module}||view||{$profile.id_profile}"
+										{else}
+											class="ajax-ma-view"
+											disabled="disabled"
+										{/if}
+									/>
+								</td>
+								<td>
+									<input type="checkbox"
+										value="1"
+										{if $module.configure == true}checked="checked"{/if}
+										{if $access_edit == 1}
+											class="ajax-ma-configure changeModuleAccess"
+											rel="{$module.id_module}||configure||{$profile.id_profile}"
+										{else}
+											class="ajax-ma-configure"
+											disabled="disabled"
+										{/if}
+									/>
+								</td>
+							</tr>
+						{/foreach}
+					{/if}
+				</table>
+				
+				<div class="clear">&nbsp;</div>
+
+			{else}
+				{l s='Administrator permissions can\'t be modified.'}
+			{/if}
+
+		</div>
+
+	{/foreach}
+</form>

admin-dev/themes/default/template/controllers/accounting_export/common_form.tpl

@@ -26,7 +26,7 @@
 
 {if $existingExport}
 	<div class="hint" style="display:block;">
-		{l s='The last export has been for this section:'}
+		{l s='The last export has been found for this section:'}
 		<a href="{$smarty.server.REQUEST_URI}&download={$type}">{l s='Click here'}</a>
 	</div>
 	<br />
@@ -34,7 +34,7 @@
 
 <label for="clientPrefix">{l s='Client prefix:'}</label>
 <div class="margin-form">
-	<input type="text" value="{$clientPrefix}" name="clientPrefix" />
+	<input type="text" value="{$clientPrefix|htmlentities}" name="clientPrefix" />
 	<span class="input-error"></span>
 </div>
 

admin-dev/themes/default/template/controllers/accounting_export/global_export.tpl

@@ -28,10 +28,10 @@
 	<fieldset>
 		<legend>{$title}</legend>
 		<form id="reconfiliation_form" action="{$smarty.server.REQUEST_URI}" method="POST">
-			{include file="$pathAccountExportTpl/common_form.tpl"}
+			{include file="controllers/accounting_export/common_form.tpl"}
 			<label for="clientPrefix">{l s='Journal:'}</label>
 			<div class="margin-form">
-				<input type="text" name="journal" value="{$journal}"/>
+				<input type="text" name="journal" value="{$journal|htmlentities}"/>
 			</div>	
 			<div class="margin-form">
 				<input id="submitGlobalExport" type="submit" class="button" name="submitAccountingExportType" />

admin-dev/themes/default/template/controllers/accounting_export/menu.tpl

@@ -0,0 +1,117 @@
+{*
+* 2007-2011 PrestaShop
+*
+* NOTICE OF LICENSE
+*
+* This source file is subject to the Academic Free License (AFL 3.0)
+* that is bundled with this package in the file LICENSE.txt.
+* It is also available through the world-wide-web at this URL:
+* http://opensource.org/licenses/afl-3.0.php
+* If you did not receive a copy of the license and are unable to
+* obtain it through the world-wide-web, please send an email
+* to license@prestashop.com so we can send you a copy immediately.
+*
+* DISCLAIMER
+*
+* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+* versions in the future. If you wish to customize PrestaShop for your
+* needs please refer to http://www.prestashop.com for more information.
+*
+*  @author PrestaShop SA <contact@prestashop.com>
+*  @copyright  2007-2011 PrestaShop SA
+*  @version  Release: $Revision: 9856 $
+*  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*}
+
+<script type="text/javascript">
+	
+	function validateInputDate(input, displayError)
+	{
+		{literal}
+		dateRegex = /^\d{4}-\d{1,2}-\d{1,2}$/
+  	{/literal}
+			
+  	if (!input.val().match(dateRegex))
+  	{
+			input.parent().find('span.input-error').fadeIn('fast');
+			return false;
+		}
+		input.parent().find('span.input-error').css('display','none');
+		return true;
+	}
+	
+	function validateAccountingForm()
+	{
+		validation = true;
+		
+		$('span.input-error').css('display', 'none');
+		$('.datepicker:visible').each(function() {
+			if (!(validateInputDate($(this), true)))
+				validation = false;
+		});
+    
+		return validation;
+	}
+	
+	$(document).ready(function() {
+		$('#export_menu').find('a').each(function() {
+			$(this).click(function() {
+				blockID = 'block_' + $(this).attr('id');
+				if (!$('#' + blockID).is(':visible'))
+				{
+				
+					$('.formAccountingExport:visible').each(function() {
+						$(this).fadeOut('fast', function() {
+							$('#' + blockID).fadeIn('fast');
+						});			
+					});
+				}
+			});
+		});
+		
+		$('#' + '{$defaultType}').fadeIn('fast');
+	
+		$('.datepicker').each(function() {
+			$(this).change(function() {
+				validateInputDate($(this), true);
+			});
+			$(this).datepicker({
+	     prevText: '',
+	     nextText: '',
+	     dateFormat: 'yy-mm-dd'
+	    });			
+		});
+    
+    $('.formAccountingExport form input[type="submit"]').each(function()
+    {
+    	$(this).click(function() {
+    		return validateAccountingForm();
+    	});
+    });
+	});
+</script>
+
+{foreach from=$preventList key=name item=preventType}
+	{if !empty($preventType)}
+		<div class="{$name}">
+			{foreach from=$preventType item=translationPrevent}
+				{$translationPrevent}
+			{/foreach}
+		</div>
+	{/if}
+{/foreach}
+
+<div id="export_menu">
+	<div class="toolbarBox">
+		<div class="pageTitle">
+			<h3>
+				<span id="current_obj" style="font-weight: normal;">{l s='Export:'}</span>
+			</h3>
+			{l s='Select which export you want to do:'}<br />
+			{foreach from=$exportTypeList item=export}
+				<a id="{$export['type']}" class="button" href="javascript:void(0);">{$export['name']}</a>
+			{/foreach}
+		</div>
+	</div>
+</div>

admin-dev/themes/default/template/controllers/accounting_export/reconciliation_export.tpl

@@ -28,7 +28,7 @@
 	<fieldset>
 		<legend>{$title}</legend>
 		<form id="reconfiliation_form" action="{$smarty.server.REQUEST_URI}" method="POST">
-			{include file="$pathAccountExportTpl/common_form.tpl"}
+			{include file="controllers/accounting_export/common_form.tpl"}
 			
 			<div class="margin-form">
 				<input id="submitReconciliationExport" type="submit" class="button" name="submitAccountingExportType" />

admin-dev/themes/default/template/controllers/accounting_management/content.tpl

@@ -0,0 +1,63 @@
+{*
+* 2007-2011 PrestaShop
+*
+* NOTICE OF LICENSE
+*
+* This source file is subject to the Academic Free License (AFL 3.0)
+* that is bundled with this package in the file LICENSE.txt.
+* It is also available through the world-wide-web at this URL:
+* http://opensource.org/licenses/afl-3.0.php
+* If you did not receive a copy of the license and are unable to
+* obtain it through the world-wide-web, please send an email
+* to license@prestashop.com so we can send you a copy immediately.
+*
+* DISCLAIMER
+*
+* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+* versions in the future. If you wish to customize PrestaShop for your
+* needs please refer to http://www.prestashop.com for more information.
+*
+*  @author PrestaShop SA <contact@prestashop.com>
+*  @copyright  2007-2011 PrestaShop SA
+*  @version  Release: $Revision: 9856 $
+*  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*}
+
+{if !empty($error)}
+	<div class="hint" style="display:block">{$error}</div>
+{else}
+	<div class="toolbarBox">
+		{include file="toolbar.tpl" toolbar_btn=$toolbar_btn}
+		<div class="pageTitle">
+			<h3>
+				<span id="current_obj" style="font-weight: normal;">{$title|default:'&nbsp;'}</span>
+			</h3>
+		</div>
+	</div>
+	<fieldset>
+		<legend>{l s='Account number'}</legend>
+		<div class="hint" style="display:block">
+			{l s='Configure the account number by zone for:'} <b>{$shop_details['name']}</b>
+		</div>
+		<br />
+		<form id="{$table}_form" method="POST" action="{$smarty.server.REQUEST_URI}">
+			<label>{l s='Default number for this shop'}</label>
+				<div class="margin-form">
+				<input type="text" name="default_account_number" value="{$shop_details['default_account_number']|htmlentities}" />
+				<p>{l s='If a zone field is empty it will use this default number.'}</p>
+			</div>
+			{foreach from=$shop_details['zones'] key=id_zone item=currentZone}
+				<label>{$currentZone['name']}</label>
+				<div class="margin-form">
+					<input type="text" name="zone_{$id_zone}" value="{$currentZone['account_number']|escape:htmlall|htmlentities}" />
+
+				</div>
+			{/foreach}
+			<div class="margin-form">
+				<input type="submit" class="button" id="{$table}_form_submit_btn" name="UpdateNumbers" value="{l s='Save'}"/>
+			</div>
+		</form>
+		<div class="separation"></div>
+	</fieldset>
+{/if}

admin-dev/themes/default/template/controllers/addons_catalog/content.tpl

@@ -0,0 +1,28 @@
+{*
+* 2007-2011 PrestaShop
+*
+* NOTICE OF LICENSE
+*
+* This source file is subject to the Academic Free License (AFL 3.0)
+* that is bundled with this package in the file LICENSE.txt.
+* It is also available through the world-wide-web at this URL:
+* http://opensource.org/licenses/afl-3.0.php
+* If you did not receive a copy of the license and are unable to
+* obtain it through the world-wide-web, please send an email
+* to license@prestashop.com so we can send you a copy immediately.
+*
+* DISCLAIMER
+*
+* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+* versions in the future. If you wish to customize PrestaShop for your
+* needs please refer to http://www.prestashop.com for more information.
+*
+*  @author PrestaShop SA <contact@prestashop.com>
+*  @copyright  2007-2011 PrestaShop SA
+*  @version  Release: $Revision$
+*  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*}
+<iframe frameborder="no" style="margin:0px;padding:0px;width:100%;height:920px" src="http://addons.prestashop.com/iframe/search.php?parentUrl={$parentDomain}"></iframe>
+<div class="clear">&nbsp;</div>
+

admin-dev/themes/default/template/controllers/addons_my_account/content.tpl

@@ -0,0 +1,27 @@
+{*
+* 2007-2011 PrestaShop
+*
+* NOTICE OF LICENSE
+*
+* This source file is subject to the Academic Free License (AFL 3.0)
+* that is bundled with this package in the file LICENSE.txt.
+* It is also available through the world-wide-web at this URL:
+* http://opensource.org/licenses/afl-3.0.php
+* If you did not receive a copy of the license and are unable to
+* obtain it through the world-wide-web, please send an email
+* to license@prestashop.com so we can send you a copy immediately.
+*
+* DISCLAIMER
+*
+* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+* versions in the future. If you wish to customize PrestaShop for your
+* needs please refer to http://www.prestashop.com for more information.
+*
+*  @author PrestaShop SA <contact@prestashop.com>
+*  @copyright  2007-2011 PrestaShop SA
+*  @version  Release: $Revision$
+*  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*}
+<iframe frameborder="no" style="margin:0px;padding:0px;width:960px;height:920px" src="http://addons.prestashop.com/iframe/myaccount.php?parentUrl={$parentDomain}"></iframe>
+<div class="clear">&nbsp;</div>

admin-dev/themes/default/template/controllers/addresses/helpers/form/form.tpl

@@ -0,0 +1,105 @@
+{*
+* 2007-2011 PrestaShop 
+*
+* NOTICE OF LICENSE
+*
+* This source file is subject to the Academic Free License (AFL 3.0)
+* that is bundled with this package in the file LICENSE.txt.
+* It is also available through the world-wide-web at this URL:
+* http://opensource.org/licenses/afl-3.0.php
+* If you did not receive a copy of the license and are unable to
+* obtain it through the world-wide-web, please send an email
+* to license@prestashop.com so we can send you a copy immediately.
+*
+* DISCLAIMER
+*
+* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+* versions in the future. If you wish to customize PrestaShop for your
+* needs please refer to http://www.prestashop.com for more information.
+*
+*  @author PrestaShop SA <contact@prestashop.com>
+*  @copyright  2007-2011 PrestaShop SA
+*  @version  Release: $Revision$
+*  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*}
+
+{extends file="helpers/form/form.tpl"}
+
+{block name="label"}
+{/block}
+
+{block name="start_field_block"}
+	{if $input.type == 'text_customer'}
+		{if isset($customer)}
+			<label>{$input.label}</label>
+			<div class="margin-form"><a style="display: block; padding-top: 4px;" href="?tab=AdminCustomers&id_customer={$customer->id}&viewcustomer&token={$tokenCustomer}">{$customer->lastname} {$customer->firstname} ({$customer->email})</a></div>
+			<input type="hidden" name="id_customer" value="{$customer->id}" />
+			<input type="hidden" name="email" value="{$customer->email}" />
+		{else}
+			<script type="text/javascript">
+			$('input[name=email]').live('blur', function(e)
+			{
+				var email = $(this).val();
+				if (email.length > 5)
+				{
+					var data = {};
+					data.email = email;
+					data.token = "{$token}";
+					data.ajax = 1;
+					data.controller = "AdminAddresses";
+					data.action = "loadNames";
+					$.ajax({
+						type: "POST",
+						url: "ajax-tab.php",
+						data: data,
+						dataType: 'json',
+						async : true,
+						success: function(msg)
+						{
+							if (msg)
+							{
+								var infos = msg.infos.split('_');
+								$('input[name=firstname]').val(infos[0]);
+								$('input[name=lastname]').val(infos[1]);
+							}
+						},
+						error: function(msg)
+						{
+						}
+					});
+				}
+			});
+			</script>
+			<label>{l s='Customer e-mail'}</label>
+			<div class="margin-form">
+				<input type="text" size="33" name="email" value="{$fields_value[$input.name]|escape:'htmlall':'UTF-8'|htmlentities}" style="text-transform: lowercase;" /> <sup>*</sup>
+			</div>
+		{/if}
+	{else} 
+		{if $input.name == 'vat_number'}		
+			{if $vat == 'is_applicable'}
+				<div id="vat_area" style="display: visible">
+			{else if $vat == 'management'}
+				<div id="vat_area" style="display: hidden">
+			{else}
+				<div style="display: none;">
+			{/if}
+		{else if $input.name == 'id_state'}
+				<div id="contains_states" {if $contains_states}style="display:none;"{/if}>
+		{/if}
+		<label>{$input.label} </label>
+		<div class="margin-form">
+	{/if}
+{/block}
+
+{block name="end_field_block"}
+	{* close div margin-form *}
+	{if $input.type != 'text_customer'}
+		</div>
+	{/if}
+	{* close hidden div *}
+	{if $input.name == 'vat_number' || $input.name == 'id_state'}
+		</div>
+	{/if}
+{/block}