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 b81b8ebf6..c479a5e41 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 @@ -45,26 +45,31 @@
-
- - {foreach from=$wizard_contents.contents key=step_nbr item=content} -
- {$content} -
- {/foreach} +
+
+ + {foreach from=$wizard_contents.contents key=step_nbr item=content} +
+ {$content} +
+ {/foreach} +
+
+
+ {$logo_content}
{/block} diff --git a/controllers/admin/AdminCarrierWizardController.php b/controllers/admin/AdminCarrierWizardController.php index d37dc4669..c00652b14 100644 --- a/controllers/admin/AdminCarrierWizardController.php +++ b/controllers/admin/AdminCarrierWizardController.php @@ -129,9 +129,13 @@ class AdminCarrierWizardControllerCore extends AdminController array_splice($this->tpl_view_vars['wizard_contents']['contents'], 1, 0, array(0 => $this->renderStepTwo($carrier))); $this->context->smarty->assign(array( - 'carrier_logo' => (Validate::isLoadedObject($carrier) && file_exists(_PS_SHIP_IMG_DIR_.$carrier->id.'.jpg') ? _THEME_SHIP_DIR_.$carrier->id.'.jpg' : false) - )); - $this->content .= $this->createTemplate('logo.tpl')->fetch(); + 'carrier_logo' => (Validate::isLoadedObject($carrier) && file_exists(_PS_SHIP_IMG_DIR_.$carrier->id.'.jpg') ? _THEME_SHIP_DIR_.$carrier->id.'.jpg' : false), + )); + + $this->context->smarty->assign(array( + 'logo_content' => $this->createTemplate('logo.tpl')->fetch() + )); + $this->addjQueryPlugin(array('ajaxfileupload')); return parent::renderView();