From 2f14bbc7f34dc76acdd3ca74622d6f6439e84bb3 Mon Sep 17 00:00:00 2001
From: vChabot <vincent.chabot@prestashop.com>
Date: Fri, 10 Feb 2012 14:08:03 +0000
Subject: [PATCH] // report bugfix from saving customization with combination

---
 controllers/front/ProductController.php | 17 +++++++++
 js/tools.js                             |  8 ++++-
 modules/blockcart/ajax-cart.js          |  8 +++--
 themes/default/css/global.css           |  7 ++++
 themes/default/js/product.js            | 48 +++++++++++++++++++++++--
 5 files changed, 82 insertions(+), 6 deletions(-)

diff --git a/controllers/front/ProductController.php b/controllers/front/ProductController.php
index 11511a1df..9d152c935 100644
--- a/controllers/front/ProductController.php
+++ b/controllers/front/ProductController.php
@@ -559,5 +559,22 @@ class ProductControllerCore extends FrontController
 		}
 		return $specific_prices;
 	}
+
+	public function postProcess()
+	{
+		if ($this->ajax)
+		{
+			if (Tools::isSubmit('submitCustomizedDatas'))
+			{
+				$this->pictureUpload($this->product, $this->context->cart);
+				$this->textRecord($this->product, $this->context->cart);
+				$this->formTargetFormat();
+			}
+			if (count($this->errors))
+				die(Tools::jsonEncode(array('hasErrors' => true, 'errors' => $this->errors)));
+			else
+				die(Tools::jsonEncode(array('hasErrors' => false, 'conf' => Tools::displayError('Customization saved successfully.'))));
+		}
+	}
 }
 
diff --git a/js/tools.js b/js/tools.js
index 5038af989..f4be7c856 100644
--- a/js/tools.js
+++ b/js/tools.js
@@ -214,7 +214,13 @@ function checkCustomizations()
 function emptyCustomizations()
 {
 	if(typeof(customizationFields) == 'undefined') return;
-	
+
+	$('.customization_block .success').fadeOut(function(){
+		$(this).remove();
+	});
+	$('.customization_block .error').fadeOut(function(){
+		$(this).remove();
+	});
 	for (var i = 0; i < customizationFields.length; i++)
 	{
 		$('#' + customizationFields[i][0]).html('');
diff --git a/modules/blockcart/ajax-cart.js b/modules/blockcart/ajax-cart.js
index 5430737e5..38ad20d56 100644
--- a/modules/blockcart/ajax-cart.js
+++ b/modules/blockcart/ajax-cart.js
@@ -493,8 +493,10 @@ var ajaxCart = {
 
 		if (!hasAlreadyCustomizations)
 		{
-			if (!product.hasAttributes) content += '<dd id="cart_block_combination_of_' + productId + '" class="hidden">';
-			content += '<ul class="cart_block_customizations" id="customization_' + productId + '_' + productAttributeId + '">';
+			if (!product.hasAttributes)
+				content += '<dd id="cart_block_combination_of_' + productId + '" class="hidden">';
+			if ($('#customization_' + productId + '_' + productAttributeId).val() == undefined)
+				content += '<ul class="cart_block_customizations" id="customization_' + productId + '_' + productAttributeId + '">';
 		}
 
 		$(product.customizedDatas).each(function(){
@@ -502,7 +504,7 @@ var ajaxCart = {
 			customizationId = parseInt(this.customizationId);
 			productAttributeId = typeof(product.idCombination) == 'undefined' ? 0 : parseInt(product.idCombination);
 			// If the customization is already displayed on the cart, no update's needed
-			if($('#cart_block').find("div[id^=deleteCustomizableProduct_" + customizationId + "_]").length)
+			if ($("#deleteCustomizableProduct_" + customizationId + "_" + productId + "_" + productAttributeId).length)
 				return ('');
 			content += '<li name="customization"><div class="deleteCustomizableProduct" id="deleteCustomizableProduct_' + customizationId + '_' + productId + '_' + (productAttributeId ?  productAttributeId : '0') + '"><a  rel="nofollow" class="ajax_cart_block_remove_link" href="' + baseDir + 'index.php?controller=cart&amp;delete&amp;id_product=' + productId + '&amp;ipa=' + productAttributeId + '&amp;id_customization=' + customizationId + '&amp;token=' + static_token + '"> </a></div><span class="quantity-formated"><span class="quantity">' + parseInt(this.quantity) + '</span>x</span>';
 
diff --git a/themes/default/css/global.css b/themes/default/css/global.css
index 880692e09..818916047 100644
--- a/themes/default/css/global.css
+++ b/themes/default/css/global.css
@@ -89,6 +89,13 @@ p {padding-bottom:20px}
 	font-size:13px;
 	background:#ffffe0
 }
+.success {
+	margin:0 0 10px 0;
+	padding:10px;
+	border:1px solid #5cff74;
+	font-size:13px;
+	background: #d3ffab
+}
 .error {
 	margin:0 0 10px 0;
 	padding:10px;
diff --git a/themes/default/js/product.js b/themes/default/js/product.js
index ffb1843d8..47ccc8cdb 100644
--- a/themes/default/js/product.js
+++ b/themes/default/js/product.js
@@ -30,6 +30,7 @@ var combinations = new Array();
 var selectedCombination = new Array();
 var globalQuantity = new Number;
 var colors = new Array();
+var input_save_customized_datas = '';
 
 //check if a function exists
 function function_exists(function_name)
@@ -548,6 +549,7 @@ $(document).ready(function()
 
 	// Hide the customization submit button and display some message
 	$('p#customizedDatas input').click(function() {
+		input_save_customized_datas = $('p#customizedDatas').html();
 		$('p#customizedDatas input').hide();
 		$('#ajax-loader').fadeIn();
 		$('p#customizedDatas').append(uploading_in_progress);
@@ -578,8 +580,50 @@ function saveCustomization()
 	$('body select[id^="group_"]').each(function() {
 		customAction = customAction.replace(new RegExp(this.id + '=\\d+'), this.id +'='+this.value);
 	});
-	$('#customizationForm').attr('action', customAction);
-	$('#customizationForm').submit();
+
+	$.ajax({
+		type: 'POST',
+		url: customAction,
+		data: 'ajax=true&'+$('#customizationForm').serialize(),
+		dataType: 'json',
+		async : true,
+		success: function(data) {
+			$('#customizedDatas').fadeOut();
+			$('#customizedDatas').html(input_save_customized_datas);
+			$('#customizedDatas').fadeIn();
+			if (!data.hasErrors)
+			{
+				$('#customizationForm').find('.error').fadeOut(function(){
+					$(this).remove();
+				});
+				// display a confirmation message
+				if ($('#customizationForm').find('.success').val() == undefined)
+					$('#customizationForm').prepend("<p class='success'>"+data.conf+"</p>");
+				else
+					$('#customizationForm.success').html("<p class='success'>"+data.conf+"</p>");
+			}
+			else
+			{
+				$('#customizationForm').find('.success').fadeOut(function(){
+					$(this).remove();
+				});
+				// display an error message
+				if ($('#customizationForm').find('.error').val() == undefined)
+				{
+					$('#customizationForm').prepend("<p class='error'></p>");
+					for (var i = 0; i < data.errors.length; i++)
+						$('#customizationForm .error').html($('#customizationForm .error').html()+data.errors[i]+"<br />");
+				}
+				else
+				{
+					$('#customizationForm .error').html('');
+					for (var i = 0; i < data.errors.length; i++)
+						$('#customizationForm .error').html($('#customizationForm .error').html()+data.errors[i]+"<br />");
+				}
+			}
+		}
+	});
+	return false;
 }
 
 function submitPublishProduct(url, redirect)