diff --git a/admin-dev/themes/default/template/controllers/carrier_wizard/helpers/view/view.tpl b/admin-dev/themes/default/template/controllers/carrier_wizard/helpers/view/view.tpl index 19c77ecf5..0be09cf90 100644 --- a/admin-dev/themes/default/template/controllers/carrier_wizard/helpers/view/view.tpl +++ b/admin-dev/themes/default/template/controllers/carrier_wizard/helpers/view/view.tpl @@ -32,6 +32,7 @@ var labelDelete = '{l s="Delete" js=1}'; var labelValidate = '{l s="Validate" js=1}'; var validate_url = '{$validate_url|addslashes}'; + var carrierlist_url = '{$carrierlist_url|addslashes}'; var nbr_steps = {$wizard_steps.steps|count}; var enableAllSteps = {if $enableAllSteps|intval == 1}true{else}false{/if}; diff --git a/controllers/admin/AdminCarrierWizardController.php b/controllers/admin/AdminCarrierWizardController.php index d47515e95..d6848f3fb 100644 --- a/controllers/admin/AdminCarrierWizardController.php +++ b/controllers/admin/AdminCarrierWizardController.php @@ -100,6 +100,7 @@ class AdminCarrierWizardControllerCore extends AdminController 'enableAllSteps' => (int)Validate::isLoadedObject($carrier), 'wizard_steps' => $this->wizard_steps, 'validate_url' => $this->context->link->getAdminLink('AdminCarrierWizard'), + 'carrierlist_url' => $this->context->link->getAdminLink('AdminCarriers').'&conf='.((int)Validate::isLoadedObject($carrier) ? 4 : 3), 'wizard_contents' => array( 'contents' => array( 0 => $this->renderStepOne($carrier), diff --git a/controllers/admin/AdminCarriersController.php b/controllers/admin/AdminCarriersController.php index 7d749588d..495766846 100644 --- a/controllers/admin/AdminCarriersController.php +++ b/controllers/admin/AdminCarriersController.php @@ -166,31 +166,6 @@ class AdminCarriersControllerCore extends AdminController public function renderList() { - $this->displayInformation( - ' '.$this->l('How do I create a new carrier?').' -
- ' - ); $this->_select = 'b.*'; $this->_join = 'LEFT JOIN `'._DB_PREFIX_.'carrier_lang` b ON a.id_carrier = b.id_carrier'.Shop::addSqlRestrictionOnLang('b').' LEFT JOIN `'._DB_PREFIX_.'carrier_tax_rules_group_shop` ctrgs ON (a.`id_carrier` = ctrgs.`id_carrier` diff --git a/js/admin_carrier_wizard.js b/js/admin_carrier_wizard.js index 724e72d41..73f8d5039 100644 --- a/js/admin_carrier_wizard.js +++ b/js/admin_carrier_wizard.js @@ -69,7 +69,7 @@ function onFinishCallback(obj, context) resizeWizard(); } else - alert('YEAAAAAAH !!!'); + window.location.href = carrierlist_url; } }); }