Merge pull request #26 from PrestaShop/dev

Release 1.2.0
PrestaShop · Apr 29, 2020 · 6948209 · 6948209
2 parents 79ada10 + 6dc4fa9
commit 6948209
Show file tree

Hide file tree

Showing 10 changed files with 118 additions and 101 deletions.
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,19 @@
+<!-----------------------------------------------------------------------------
+Thank you for contributing to the PrestaShop project! 
+
+Please take the time to edit the "Answers" rows below with the necessary information.
+
+Check out our contribution guidelines to find out how to complete it:
+https://devdocs.prestashop.com/1.7/contribute/contribution-guidelines/#pull-requests
+------------------------------------------------------------------------------>
+
+| Questions     | Answers
+| ------------- | -------------------------------------------------------
+| Description?  | Please be specific when describing the PR. <br> Every detail helps: versions, browser/server configuration, specific module/theme, etc. Feel free to add more information below this table.
+| Type?         | bug fix / improvement / new feature / refacto / critical
+| BC breaks?    | yes / no
+| Deprecations? | yes / no
+| Fixed ticket? | Fixes PrestaShop/Prestashop#{issue number here}.
+| How to test?  | Please indicate how to best verify that this PR is correct.
+
+<!-- Click the form's "Preview" button to make sure the table is functional in GitHub. Thank you! -->
diff --git a/Readme.md b/Readme.md
@@ -5,6 +5,12 @@
 Easily configure and customize your homepage’s theme and main native modules.
 This module is only compatible with PrestaShop 1.7 and more.
 
+## Multistore compatibility
+
+This module is compatible with the multistore :heavy_check_mark: <br/>
+It can be configured differently from one store to another.<br/>
+It can be activated on one store and deactivated on another
+
 ## Reporting issues
 
 You can report issues with this module in the main PrestaShop repository. [Click here to report an issue][report-issue]. 

diff --git a/config.xml b/config.xml
@@ -2,11 +2,11 @@
 <module>
     <name>ps_themecusto</name>
     <displayName><![CDATA[Theme Customization]]></displayName>
-    <version><![CDATA[1.1.0]]></version>
+    <version><![CDATA[1.2.0]]></version>
     <description><![CDATA[Easily configure and customize your homepage&rsquo;s theme and main native modules. Feature available on Design &gt; Theme &amp; Logo page.]]></description>
     <author><![CDATA[PrestaShop]]></author>
     <tab><![CDATA[]]></tab>
     <is_configurable>0</is_configurable>
     <need_instance>1</need_instance>
 	<limited_countries></limited_countries>
-</module>
+</module>
diff --git a/controllers/admin/AdminPsThemeCustoAdvanced.php b/controllers/admin/AdminPsThemeCustoAdvanced.php
@@ -69,8 +69,8 @@ public function initContent()
             'file_not_valid' => $this->l('The file is not valid.'),
         );
         $aJs = array(
-            $this->module->js_path . '/controllers/' . $this->controller_quick_name . '/back.js',
             $this->module->js_path . '/controllers/' . $this->controller_quick_name . '/dropzone.js',
+            $this->module->js_path . '/controllers/' . $this->controller_quick_name . '/back.js',
         );
         $aCss = array($this->module->css_path . '/controllers/' . $this->controller_quick_name . '/back.css');
         $this->module->setMedia($aJsDef, $aJs, $aCss);

diff --git a/controllers/admin/AdminPsThemeCustoConfiguration.php b/controllers/admin/AdminPsThemeCustoConfiguration.php
@@ -23,7 +23,9 @@
 * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
 * International Registered Trademark & Property of PrestaShop SA
 **/
-require_once _PS_MODULE_DIR_ . 'ps_themecusto/vendor/autoload.php';
+if (file_exists(_PS_MODULE_DIR_ . 'ps_themecusto/vendor/autoload.php')) {
+    require_once _PS_MODULE_DIR_ . 'ps_themecusto/vendor/autoload.php';
+}
 
 class AdminPsThemeCustoConfigurationController extends ModuleAdminController
 {

diff --git a/ps_themecusto.php b/ps_themecusto.php
@@ -45,7 +45,7 @@ class ps_themecusto extends Module
     public function __construct()
     {
         $this->name = 'ps_themecusto';
-        $this->version = '1.1.0';
+        $this->version = '1.2.0';
         $this->author = 'PrestaShop';
         $this->module_key = 'af0983815ad8c8a193b5dc9168e8372e';
         $this->author_address = '0x64aa3c1e4034d07015f639b0e171b0d7b27d01aa';

diff --git a/translations/es.php b/translations/es.php
@@ -29,12 +29,12 @@
 $_MODULE['<{ps_themecusto}prestashop>adminpsthemecustoconfiguration_6ff29916f99fff9d2494d28e721ae77e'] = 'Banner';
 $_MODULE['<{ps_themecusto}prestashop>adminpsthemecustoconfiguration_189b43cdd11a8e8db346c4d4885c7fed'] = 'Redes sociales y boletán';
 $_MODULE['<{ps_themecusto}prestashop>adminpsthemecustoconfiguration_ded40f2a77c30efc6062db0cbd857746'] = 'Pie de página';
-$_MODULE['<{ps_themecusto}prestashop>adminpsthemecustoconfiguration_a39a7bb20b87c1e818ff2d321d612c23'] = 'Crear y gestionar categorías de productos';
+$_MODULE['<{ps_themecusto}prestashop>adminpsthemecustoconfiguration_af1b98adf7f686b84cd0b443e022b7a0'] = 'Crear y gestionar categorías de productos';
 $_MODULE['<{ps_themecusto}prestashop>adminpsthemecustoconfiguration_60328687faec0cab8613aa9d796cc0fe'] = 'Crea una amplia gama de categorías y subcategorías para clasificar tus productos y gestionar fácilmente tu catálogo.';
-$_MODULE['<{ps_themecusto}prestashop>adminpsthemecustoconfiguration_a03facafa0612fe501fc66292d6510d7'] = 'Crear páginas de contenido';
-$_MODULE['<{ps_themecusto}prestashop>adminpsthemecustoconfiguration_81b5e93faa3b91bac0e79fda6865f8f3'] = 'Añade y gestiona tus páginas de contenido (páginas CMS: Condiciones de uso, Nuestras tiendas, Sobre nosotros, etc.) como quieras.';
-$_MODULE['<{ps_themecusto}prestashop>adminpsthemecustoconfiguration_c5a358d061895cc982600e71b9947a2e'] = 'Crear páginas de marcas y proveedores';
-$_MODULE['<{ps_themecusto}prestashop>adminpsthemecustoconfiguration_60daf439ec64a846c2b5d13e6e7b1dda'] = 'Este apartado te permite crear y gestionar tus páginas de marcas y proveedores.';
+$_MODULE['<{ps_themecusto}prestashop>adminpsthemecustoconfiguration_8b12d77641baf3ee673f6508bde7b707'] = 'Crear páginas de contenido';
+$_MODULE['<{ps_themecusto}prestashop>adminpsthemecustoconfiguration_3c0d599de9d0dcab37829c7eb7f8e522'] = 'Añade y gestiona tus páginas de contenido (páginas CMS: Condiciones de uso, Nuestras tiendas, Sobre nosotros, etc.) como quieras.';
+$_MODULE['<{ps_themecusto}prestashop>adminpsthemecustoconfiguration_d928b386dd4043c0a72c435eb1cfffa7'] = 'Crear páginas de marcas y proveedores';
+$_MODULE['<{ps_themecusto}prestashop>adminpsthemecustoconfiguration_f5f52d2a02db811858558a879a352e54'] = 'Este apartado te permite crear y gestionar tus páginas de marcas y proveedores.';
 $_MODULE['<{ps_themecusto}prestashop>adminpsthemecustoconfiguration_7cd5fa3f9e9e911c6b60b9044436d227'] = 'Detalles de la tienda';
 $_MODULE['<{ps_themecusto}prestashop>adminpsthemecustoconfiguration_c15614439ecc7d478eec1e4e12edc85b'] = 'Muestra información adicional sobre tu tienda o sobre la forma de contacto para que a tus clientes les resulte más fácil hablar contigo.';
 $_MODULE['<{ps_themecusto}prestashop>adminpsthemecustoconfiguration_4b8a74f166975e0d8c67e68e0590ce10'] = 'La acción en el módulo se ha completado correctamente';