TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

WIP : Coupon : Fix condition edition

Browse Source
This commit is contained in:
gmorel
2013-09-27 15:57:56 +02:00
parent 5abe350b65
commit a74cf0aa85
6 changed files with 58 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
templates/admin/default/assets/js/coupon.js
View File

@@ -89,7 +89,7 @@ $(function($){
// Save conditions on click
$.couponManager.onClickSaveCondition = function() {
$('#constraint-save-btn').on('click', function () {
$('#condition-save-btn').on('click', function () {
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 ?");
@@ -106,7 +106,7 @@ $(function($){
// Remove condition on click
$.couponManager.onClickDeleteCondition = function() {
$('.constraint-delete-btn').on('click', function (e) {
$('.condition-delete-btn').on('click', function (e) {
e.preventDefault();
var $this = $(this);
$.couponManager.removeConditionAjax($this.attr('data-int'));

14
templates/admin/default/coupon/form.html
View File

@@ -194,13 +194,13 @@
</a>
<div id="condition-add-organizer" class="form-group col-md-2">
<label for="type">{intl l='Condition type :'}</label>
<label class="radio">
<input type="radio" name="type" class="form-control" id="type" value="1" checked> {intl l='And'}
</label>
<label class="radio">
<input type="radio" name="type" class="form-control" value="2"> {intl l='Or'}
</label>
{*<label for="type">{intl l='Condition type :'}</label>*}
{*<label class="radio">*}
{*<input type="radio" name="type" class="form-control" id="type" value="1" checked> {intl l='And'}*}
{*</label>*}
{*<label class="radio">*}
{*<input type="radio" name="type" class="form-control" value="2"> {intl l='Or'}*}
{*</label>*}
</div>
<div id="condition-add-type" class="form-group col-md-4">