Merge pull request #400 from roadster31/coupons-return

Coupons return

templates/backOffice/default/I18n/en_US.php

@@ -490,6 +490,7 @@ return array(
     'Folder title' => 'Folder title',
     'Folders' => 'Folders',
     'Folders in %fold' => 'Folders in %fold',
+    'Format: %fmt' => 'Format: %fmt ',
     'Format: %fmt, e.g. %date' => 'Format: %fmt, e.g. %date',
     'French 19.6% VAT is a tax which add a 19.6% tax to the product price.' => 'French 19.6% VAT is a tax which add a 19.6% tax to the product price.',
     'French 19.6% VAT with ecotax is the applicance of the ecotax (on the product price) then the applicance of the 19.6% tax (on the product price + the ecotax amount).' => 'French 19.6% VAT with ecotax is the applicance of the ecotax (on the product price) then the applicance of the 19.6% tax (on the product price + the ecotax amount).',
@@ -633,6 +634,7 @@ return array(
     'Period' => 'Period',
     'Phone' => 'Phone',
     'Phone number' => 'Phone number',
+    'Please enter the date using the %fmt format' => 'Merci d\'indiquer une date au format %fmt',
     'Please retry' => 'Please retry',
     'Please save this coupon first to define coupon conditions' => 'Please save this coupon first to define coupon conditions',
     'Please select a condition' => 'Please select a condition',
@@ -773,6 +775,8 @@ return array(
     'Short description :' => 'Short description :',
     'Show logs' => 'Show logs',
     'Some of your translations are not saved. Continue anyway ?' => 'Some of your translations are not saved. Continue anyway ?',
+    'Something goes wrong, please try again' => 'Une erreur est survenue, merci de ré-essayer',
+    'Something goes wrong, please try again.' => 'Une erreur est survenue, merci de ré-essayer.',
     'Sorry, attribute ID=%id was not found.' => 'Sorry, attribute ID=%id was not found.',
     'Sorry, country ID=%id was not found.' => 'Sorry, country ID=%id was not found.',
     'Sorry, currency ID=%id was not found.' => 'Sorry, currency ID=%id was not found.',
@@ -822,6 +826,7 @@ return array(
     'The mailing template in text-only format.' => 'The mailing template in text-only format.',
     'The page you\'ve requested was not found. Please check the page address, and try again.' => 'The page you\'ve requested was not found. Please check the page address, and try again.',
     'The rate from Euro (Price in Euro * rate = Price in this currency)' => 'The rate from Euro (Price in Euro * rate = Price in this currency)',
+    'The selected countries :' => 'Les pays sélectionnés :',
     'The server returned a "404 Not Found"' => 'The server returned a "404 Not Found"',
     'The symbol, such as $, £, €...' => 'The symbol, such as $, £, €...',
     'The syntax used is identical to the PHP <a href="http://www.php.net/date" target="_other">date()</a> function' => 'The syntax used is identical to the PHP <a href="http://www.php.net/date" target="_other">date()</a> function',
@@ -836,7 +841,6 @@ return array(
     'Thelia Shipping zones' => 'Thelia Shipping zones',
     'Thelia System Variables' => 'Thelia System Variables',
     'Thelia caches flushing' => 'Thelia caches flushing',
-    'Thelia configuration' => 'Thelia configuration',
     'Thelia contributions' => 'Thelia contributions',
     'Thelia core' => 'Thelia core',
     'Thelia informations' => 'Thelia information',
@@ -846,7 +850,6 @@ return array(
     'Thelia product templates' => 'Thelia product templates',
     'Thelia support forum' => 'Thelia support forum',
     'Thelia system variables' => 'Thelia system variables',
-    'Thelia tools' => 'Thelia tools',
     'Thelia, the open source e-commerce solution' => 'Thelia, the open source e-commerce solution',
     'There are no shipping zones attached to this module.' => 'There are no shipping zones attached to this module.',
     'There is currently no active module here.' => 'There is currently no active module here.',
@@ -918,6 +921,7 @@ return array(
     'Update this image' => 'Update this image',
     'Usage count' => 'Usage count',
     'Usages left' => 'Usages left',
+    'Use Ctrl+click to select (or deselect) more that one country' => 'Utiliser Ctrl+clic pour sélectionner (ou dé-sélectionner) plusieurs pays.',
     'Use Ctrl+click to select more than one value. You can also <a href="#" class="clear_feature_value" data-id="%id">clear selected values</a>.' => 'Use Ctrl+click to select more than one value. You can also <a href="#" class="clear_feature_value" data-id="%id">clear selected values</a>.',
     'Use HTML message defined below' => 'Use HTML message defined below',
     'Use Text message defined below' => 'Use Text message defined below',
@@ -930,6 +934,7 @@ return array(
     'Username :' => 'Username :',
     'Using a domain or subdomain for each language' => 'Using a domain or subdomain for each language',
     'Valid on special offers' => 'Valid on special offers',
+    'Validity start date' => 'Date de début de validité',
     'Value' => 'Value',
     'Variable created on %date_create. Last modification: %date_change' => 'Variable created on %date_create. Last modification: %date_change',
     'Variable name' => 'Variable name',
@@ -971,7 +976,6 @@ return array(
     'company' => 'company',
     'customer ref' => 'customer ref',
     'd-m-Y' => 'd-m-Y',
-    'date form' => 'date form',
     'date in yyyy-mm-dd format' => 'date in yyyy-mm-dd format',
     'deactivate' => 'deactivate',
     'deactivation' => 'deactivation',
@@ -988,7 +992,6 @@ return array(
     'short description' => 'short description',
     'tax rules' => 'tax rules',
     'taxes' => 'taxes',
-    'time form' => 'time form',
     'title' => 'title',
     'tracking reference' => 'tracking reference',
     'uncheck all' => 'uncheck all',

templates/backOffice/default/assets/js/coupon.js

@@ -105,6 +105,7 @@ $(function($){
                 $.couponManager.intlPleaseRetry
             );
         }).always(function() {
+            $('#condition-save-btn').hide();
             // Reload condition summaries ajax
             $.couponManager.displayConditionsSummary();
         });

templates/backOffice/default/coupon-create.html

@@ -42,7 +42,7 @@
         $(function($){
             // Url alowing to get coupon inputs
             $.couponManager.urlAjaxAdminCouponDrawInputs = "{$urlAjaxAdminCouponDrawInputs}";
-            $.couponManager.intlPleaseRetry = '{intl l='Please retry'}';
+            $.couponManager.intlPleaseRetry = '{intl l='Something goes wrong, please try again.'}';
             $.couponManager.intlDoYouReallyWantToSetCouponAvailableForEveryOne = '{intl l='Do you really want to set this coupon available to everyone ?'}';
             $.couponManager.intlDoYouReallyWantToDeleteThisCondition = '{intl l='Do you really want to delete this condition ?'}';
         });

templates/backOffice/default/coupon-update.html

@@ -49,7 +49,7 @@
             $.couponManager.urlAjaxAdminCouponDrawInputs = '{$urlAjaxAdminCouponDrawInputs}';
             $.couponManager.urlAjaxGetConditionInputFromServiceId = '{$urlAjaxGetConditionInputFromServiceId}';
             $.couponManager.urlAjaxGetConditionInputFromConditionInterface = '{$urlAjaxGetConditionInputFromConditionInterface}';
-            $.couponManager.intlPleaseRetry = '{intl l='Please retry'}';
+            $.couponManager.intlPleaseRetry = '{intl l='Something goes wrong, please try again'}';
             $.couponManager.intlPleaseSelectAnotherCondition = '{intl l='Please select another condition'}';
             $.couponManager.intlDoYouReallyWantToSetCouponAvailableForEveryOne = '{intl l='Do you really want to set this coupon available to everyone ?'}';
             $.couponManager.intlDoYouReallyWantToDeleteThisCondition = '{intl l='Do you really want to delete this condition ?'}';

templates/backOffice/default/coupon/condition-fragments/cart-contains-categories-condition.html

@@ -0,0 +1,14 @@
+<div class="form-group">
+    <label for="operator">{intl l="Products are :"}</label>
+    {$operatorSelectHtml nofilter}
+</div>
+
+<div class="form-group">
+    <label for="{$categories_field_name}-value">{intl l="The selected categories :"}</label>
+    <select required multiple size="5" class="form-control" id="{$categories_field_name}-value" name="{$categories_field_name}[value][]">
+        {loop type="category-tree" category=0 name="list-of-categories"}
+            <option style="padding-left: {$LEVEL * 20}px" value="{$ID}" {if in_array($ID, $values)}selected="selected"{/if}>{$TITLE}</option>
+        {/loop}
+    </select>
+    <span class="label-help-block">{intl l='Use Ctrl+click to select (or deselect) more that one category'}</span>
+</div>

templates/backOffice/default/coupon/condition-fragments/cart-contains-products-condition.html

@@ -0,0 +1,14 @@
+<div class="form-group">
+    <label for="operator">{intl l="Products are :"}</label>
+    {$operatorSelectHtml nofilter}
+</div>
+
+<div class="form-group">
+    <label for="{$products_field_name}-value">{intl l="The selected products :"}</label>
+    <select required multiple size="5" class="form-control" id="{$products_field_name}-value" name="{$products_field_name}[value][]">
+        {loop type="product" name="list-of-products" order="alpha"}
+            <option value="{$ID}" {if in_array($ID, $values)}selected="selected"{/if}>{$TITLE}</option>
+        {/loop}
+    </select>
+    <span class="label-help-block">{intl l='Use Ctrl+click to select (or deselect) more that one product'}</span>
+</div>

templates/backOffice/default/coupon/condition-fragments/countries-condition.html

@@ -0,0 +1,14 @@
+<div class="form-group">
+    <label for="operator">{$countryLabel}</label>
+    {$operatorSelectHtml nofilter}
+</div>
+
+<div class="form-group">
+    <label for="{$countries_field_name}-value">{intl l="The selected countries :"}</label>
+    <select required multiple size="5" class="form-control" id="{$countries_field_name}-value" name="{$countries_field_name}[value][]">
+        {loop type="country" name="list-of-countries" order="alpha"}
+            <option style="padding-left: {$LEVEL * 20}px" value="{$ID}" {if in_array($ID, $values)}selected="selected"{/if}>{$TITLE}</option>
+        {/loop}
+    </select>
+    <span class="label-help-block">{intl l='Use Ctrl+click to select (or deselect) more that one country'}</span>
+</div>

templates/backOffice/default/coupon/condition-fragments/customers-condition.html

@@ -0,0 +1,14 @@
+<div class="form-group">
+    <label for="operator">{intl l="Customer is"}</label>
+    {$operatorSelectHtml nofilter}
+</div>
+
+<div class="form-group">
+    <label for="{$customers_field_name}-value">{intl l="The selected customer :"}</label>
+    <select required multiple size="5" class="form-control" id="{$customers_field_name}-value" name="{$customers_field_name}[value][]">
+        {loop type="customer" name="list-of-customers" order="lastname,firstname" current="0" backend_context="1"}
+            <option value="{$ID}" {if in_array($ID, $values)}selected="selected"{/if}>{$LASTNAME} {$FIRSTNAME} {$REF}</option>
+        {/loop}
+    </select>
+    <span class="label-help-block">{intl l='Use Ctrl+click to select (or deselect) more that one country'}</span>
+</div>

templates/backOffice/default/coupon/condition-fragments/start-date-condition.html

@@ -0,0 +1,7 @@
+<input type="hidden" name="{$fieldName}[operator]" value="{$criteria}" />
+
+<div id="condition-add-operators-values" class="form-group">
+    <label for="operator">{intl l="Validity start date"} :</label>
+    <input type="text" class="form-control" id="{$fieldName}-value" name="{$fieldName}[value]" value="{$currentValue}" placeholder="{intl l="Format: %fmt" fmt=$dateFormat}">
+    <span class="label-help-block">{intl l='Please enter the date using the %fmt format' fmt=$dateFormat}</span>
+</div>