dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release

Browse Source
This commit is contained in:
Rémi Gaillard
2013-08-22 10:54:07 +02:00
parent 907d81c32e 6ad274e39d
commit 9d261b8f1f
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/admin/AdminCarrierWizardController.php
+1 -1
View File
@@ -718,7 +718,7 @@ class AdminCarrierWizardControllerCore extends AdminController
&& (!isset($logo['error']) || !$logo['error'])
&& preg_match('/\.(jpe?g|gif|png)$/', $logo['name'])
&& is_uploaded_file($logo['tmp_name'])
&& ImageManager::isRealImage($logo['tmp_name']))
&& ImageManager::isRealImage($logo['tmp_name'], $logo['type']))
{
$file = $logo['tmp_name'];
do $tmp_name = uniqid().'.jpg';
js/admin_carrier_wizard.js
+8 -8
View File
@@ -105,8 +105,8 @@ function onLeaveStepCallback(obj, context)
{
if (context.toStep == nbr_steps)
displaySummary();
return validateSteps(context.fromStep); // return false to stay on step and true to continue navigation
return validateSteps(context.fromStep, context.toStep); // return false to stay on step and true to continue navigation
}
function displaySummary()
@@ -192,25 +192,25 @@ function displaySummary()
});
}
function validateSteps(step_number)
function validateSteps(fromStep, toStep)
{
var is_ok = true;
if ((multistore_enable && step_number == 3) || (!multistore_enable && step_number == 2))
if ((multistore_enable && fromStep == 3) || (!multistore_enable && fromStep == 2))
{
if (!$('#is_free_on').attr('checked') && !validateRange(2))
if (toStep > fromStep && !$('#is_free_on').attr('checked') && !validateRange(2))
is_ok = false;
}
$('.wizard_error').remove();
if (is_ok)
{
form = $('#carrier_wizard #step-'+step_number+' form');
form = $('#carrier_wizard #step-'+fromStep+' form');
$.ajax({
type:"POST",
url : validate_url,
async: false,
dataType: 'json',
data : form.serialize()+'&step_number='+step_number+'&action=validate_step&ajax=1',
data : form.serialize()+'&step_number='+fromStep+'&action=validate_step&ajax=1',
success : function(datas)
{
if (datas.has_error)
@@ -220,7 +220,7 @@ function validateSteps(step_number)
$('input').focus( function () {
$(this).removeClass('field_error');
});
displayError(datas.errors, step_number);
displayError(datas.errors, fromStep);
resizeWizard();
}
},