// Merge -> revision 9435

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9438 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-19 08:14:42 +00:00
parent 43958d54e7
commit 42564ca3d0
35 changed files with 853 additions and 572 deletions
@@ -210,6 +210,8 @@ var shopImporter = {
 			if (isOk)
 			{
 				shopImporter.syncCurrency(function(isOk) {
+					if (isOk)
+					{
 						$.ajax({
 						       type: 'GET',
 						       url: '../modules/shopimporter/ajax.php',
@@ -268,6 +270,7 @@ var shopImporter = {
 						       		$('#technical_error_feedback').fadeIn('slow');
 						       }
 						   });
+					}
 				});
 			}
 		});
@@ -692,7 +695,7 @@ function validateSpecificOptions(moduleName, specificOptions)
 	       async: false,
 	       cache: false,
 	       dataType : 'json',
-	       data: 'ajax=true&token='+this.token+'&validateSpecificOptions&moduleName='+moduleName+specificOptions ,
+	       data: 'ajax=true&token='+token+'&validateSpecificOptions&moduleName='+moduleName+specificOptions ,
 	       success: function(jsonData)
 	       {
 	       		var jsonError = '';
@@ -1265,6 +1265,7 @@ class shopimporter extends ImportModule

 				Image::deleteAllImages(_PS_PROD_IMG_DIR_);
 				Image::clearTmpDir();
+				@mkdir(_PS_PROD_IMG_DIR_);
 				break;
 			case 'manufacturer' :
 				Db::getInstance()->execute('TRUNCATE TABLE `'._DB_PREFIX_.'manufacturer');