Merge branch 'master' of gitlab.antadis.net:dev-antadis/chocolatdemariage

www/modules/antadissimulator/views/js/doublecube-exclusif.js

@@ -74,7 +74,7 @@ function initFaces()
 	$.each(['1', '2'], function(iCube, cube){
 		$.each(faceDeg, function(i, v) {
 			img = ''; color = ''; txt = ''; font = '';
-			type = $('#'+cube+'-'+i.toUpperCase()+'TYPE').val();
+			type = $('#CUBE'+cube+'-'+i.toUpperCase()+'TYPE').val();
 			if (type == 'IMAGE') {
 				var request = new XMLHttpRequest();
 				request.open('GET', $('#'+cube+'-'+i.toUpperCase()+'IMG').val());
@@ -89,14 +89,14 @@ function initFaces()
 				request.send();
 			} else {
 				if (type == 'TEXT') {
-					color = $('#'+cube+'-'+i.toUpperCase()+'COLOR').val();				
-					font = $('#'+cube+'-'+i.toUpperCase()+'FONT').val();
-					txt = $('#'+cube+'-'+i.toUpperCase()+'TEXT').val();
+					color = $('#CUBE'+cube+'-'+i.toUpperCase()+'COLOR').val();				
+					font = $('#CUBE'+cube+'-'+i.toUpperCase()+'FONT').val();
+					txt = $('#CUBE'+cube+'-'+i.toUpperCase()+'TEXT').val();
 					$('.db-cube'+cube+' .cubeface.'+i+' .txtface').html('<div class="freetext-holder">'+txt+'</div>');
 					$('.db-cube'+cube+' .cubeface.'+i+' .txtface .freetext-holder').css({'margin-top':-$('.db-cube'+cube+' .cubeface.'+i+' .txtface .freetext-holder').height()*0.5});				
 				} else if (type == 'INITIALE') {
-					color = $('#'+cube+'-'+i.toUpperCase()+'COLOR').val();				
-					font = $('#'+cube+'-'+i.toUpperCase()+'FONT').val();
+					color = $('#CUBE'+cube+'-'+i.toUpperCase()+'COLOR').val();				
+					font = $('#CUBE'+cube+'-'+i.toUpperCase()+'FONT').val();
 					$('.db-cube'+cube+' .cubeface.'+i+' .txtface').html($('#custom_elmts .initiales-holder').clone());
 				}
 				$('.db-cube'+cube+' .cubeface.'+i+' .txtface').addClass(font);

www/themes/chocolatdemariage/modules/antadisconfigurator/views/templates/hook/displayProductForm.tpl

@@ -49,7 +49,7 @@
 				{assign var="optValue" value=$optSelectedValues[$optGroup['id_configurator_opt_group']][0]}
 				{/if}
 				<div class="ctn-input">
-					<input id="{$optGroup['reference']}" type="date" class="form-control configurator-opt-datepicker"
+					<input id="{$optGroup['reference']}" class="form-control configurator-opt-datepicker"
 					name="optgroup-{$optGroup['id_configurator_opt_group']}-{$optImpact['id_configurator_opt']}"
 					value="{if $optValue eq ''}{$smarty.now|date_format:"%d/%m/%Y"}{else}{$optValue}{/if}" />
 				</div>