dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

// BO : cart rules form improved

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10294 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
dMetzger
2011-11-20 16:18:04 +00:00
parent 14cb2b1ef0
commit 8fdcb10f78
4 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/template/cart_rules/form.js
+3 -2
View File
@@ -305,12 +305,13 @@ function displayCartRuleTab(tab)
$('.tab-page').removeClass('selected'); $('.tab-page').removeClass('selected');
$('#cart_rule_' + tab).show(); $('#cart_rule_' + tab).show();
$('#cart_rule_link_' + tab).addClass('selected'); $('#cart_rule_link_' + tab).addClass('selected');
$('#currentFormTab').val(tab);
} }
$('.cart_rule_tab').hide(); $('.cart_rule_tab').hide();
$('.tab-page').removeClass('selected'); $('.tab-page').removeClass('selected');
$('#cart_rule_informations').show(); $('#cart_rule_' + currentFormTab).show();
$('#cart_rule_link_informations').addClass('selected'); $('#cart_rule_link_' + currentFormTab).addClass('selected');
var date = new Date(); var date = new Date();
var hours = date.getHours(); var hours = date.getHours();
admin-dev/themes/template/cart_rules/form.tpl
+7 -1
View File
@@ -14,6 +14,8 @@
</div> </div>
</div> </div>
<form action="{$currentIndex}&token={$currentToken}&addcart_rule" id="cart_rule_form" method="post"> <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"> <div id="cart_rule_informations" class="cart_rule_tab">
<h4>{l s='Cart rule informations'}</h4> <h4>{l s='Cart rule informations'}</h4>
<div class="separation"></div> <div class="separation"></div>
@@ -30,11 +32,15 @@
{include file='cart_rules/actions.tpl'} {include file='cart_rules/actions.tpl'}
</div> </div>
<div class="separation"></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> </form>
<script type="text/javascript"> <script type="text/javascript">
var product_rules_counter = {if isset($product_rules_counter)}{$product_rules_counter}{else}0{/if}; var product_rules_counter = {if isset($product_rules_counter)}{$product_rules_counter}{else}0{/if};
var currentToken = '{$currentToken}'; var currentToken = '{$currentToken}';
var currentFormTab = '{if isset($smarty.post.currentFormTab)}{$smarty.post.currentFormTab|escape}{else}informations{/if}';
var languages = new Array(); var languages = new Array();
{foreach from=$languages item=language key=k} {foreach from=$languages item=language key=k}
admin-dev/themes/template/cart_rules/informations.tpl
-1
View File
@@ -1,7 +1,6 @@
<table cellpadding="0" cellspacing="0"> <table cellpadding="0" cellspacing="0">
<tr> <tr>
<td style="width:50%"> <td style="width:50%">
{if $currentObject->id}<input type="hidden" name="id_cart_rule" value="{$currentObject->id|intval}" />{/if}
<label>{l s='Name'}</label> <label>{l s='Name'}</label>
<div class="margin-form"> <div class="margin-form">
<div class="translatable"> <div class="translatable">
controllers/admin/AdminCartRulesController.php
+1 -1
View File
@@ -51,7 +51,7 @@ class AdminCartRulesControllerCore extends AdminController
public function postProcess() 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 // 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) foreach (array('country', 'carrier', 'group', 'cart_rule', 'product') as $type)