WIP : Coupon : Fix condition selection JS + Dependency Injection register

This commit is contained in:
gmorel
2013-09-27 14:52:38 +02:00
parent 1766951389
commit 5abe350b65
8 changed files with 27 additions and 31 deletions

View File

@@ -55,7 +55,7 @@ $(function($){
$.couponManager.conditionToSave = $.couponManager.conditionsToSave[id];
// Set the condition selector
$("#category-rule option").filter(function() {
$("#category-condition option").filter(function() {
return $(this).val() == $.couponManager.conditionToSave.serviceId;
}).prop('selected', true);
@@ -90,7 +90,7 @@ $(function($){
// Save conditions on click
$.couponManager.onClickSaveCondition = function() {
$('#constraint-save-btn').on('click', function () {
if($('#category-rule').val() == 'thelia.condition.match_for_everyone') {
if($('#category-condition').val() == 'thelia.condition.match_for_everyone') {
// // @todo translate message + put it in modal
var r = confirm("Do you really want to set this coupon available to everyone ?");
if (r == true) {
@@ -140,7 +140,7 @@ $(function($){
// Reload condition inputs when changing effect
$.couponManager.onConditionChange = function() {
$('#category-rule').on('change', function () {
$('#category-condition').on('change', function () {
$.couponManager.loadConditionInputs($(this).val(), function() {});
});
};
@@ -152,9 +152,9 @@ $(function($){
// Set max usage to unlimited or not
$.couponManager.onUsageUnlimitedChange = function() {
var isUnlimited = $('#is-unlimited');
var $isUnlimited = $('#is-unlimited');
if ($('#max-usage').val() == -1) {
isUnlimited.prop('checked', true);
$isUnlimited.prop('checked', true);
$('#max-usage').hide();
$('#max-usage-label').hide();
} else {
@@ -163,7 +163,7 @@ $(function($){
$('#max-usage-label').show();
}
isUnlimited.change(function(){
$isUnlimited.change(function(){
var $this = $(this);
if ($this.is(':checked')) {
$('#max-usage').hide().val('-1');

View File

@@ -43,7 +43,7 @@
<script>
$(function($){
miniBrowser(0, '/test_to_remove/datas_coupon_edit.json');
// miniBrowser(0, '/test_to_remove/datas_coupon_edit.json');
// Init Conditions
$.couponManager.initConditions = function() {

View File

@@ -45,7 +45,6 @@
{form_field form=$form field='isAvailableOnSpecialOffers'}
<div class="form-group {if $error}has-error{/if}">
{$value|var_dump}
<label for="is-available-on-special-offers" class="checkbox control-label">
<input id="is-available-on-special-offers" type="checkbox" name="{$name}" {if $value}value="1" checked{/if} />
{if $error}{$message}{/if}
@@ -122,7 +121,6 @@
<div class="col-md-6">
{form_field form=$form field='amount'}
<div class="form-group {if $error}has-error{/if}">
{$value}
<label for="amount" class="control-label">{intl l='Amount :'}</label>
<input id="amount" type="text" class="form-control" name="{$name}" value="{$value}" placeholder="{intl l='14.50'}">
{if $error}{$message}{/if}