[+] Project : Vouchers are now replaced by cart rules

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

admin-dev/ajax-tab.php

@@ -36,6 +36,8 @@ if (!isset($_POST['controller']) && isset($_POST['tab']))
 	$_POST['controller'] = strtolower($_POST['tab']);
 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/tabs/AdminCustomerThreads.php

@@ -120,7 +120,6 @@ class AdminCustomerThreads extends AdminTab
 			}
 			if (isset($_POST['id_employee_forward']))
 			{
-				// Todo: need to avoid doubles 
 				$messages = Db::getInstance()->executeS('
 				SELECT ct.*, cm.*, cl.name subject, CONCAT(e.firstname, \' \', e.lastname) employee_name, CONCAT(c.firstname, \' \', c.lastname) customer_name, c.firstname
 				FROM '._DB_PREFIX_.'customer_thread ct

admin-dev/tabs/AdminDiscounts.php

@@ -1,532 +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: 7060 $
-*  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
-*  International Registered Trademark & Property of PrestaShop SA
-*/
-
-class AdminDiscounts extends AdminTab
-{
-	public function __construct()
-	{
-		$this->context = Context::getContext();
-		$this->table = 'discount';
-	 	$this->className = 'Discount';
-	 	$this->lang = true;
-	 	$this->edit = true;
-	 	$this->delete = true;
-	 	$this->_select = 'dtl.`name` AS discount_type,
-			IF(a.id_discount_type = '.(int)Discount::PERCENT.', CONCAT(a.value, " %"),
-			IF(a.id_discount_type = '.(int)Discount::AMOUNT.', CONCAT(a.value, " ", c.sign),
-			"--")) as strvalue';
-	 	$this->_join = 'LEFT JOIN `'._DB_PREFIX_.'currency` c ON (c.`id_currency` = a.`id_currency`)
-						LEFT JOIN `'._DB_PREFIX_.'discount_type` dt ON (dt.`id_discount_type` = a.`id_discount_type`)
-						LEFT JOIN `'._DB_PREFIX_.'discount_type_lang` dtl ON (dt.`id_discount_type` = dtl.`id_discount_type` AND dtl.`id_lang` = '.(int)$this->context->language->id.')';
-
-		$typesArray = array();
-		$types = Discount::getDiscountTypes($this->context->language->id);
-		foreach ($types AS $type)
-			$typesArray[$type['id_discount_type']] = $type['name'];
-
-		$this->fieldsDisplay = array(
-			'id_discount' => array('title' => $this->l('ID'), 'align' => 'center', 'width' => 25),
-			'name' => array('title' => $this->l('Code'), 'width' => 85, 'prefix' => '<span class="discount_name">', 'suffix' => '</span>', 'filter_key' => 'a!name'),
-			'shop_name' => array('title' => $this->l('Shop'), 'width' => 85, 'filter_key' => 's!name'),
-			'description' => array('title' => $this->l('Description'), 'width' => 100, 'filter_key' => 'b!description'),
-			'discount_type' => array('title' => $this->l('Type'), 'type' => 'select', 'select' => $typesArray, 'filter_key' => 'dt!id_discount_type'),
-			'strvalue' => array('title' => $this->l('Value'), 'width' => 50, 'align' => 'right', 'filter_key' => 'a!value'),
-			'quantity' => array('title' => $this->l('Qty'), 'width' => 40, 'align' => 'right'),
-			'date_to' => array('title' => $this->l('To'), 'width' => 60, 'type' => 'date', 'align' => 'right'),
-			'active' => array('title' => $this->l('Status'), 'align' => 'center', 'active' => 'status', 'type' => 'bool', 'orderby' => false),
-		);
-
-		$this->optionsList = array(
-			'general' => array(
-				'title' =>	$this->l('Discounts options'),
-				'fields' =>	array(
-					'PS_VOUCHERS' => array('title' => $this->l('Enable vouchers:'), 'desc' => $this->l('Allow the use of vouchers in shop'), 'cast' => 'intval', 'type' => 'bool'),
-				),
-			),
-		);
-
-		parent::__construct();
-	}
-
-	protected function copyFromPost(&$object, $table)
-	{
-		parent::copyFromPost($object, $table);
-
-		$object->cumulable = (!isset($_POST['cumulable']) ? false : true);
-		$object->cumulable_reduction = (!isset($_POST['cumulable_reduction']) ? false : true);
-	}
-
-	public function postProcess()
-	{
-		$token = Tools::getValue('token') ? Tools::getValue('token') : $this->token;
-
-		if ($discountName = Tools::getValue('name') AND Validate::isDiscountName($discountName) AND Discount::discountExists($discountName, Tools::getValue('id_discount')))
-			$this->_errors[] = Tools::displayError('A voucher of this name already exists. Please choose another name.');
-
-		if (Tools::getValue('submitAdd'.$this->table))
-		{
-			if (Tools::getValue('id_discount_type') == 0)
-				$this->_errors[] = Tools::displayError('Please set a type for this voucher.');
-			if (Tools::getValue('id_discount_type') == Discount::AMOUNT AND Tools::getValue('id_currency') == 0)
-				$this->_errors[] = Tools::displayError('Please set a currency for this voucher.');
-			if ((Tools::getValue('id_discount_type') == Discount::PERCENT || Tools::getValue('id_discount_type') == 2) && !Tools::getValue('value'))
-				$this->_errors[] = Tools::displayError('Please set a amount for this voucher.');
-			if (!Validate::isBool_Id(Tools::getValue('id_target')))
-				$this->_errors[] = Tools::displayError('Invalid customer or group ID field');
-			else
-			{
-				$rules = explode('_', Tools::getValue('id_target'));
-				/* In form, there is one field for two differents fields in object*/
-				$_POST[($rules[0] ? 'id_group' : 'id_customer')] = $rules[1];
-			}
-			/* Checking fields validity */
-			$this->validateRules();
-			if (!sizeof($this->_errors))
-			{
-				$id = (int)(Tools::getValue($this->identifier));
-				/* Object update */
-				if (isset($id) AND !empty($id))
-				{
-					if ($this->tabAccess['edit'] === '1')
-					{
-						$object = new $this->className($id);
-						if (Validate::isLoadedObject($object))
-						{
-							/* Specific to objects which must not be deleted */
-							if ($this->deleted AND $this->beforeDelete($object))
-							{
-								$object->deleted = 1;
-								$object->update();
-								$objectNew = new $this->className();
-								$this->copyFromPost($objectNew, $this->table);
-								$result = $objectNew->add();
-								if (Validate::isLoadedObject($objectNew))
-									$this->afterDelete($objectNew, $object->id);
-							}
-							else
-							{
-								if (($categories = Tools::getValue('categoryBox')) === false OR (!empty($categories) AND !is_array($categories)))
-									$this->_errors[] = Tools::displayError('Please set a category for this voucher.');
-								$this->copyFromPost($object, $this->table);
-								$result = $object->update(true, false, $categories);
-							}
-							if (!$result)
-								$this->_errors[] = Tools::displayError('An error occurred while updating object.').' <b>'.$this->table.'</b>';
-							elseif ($this->postImage($object->id))
-							{
-								if ($back = Tools::getValue('back'))
-									Tools::redirectAdmin(urldecode($back).'&conf=4');
-								if (Tools::getValue('stay_here') == 'on' || Tools::getValue('stay_here') == 'true' || Tools::getValue('stay_here') == '1')
-									Tools::redirectAdmin(self::$currentIndex.'&'.$this->identifier.'='.$object->id.'&conf=4&updatescene&token='.$token);
-								Tools::redirectAdmin(self::$currentIndex.'&'.$this->identifier.'='.$object->id.'&conf=4&token='.$token);
-							}
-						}
-						else
-							$this->_errors[] = Tools::displayError('An error occurred while updating object.').' <b>'.$this->table.'</b> '.Tools::displayError('(cannot load object)');
-					}
-					else
-						$this->_errors[] = Tools::displayError('You do not have permission to edit here.');
-				}
-
-				/* Object creation */
-				else
-				{
-					if ($this->tabAccess['add'] === '1')
-					{
-						$object = new $this->className();
-						$this->copyFromPost($object, $this->table);
-						$categories = Tools::getValue('categoryBox', null);
-						if (!$object->add(true, false, $categories))
-							$this->_errors[] = Tools::displayError('An error occurred while creating object.').' <b>'.$this->table.'</b>';
-						elseif (($_POST[$this->identifier] = $object->id /* voluntary */) AND $this->postImage($object->id) AND $this->_redirect)
-						{
-							if ($customer = new Customer($object->id_customer) AND Validate::isLoadedObject($customer))
-							{
-								if (Validate::isEmail($customer->email))
-								{
-									$data = array(
-										'{firstname}' => $customer->firstname,
-										'{lastname}' => $customer->lastname,
-										'{email}' => $customer->email,
-										'{voucher_num}' => $object->name);
-
-									@Mail::Send((int)Configuration::get('PS_LANG_DEFAULT'), 'voucher_new', Mail::l('New voucher'), $data, $customer->email, $customer->firstname.' '.$customer->lastname);
-								}
-							}
-							elseif ($group = new Group($object->id_group) AND Validate::isLoadedObject($group))
-							{
-								$customer = null;
-								$customers = $group->getCustomers();
-
-								if ($customers)
-									foreach ($customers as $customer)
-									{
-										$data = array(
-											'{firstname}' => $customer['firstname'],
-											'{lastname}' => $customer['lastname'],
-											'{email}' => $customer['email'],
-											'{voucher_num}' => $object->name);
-
-										@Mail::Send((int)Configuration::get('PS_LANG_DEFAULT'), 'voucher_new', Mail::l('New voucher'), $data, $customer['email'], $customer['firstname'].' '.$customer['lastname']);
-									}
-							}
-
-							Tools::redirectAdmin(self::$currentIndex.'&'.$this->identifier.'='.$object->id.'&conf=3&token='.$token);
-						}
-					}
-					else
-						$this->_errors[] = Tools::displayError('You do not have permission to add here.');
-				}
-			}
-			$this->_errors = array_unique($this->_errors);
-		}
-		else
-			return parent::postProcess();
-	}
-
-	public function displayForm($isMainTab = true)
-	{
-		parent::displayForm();
-
-		if (!($obj = $this->loadObject(true)))
-			return;
-
-		echo '
-		<script type="text/javascript">
-			function discountType()
-			{
-				if ($("#id_discount_type").val() == 0)
-					$("#value-div").css("display", "none");
-				else if ($("#id_discount_type").val() == '.Discount::PERCENT.')
-				{
-					$("#value-div").css("display", "block");
-					$("#percent-span").css("display", "block");
-					$("#id_currency").css("display", "none");
-				}
-				else if ($("#id_discount_type").val() == '.Discount::AMOUNT.')
-				{
-					$("#value-div").css("display", "block");
-					$("#percent-span").css("display", "none");
-					$("#id_currency").css("display", "block");
-					$(\'#behavior_not_exhausted\').show();
-
-				}
-				else if ($("#id_discount_type").val() == '.Discount::FREE_SHIPPING.')
-					$("#value-div").css("display", "none");
-				if ($(\'#id_discount_type\').val() != '.Discount::AMOUNT.')
-					$(\'#behavior_not_exhausted\').hide();
-
-			}
-			$(document).ready(function(){
-				$("#id_discount_type").change(function(){discountType();});
-				discountType();
-			});
-		</script>
-		<form action="'.self::$currentIndex.'&submitAdd'.$this->table.'=1&token='.$this->token.'" id="discount" name="discount" method="post" enctype="multipart/form-data">
-		'.($obj->id ? '<input type="hidden" name="id_'.$this->table.'" value="'.$obj->id.'" />' : '').'
-			<fieldset><legend><img src="../img/admin/coupon.gif" />'.$this->l('Vouchers').'</legend>
-				<label>'.$this->l('Code:').' </label>
-				<div class="margin-form">
-					<input type="text" size="30" maxlength="32" name="name" value="'.htmlentities($this->getFieldValue($obj, 'name'), ENT_COMPAT, 'UTF-8').'" id="code" />
-					<sup>*</sup>
-					<img src="../img/admin/news-new.gif" onclick="gencode(8);" style="cursor: pointer" />
-					<span class="hint" name="help_box">'.$this->l('Invalid characters: numbers and').' !<>,;?=+()@#"�{}_$%:<span class="hint-pointer">&nbsp;</span></span>
-					<p class="clear">'.$this->l('The voucher\'s code, at least 3 characters long, which the customer types in during check-out').'</p>
-				</div>
-				<label>'.$this->l('Type:').' </label>
-				<div class="margin-form">
-					<select name="id_discount_type" id="id_discount_type" onchange="free_shipping()">
-						<option value="0">'.$this->l('-- Choose --').'</option>';
-		$discountTypes = Discount::getDiscountTypes($this->context->language->id);
-		foreach ($discountTypes AS $discountType)
-			echo '<option value="'.(int)($discountType['id_discount_type']).'"'.
-			(($this->getFieldValue($obj, 'id_discount_type') == $discountType['id_discount_type']) ? ' selected="selected"' : '').'>'.$discountType['name'].'</option>';
-		echo '		</select> <sup>*</sup>
-				</div>
-				<div id="value-div" style="display:none">
-					<label>'.$this->l('Value').'</label>
-					<div class="margin-form">
-						<input style="float:left;width:80px" type="text" name="value" id="discount_value" value="'.(float)($this->getFieldValue($obj, 'value')).'" onKeyUp="javascript:this.value = this.value.replace(/,/g, \'.\'); " />
-						<select id="id_currency" name="id_currency" style="float:left;margin-left:10px;width:50px;display:none">
-							<option value="0">--</option>';
-		foreach (Currency::getCurrencies() as $row)
-			echo '			<option value="'.(int)$row['id_currency'].'" '.(($this->getFieldValue($obj, 'id_currency') == $row['id_currency']) ? 'selected="selected"' : '').'>'.$row['sign'].'</option>';
-		echo '			</select>
-						<span id="percent-span" style="margin-left:10px;display:none;float:left;font-size:12px;font-weight:bold;color:black"> %</span>
-						<sup style="float:left;margin-left:5px">*</sup>
-						<p class="clear">'.$this->l('Either the monetary amount or the %, depending on Type selected above').'</p>
-					</div>
-				<div id="behavior_not_exhausted" style="display:none;">
-					<label>'.$this->l('Behavior not exhausted:').'</label>
-					<div class="margin-form">
-						<select name="behavior_not_exhausted">
-							<option value="1" '.($obj->behavior_not_exhausted === 1 ? 'selected="selected"' : '').'>'.$this->l('Reduce the voucher to the total order amount').'</option>
-							<option value="2" '.($obj->behavior_not_exhausted == 2 ? 'selected="selected"' : '').'>'.$this->l('Create a new voucher with remaining amount').'</option>
-							<option value="3" '.($obj->behavior_not_exhausted == 3 ? 'selected="selected"' : '').'>'.$this->l('Create negative invoice').'</option>
-						</select>
-					</div>
-				</div>
-				</div>
-				<label>'.$this->l('Description:').' </label>
-				<div class="margin-form">';
-		foreach ($this->_languages as $language)
-			echo '	<div id="description_'.$language['id_lang'].'" style="display: '.($language['id_lang'] == $this->_defaultFormLanguage ? 'block' : 'none').'; float: left;">
-						<input size="33" type="text" name="description_'.$language['id_lang'].'" value="'.htmlentities($this->getFieldValue($obj, 'description', (int)($language['id_lang'])), ENT_COMPAT, 'UTF-8').'" /><sup> *</sup>
-						<span class="hint" name="help_box">'.$this->l('Invalid characters:').' <>;=#{}<span class="hint-pointer">&nbsp;</span></span>
-						<p class="clear">'.$this->l('Will appear in cart next to voucher code').'</p>
-					</div>';
-		$this->displayFlags($this->_languages, $this->_defaultFormLanguage, 'description', 'description');
-		echo '	</div>
-				<div class="clear" / >
-				<label>'.$this->l('Categories:').' </label>
-					<div class="margin-form">
-							<table cellspacing="0" cellpadding="0" class="table" style="width: 600px;">
-									<tr>
-										<th><input type="checkbox" name="checkme" class="noborder" onclick="checkDelBoxes(this.form, \'categoryBox[]\', this.checked)" /></th>
-										<th>'.$this->l('ID').'</th>
-										<th>'.$this->l('Name').'</th>
-									</tr>';
-		$done = array();
-		$index = array();
-		$indexedCategories =  isset($_POST['categoryBox']) ? $_POST['categoryBox'] : ($obj->id ? Discount::getCategories($obj->id) : array());
-		$categories = Category::getCategories($this->context->language->id, false);
-		foreach ($indexedCategories AS $k => $row)
-			$index[] = $row['id_category'];
-		$this->recurseCategoryForInclude((int)(Tools::getValue($this->identifier)), $index, $categories, $categories[0][1], 1, $obj->id);
-		echo '
-							</table>
-							<p style="padding:0px; margin:0px 0px 10px 0px;">'.$this->l('Mark all checkbox(es) of categories to which the discount is to be applied').'<sup> *</sup></p>
-						</div>
-				<div class="clear" / >
-				<label>'.$this->l('Total quantity:').' </label>
-				<div class="margin-form">
-					<input type="text" size="15" name="quantity" value="'.(int)($this->getFieldValue($obj, 'quantity')).'" /> <sup>*</sup>
-					<p class="clear">'.$this->l('Total quantity available (mainly for vouchers open to everyone)').'</p>
-				</div>
-				<label>'.$this->l('Qty per each user:').' </label>
-				<div class="margin-form">
-					<input type="text" size="15" name="quantity_per_user" value="'.(int)($this->getFieldValue($obj, 'quantity_per_user')).'" /> <sup>*</sup>
-					<p class="clear">'.$this->l('Number of times a single customer can use this voucher').'</p>
-				</div>
-				<label>'.$this->l('Minimum amount').'</label>
-				<div class="margin-form">
-					<input type="text" size="15" name="minimal" value="'.($this->getFieldValue($obj, 'minimal') ? (float)($this->getFieldValue($obj, 'minimal')) : '0').'" onkeyup="javascript:this.value = this.value.replace(/,/g, \'.\'); " /> <sup>*</sup>&nbsp;
-					<select name="include_tax" id="include_tax" style="vertical-align: middle;">
-						<option value="0" '.($obj->include_tax == 0 ? 'selected="selected"' : '').'>'.$this->l('tax excl.').'</option>
-						<option value="1" '.($obj->include_tax == 1 ? 'selected="selected"' : '').'>'.$this->l('tax incl.').'</option>
-					</select>
-					<p class="clear">'.$this->l('0 if not applicable').'</p>
-				</div>
-				<div class="margin-form">
-					<p>
-						<input type="checkbox" name="cumulable"'.(($this->getFieldValue($obj, 'cumulable') == 1) ? ' checked="checked"' : '').' id="cumulable_on" value="1" />
-						<label class="t" for="cumulable_on"> '.$this->l('Cumulative with other vouchers').'</label>
-					</p>
-				</div>
-				<div class="margin-form">
-					<p>
-						<input type="checkbox" name="cumulable_reduction"'.(($this->getFieldValue($obj, 'cumulable_reduction') == 1) ? ' checked="checked"' : '').' id="cumulable_reduction_on" value="1" />
-						<label class="t" for="cumulable_reduction_on"> '.$this->l('Cumulative with price reductions').'</label>
-					</p>
-				</div>
-				<label>'.$this->l('To be used by:').' </label>
-								<div class="margin-form">
-					<input type="hidden" name="id_customer" value="0">
-					<input type="hidden" name="id_group" value="0">
-					<select name="id_target" id="id_target">
-					<option value="0_0">-- '.$this->l('All customers').' --</option>
-						<optgroup label="'.$this->l('Groups').'" id="id_target_group">
-						</optgroup>
-						<optgroup label="'.$this->l('Customers').'" id="id_target_customers">
-						</optgroup>
-					</select><br />'.$this->l('Filter:').' <input type="text" size="25" name="filter" id="filter" onkeyup="fillCustomersAjax();" class="space" value="" />
-					<script type="text/javascript">
-						var formDiscount = document.layers ? document.forms.discount : document.discount;
-						function fillCustomersAjax()
-						{
-							var filterValue = \''.(($value = (int)($this->getFieldValue($obj, 'id_customer'))) ? '0_'.$value : (($value = (int)($this->getFieldValue($obj, 'id_group'))) ? '1_'.$value : '')).'\';
-							if ($(\'#filter\').val())
-								filterValue = $(\'#filter\').val();
-
-							$.getJSON("'.dirname(self::$currentIndex).'/ajax.php",{ajaxDiscountCustomers:1,filter:filterValue},
-								function(obj) {
-									var groups_length = obj.groups.length;
-									if (obj.groups.length == 0)
-										groups_length = 1;
-									var customers_length = obj.customers.length;
-									if (obj.customers.length == 0)
-										customers_length = 1;
-									formDiscount.id_target.length = 1 + customers_length + groups_length;
-
-									if (obj.groups.length == 0)
-									{
-										formDiscount.id_target.options[1].value = -1;
-										formDiscount.id_target.options[1].text = \''.$this->l('No match found').'\';
-										formDiscount.id_target.options[1].className = "groups_filtered";
-									}
-									else
-									{
-										for (i = 0; i < obj.groups.length && i < 50; i++)
-										{
-											formDiscount.id_target.options[i+1].value = obj.groups[i]["value"];
-											formDiscount.id_target.options[i+1].text = obj.groups[i]["text"];
-											formDiscount.id_target.options[i+1].className = "groups_filtered";
-										}
-										if (obj.groups.length >= 50)
-										{
-											formDiscount.id_target.options[50].text = "'.$this->l('Too many results...',__CLASS__ , true, false).'";
-											formDiscount.id_target.options[50].value = "_";
-											formDiscount.id_target.options[50].className = "groups_filtered";
-										}
-									}
-
-									if (obj.customers.length == 0)
-									{
-										formDiscount.id_target.options[groups_length+1].value = -1;
-										formDiscount.id_target.options[groups_length+1].text = \''.$this->l('No match found').'\';
-										formDiscount.id_target.options[groups_length+1].className = "customers_filtered";
-									}
-									else
-									{
-										for (i = 0; i < obj.customers.length && i < 50; i++)
-										{
-											formDiscount.id_target.options[groups_length+1+i].value = obj.customers[i]["value"];
-											formDiscount.id_target.options[groups_length+1+i].text = obj.customers[i]["text"];
-											formDiscount.id_target.options[groups_length+1+i].className = "customers_filtered";
-										}
-										if (obj.customers.length >= 50)
-										{
-											formDiscount.id_target.options[groups_length+50+i].text = "'.$this->l('Too many results...',__CLASS__ , true, false).'";
-											formDiscount.id_target.options[groups_length+50+i].value = "_";
-											formDiscount.id_target.options[groups_length+50+i].className = "customers_filtered";
-										}
-									}
-									$(".groups_filtered").appendTo($("#id_target_group"));
-									$(".customers_filtered").appendTo($("#id_target_customers"));
-									if ($(\'#filter\').val())
-									{
-										if (formDiscount.id_target.options[1].value != -1)
-											formDiscount.id_target.options.selectedIndex = 1;
-										else
-											formDiscount.id_target.options.selectedIndex = 2;
-									}
-									else if(filterValue)
-										for (i = 0; i < (customers_length + groups_length); i++)
-											if (formDiscount.id_target.options[i+1].value == filterValue)
-												formDiscount.id_target.options.selectedIndex = i + 1;
-								}
-							);
-						}
-						fillCustomersAjax();
-					</script>
-				</div><br />';
-		includeDatepicker(array('date_from', 'date_to'), true);
-		echo '
-				<label>'.$this->l('From:').' </label>
-				<div class="margin-form">
-					<input type="text" size="20" id="date_from" name="date_from" value="'.($this->getFieldValue($obj, 'date_from') ? htmlentities($this->getFieldValue($obj, 'date_from'), ENT_COMPAT, 'UTF-8') : date('Y-m-d H:i:s')).'" /> <sup>*</sup>
-					<p class="clear">'.$this->l('Start date/time from which voucher can be used').'<br />'.$this->l('Format: YYYY-MM-DD HH:MM:SS').'</p>
-				</div>
-				<label>'.$this->l('To:').' </label>
-				<div class="margin-form">
-					<input type="text" size="20" id="date_to" name="date_to" value="'.($this->getFieldValue($obj, 'date_to') ? htmlentities($this->getFieldValue($obj, 'date_to'), ENT_COMPAT, 'UTF-8') : (date('Y') + 1).date('-m-d H:i:s')).'" /> <sup>*</sup>
-					<p class="clear">'.$this->l('End date/time at which voucher is no longer valid').'<br />'.$this->l('Format: YYYY-MM-DD HH:MM:SS').'</p>
-				</div>
-				<label>'.$this->l('Display the voucher in the cart summary:').' </label>
-				<div class="margin-form">
-					<input type="radio" name="cart_display" id="cart_active_on" value="1" '.($this->getFieldValue($obj, 'cart_display') ? 'checked="checked" ' : '').'/>
-					<label class="t" for="cart_display_on"> <img src="../img/admin/enabled.gif" alt="'.$this->l('Enabled').'" title="'.$this->l('Enabled').'" /></label>
-					<input type="radio" name="cart_display" id="cart_active_off" value="0" '.(!$this->getFieldValue($obj, 'cart_display') ? 'checked="checked" ' : '').'/>
-					<label class="t" for="cart_display_off"> <img src="../img/admin/disabled.gif" alt="'.$this->l('Disabled').'" title="'.$this->l('Disabled').'" /></label>
-				</div>
-				<div class="clear" / >
-				<label>'.$this->l('Status:').' </label>
-				<div class="margin-form">
-					<input type="radio" name="active" id="active_on" value="1" '.($this->getFieldValue($obj, 'active') ? 'checked="checked" ' : '').'/>
-					<label class="t" for="active_on"> <img src="../img/admin/enabled.gif" alt="'.$this->l('Enabled').'" title="'.$this->l('Enabled').'" /></label>
-					<input type="radio" name="active" id="active_off" value="0" '.(!$this->getFieldValue($obj, 'active') ? 'checked="checked" ' : '').'/>
-					<label class="t" for="active_off"> <img src="../img/admin/disabled.gif" alt="'.$this->l('Disabled').'" title="'.$this->l('Disabled').'" /></label>
-					<p>'.$this->l('Enable or disable voucher').'</p>
-				</div>';
-				if (Shop::isFeatureActive())
-				{
-					echo '<label>'.$this->l('Shop association:').'</label><div class="margin-form">';
-					$this->displayAssoShop();
-					echo '</div>';
-				}
-		echo '	<div class="margin-form">
-					<input type="submit" value="'.$this->l('   Save   ').'" name="submitAdd'.$this->table.'" class="button" />
-				</div>
-				<div class="small"><sup>*</sup> '.$this->l('Required field').'</div>
-			</fieldset>
-		</form>';
-	}
-		/**
-	 * Build a categories tree
-	 *
-	 * @param array $indexedCategories Array with categories where product is indexed (in order to check checkbox)
-	 * @param array $categories Categories to list
-	 * @param array $current Current category
-	 * @param integer $id_category Current category id
-	 */
-	public static function recurseCategoryForInclude($id_obj, $indexedCategories, $categories, $current, $id_category = 1, $id_category_default = NULL, $has_suite = array())
-	{
-		global $done;
-		static $irow;
-
-		if (!isset($done[$current['infos']['id_parent']]))
-			$done[$current['infos']['id_parent']] = 0;
-		$done[$current['infos']['id_parent']] += 1;
-
-		$todo = sizeof($categories[$current['infos']['id_parent']]);
-		$doneC = $done[$current['infos']['id_parent']];
-
-		$level = $current['infos']['level_depth'] + 1;
-
-		echo '
-		<tr class="'.($irow++ % 2 ? 'alt_row' : '').'">
-			<td>
-				<input type="checkbox" name="categoryBox[]" class="categoryBox'.($id_category_default == $id_category ? ' id_category_default' : '').'" id="categoryBox_'.$id_category.'" value="'.$id_category.'"'.((in_array($id_category, $indexedCategories) OR ((int)(Tools::getValue('id_category')) == $id_category AND !(int)($id_obj)) OR Tools::getIsset('adddiscount')) ? ' checked="checked"' : '').' />
-			</td>
-			<td>
-				'.$id_category.'
-			</td>
-			<td>';
-			for ($i = 2; $i < $level; $i++)
-				echo '<img src="../img/admin/lvl_'.$has_suite[$i - 2].'.gif" alt="" style="vertical-align: middle;"/>';
-			echo '<img src="../img/admin/'.($level == 1 ? 'lv1.gif' : 'lv2_'.($todo == $doneC ? 'f' : 'b').'.gif').'" alt="" style="vertical-align: middle;"/> &nbsp;
-			<label for="categoryBox_'.$id_category.'" class="t">'.stripslashes($current['infos']['name']).'</label></td>
-		</tr>';
-
-		if ($level > 1)
-			$has_suite[] = ($todo == $doneC ? 0 : 1);
-		if (isset($categories[$id_category]))
-			foreach ($categories[$id_category] AS $key => $row)
-				if ($key != 'infos')
-					self::recurseCategoryForInclude($id_obj, $indexedCategories, $categories, $categories[$id_category][$key], $key, $id_category_default, $has_suite);
-	}
-}

admin-dev/tabs/AdminPerformance.php

@@ -229,7 +229,7 @@ class AdminPerformance extends AdminTab
 		if (!extension_loaded('xcache'))
 			$warnings[] = $this->l('To use Xcache, you must install the Xcache extension on your server.').' <a href="http://xcache.lighttpd.net">http://xcache.lighttpd.net</a>';
 
-		if (!is_writable(_PS_CACHEFS_DIRECTORY_))
+		if(!is_writable(_PS_CACHEFS_DIRECTORY_))
 			$warnings[] = $this->l('To use CacheFS the directory').' '.realpath(_PS_CACHEFS_DIRECTORY_).' '.$this->l('must be writable');
 
 		if ($warnings)

admin-dev/themes/template/cart_rules/actions.tpl

@@ -0,0 +1,85 @@
+<label>{l s='Free shipping'}</label>
+<div class="margin-form">
+	&nbsp;&nbsp;
+	<input type="radio" name="free_shipping" id="free_shipping_on" value="1" {if $currentTab->getFieldValue($currentObject, 'free_shipping')|intval}checked="checked"{/if} />
+	<label class="t" for="free_shipping_on"> <img src="../img/admin/enabled.gif" alt="{l s='Enabled'}" title="{l s='Enabled'}" style="cursor:pointer" /></label>
+	&nbsp;&nbsp;
+	<input type="radio" name="free_shipping" id="free_shipping_off" value="0"  {if !$currentTab->getFieldValue($currentObject, 'free_shipping')|intval}checked="checked"{/if} />
+	<label class="t" for="free_shipping_off"> <img src="../img/admin/disabled.gif" alt="{l s='Disabled'}" title="{l s='Disabled'}" style="cursor:pointer" /></label>
+</div>
+<hr />
+<label>{l s='Apply a discount'}</label>
+<div class="margin-form">
+	&nbsp;&nbsp;
+	<input type="radio" name="apply_discount" id="apply_discount_percent" value="percent" {if $currentTab->getFieldValue($currentObject, 'reduction_percent')|intval}checked="checked"{/if} />
+	<label class="t" for="apply_discount_percent"> <img src="../img/admin/enabled.gif" alt="{l s='Enabled'}" title="{l s='Enabled'}" style="cursor:pointer" /> {l s='Percent (%)'}</label>
+	&nbsp;&nbsp;
+	<input type="radio" name="apply_discount" id="apply_discount_amount" value="amount"  {if $currentTab->getFieldValue($currentObject, 'reduction_amount')|intval}checked="checked"{/if} />
+	<label class="t" for="apply_discount_amount"> <img src="../img/admin/enabled.gif" alt="{l s='Enabled'}" title="{l s='Enabled'}" style="cursor:pointer" /> {l s='Amount (¤)'}</label>
+	&nbsp;&nbsp;
+	<input type="radio" name="apply_discount" id="apply_discount_off" value="off"  {if !$currentTab->getFieldValue($currentObject, 'reduction_amount')|intval && !$currentTab->getFieldValue($currentObject, 'reduction_percent')|intval}checked="checked"{/if} />
+	<label class="t" for="apply_discount_off"> <img src="../img/admin/disabled.gif" alt="{l s='Disabled'}" title="{l s='Disabled'}" style="cursor:pointer" /> {l s='None'}</label>
+</div>
+<div id="apply_discount_percent_div">
+	<label>{l s='Value (%)'}</label>
+	<div class="margin-form">
+		<input type="text" id="reduction_percent" name="reduction_percent" value="{$currentTab->getFieldValue($currentObject, 'reduction_percent')|floatval}" />
+		<p>{l s='Does not apply to the shipping costs'}</p>
+	</div>
+</div>
+<div id="apply_discount_amount_div">
+	<label>{l s='Value (¤)'}</label>
+	<div class="margin-form">
+		<input type="text" id="reduction_amount" name="reduction_amount" value="{$currentTab->getFieldValue($currentObject, 'reduction_amount')|floatval}" />
+		<select name="reduction_currency">
+		{foreach from=$currencies item='currency'}
+			<option value="{$currency.id_currency|intval}" {if $currentTab->getFieldValue($currentObject, 'reduction_currency') == $currency.id_currency || (!$currentTab->getFieldValue($currentObject, 'reduction_currency') && $currency.id_currency == $defaultCurrency)}selected="selected"{/if}>{$currency.iso_code}</option>
+		{/foreach}
+		</select>
+		<select name="reduction_tax">
+			<option value="0" {if $currentTab->getFieldValue($currentObject, 'reduction_tax') == 0}selected="selected"{/if}>{l s='Tax excluded'}</option>
+			<option value="1" {if $currentTab->getFieldValue($currentObject, 'reduction_tax') == 1}selected="selected"{/if}>{l s='Tax included'}</option>
+		</select>
+	</div>
+</div>
+<div id="apply_discount_to_div">
+	<label>{l s='Apply discount to'}</label>
+	<div class="margin-form">
+		&nbsp;&nbsp;
+		<input type="radio" name="apply_discount_to" id="apply_discount_to_order" value="order" {if $currentTab->getFieldValue($currentObject, 'reduction_product')|intval == 0}checked="checked"{/if} />
+		<label class="t" for="apply_discount_to_order"> {l s='Order (without shipping)'}</label>
+		&nbsp;&nbsp;
+		<input type="radio" name="apply_discount_to" id="apply_discount_to_product" value="specific"  {if $currentTab->getFieldValue($currentObject, 'reduction_product')|intval > 0}checked="checked"{/if} />
+		<label class="t" for="apply_discount_to_product"> {l s='Specific product'}</label>
+		&nbsp;&nbsp;
+		<input type="radio" name="apply_discount_to" id="apply_discount_to_cheapest" value="cheapest"  {if $currentTab->getFieldValue($currentObject, 'reduction_product')|intval == -1}checked="checked"{/if} />
+		<label class="t" for="apply_discount_to_cheapest"> {l s='Cheapest product'}</label>
+		&nbsp;&nbsp;
+		<input type="radio" name="apply_discount_to" id="apply_discount_to_selection" value="selection"  {if $currentTab->getFieldValue($currentObject, 'reduction_product')|intval == -2}checked="checked"{/if} />
+		<label class="t" for="apply_discount_to_selection"> {l s='Selected product(s)'}</label>
+	</div>
+	<div id="apply_discount_to_product_div">
+		<label>{l s='Product'}</label>
+		<div class="margin-form">
+			<input type="hidden" id="reduction_product" name="reduction_product" value="{$currentTab->getFieldValue($currentObject, 'reduction_product')|intval}" />
+			<input type="text" id="reductionProductFilter" name="reductionProductFilter" value="{$reductionProductFilter}" style="width:400px" />
+		</div>
+	</div>
+</div>
+<hr />
+<label>{l s='Send a free gift'}</label>
+<div class="margin-form">
+	&nbsp;&nbsp;
+	<input type="radio" name="free_gift" id="free_gift_on" value="1" {if $currentTab->getFieldValue($currentObject, 'gift_product')|intval}checked="checked"{/if} />
+	<label class="t" for="free_gift_on"> <img src="../img/admin/enabled.gif" alt="{l s='Enabled'}" title="{l s='Enabled'}" style="cursor:pointer" /></label>
+	&nbsp;&nbsp;
+	<input type="radio" name="free_gift" id="free_gift_off" value="0"  {if !$currentTab->getFieldValue($currentObject, 'gift_product')|intval}checked="checked"{/if} />
+	<label class="t" for="free_gift_off"> <img src="../img/admin/disabled.gif" alt="{l s='Disabled'}" title="{l s='Disabled'}" style="cursor:pointer" /></label>
+</div>
+<div id="free_gift_div">
+	<label>{l s='Product'}</label>
+	<div class="margin-form">
+		<input type="hidden" id="gift_product" name="gift_product" value="{$currentTab->getFieldValue($currentObject, 'gift_product')|intval}" />
+		<input type="text" id="giftProductFilter" name="giftProductFilter" value="{$giftProductFilter}" style="width:400px" />
+	</div>
+</div>

admin-dev/themes/template/cart_rules/conditions.tpl

@@ -0,0 +1,188 @@
+<label>{l s='Limit to a single customer'}</label>
+<div class="margin-form">
+	<input type="hidden" id="id_customer" name="id_customer" value="{$currentTab->getFieldValue($currentObject, 'id_customer')|intval}" />
+	<input type="text" id="customerFilter" name="customerFilter" value="{$customerFilter}" style="width:400px" />
+	<p>{l s='Optional, the cart rule will be available for everyone if you leave this field blank.'}</p>
+</div>
+<label>{l s='Validity'}</label>
+<div class="margin-form">
+	<strong>{l s='from'}</strong>
+	<input type="text" name="date_from" value="{if $currentTab->getFieldValue($currentObject, 'date_from')}{$currentTab->getFieldValue($currentObject, 'date_from')}{else}{$defaultDateFrom}{/if}" />
+	<strong>{l s='to'}</strong>
+	<input type="text" name="date_to" value="{if $currentTab->getFieldValue($currentObject, 'date_to')}{$currentTab->getFieldValue($currentObject, 'date_to')}{else}{$defaultDateTo}{/if}" />
+	<p>{l s='Default period is one year.'}</p>
+</div>
+<label>{l s='Minimum amount'}</label>
+<div class="margin-form">
+	<input type="text" name="minimum_amount" value="{$currentTab->getFieldValue($currentObject, 'minimum_amount')|floatval}" />
+	<select name="minimum_amount_currency">
+	{foreach from=$currencies item='currency'}
+		<option value="{$currency.id_currency|intval}" {if $currentTab->getFieldValue($currentObject, 'minimum_amount_currency') == $currency.id_currency || (!$currentTab->getFieldValue($currentObject, 'minimum_amount_currency') && $currency.id_currency == $defaultCurrency)}selected="selected"{/if}>{$currency.iso_code}</option>
+	{/foreach}
+	</select>
+	<select name="minimum_amount_tax">
+		<option value="0" {if $currentTab->getFieldValue($currentObject, 'minimum_amount_tax') == 0}selected="selected"{/if}>{l s='Tax excluded'}</option>
+		<option value="1" {if $currentTab->getFieldValue($currentObject, 'minimum_amount_tax') == 1}selected="selected"{/if}>{l s='Tax included'}</option>
+	</select>
+	<select name="minimum_amount_shipping">
+		<option value="0" {if $currentTab->getFieldValue($currentObject, 'minimum_amount_shipping') == 0}selected="selected"{/if}>{l s='Shipping excluded'}</option>
+		<option value="1" {if $currentTab->getFieldValue($currentObject, 'minimum_amount_shipping') == 1}selected="selected"{/if}>{l s='Shipping included'}</option>
+	</select>
+	<p>{l s='You can choose a minimum amount for the cart either with or without the taxes, with or without shipping.'}</p>
+</div>
+<label>{l s='Total available'}</label>
+<div class="margin-form">
+	<input type="text" name="quantity" value="{$currentTab->getFieldValue($currentObject, 'quantity')|intval}" />
+</div>
+<label>{l s='Total available for each user'}</label>
+<div class="margin-form">
+	<input type="text" name="quantity_per_user" value="{$currentTab->getFieldValue($currentObject, 'quantity_per_user')|intval}" />
+</div>
+{if $countries.unselected|@count + $countries.selected|@count > 1}
+<br />
+<input type="checkbox" id="country_restriction" name="country_restriction" value="1" {if $countries.unselected|@count}checked="checked"{/if} /> <strong>{l s='Country selection'}</strong>
+<div id="country_restriction_div" style="border:1px solid #AAAAAA;margin-top:10px;padding:0 10px 10px 10px;background-color:#FFF5D3">
+	<table>
+		<tr>
+			<td>
+				<p><strong>{l s='Selected countries'}</strong></p>
+				<select name="country_select[]" id="country_select_2" style="border:1px solid #AAAAAA;width:400px;height:160px" multiple>
+					{foreach from=$countries.selected item='country'}
+						<option value="{$country.id_country|intval}">&nbsp;{$country.name}</option>
+					{/foreach}
+				</select><br /><br />
+				<a style="cursor:pointer;text-align:center;display:block;border:1px solid #aaa;text-decoration:none;background-color:#fafafa;color:#123456;margin:2px;padding:2px" id="country_select_remove">
+					{l s='Remove'} &gt;&gt;
+				</a>
+			</td>
+			<td style="padding-left:20px;">
+				<p><strong>{l s='Unselected countries'}</strong></p>
+				<select id="country_select_1" style="border:1px solid #AAAAAA;width:400px;height:160px" multiple>
+					{foreach from=$countries.unselected item='country'}
+						<option value="{$country.id_country|intval}">&nbsp;{$country.name}</option>
+					{/foreach}
+				</select><br /><br />
+				<a style="cursor:pointer;text-align:center;display:block;border:1px solid #aaa;text-decoration:none;background-color:#fafafa;color:#123456;margin:2px;padding:2px" id="country_select_add">
+					&lt;&lt; {l s='Add'}
+				</a>
+			</td>
+		</tr>
+	</table>
+</div>
+{/if}
+{if $carriers.unselected|@count + $carriers.selected|@count > 1}
+<br />
+<input type="checkbox" id="carrier_restriction" name="carrier_restriction" value="1" {if $carriers.unselected|@count}checked="checked"{/if} /> <strong>{l s='Carrier selection'}</strong>
+<div id="carrier_restriction_div" style="border:1px solid #AAAAAA;margin-top:10px;padding:0 10px 10px 10px;background-color:#FFF5D3">
+	<table>
+		<tr>
+			<td>
+				<p><strong>{l s='Selected carriers'}</strong></p>
+				<select name="carrier_select[]" id="carrier_select_2" style="border:1px solid #AAAAAA;width:400px;height:160px" multiple>
+					{foreach from=$carriers.selected item='carrier'}
+						<option value="{$carrier.id_carrier|intval}">&nbsp;{$carrier.name}</option>
+					{/foreach}
+				</select><br /><br />
+				<a style="cursor:pointer;text-align:center;display:block;border:1px solid #aaa;text-decoration:none;background-color:#fafafa;color:#123456;margin:2px;padding:2px" id="carrier_select_remove">
+					{l s='Remove'} &gt;&gt;
+				</a>
+			</td>
+			<td style="padding-left:20px;">
+				<p><strong>{l s='Unselected carriers'}</strong></p>
+				<select id="carrier_select_1" style="border:1px solid #AAAAAA;width:400px;height:160px" multiple>
+					{foreach from=$carriers.unselected item='carrier'}
+						<option value="{$carrier.id_carrier|intval}">&nbsp;{$carrier.name}</option>
+					{/foreach}
+				</select><br /><br />
+				<a style="cursor:pointer;text-align:center;display:block;border:1px solid #aaa;text-decoration:none;background-color:#fafafa;color:#123456;margin:2px;padding:2px" id="carrier_select_add">
+					&lt;&lt; {l s='Add'}
+				</a>
+			</td>
+		</tr>
+	</table>
+</div>
+{/if}
+{if $groups.unselected|@count + $groups.selected|@count > 1}
+<br />
+<input type="checkbox" id="group_restriction" name="group_restriction" value="1" {if $groups.unselected|@count}checked="checked"{/if} /> <strong>{l s='Customer group selection'}</strong>
+<div id="group_restriction_div" style="border:1px solid #AAAAAA;margin-top:10px;padding:0 10px 10px 10px;background-color:#FFF5D3">
+	<table>
+		<tr>
+			<td>
+				<p><strong>{l s='Selected groups'}</strong></p>
+				<select name="group_select[]" id="group_select_2" style="border:1px solid #AAAAAA;width:400px;height:160px" multiple>
+					{foreach from=$groups.selected item='group'}
+						<option value="{$group.id_group|intval}">&nbsp;{$group.name}</option>
+					{/foreach}
+				</select><br /><br />
+				<a style="text-align:center;display:block;border:1px solid #aaa;text-decoration:none;background-color:#fafafa;color:#123456;margin:2px;padding:2px" id="group_select_remove">
+					{l s='Remove'} &gt;&gt;
+				</a>
+			</td>
+			<td style="padding-left:20px;">
+				<p><strong>{l s='Unselected groups'}</strong></p>
+				<select id="group_select_1" style="border:1px solid #AAAAAA;width:400px;height:160px" multiple>
+					{foreach from=$groups.unselected item='group'}
+						<option value="{$group.id_group|intval}">&nbsp;{$group.name}</option>
+					{/foreach}
+				</select><br /><br />
+				<a style="text-align:center;display:block;border:1px solid #aaa;text-decoration:none;background-color:#fafafa;color:#123456;margin:2px;padding:2px" id="group_select_add">
+					&lt;&lt; {l s='Add'}
+				</a>
+			</td>
+		</tr>
+	</table>
+</div>
+{/if}
+{if $cart_rules.unselected|@count + $cart_rules.selected|@count > 1}
+<br />
+<input type="checkbox" id="cart_rule_restriction" name="cart_rule_restriction" value="1" {if $cart_rules.unselected|@count}checked="checked"{/if} /> <strong>{l s='Other cart rules compatibility'}</strong>
+<div id="cart_rule_restriction_div" style="border:1px solid #AAAAAA;margin-top:10px;padding:0 10px 10px 10px;background-color:#FFF5D3">
+	<table>
+		<tr>
+			<td>
+				<p><strong>{l s='Combinable cart rules'}</strong></p>
+				<select name="cart_rule_select[]" id="cart_rule_select_2" style="border:1px solid #AAAAAA;width:400px;height:160px" multiple>
+					{foreach from=$cart_rules.selected item='cart_rule'}
+						<option value="{$cart_rule.id_cart_rule|intval}">&nbsp;{$cart_rule.name}</option>
+					{/foreach}
+				</select><br /><br />
+				<a style="text-align:center;display:block;border:1px solid #aaa;text-decoration:none;background-color:#fafafa;color:#123456;margin:2px;padding:2px" id="cart_rule_select_remove">
+					{l s='Remove'} &gt;&gt;
+				</a>
+			</td>
+			<td style="padding-left:20px;">
+				<p><strong>{l s='Uncombinable cart rules'}</strong></p>
+				<select id="cart_rule_select_1" style="border:1px solid #AAAAAA;width:400px;height:160px" multiple="">
+					{foreach from=$cart_rules.unselected item='cart_rule'}
+						<option value="{$cart_rule.id_cart_rule|intval}">&nbsp;{$cart_rule.name}</option>
+					{/foreach}
+				</select><br /><br />
+				<a style="text-align:center;display:block;border:1px solid #aaa;text-decoration:none;background-color:#fafafa;color:#123456;margin:2px;padding:2px" id="cart_rule_select_add">
+					&lt;&lt; {l s='Add'}
+				</a>
+			</td>
+		</tr>
+	</table>
+</div>
+{/if}
+<br />
+<input type="checkbox" id="product_restriction" name="product_restriction" value="1" {if $product_rules|@count}checked="checked"{/if} /> <strong>{l s='Product selection'}</strong>
+<div id="product_restriction_div" style="border:1px solid #AAAAAA;margin-top:10px;padding:10px 10px 10px 10px;background-color:#FFF5D3">
+	{l s='Add a filter on'}
+	<select id="product_rule_type">
+		<option value="">{l s='-- Choose --'}</option>
+		<option value="products">{l s='Products'}</option>
+		<option value="attributes">{l s='Attributes'}</option>
+		<option value="categories">{l s='Categories'}</option>
+	</select>
+	<a href="javascript:addProductRule();">
+		<img src="../img/admin/add.gif" alt="{l s='Add'}" title="{l s='Add'}" /> {l s='Add'}
+	</a>
+	<hr />
+	<table id="product_rule_table" class="table" cellpadding="0" cellspacing="0">
+		{foreach from=$product_rules item='product_rule'}
+			{$product_rule}
+		{/foreach}
+	</table>
+</div>

admin-dev/themes/template/cart_rules/form.js

@@ -0,0 +1,300 @@
+/*
+* 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
+*/
+
+function addProductRule()
+{
+	product_rules_counter += 1;
+	if ($('#product_rule_type').val() != 0)
+		$.get(
+			'ajax-tab.php',
+			{controller:'AdminCartRules',token:currentToken,newProductRule:1,product_rule_type:$('#product_rule_type').val(),product_rule_id:product_rules_counter},
+			function(content) {
+				if (content != "")
+					$('#product_rule_table').append(content);
+			}
+		);
+}
+
+function removeProductRule(id)
+{
+	$('#product_rule_' + id + '_tr').remove();
+}
+
+function toggleCartRuleFilter(id)
+{
+	if ($(id).attr('checked'))
+		$('#' + $(id).attr('id') + '_div').show(400);
+	else
+		$('#' + $(id).attr('id') + '_div').hide(200);
+}
+
+function removeCartRuleOption(item)
+{
+	var id = $(item).attr('id').replace('_remove', '');
+	$('#' + id + '_2 option:selected').remove().appendTo('#' + id + '_1');
+}
+
+function addCartRuleOption(item)
+{
+	var id = $(item).attr('id').replace('_add', '');
+	$('#' + id + '_1 option:selected').remove().appendTo('#' + id + '_2');
+}
+
+function updateProductRuleShortDescription(item)
+{
+	var id1 = $(item).attr('id').replace('_add', '').replace('_remove', '');
+	var id2 = id1.replace('_select', '');
+	var length = $('#' + id1 + '_2 option').length;
+	if (length == 1)
+		$('#' + id2 + '_match').val($('#' + id1 + '_2 option').first().text().trim());
+	else
+		$('#' + id2 + '_match').val(length);
+}
+
+var restrictions = new Array('country', 'carrier', 'group', 'cart_rule');
+for (i in restrictions)
+{
+	toggleCartRuleFilter($('#' + restrictions[i] + '_restriction'));
+	$('#' + restrictions[i] + '_restriction').click(function() {toggleCartRuleFilter(this);});
+	$('#' + restrictions[i] + '_select_remove').click(function() {removeCartRuleOption(this);});
+	$('#' + restrictions[i] + '_select_add').click(function() {addCartRuleOption(this);});
+}
+toggleCartRuleFilter($('#product_restriction'));
+$('#product_restriction').click(function() {toggleCartRuleFilter(this);});
+
+function toggleApplyDiscount(percent, amount, apply_to)
+{
+	if (percent)
+	{
+		$('#apply_discount_percent_div').show(400);
+		if ($('#apply_discount_to_product').attr('checked'))
+			toggleApplyDiscountTo();
+		$('#apply_discount_to_cheapest').removeAttr('disabled');
+		$('#apply_discount_to_cheapest').removeAttr('checked');
+	}
+	else
+	{
+		$('#apply_discount_percent_div').hide(200);
+		$('#reduction_percent').val('0');
+		$('#apply_discount_to_cheapest').attr('disabled', 'disabled');
+	}
+	
+	if (amount)
+	{
+		$('#apply_discount_amount_div').show(400);
+		if ($('#apply_discount_to_product').attr('checked'))
+			toggleApplyDiscountTo();
+		$('#apply_discount_to_cheapest').attr('disabled', 'disabled');
+		$('#apply_discount_to_cheapest').removeAttr('checked');
+	}
+	else
+	{
+		$('#apply_discount_amount_div').hide(200);
+		$('#reduction_amount').val('0');
+		$('#apply_discount_to_cheapest').removeAttr('disabled');
+	}
+		
+	if (apply_to)
+		$('#apply_discount_to_div').show(400);
+	else
+	{
+		toggleApplyDiscountTo();
+		$('#apply_discount_to_div').hide(200);
+	}
+}
+
+function toggleApplyDiscountTo()
+{
+	if ($('#apply_discount_to_product').attr('checked'))
+		$('#apply_discount_to_product_div').show(400);
+	else
+	{
+		$('#apply_discount_to_product_div').hide(200);
+		$('#reductionProductFilter').val('');
+		if ($('#apply_discount_to_order').attr('checked'))
+			$('#reduction_product').val('0');
+		if ($('#apply_discount_to_cheapest').attr('checked'))
+			$('#reduction_product').val('-1');
+		if ($('#apply_discount_to_selection').attr('checked'))
+			$('#reduction_product').val('-2');
+	}
+}
+
+function toggleGiftProduct()
+{
+	if ($('#free_gift_on').attr('checked'))
+		$('#free_gift_div').show(400);
+	else
+	{
+		$('#gift_product').val('0');
+		$('#giftProductFilter').val('');
+		$('#free_gift_div').hide(200);
+	}
+}
+
+$('#apply_discount_percent').click(function() {toggleApplyDiscount(true, false, true);});
+if ($('#apply_discount_percent').attr('checked'))
+	toggleApplyDiscount(true, false, true);
+
+$('#apply_discount_amount').click(function() {toggleApplyDiscount(false, true, true);});
+if ($('#apply_discount_amount').attr('checked'))
+	toggleApplyDiscount(false, true, true);
+
+$('#apply_discount_off').click(function() {toggleApplyDiscount(false, false, false);});
+if ($('#apply_discount_off').attr('checked'))
+	toggleApplyDiscount(false, false, false);
+
+$('#apply_discount_to_order').click(function() {toggleApplyDiscountTo();});
+if ($('#apply_discount_to_order').attr('checked'))
+	toggleApplyDiscountTo();
+	
+$('#apply_discount_to_product').click(function() {toggleApplyDiscountTo();});
+if ($('#apply_discount_to_product').attr('checked'))
+	toggleApplyDiscountTo();
+	
+$('#apply_discount_to_cheapest').click(function() {toggleApplyDiscountTo();});
+if ($('#apply_discount_to_cheapest').attr('checked'))
+	toggleApplyDiscountTo();
+	
+$('#apply_discount_to_selection').click(function() {toggleApplyDiscountTo();});
+if ($('#apply_discount_to_selection').attr('checked'))
+	toggleApplyDiscountTo();
+	
+$('#free_gift_on').click(function() {toggleGiftProduct();});
+$('#free_gift_off').click(function() {toggleGiftProduct();});
+toggleGiftProduct();
+
+// Main form submit
+$('#cart_rule_form').submit(function() {
+	if ($('#customerFilter').val() == '')
+		$('#id_customer').val('0');
+
+	for (i in restrictions)
+	{
+		if ($('#' + restrictions[i] + '_select_1 option').length == 0)
+			$('#' + restrictions[i] + '_restriction').removeAttr('checked');
+		else
+		{
+			$('#' + restrictions[i] + '_select_2 option').each(function(i) {
+				$(this).attr('selected', 'selected');
+			});
+		}
+	}
+	
+	$('.product_rule_toselect option').each(function(i) {
+		$(this).attr('selected', 'selected');
+	});
+});
+
+$('#giftProductFilter')
+	.autocomplete(
+			'ajax-tab.php', {
+			minChars: 2,
+			max: 50,
+			width: 500,
+			selectFirst: false,
+			scroll: false,
+			dataType: 'json',
+			formatItem: function(data, i, max, value, term) {
+				return value;
+			},
+			parse: function(data) {
+				var mytab = new Array();
+				for (var i = 0; i < data.length; i++)
+					mytab[mytab.length] = { data: data[i], value: (data[i].reference + ' ' + data[i].name).trim() };
+				return mytab;
+			},
+			extraParams: {
+				controller: 'AdminCartRules',
+				token: currentToken,
+				giftProductFilter: 1
+			}
+		}
+	)
+	.result(function(event, data, formatted) {
+		$('#gift_product').val(data.id_product);
+		$('#giftProductFilter').val((data.reference + ' ' + data.name).trim());
+	});
+	
+$('#reductionProductFilter')
+	.autocomplete(
+			'ajax-tab.php', {
+			minChars: 2,
+			max: 50,
+			width: 500,
+			selectFirst: false,
+			scroll: false,
+			dataType: 'json',
+			formatItem: function(data, i, max, value, term) {
+				return value;
+			},
+			parse: function(data) {
+				var mytab = new Array();
+				for (var i = 0; i < data.length; i++)
+					mytab[mytab.length] = { data: data[i], value: (data[i].reference + ' ' + data[i].name).trim() };
+				return mytab;
+			},
+			extraParams: {
+				controller: 'AdminCartRules',
+				token: currentToken,
+				reductionProductFilter: 1
+			}
+		}
+	)
+	.result(function(event, data, formatted) {
+		$('#reduction_product').val(data.id_product);
+		$('#reductionProductFilter').val((data.reference + ' ' + data.name).trim());
+	});
+	
+$('#customerFilter')
+	.autocomplete(
+			'ajax-tab.php', {
+			minChars: 2,
+			max: 50,
+			width: 500,
+			selectFirst: false,
+			scroll: false,
+			dataType: 'json',
+			formatItem: function(data, i, max, value, term) {
+				return value;
+			},
+			parse: function(data) {
+				var mytab = new Array();
+				for (var i = 0; i < data.length; i++)
+					mytab[mytab.length] = { data: data[i], value: data[i].cname + ' (' + data[i].email + ')' };
+				return mytab;
+			},
+			extraParams: {
+				controller: 'AdminCartRules',
+				token: currentToken,
+				customerFilter: 1
+			}
+		}
+	)
+	.result(function(event, data, formatted) {
+		$('#id_customer').val(data.id_customer);
+		$('#customerFilter').val(data.cname + ' (' + data.email + ')');
+	});

admin-dev/themes/template/cart_rules/form.tpl

@@ -0,0 +1,59 @@
+<form action="{$currentIndex}&token={$currentToken}&addcart_rule" id="cart_rule_form" method="post">
+	<fieldset>
+		<legend><img src="../img/t/AdminCartRules.gif" /> {l s='Cart Rule'}</legend>
+		{if $currentObject->id}<input type="hidden" name="id_cart_rule" value="{$currentObject->id|intval}" />{/if}
+		<label>{l s='Name'}</label>
+		<div class="margin-form">
+		
+		{foreach from=$languages item=language}
+			<input type="text" name="name_{$language.id_lang}" value="{$currentTab->getFieldValue($currentObject, 'name', $language.id_lang)}" style="width:300px" />
+			<br />
+		{/foreach}
+			<p>{l s='Will be displayed in the cart summary as well as on the invoice.'}</p>
+		</div>
+		<label>{l s='Description'}</label>
+		<div class="margin-form">
+			<textarea name="description" style="width:90%;height:100px">{$currentTab->getFieldValue($currentObject, 'description')}</textarea>
+			<p>{l s='For you only, never displayed to the customer.'}</p>
+		</div>
+		<label>{l s='Code'}</label>
+		<div class="margin-form">
+			<input type="text" id="code" name="code" value="{$currentTab->getFieldValue($currentObject, 'code')}" />
+			<img src="../img/admin/news-new.gif" onclick="gencode(8);" style="cursor:pointer" />
+			<p>{l s='Optional, the rule will automatically be applied if you leave this field blank.'}</p>
+		</div>
+		<label>{l s='Partial use'}</label>
+		<div class="margin-form">
+			<select name="partial_use">
+				<option value="0" {if $currentTab->getFieldValue($currentObject, 'partial_use') == 0}selected="selected"{/if}>{l s='No - Lower the voucher value to the total order amount'}</option>
+				<option value="1" {if $currentTab->getFieldValue($currentObject, 'partial_use') == 1}selected="selected"{/if}>{l s='Yes - Create a new voucher with the remainder'}</option>
+			</select>
+		</div>
+		<label>{l s='Priority'}</label>
+		<div class="margin-form">
+			<input type="text" name="priority" value="{$currentTab->getFieldValue($currentObject, 'priority')|intval}" />
+		</div>
+		<label>{l s='Status'}</label>
+		<div class="margin-form">
+			&nbsp;&nbsp;
+			<input type="radio" name="active" id="active_on" value="1" {if $currentTab->getFieldValue($currentObject, 'active')|intval}checked="checked"{/if} />
+			<label class="t" for="active_on"> <img src="../img/admin/enabled.gif" alt="{l s='Enabled'}" title="{l s='Enabled'}" style="cursor:pointer" /></label>
+			&nbsp;&nbsp;
+			<input type="radio" name="active" id="active_off" value="0"  {if !$currentTab->getFieldValue($currentObject, 'active')|intval}checked="checked"{/if} />
+			<label class="t" for="active_off"> <img src="../img/admin/disabled.gif" alt="{l s='Disabled'}" title="{l s='Disabled'}" style="cursor:pointer" /></label>
+		</div>
+		<hr />
+		<legend style="margin:-22px 0 10px 0"><img src="../img/admin/access.png" /> {l s='Conditions'}</legend>
+		{include file='cart_rules/conditions.tpl'}
+		<div class="clear">&nbsp;</div><hr />
+		<legend style="margin:-22px 0 10px 0"><img src="../img/admin/asterisk.gif" /> {l s='Actions'}</legend>
+		{include file='cart_rules/actions.tpl'}
+		<hr />
+		<input type="submit" value="{l s='Save'}" class="button" name="submitAddcart_rule" />
+	</fieldset>
+</form>
+<script type="text/javascript">
+	var product_rules_counter = {if isset($product_rules_counter)}{$product_rules_counter}{else}0{/if};
+	var currentToken = '{$currentToken}';
+</script>
+<script type="text/javascript" src="themes/template/cart_rules/form.js"></script>

admin-dev/themes/template/cart_rules/product_rule.tpl

@@ -0,0 +1,36 @@
+<tr id="product_rule_{$product_rule_id}_tr">
+	<td>
+		<a href="javascript:removeProductRule({$product_rule_id});">
+			<img src="../img/admin/disabled.gif" alt="{l s='Remove'}" title="{l s='Remove'}" />
+		</a>
+	</td>
+	<td>
+		<input type="hidden" name="product_rule[]" value="{$product_rule_id}" />
+		<input type="hidden" name="product_rule_{$product_rule_id}_type" value="{$product_rule_type}" />
+		[{$product_rule_type}] {l s='The cart must contain at least'}
+	</td>
+	<td style="padding:5px">
+		<input type="text" name="product_rule_{$product_rule_id}_quantity" value="{$product_rule_quantity|intval}" style="width:30px" />
+	</td>
+	<td>
+		{l s='product(s) matching'}
+	</td>
+	<td>
+		<input type="text" id="product_rule_{$product_rule_id}_match" value="" disabled="disabled" />
+	</td>
+	<td>
+		<a id="product_rule_{$product_rule_id}_choose_link" href="#product_rule_{$product_rule_id}_choose_content">
+			<img src="../img/admin/choose.gif" alt="{l s='Choose'}" title="{l s='Choose'}" /> {l s='Choose'}
+		</a>
+		<div>
+			<div id="product_rule_{$product_rule_id}_choose_content">
+				{$product_rule_choose_content}
+			</div>
+		</div>
+	</td>
+</tr>
+
+<script type="text/javascript">
+	$('#product_rule_{$product_rule_id}_choose_content').parent().hide();
+	$("#product_rule_{$product_rule_id}_choose_link").fancybox();
+</script>

admin-dev/themes/template/cart_rules/product_rule_itemlist.tpl

@@ -0,0 +1,32 @@
+<table>
+	<tr>
+		<td>
+			<p><strong>{l s='Selected'}</strong></p>
+			<select name="product_rule_select_{$product_rule_id}[]" class="product_rule_toselect" id="product_rule_select_{$product_rule_id}_2" style="border:1px solid #AAAAAA;width:400px;height:160px" multiple>
+				{foreach from=$product_rule_itemlist.selected item='item'}
+					<option value="{$item.id|intval}">&nbsp;{$item.name}</option>
+				{/foreach}
+			</select><br /><br />
+			<a style="cursor:pointer;text-align:center;display:block;border:1px solid #aaa;text-decoration:none;background-color:#fafafa;color:#123456;margin:2px;padding:2px" id="product_rule_select_{$product_rule_id}_remove">
+				{l s='Remove'} &gt;&gt;
+			</a>
+		</td>
+		<td style="padding-left:20px;">
+			<p><strong>{l s='Unselected'}</strong></p>
+			<select id="product_rule_select_{$product_rule_id}_1" style="border:1px solid #AAAAAA;width:400px;height:160px" multiple>
+				{foreach from=$product_rule_itemlist.unselected item='item'}
+					<option value="{$item.id|intval}">&nbsp;{$item.name}</option>
+				{/foreach}
+			</select><br /><br />
+			<a style="cursor:pointer;text-align:center;display:block;border:1px solid #aaa;text-decoration:none;background-color:#fafafa;color:#123456;margin:2px;padding:2px" id="product_rule_select_{$product_rule_id}_add">
+				&lt;&lt; {l s='Add'}
+			</a>
+		</td>
+	</tr>
+</table>
+
+<script type="text/javascript">
+	$('#product_rule_select_{$product_rule_id}_remove').click(function() { removeCartRuleOption(this); updateProductRuleShortDescription(this); });
+	$('#product_rule_select_{$product_rule_id}_add').click(function() { addCartRuleOption(this); updateProductRuleShortDescription(this); });
+	$(document).ready(function() { updateProductRuleShortDescription($('#product_rule_select_{$product_rule_id}_add')); });
+</script>

admin-dev/themes/template/categories/list_header.tpl

@@ -82,7 +82,7 @@
 		{foreach from=$toolbar_btn item=btn key=k}
 			<li>
 				<a class="toolbar_btn" href="{$btn.href}" title="{$btn.desc}">
-					<span class="process-icon-{$btn.imgclass|default:$k} {$btn.class|default:'' }" ></span>{$btn.desc}
+					<span class="process-icon-{$btn.imgclass|default:$k} {$btn.class|default:''}" ></span>{$btn.desc}
 				</a>
 			</li> 
 			{/foreach}

admin-dev/themes/template/customers/form.tpl

@@ -59,7 +59,7 @@
 		{foreach from=$toolbar_btn item=btn key=k}
 			<li>
 				<a class="toolbar_btn" href="{$btn.href}" title="{$btn.desc}">
-					<span class="process-icon-{$btn.imgclass|default:$k} {$btn.class|default:'' }" ></span>{$btn.desc}
+					<span class="process-icon-{$btn.imgclass|default:$k} {$btn.class|default:''}" ></span>{$btn.desc}
 				</a>
 			</li> 
 			{/foreach}

admin-dev/themes/template/helper/form/form.tpl

@@ -67,7 +67,7 @@
 		{foreach from=$toolbar_btn item=btn key=k}
 			<li>
 				<a class="toolbar_btn" href="{$btn.href}" title="{$btn.desc}">
-					<span class="process-icon-{$btn.imgclass|default:$k} {$btn.class|default:'' }" ></span>{$btn.desc}
+					<span class="process-icon-{$btn.imgclass|default:$k} {$btn.class|default:''}" ></span>{$btn.desc}
 				</a>
 			</li>
 			{/foreach}

admin-dev/themes/template/helper/list/list_header.tpl

@@ -61,7 +61,7 @@
 		{foreach from=$toolbar_btn item=btn key=k}
 			<li>
 				<a class="toolbar_btn" href="{$btn.href}" title="{$btn.desc}">
-					<span class="process-icon-{$btn.imgclass|default:$k} {$btn.class|default:'' }" ></span>{$btn.desc}
+					<span class="process-icon-{$btn.imgclass|default:$k} {$btn.class|default:''}" ></span>{$btn.desc}
 				</a>
 			</li> 
 			{/foreach}

admin-dev/themes/template/helper/options/options.tpl

@@ -136,13 +136,13 @@
 								<input type="text" size="{if isset($field['size'])}{$field['size']|intval}{else}5{/if}" name="{$key}_{$id_lang}" value="{$value}" />
 							</div>
 						{/foreach}
-					{elseif $field['type'] == 'textareaLang' }
+					{elseif $field['type'] == 'textareaLang'}
 						{foreach $field['languages'] AS $id_lang => $value}
 							<div id="{$key}_{$id_lang}" style="display: {if $id_lang == $current_id_lang}block{else}none{/if}; float: left;">
 								<textarea rows="{$field['rows']}" cols="{$field['cols']|intval}"  name="{$key}_{$id_lang}">{$value|replace:'\r\n':"\n"}</textarea>
 							</div>
 						{/foreach}
-					{elseif $field['type'] == 'selectLang' }
+					{elseif $field['type'] == 'selectLang'}
 						{foreach $languages as $language}
 						<div id="{$key}_{$language.id_lang}" style="margin-bottom:8px; display: {if $language.id_lang == $current_id_lang}block{else}none{/if}; float: left; vertical-align: top;">
 							<select name="{$key}_{$language.iso_code|upper}">

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

@@ -111,7 +111,7 @@ $(document).ready(function() {
 	if({$refresh_check_version})
 	{
 		$('#blockNewVersionCheck').hide();
-		$.ajax({
+	$.ajax({
 			type : 'POST',
 			data : {
 				ajax : '1',
@@ -179,7 +179,7 @@ $(document).ready(function() {
 		{
 			// don't show/hide screencast if it's deactivated
 			{if $employee->bo_show_screencast}
-				$('#adminpresentation').fadeOut('slow');
+			$('#adminpresentation').fadeOut('slow');
 			{/if}
 			$('#partner_preactivation').fadeOut('slow');
 			$('#discover_prestashop').fadeOut('slow');

admin-dev/themes/template/manufacturers/list_header.tpl

@@ -61,7 +61,7 @@
 		{foreach from=$toolbar_btn item=btn key=k}
 			<li>
 				<a class="toolbar_btn" href="{$btn.href}" title="{$btn.desc}">
-					<span class="process-icon-{$btn.imgclass|default:$k} {$btn.class|default:'' }" ></span>{$btn.desc}
+					<span class="process-icon-{$btn.imgclass|default:$k} {$btn.class|default:''}" ></span>{$btn.desc}
 				</a>
 			</li> 
 			{/foreach}

admin-dev/themes/template/preferences/options.tpl

@@ -29,7 +29,7 @@
 	{if $field['type'] == 'price'}
 		<div class="margin-form">
 			{$field['currency_left']}
-			<input type="text"{if isset($field['id']) } id="{$field['id']}"{/if} size="{if isset($field['size'])}{$field['size']|intval}{else} 5{/if}" name="{$key}" value="{$field['value']|escape:'htmlall':'UTF-8'}" />
+			<input type="text"{if isset($field['id'])} id="{$field['id']}"{/if} size="{if isset($field['size'])}{$field['size']|intval}{else} 5{/if}" name="{$key}" value="{$field['value']|escape:'htmlall':'UTF-8'}" />
 			{if isset($field['next'])} &nbsp; {$field['next']|strval}{/if}
 			{$field['currency_right']}
 	{elseif $field['type'] == 'disabled'}
@@ -38,7 +38,7 @@
 	{elseif $field['type'] == 'maintenance_ip'}
 		<div class="margin-form">
 			{$field['script_ip']}
-			<input type="text"{if isset($field['id']) } id="{$field['id']}"{/if} size="{if isset($field['size'])}{$field['size']|intval}{else} 5{/if}" name="{$key}" value="{$field['value']|escape:'htmlall':'UTF-8'}" />
+			<input type="text"{if isset($field['id'])} id="{$field['id']}"{/if} size="{if isset($field['size'])}{$field['size']|intval}{else} 5{/if}" name="{$key}" value="{$field['value']|escape:'htmlall':'UTF-8'}" />
 			{$field['link_remove_ip']}
 	{else}
 		<div class="margin-form">

admin-dev/themes/template/products/combinations.tpl

@@ -167,7 +167,7 @@
 			  <td style="padding-bottom:5px;">
 				{if $currency->format % 2 != 0}{$currency->sign}{/if}
 				<input type="text" size="6"  name="attribute_wholesale_price" id="attribute_wholesale_price" value="0.00" onKeyUp="if (isArrowKey(event)) return ;this.value = this.value.replace(/,/g, '.');" />
-				{if $currency->format % 2 == 0 } {$currency->sign} {/if}({l s='overrides Wholesale price on Information tab'})</td>
+				{if $currency->format % 2 == 0} {$currency->sign} {/if}({l s='overrides Wholesale price on Information tab'})</td>
 		  </tr>
 		  <tr>
 			  <td style="width:150px;vertical-align:top;text-align:right;padding-right:10px;font-weight:bold;">{l s='Impact on price:'}</td>
@@ -178,7 +178,7 @@
 				  <option value="-1">{l s='Reduction'}</option>
 				</select>
 				<span id="span_impact">&nbsp;&nbsp;{l s='of'}&nbsp;&nbsp;{if $currency->format % 2 != 0}{$currency->sign} {/if}
-					<input type="text" size="6" name="attribute_price" id="attribute_price" value="0.00" onKeyUp="if (isArrowKey(event)) return ;this.value = this.value.replace(/,/g, '.'); calcImpactPriceTI();"/>{if $currency->format % 2 == 0 } {$currency->sign}{/if}
+					<input type="text" size="6" name="attribute_price" id="attribute_price" value="0.00" onKeyUp="if (isArrowKey(event)) return ;this.value = this.value.replace(/,/g, '.'); calcImpactPriceTI();"/>{if $currency->format % 2 == 0} {$currency->sign}{/if}
 				{if $country_display_tax_label}
 						 {l s='(tax excl.)'}
 						 <span {if $tax_exclude_option}style="display:none"{/if}> {l s='or'} {if $currency->format % 2 != 0}{$currency->sign} {/if}
@@ -218,9 +218,9 @@
 		{if $ps_use_ecotax}
 <tr>
 	<td style="width:150px;vertical-align:top;text-align:right;padding-right:10px;font-weight:bold;">
-		{l s='Eco-tax:' }
+		{l s='Eco-tax:'}
 	</td>
-	<td style="padding-bottom:5px;">{if $currency->format % 2 != 0 }{$currency->sign}{/if}
+	<td style="padding-bottom:5px;">{if $currency->format % 2 != 0}{$currency->sign}{/if}
 		<input type="text" size="3" name="attribute_ecotax" id="attribute_ecotax" value="0.00" 
 		onKeyUp="if (isArrowKey(event)) return ;this.value = this.value.replace(/,/g, '.');" />
 		{if $currency->format % 2 == 0} {$currency->sign}{/if}
@@ -229,7 +229,7 @@
 	</tr>
 {/if}
 			<tr>
-			<td style="width:150px;vertical-align:top;text-align:right;padding-right:10px;font-weight:bold;" class="col-left"><label>{l s='Minimum quantity:' }</label>
+			<td style="width:150px;vertical-align:top;text-align:right;padding-right:10px;font-weight:bold;" class="col-left"><label>{l s='Minimum quantity:'}</label>
 			</td>
 			<td style="padding-bottom:5px;">
 				<input size="3" maxlength="6" name="minimal_quantity" id="minimal_quantity" type="text" value="{$minimal_quantity}" />
@@ -252,7 +252,7 @@
 		  </tr>
 		  <tr><td colspan="2"><div class="separation"></div></td></tr>
 		  <tr>
-			  <td style="width:150px">{l s='Image:' }</td>
+			  <td style="width:150px">{l s='Image:'}</td>
 			  <td style="padding-bottom:5px;">
 				<ul id="id_image_attr">
 					{foreach from=$images key=k item=image}

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

@@ -12,7 +12,7 @@
 		{foreach from=$toolbar_btn item=btn key=k}
 			<li>
 				<a class="toolbar_btn action-{$k}" href="{$btn.href}" title="{$btn.desc}">
-					<span class="process-icon-{$k} {$btn.class|default:'' }" ></span>{$btn.desc}
+					<span class="process-icon-{$k} {$btn.class|default:''}" ></span>{$btn.desc}
 				</a>
 			</li> 
 			{/foreach}

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

@@ -56,7 +56,7 @@
 							{foreach $ranges AS $range}
 								<td class="center">
 									{$currency->getSign('left')}
-									<input type="text" id="fees_all_{$range[$rangeIdentifier]}" onchange="this.value = this.value.replace(/,/g, \'.\');" onkeyup="if ((event.keyCode||event.which) != 9){ spreadFees('.$range[$rangeIdentifier].') }" style="width: 45px;" />
+									<input type="text" id="fees_all_{$range[$rangeIdentifier]}" onchange="this.value = this.value.replace(/,/g, \'.\');" onkeyup="if ((event.keyCode||event.which) != 9){ spreadFees('.$range[$rangeIdentifier].')}" style="width: 45px;" />
 									{$currency->getSign('right')}
 								</td>
 							{/foreach}