diff --git a/.idea/workspace.xml b/.idea/workspace.xml index f2ddbf3a..da9a0c77 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -11,440 +11,95 @@ + + + + + + + + + + + + + + - - + + + - - - - - - - - - + + + + - - - - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + - - - + + + - - - - - - + + + + + + - - + + - - - + + + - - - + + + - - + + - - - - + + + + - + - - - - - + + + + + - - - - + + + + - - - - + + + - - - - - - - - - - + - @@ -493,6 +147,11 @@ + + + + + @@ -500,11 +159,6 @@ - - - - - @@ -533,7 +187,13 @@ - + + + + + + + 1602059851601 @@ -577,7 +237,14 @@ - @@ -605,7 +272,8 @@ - @@ -620,59 +288,71 @@ - + - + - + - - + + + - - + + + - - + + + - - + + + - - + + + - - + + + - - + + + - - + + + - - + + + - - + + + - - + + + - + + @@ -681,20 +361,20 @@ - + - + - + - - + + @@ -704,20 +384,4 @@ - - - - - file://$PROJECT_DIR$/modules/mesCategories/mesCategories.php - 232 - - - file://$PROJECT_DIR$/modules/mesCategories/mesCategories.php - 226 - - - - \ No newline at end of file diff --git a/config/xml/blog-fr.xml b/config/xml/blog-fr.xml index c56a07a2..0f343afe 100644 --- a/config/xml/blog-fr.xml +++ b/config/xml/blog-fr.xml @@ -6,6 +6,30 @@ fr + Les modules PrestaShop à considérer pour réussir Black Friday et les fêtes de fin d’année + https://www.prestashop.com/fr/blog/modules-black-friday-2020 + En marge des ventes liées aux fêtes de fin d’années, le phénomène Black Friday, un mois environ avant Noël, continue de + Sun, 25 Oct 2020 16:03:17 +0100 + L'équipe PrestaShop + https://www.prestashop.com/fr/blog/modules-black-friday-2020 + + + Savoir soigner le SAV et la relation avec vos clients e-commerce + https://www.prestashop.com/fr/blog/soigner-sav-e-commerce + Dans l’e-commerce, optimiser votre service après-vente est une étape fondamentale à soigner dans le moindre détail. + Fri, 23 Oct 2020 17:30:29 +0200 + Caroline Phillips + https://www.prestashop.com/fr/blog/soigner-sav-e-commerce + + + 5 astuces pour booster le taux d’ouverture de vos e-mails + https://www.prestashop.com/fr/blog/taux-ouverture-e-mails + Les campagnes d’e-mailing sont un merveilleux levier pour atteindre directement vos clients, les informer des nouveaux produits, services ou des actualités à ne pas manquer ! + Tue, 20 Oct 2020 18:21:12 +0200 + YATEO + https://www.prestashop.com/fr/blog/taux-ouverture-e-mails + + Les paiements de A à Z – Chapitre 2 : optimisez le paiement en magasin https://www.prestashop.com/fr/blog/optimisez-paiement-magasin Dans le chapitre précédent, nous évoquions le paiem @@ -60,30 +84,6 @@ Fri, 02 Oct 2020 16:26:05 +0200 Lucie Gimon FR https://www.prestashop.com/fr/blog/paiements-experience-achat - - - L'importance de la traduction dans l'internationalisation de votre e-commerce - https://www.prestashop.com/fr/blog/traduction-internationalisation-e-commerce - L'expansion internationale est un facteur particulièrement important pour la croissance des ventes de votre boutique en ligne. - Mon, 28 Sep 2020 16:23:16 +0200 - Sara Lázaro FR - https://www.prestashop.com/fr/blog/traduction-internationalisation-e-commerce - - - Une migration vers PrestaShop réussie pour Dream Extension - https://www.prestashop.com/fr/blog/migration-oxatis-prestashop-dream-extensions - Migrer son site e-commerce est une décision stratégique qui peut être redoutée par certains marchands. Pourtant, le changement est souvent très bénéfique. - Fri, 25 Sep 2020 12:14:00 +0200 - L'équipe PrestaShop - https://www.prestashop.com/fr/blog/migration-oxatis-prestashop-dream-extensions - - - Comment analyser la concurrence avant de monter son entreprise ? - https://www.prestashop.com/fr/blog/analyser-concurrence-entreprise - Vous montez votre entreprise de vente en ligne ? - Wed, 23 Sep 2020 11:58:02 +0200 - YATEO - https://www.prestashop.com/fr/blog/analyser-concurrence-entreprise diff --git a/config/xml/default_country_modules_list.xml b/config/xml/default_country_modules_list.xml index 81ed62ed..57dc807a 100644 --- a/config/xml/default_country_modules_list.xml +++ b/config/xml/default_country_modules_list.xml @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/config/xml/modules_native_addons.xml b/config/xml/modules_native_addons.xml index bdf165ad..e6f855cd 100644 --- a/config/xml/modules_native_addons.xml +++ b/config/xml/modules_native_addons.xml @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/config/xml/must_have_modules_list.xml b/config/xml/must_have_modules_list.xml index 2b568d02..73137dcb 100644 --- a/config/xml/must_have_modules_list.xml +++ b/config/xml/must_have_modules_list.xml @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/config/xml/trusted_modules_list.xml b/config/xml/trusted_modules_list.xml index 4236596e..8ed48e0a 100644 --- a/config/xml/trusted_modules_list.xml +++ b/config/xml/trusted_modules_list.xml @@ -1,2 +1,2 @@ - + diff --git a/img/c/3-categorie_sur_homepage.jpg b/img/c/3-categorie_sur_homepage.jpg new file mode 100644 index 00000000..31b3537d Binary files /dev/null and b/img/c/3-categorie_sur_homepage.jpg differ diff --git a/img/c/4-categorie_sur_homepage.jpg b/img/c/4-categorie_sur_homepage.jpg new file mode 100644 index 00000000..88428ee1 Binary files /dev/null and b/img/c/4-categorie_sur_homepage.jpg differ diff --git a/img/c/5-categorie_sur_homepage.jpg b/img/c/5-categorie_sur_homepage.jpg new file mode 100644 index 00000000..b92f8724 Binary files /dev/null and b/img/c/5-categorie_sur_homepage.jpg differ diff --git a/img/c/6-category_default.jpg b/img/c/6-category_default.jpg new file mode 100644 index 00000000..eeb101f8 Binary files /dev/null and b/img/c/6-category_default.jpg differ diff --git a/img/c/6-small_default.jpg b/img/c/6-small_default.jpg new file mode 100644 index 00000000..6fce6061 Binary files /dev/null and b/img/c/6-small_default.jpg differ diff --git a/img/c/6.jpg b/img/c/6.jpg new file mode 100644 index 00000000..119ee95d Binary files /dev/null and b/img/c/6.jpg differ diff --git a/img/c/7-categorie_sur_homepage.jpg b/img/c/7-categorie_sur_homepage.jpg new file mode 100644 index 00000000..6a72f798 Binary files /dev/null and b/img/c/7-categorie_sur_homepage.jpg differ diff --git a/img/c/fr-default-categorie_sur_homepage.jpg b/img/c/fr-default-categorie_sur_homepage.jpg new file mode 100644 index 00000000..73a544ba Binary files /dev/null and b/img/c/fr-default-categorie_sur_homepage.jpg differ diff --git a/modules/mesCategories/mesCategories.php b/modules/mesCategories/mesCategories.php index b3daf0cf..be2441e0 100644 --- a/modules/mesCategories/mesCategories.php +++ b/modules/mesCategories/mesCategories.php @@ -223,16 +223,35 @@ class MesCategories extends Module public function hookDisplayHome() { - $categories = Category::getHomeCategories((int)$this->context->language->id, true); + $lang_id = (int)$this->context->language->id; + $my_array = array(); + + $categories = Category::getHomeCategories($lang_id, true); foreach ($categories as $category) { - if (Category::hasChildren($category[id_category], (int)$this->context->language->id, true)) { - $children = Category::getChildren($category[id_category], (int)$this->context->language->id, true); - array_push($subcategories, [$children]); + + $array_category = array ( + 'category_id' => $category[id_category], + 'category_name' => $category[name], + 'category_img' => $category[name] + ); + + if (Category::hasChildren($category[id_category], $lang_id, true)) { + $subcategories = Category::getChildren($category[id_category], $lang_id, true, true); + $array_subcategories = array(); + + foreach ($subcategories as $subcategory) { + $array_subcategory = array( + 'subcategory_name' => $subcategory[name], + 'subcategory_id' => $subcategory[id_category], + 'subcategory_link' => $subcategory[link_rewrite]); + array_push($array_subcategories, $array_subcategory); + } + $array_category['subcategories'] = $array_subcategories; + array_push($my_array, $array_category); } } $this->smarty->assign(array( - 'categories' => $categories, - 'sub-categories' => $subcategories, + 'categories' => $my_array )); return $this->display(__FILE__, 'displayHome.tpl'); @@ -240,11 +259,11 @@ class MesCategories extends Module public function hookDisplayHomeTab() { - /* Place your code here. */ + return $this->hookDisplayHome(); } public function hookDisplayHomeTabContent() { - /* Place your code here. */ + return $this->hookDisplayHome(); } } diff --git a/modules/mesCategories/views/css/front.css b/modules/mesCategories/views/css/front.css index 88f793f6..9e39d86f 100644 --- a/modules/mesCategories/views/css/front.css +++ b/modules/mesCategories/views/css/front.css @@ -1,27 +1,53 @@ -/** -* 2007-2020 PrestaShop -* -* NOTICE OF LICENSE -* -* This source file is subject to the Academic Free License (AFL 3.0) -* that is bundled with this package in the file LICENSE.txt. -* It is also available through the world-wide-web at this URL: -* http://opensource.org/licenses/afl-3.0.php -* If you did not receive a copy of the license and are unable to -* obtain it through the world-wide-web, please send an email -* to license@prestashop.com so we can send you a copy immediately. -* -* DISCLAIMER -* -* Do not edit or add to this file if you wish to upgrade PrestaShop to newer -* versions in the future. If you wish to customize PrestaShop for your -* needs please refer to http://www.prestashop.com for more information. -* -* @author PrestaShop SA -* @copyright 2007-2020 PrestaShop SA -* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) -* International Registered Trademark & Property of PrestaShop SA -* -* Don't forget to prefix your containers with your own identifier -* to avoid any conflicts with others containers. -*/ + +/* Container principal */ +#mesCategories { + margin-top: 30px; + display: inline-flex; + width: 100%; + justify-content: space-evenly; + align-items: flex-start; + text-align: center; +} + + +/* Sous-catégories (liens hypertexte) */ +.subcategory { + display: flex; + width: 160px; + align-items: center; +} + +.category-image { + +} + +/* Catégorie (image + titre) */ +.figure img { + width: 150px; + border-radius: 5px; + opacity: 0.25; +} +.figure figcaption { + margin-bottom: 10px; + font-family: "Raleway", sans-serif; + font-weight: bolder; + color: black; +} + + +.subcategories-list { + margin-left: -145px; + line-height: 1.7rem; + z-index: 3; + text-align: center; +} +.subcategories-list a { + font-size: 0.95rem; + font-family: "Raleway", sans-serif; + color: black; + width: 100%; +} +.subcategories-list a:hover { + font-weight: bold; +} + diff --git a/modules/mesCategories/views/templates/hook/displayHome.tpl b/modules/mesCategories/views/templates/hook/displayHome.tpl index 30443747..2d0d770c 100644 --- a/modules/mesCategories/views/templates/hook/displayHome.tpl +++ b/modules/mesCategories/views/templates/hook/displayHome.tpl @@ -1,27 +1,25 @@ -
-
    +
    +
      {foreach from=$categories item=category name=category_list}
    • - categorie : {$category.name} - {if $category.image.large.url} -
      - {if !empty($category.image.legend)}{$category.image.legend}{else}{$category.name}{/if} +
      +
      +
      +
      {$category.category_name}
      + {$category.category_name|escape:'html':'UTF-8'} +
      - {/if} -
      - +
      • {/foreach} diff --git a/themes/classic-child/assets/css/custom.css b/themes/classic-child/assets/css/custom.css index 37f61718..0fdf6f20 100644 --- a/themes/classic-child/assets/css/custom.css +++ b/themes/classic-child/assets/css/custom.css @@ -71,7 +71,6 @@ body { display: none !important; } - /********** Produits populaires ************/ #products .thumbnail-container, .featured-products .thumbnail-container, .product-accessories .thumbnail-container, .product-miniature .thumbnail-container { box-shadow: none;