diff --git a/core/lib/Thelia/Core/Security/Resource/AdminResources.php b/core/lib/Thelia/Core/Security/Resource/AdminResources.php index 2ddea9877..532e8e5bc 100644 --- a/core/lib/Thelia/Core/Security/Resource/AdminResources.php +++ b/core/lib/Thelia/Core/Security/Resource/AdminResources.php @@ -105,7 +105,7 @@ final class AdminResources const EXPORT = "admin.export"; - const EXPORT_CUSTOMER_NEWSLETTER = "admin.export.customer.newsletter"; + const IMPORT = "admin.import"; const TOOLS = "admin.tools"; } diff --git a/core/lib/Thelia/Core/Template/Loop/Import.php b/core/lib/Thelia/Core/Template/Loop/Import.php index e15ec49b7..c730bd4f0 100644 --- a/core/lib/Thelia/Core/Template/Loop/Import.php +++ b/core/lib/Thelia/Core/Template/Loop/Import.php @@ -22,7 +22,7 @@ class Import extends ImportExportType { protected function getBaseUrl() { - return $this->container->getParameter("export.base_url"); + return $this->container->getParameter("import.base_url"); } protected function getQueryModel() diff --git a/templates/backOffice/default/import.html b/templates/backOffice/default/import.html new file mode 100644 index 000000000..bcd6fd972 --- /dev/null +++ b/templates/backOffice/default/import.html @@ -0,0 +1,127 @@ +{extends file="admin-layout.tpl"} + +{block name="no-return-functions"} + {$admin_current_location = 'tools'} +{/block} + +{block name="page-title"}{intl l='Imports'}{/block} + +{block name="check-resource"}admin.import{/block} +{block name="check-access"}view{/block} + +{block name="main-content"} +
+ +
+ + + + {module_include location='tools_top'} + + {loop name="import-category" type="import-category"} + {if $LOOP_COUNT % 3} +
+ {/if} + +
+ +
+ + {if $LOOP_COUNT % 3} +
+ {/if} + {/loop} + + {module_include location='configuration_bottom'} +
+
+{/block} + + +{block name="javascript-initialization"} + {javascripts file='assets/js/bootstrap-switch/bootstrap-switch.js'} + + {/javascripts} +{/block} + +{block name="javascript-last-call"} + + + {module_include location='configuration-js'} +{/block} \ No newline at end of file