From 9a0e3ca81e1912bd2056eee3466fae89cb8cf770 Mon Sep 17 00:00:00 2001
From: Damien Metzger <damien.metzger@prestashop.com>
Date: Thu, 18 Jul 2013 10:54:05 +0200
Subject: [PATCH] // Added logo remove link in carrier wizard

---
 .../controllers/carrier_wizard/logo.tpl        | 18 +++++++++++++++++-
 .../controllers/carrier_wizard/summary.tpl     |  3 ++-
 .../admin/AdminCarrierWizardController.php     | 13 +++++++++----
 js/admin_carrier_wizard.js                     |  2 +-
 4 files changed, 29 insertions(+), 7 deletions(-)

diff --git a/admin-dev/themes/default/template/controllers/carrier_wizard/logo.tpl b/admin-dev/themes/default/template/controllers/carrier_wizard/logo.tpl
index ac8329c7f..f9256ec1c 100644
--- a/admin-dev/themes/default/template/controllers/carrier_wizard/logo.tpl
+++ b/admin-dev/themes/default/template/controllers/carrier_wizard/logo.tpl
@@ -29,12 +29,24 @@
 		<input id="carrier_logo_input" type="file" onchange="uploadCarrierLogo();" name="carrier_logo_input" />
 		<input type="hidden" id="logo" name="logo" value="" />
 	</p>
+	<a id="carrier_logo_remove" {if !$carrier_logo}style="display:none"{/if} href="javascript:removeCarrierLogo();"><img src="../img/admin/disabled.gif" /> {l s='Remove the logo'}</a>
 	<p>
 		{l s='Format:'} JPG, GIF, PNG. {l s='Filesize:'} {$max_image_size|string_format:"%.2f"} {l s='MB max.'}
+		<br />{l s='Current size:'} <span id="carrier_logo_size">{l s='undefined'}</span>.
 	</p>
 </div>
 
 <script type="text/javascript">
+	var carrier_translation_undefined = '{l s='undefined' js='1'}';
+
+	function removeCarrierLogo()
+	{
+		$('#carrier_logo_img').attr('src', '../img/404.gif');
+		$('#logo').val('null');
+		fixCarrierLogoDisplay();
+		$('#carrier_logo_remove').hide();
+	}
+	
 	function uploadCarrierLogo()
 	{
 		$.ajaxFileUpload({
@@ -49,6 +61,7 @@
 				{
 					$('#carrier_logo_img').attr('src', message);
 					$('#logo').val(message);
+					$('#carrier_logo_remove').show();
 					fixCarrierLogoDisplay();
 				}
 				else
@@ -63,6 +76,7 @@
 			var maxHeight = 200;
 			var maxWidth = 200;
 			var res = this.width / this.height;
+			$('#carrier_logo_size').text(this.width + 'x' + this.height + ' px');
 			$('#carrier_logo_img').width(this.width);
 			$('#carrier_logo_img').height(this.height);
 			if ($('#carrier_logo_img').width() > maxWidth)
@@ -74,7 +88,9 @@
 			{
 				$('#carrier_logo_img').height(maxHeight);
 				$('#carrier_logo_img').width(maxHeight * res);
-			}	
+			}
+			if ($('#logo').val() == 'null')
+				$('#carrier_logo_size').text(carrier_translation_undefined);
 		});
 	}
 	
diff --git a/admin-dev/themes/default/template/controllers/carrier_wizard/summary.tpl b/admin-dev/themes/default/template/controllers/carrier_wizard/summary.tpl
index e3a8ed262..42cfd89af 100644
--- a/admin-dev/themes/default/template/controllers/carrier_wizard/summary.tpl
+++ b/admin-dev/themes/default/template/controllers/carrier_wizard/summary.tpl
@@ -38,7 +38,8 @@
 </script>
 
 <fieldset>
-	<legend>{l s='Summary'} - <span id="summary_name"></span></legend>
+	{l s='Carrier name:'} <strong id="summary_name"></strong>
+	<div class="clear">&nbsp;</div>
 	<div id="summary_meta_informations"></div>
 	<div class="clear">&nbsp;</div>
 	<div id="summary_shipping_cost"></div>
diff --git a/controllers/admin/AdminCarrierWizardController.php b/controllers/admin/AdminCarrierWizardController.php
index d6d4907a2..d41884288 100644
--- a/controllers/admin/AdminCarrierWizardController.php
+++ b/controllers/admin/AdminCarrierWizardController.php
@@ -635,11 +635,16 @@ class AdminCarrierWizardControllerCore extends AdminController
 			
 			if (Tools::getValue('logo'))
 			{
-				$logo = basename(Tools::getValue('logo'));
-				if (!file_exists(_PS_TMP_IMG_DIR_.$logo) || !copy(_PS_TMP_IMG_DIR_.$logo, _PS_SHIP_IMG_DIR_.$carrier->id.'.jpg'))
+				if (Tools::getValue('logo') == 'null' && file_exists(_PS_SHIP_IMG_DIR_.$carrier->id.'.jpg'))
+					unlink(_PS_SHIP_IMG_DIR_.$carrier->id.'.jpg');
+				else
 				{
-					$return['has_error'] = true;
-					$return['errors'][] = $this->l('An error occurred while saving carrier logo.');
+					$logo = basename(Tools::getValue('logo'));
+					if (!file_exists(_PS_TMP_IMG_DIR_.$logo) || !copy(_PS_TMP_IMG_DIR_.$logo, _PS_SHIP_IMG_DIR_.$carrier->id.'.jpg'))
+					{
+						$return['has_error'] = true;
+						$return['errors'][] = $this->l('An error occurred while saving carrier logo.');
+					}
 				}
 			}
 			$return['id_carrier'] = $carrier->id;
diff --git a/js/admin_carrier_wizard.js b/js/admin_carrier_wizard.js
index bbf932573..3bbf037d6 100644
--- a/js/admin_carrier_wizard.js
+++ b/js/admin_carrier_wizard.js
@@ -91,7 +91,7 @@ function displaySummary()
 	$('#summary_name').html($('#name').val());
 	
 	// Delay and pricing
-	tmp = summary_translation_meta_informations.replace('@s2', $('#delay_1').val());
+	tmp = summary_translation_meta_informations.replace('@s2', '<strong>' + $('#delay_1').val() + '</strong>');
 	if ($('#is_free_on').attr('checked'))
 		tmp = tmp.replace('@s1', summary_translation_free);
 	else