From 8fdcb10f785fb6aa8d1bf1530c9f646f862f7a13 Mon Sep 17 00:00:00 2001
From: dMetzger <damien.metzger@prestashop.com>
Date: Sun, 20 Nov 2011 16:18:04 +0000
Subject: [PATCH] // BO : cart rules form improved

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10294 b9a71923-0436-4b27-9f14-aed3839534dd
---
 admin-dev/themes/template/cart_rules/form.js          | 5 +++--
 admin-dev/themes/template/cart_rules/form.tpl         | 8 +++++++-
 admin-dev/themes/template/cart_rules/informations.tpl | 1 -
 controllers/admin/AdminCartRulesController.php        | 2 +-
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/admin-dev/themes/template/cart_rules/form.js b/admin-dev/themes/template/cart_rules/form.js
index c3b2bf223..67d262a0e 100644
--- a/admin-dev/themes/template/cart_rules/form.js
+++ b/admin-dev/themes/template/cart_rules/form.js
@@ -305,12 +305,13 @@ function displayCartRuleTab(tab)
 	$('.tab-page').removeClass('selected');
 	$('#cart_rule_' + tab).show();
 	$('#cart_rule_link_' + tab).addClass('selected');
+	$('#currentFormTab').val(tab);
 }
 
 $('.cart_rule_tab').hide();
 $('.tab-page').removeClass('selected');
-$('#cart_rule_informations').show();
-$('#cart_rule_link_informations').addClass('selected');
+$('#cart_rule_' + currentFormTab).show();
+$('#cart_rule_link_' + currentFormTab).addClass('selected');
 
 var date = new Date();
 var hours = date.getHours();
diff --git a/admin-dev/themes/template/cart_rules/form.tpl b/admin-dev/themes/template/cart_rules/form.tpl
index 4f74e5052..6d3b7d318 100644
--- a/admin-dev/themes/template/cart_rules/form.tpl
+++ b/admin-dev/themes/template/cart_rules/form.tpl
@@ -14,6 +14,8 @@
 	</div>
 </div>
 <form action="{$currentIndex}&token={$currentToken}&addcart_rule" id="cart_rule_form" method="post">
+	{if $currentObject->id}<input type="hidden" name="id_cart_rule" value="{$currentObject->id|intval}" />{/if}
+	<input type="hidden" id="currentFormTab" name="currentFormTab" value="informations" />
 	<div id="cart_rule_informations" class="cart_rule_tab">
 		<h4>{l s='Cart rule informations'}</h4>
 		<div class="separation"></div>
@@ -30,11 +32,15 @@
 		{include file='cart_rules/actions.tpl'}
 	</div>
 	<div class="separation"></div>
-	<div style="text-align:center"><input type="submit" value="{l s='Save'}" class="button" name="submitAddcart_rule" /></div>
+	<div style="text-align:center">
+		<input type="submit" value="{l s='Save'}" class="button" name="submitAddcart_rule" />
+		<input type="submit" value="{l s='Save and stay'}" class="button" name="submitAddcart_ruleAndStay" />
+	</div>
 </form>
 <script type="text/javascript">
 	var product_rules_counter = {if isset($product_rules_counter)}{$product_rules_counter}{else}0{/if};
 	var currentToken = '{$currentToken}';
+	var currentFormTab = '{if isset($smarty.post.currentFormTab)}{$smarty.post.currentFormTab|escape}{else}informations{/if}';
 	
 	var languages = new Array();
 	{foreach from=$languages item=language key=k}
diff --git a/admin-dev/themes/template/cart_rules/informations.tpl b/admin-dev/themes/template/cart_rules/informations.tpl
index c96ac0ba0..6fdfba679 100644
--- a/admin-dev/themes/template/cart_rules/informations.tpl
+++ b/admin-dev/themes/template/cart_rules/informations.tpl
@@ -1,7 +1,6 @@
 <table cellpadding="0" cellspacing="0">
 	<tr>
 		<td style="width:50%">
-			{if $currentObject->id}<input type="hidden" name="id_cart_rule" value="{$currentObject->id|intval}" />{/if}
 			<label>{l s='Name'}</label>
 			<div class="margin-form">
 				<div class="translatable">
diff --git a/controllers/admin/AdminCartRulesController.php b/controllers/admin/AdminCartRulesController.php
index e418437cc..bea27b829 100644
--- a/controllers/admin/AdminCartRulesController.php
+++ b/controllers/admin/AdminCartRulesController.php
@@ -51,7 +51,7 @@ class AdminCartRulesControllerCore extends AdminController
 	
 	public function postProcess()
 	{
-		if (Tools::isSubmit('submitAddcart_rule'))
+		if (Tools::isSubmit('submitAddcart_rule') || Tools::isSubmit('submitAddcart_ruleAndStay'))
 		{
 			// These are checkboxes (which aren't sent through POST when they are not check), so they are forced to 0
 			foreach (array('country', 'carrier', 'group', 'cart_rule', 'product') as $type)