From d105879fa1742ebff1402d0d67593b96f1cdc8d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Chans=C3=A9aume?= Date: Mon, 28 Jul 2014 09:37:53 +0200 Subject: [PATCH] display a message when a combination does not exist --- templates/frontOffice/default/assets/js/script.js | 12 ++++++++++++ .../default/includes/single-product.html | 13 ++++--------- templates/frontOffice/default/product.html | 5 +++++ 3 files changed, 21 insertions(+), 9 deletions(-) diff --git a/templates/frontOffice/default/assets/js/script.js b/templates/frontOffice/default/assets/js/script.js index 2a6cbd1ca..2e5280b92 100644 --- a/templates/frontOffice/default/assets/js/script.js +++ b/templates/frontOffice/default/assets/js/script.js @@ -36,6 +36,7 @@ var pseManager = (function($){ "ref": $("#pse-ref"), "ean": $("#pse-ean"), "availability": $("#pse-availability"), + "validity": $("#pse-validity"), "quantity": $("#quantity"), "promo": $("#pse-promo"), "new": $("#pse-new"), @@ -105,8 +106,10 @@ var pseManager = (function($){ if ( ! pseId ) { // not exists, revert + displayNotice(); setPseForm(); } else { + $pse.validity.hide(); $pse.id.val(pseId); $pse.pseId = pseId; } @@ -116,6 +119,15 @@ var pseManager = (function($){ updateProductUI(); } + function displayNotice() { + var $validity = $pse.validity; + $validity.show('fast', function(){ + setTimeout(function(){ + $validity.hide('fast'); + }, 3000); + }); + } + function updateProductUI() { var pse = PSE[$pse.pseId], name = [], diff --git a/templates/frontOffice/default/includes/single-product.html b/templates/frontOffice/default/includes/single-product.html index de7cf2bf9..53201f8ce 100644 --- a/templates/frontOffice/default/includes/single-product.html +++ b/templates/frontOffice/default/includes/single-product.html @@ -38,17 +38,17 @@
- - + {* List of condition : NewCondition, DamagedCondition, UsedCondition, RefurbishedCondition *} + + {* List of currency : The currency used to describe the product price, in three-letter ISO format. *} + - {if $IS_PROMO } {intl l="Special Price:"} {format_number number=$TAXED_PROMO_PRICE} {currency attr="symbol"} {intl l="Regular Price:"} {format_number number=$TAXED_PRICE} {currency attr="symbol"} {else} {format_number number=$BEST_TAXED_PRICE} {currency attr="symbol"} {/if} -
{if $hasBtn == true} @@ -80,16 +80,11 @@ {/if}
{/form_field} - -
- -
- {/form} diff --git a/templates/frontOffice/default/product.html b/templates/frontOffice/default/product.html index 41d962ab4..e053283de 100644 --- a/templates/frontOffice/default/product.html +++ b/templates/frontOffice/default/product.html @@ -136,6 +136,11 @@ {intl l="Regular Price:"} {format_number number="{$TAXED_PRICE}"} {currency attr="symbol"} + + + {form name="thelia.cart.add" }