Merge branch 'master' into template

templates/admin/default/assets/less/thelia/thelia.less

@@ -247,4 +247,10 @@
 
 .ui-slider{
 	margin-top: 23px;
+}
+
+.loading{
+  background: url("@{imgDir}/ajax-loader.gif") no-repeat;
+  height: 24px;
+  width: 24px;
 }

templates/admin/default/coupon-update.html

@@ -36,6 +36,35 @@
     <script>
         $(function($){
             miniBrowser(0, '/test_to_remove/datas_coupon_edit.json');
+
+            $('#effect').on('change', function (e) {
+                var optionSelected = $("option:selected", this);
+                $('#effectToolTip').html(optionSelected.attr("data-description"));
+            });
+
+            $('#category-rule').on('change', function (e) {
+                $('#rule-add-operators-values').html('<div class="loading" ></div>');
+                var url = "{$urlAjaxGetRuleInput}";
+                url = url.replace('ruleId', $(this).val())
+                console.log(url);
+                $.ajax({
+                    url: url,
+                    statusCode: {
+                        404: function() {
+                            $('#rule-add-operators-values').html(
+                                '{intl l='Please select another rule'}'
+                            );
+                        }
+                    }
+                }).done(function(data) {
+                    $('#rule-add-operators-values').html(data);
+                });
+            });
+
+
         });
+
+
+
     </script>
 {/block}

templates/admin/default/coupon/form.html

@@ -104,13 +104,13 @@
                             <label for="effect">{intl l='Effect :'}</label>
                             {form_field form=$form field='effect'}
                                 <select name="{$name}" value="{$value}" id="effect" class="col-md-12 form-control">
-                                    <option value="1" data-description="More description n°1 about item">Remove x percents for category Y</option>
-                                    <option value="2" data-description="More description n°2 about item">Remove x percents</option>
-                                    <option value="3" data-description="More description n°3 about item">Remove x amount</option>
+                                    {foreach from=$availableCoupons item=availableCoupon}
+                                        <option value="{$availableCoupon.serviceId}" data-description="{$availableCoupon.toolTip}">{$availableCoupon.name}</option>
+                                    {/foreach}
                                 </select>
                                 {if $error}{$message}{/if}
                             {/form_field}
-                            <span class="help-block">More description n°1 about item</span>
+                            <span id="effectToolTip" class="help-block">{$availableCoupons.0.toolTip}</span>
                         </div>
                     </div>
 
@@ -194,8 +194,11 @@
 
     <section class="row">
         <div class="col-md-12 general-block-decorator clearfix">
+            <a title="{intl l='Save this rule'}" class="btn btn-default btn-primary pull-right">
+                <span class="glyphicon glyphicon-plus-sign"></span>
+            </a>
 
-            <div class="form-group col-md-2">
+            <div id="rule-add-organizer" class="form-group col-md-2">
                 <label for="type">{intl l='Condition type :'}</label>
                 <label class="radio">
                     <input type="radio" name="type" id="type" value="1" checked> {intl l='And'}
@@ -205,30 +208,16 @@
                 </label>
             </div>
 
-            <div class="form-group col-md-4">
-                <label for="category-rule">{intl l='Rule\'s category :'}</label>
+            <div id="rule-add-type" class="form-group col-md-4">
+                <label for="categoryRule">{intl l='Rule\'s category :'}</label>
                 <select name="categoryRule" id="category-rule" class="form-control">
-                    <option value="1" selected>Total amount</option>
-                    <option value="2">Date</option>
-                    <option value="3">NbArtFromCategory</option>
-                </select>
-
-                <label for="category-rule">Rule's category :</label>
-                <select name="categoryRule" id="category-rule" class="form-control">
-                    <option value="1">Total amount</option>
-                    <option value="2" selected>Date</option>
-                    <option value="3">NbArtFromCategory</option>
-                </select>
-
-                <label for="category-rule">Rule's category :</label>
-                <select name="categoryRule" id="category-rule" class="form-control">
-                    <option value="1">Total amount</option>
-                    <option value="2">Date</option>
-                    <option value="3" selected>NbArtFromCategory</option>
+                    {foreach from=$availableRules item=availableRule}
+                        <option value="{$availableRule.serviceId}" data-description="{$availableRule.toolTip}">{$availableRule.name}</option>
+                    {/foreach}
                 </select>
             </div>
 
-            <div class="form-group col-md-6">
+            <div id="rule-add-operators-values" class="form-group col-md-6">
                 <label for="operator">{intl l='Operator :'}</label>
                 <div class="row">
                     <div class="col-lg-6">

templates/admin/default/coupon/rule-input-ajax.html

@@ -1 +1,74 @@
-test
+{*test*}
+{*{$ruleId}*}
+{*{$inputs|var_dump}*}
+
+{foreach from=$inputs key=name item=input}
+    <label for="operator">{$input.title}</label>
+    <div class="row">
+        <div class="col-lg-6">
+            <select class="form-control" id="{$name}[operator]" name="{$name}[operator]">
+                {foreach from=$input.availableOperators key=k item=availableOperator}
+                    <option value="{$availableOperator}">{$availableOperator}</option>
+                {/foreach}
+            </select>
+        </div>
+        <div class="input-group col-lg-6">
+            {if $input.type == 'select'}
+                <select class="{$input.class}" id="{$name}[value]" name="{$name}[value]">
+                    {foreach from=$input.availableValues key=code item=availableValue}
+                        <option value="{$code}">{$availableValue}</option>
+                    {/foreach}
+                </select>
+            {else}
+                <input type="{$input.type}" class="{$input.class}" id="{$name}[value]" name="{$name}[value]">
+                {*<span class="input-group-addon">€</span>*}
+            {/if}
+        </div>
+    </div>
+{/foreach}
+    {*<label for="operator">Operator :</label>*}
+    {*<div class="row">*}
+        {*<div class="col-lg-6">*}
+            {*<select class="form-control" id="operator" name="operator">*}
+                {*<option value="1">is superior to</option>*}
+                {*<option value="2">equals to</option>*}
+                {*<option value="3">is inferior to</option>*}
+                {*<option value="4">is inferior or equals to</option>*}
+                {*<option value="5">is superior or equals to</option>*}
+            {*</select>*}
+        {*</div>*}
+        {*<div data-date-format="dd/mm/yyyy" data-date="12/02/2012" class="input-group col-lg-6 date">*}
+            {*<input type="text" class="form-control" name="value">*}
+            {*<span class="input-group-addon"><span class="glyphicon glyphicon-th"></span></span>*}
+        {*</div>*}
+    {*</div>*}
+    {*<label for="operator">Operator :</label>*}
+    {*<div class="row">*}
+        {*<div class="col-lg-6">*}
+            {*<select class="form-control" id="operator" name="operator">*}
+                {*<option value="1">is superior to</option>*}
+                {*<option value="2">equals to</option>*}
+                {*<option value="3">is inferior to</option>*}
+                {*<option value="4">is inferior or equals to</option>*}
+                {*<option value="5">is superior or equals to</option>*}
+            {*</select>*}
+        {*</div>*}
+        {*<div class="col-lg-6">*}
+            {*<input type="text" class="form-control" name="value">*}
+        {*</div>*}
+    {*</div>*}
+    {*<div class="row">*}
+        {*<div class="col-lg-12">*}
+            {*<table class="table table-bordered">*}
+                {*<tbody><tr>*}
+                    {*<td id="minibrowser-breadcrumb"><div><span> &gt; </span><a href="#">Racine</a></div></td>*}
+                {*</tr>*}
+                {*<tr>*}
+                    {*<th><span class="icon-th-list"></span> Categories list</th>*}
+                {*</tr>*}
+                {*<tr>*}
+                    {*<td id="minibrowser-categories"><div><p><a href="#">Boyaux</a></p><p><a href="#">Epices / condiments</a></p><p><a href="#">Emballage</a></p><p><a href="#">Petits matériels</a></p><p><a href="#">Materiel de cuisine</a></p><p><a href="#">Bacs</a></p><p><a href="#">Hygiène &amp; entretien</a></p><p><a href="#">Art de la table</a></p><p><a href="#">Matériels</a></p></div></td>*}
+                {*</tr>*}
+                {*</tbody></table>*}
+        {*</div>*}
+    {*</div>*}

templates/default_save/category.html

@@ -1,3 +1,9 @@
+<html>
+<head>
+    {debugbar_renderHead}
+</head>
+<body>
+
 <h1>Category page</h1>
 
 <div style="border: solid 8px; margin: 0px; padding: 0px; width: 45%; float: left">
@@ -26,6 +32,8 @@
         <h4>#TITLE</h4>
         <p>#DESCRIPTION</p>
 
+        <p>Starting by #BEST_PRICE € HT (TAX : #BEST_PRICE_TAX ; #BEST_TAXED_PRICE € TTC)</p>
+
         {ifloop rel="ft"}
             <h5>Features</h5>
             <ul>
@@ -140,4 +148,8 @@
     {/loop}
 </ul>
 
-</div>
+</div>
+
+    {debugbar_render}
+</body>
+</html>

templates/default_save/product.html

@@ -13,6 +13,8 @@ Index : {navigate to="index"}<br />
     <h3>#TITLE</h3>
     <p>#DESCRIPTION</p>
 
+    <p>Starting by #BEST_PRICE € HT (TAX : #BEST_PRICE_TAX ; #BEST_TAXED_PRICE € TTC)</p>
+
     {ifloop rel="acc"}
     <h4>Accessories</h4>
     <ul>
@@ -64,7 +66,7 @@ Index : {navigate to="index"}<br />
         #ATTRIBUTE_TITLE = #ATTRIBUTE_AVAILABILITY_TITLE<br />
         {/loop}
         <br />#WEIGHT g
-        <br /><strong>{if #IS_PROMO == 1} #PROMO_PRICE € (instead of #PRICE) {else} #PRICE € {/if}</strong>
+        <br /><strong>{if #IS_PROMO == 1} #PROMO_PRICE € HT // TAX : #PROMO_PRICE_TAX ; #TAXED_PROMO_PRICE € TTC (instead of #PRICE HT // TAX : #PRICE_TAX ; #TAXED_PRICE € TTC){else} #PRICE € HT // TAX : #PRICE_TAX ; #TAXED_PRICE € TTC{/if}</strong>
         <br /><br />
         Add
         <select>