diff --git a/.htaccess b/.htaccess index 3948d19e..5088a23c 100644 --- a/.htaccess +++ b/.htaccess @@ -10,30 +10,30 @@ SetEnv HTTP_MOD_REWRITE On RewriteEngine on -#Domain: thecoredev.produit-naturel-france-v2:8888 +#Domain: thecoredev.produit-naturel-france:8888 RewriteRule . - [E=REWRITEBASE:/] RewriteRule ^api(?:/(.*))?$ %{ENV:REWRITEBASE}webservice/dispatcher.php?url=$1 [QSA,L] # Images -RewriteCond %{HTTP_HOST} ^thecoredev.produit-naturel-france-v2:8888$ +RewriteCond %{HTTP_HOST} ^thecoredev.produit-naturel-france:8888$ RewriteRule ^([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$1$2$3.jpg [L] -RewriteCond %{HTTP_HOST} ^thecoredev.produit-naturel-france-v2:8888$ +RewriteCond %{HTTP_HOST} ^thecoredev.produit-naturel-france:8888$ RewriteRule ^([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$1$2$3$4.jpg [L] -RewriteCond %{HTTP_HOST} ^thecoredev.produit-naturel-france-v2:8888$ +RewriteCond %{HTTP_HOST} ^thecoredev.produit-naturel-france:8888$ RewriteRule ^([0-9])([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$3/$1$2$3$4$5.jpg [L] -RewriteCond %{HTTP_HOST} ^thecoredev.produit-naturel-france-v2:8888$ +RewriteCond %{HTTP_HOST} ^thecoredev.produit-naturel-france:8888$ RewriteRule ^([0-9])([0-9])([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$3/$4/$1$2$3$4$5$6.jpg [L] -RewriteCond %{HTTP_HOST} ^thecoredev.produit-naturel-france-v2:8888$ +RewriteCond %{HTTP_HOST} ^thecoredev.produit-naturel-france:8888$ RewriteRule ^([0-9])([0-9])([0-9])([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$3/$4/$5/$1$2$3$4$5$6$7.jpg [L] -RewriteCond %{HTTP_HOST} ^thecoredev.produit-naturel-france-v2:8888$ +RewriteCond %{HTTP_HOST} ^thecoredev.produit-naturel-france:8888$ RewriteRule ^([0-9])([0-9])([0-9])([0-9])([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$3/$4/$5/$6/$1$2$3$4$5$6$7$8.jpg [L] -RewriteCond %{HTTP_HOST} ^thecoredev.produit-naturel-france-v2:8888$ +RewriteCond %{HTTP_HOST} ^thecoredev.produit-naturel-france:8888$ RewriteRule ^([0-9])([0-9])([0-9])([0-9])([0-9])([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$3/$4/$5/$6/$7/$1$2$3$4$5$6$7$8$9.jpg [L] -RewriteCond %{HTTP_HOST} ^thecoredev.produit-naturel-france-v2:8888$ +RewriteCond %{HTTP_HOST} ^thecoredev.produit-naturel-france:8888$ RewriteRule ^([0-9])([0-9])([0-9])([0-9])([0-9])([0-9])([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$3/$4/$5/$6/$7/$8/$1$2$3$4$5$6$7$8$9$10.jpg [L] -RewriteCond %{HTTP_HOST} ^thecoredev.produit-naturel-france-v2:8888$ +RewriteCond %{HTTP_HOST} ^thecoredev.produit-naturel-france:8888$ RewriteRule ^c/([0-9]+)(\-[\.*_a-zA-Z0-9-]*)(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/c/$1$2$3.jpg [L] -RewriteCond %{HTTP_HOST} ^thecoredev.produit-naturel-france-v2:8888$ +RewriteCond %{HTTP_HOST} ^thecoredev.produit-naturel-france:8888$ RewriteRule ^c/([a-zA-Z_-]+)(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/c/$1$2.jpg [L] # AlphaImageLoader for IE and fancybox RewriteRule ^images_ie/?([^/]+)\.(jpe?g|png|gif)$ js/jquery/plugins/fancybox/images/$1.$2 [L] diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 500eb42a..a5efba50 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -11,131 +11,39 @@ - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + @@ -149,14 +57,13 @@ - + - @@ -260,7 +167,6 @@ - @@ -331,58 +237,58 @@ - - - + + + - + - + - + - + - + - + - + - - - + + + - + - - + + - - + + - - + + - + - - + + @@ -491,7 +397,8 @@ - + + 1602059851601 @@ -584,7 +491,14 @@ - @@ -619,7 +533,8 @@ - @@ -634,10 +549,10 @@ - + - + @@ -707,19 +622,19 @@ - + - + - + - + diff --git a/config/xml/blog-fr.xml b/config/xml/blog-fr.xml index 0f343afe..5b9f6448 100644 --- a/config/xml/blog-fr.xml +++ b/config/xml/blog-fr.xml @@ -6,6 +6,14 @@ fr + 6 preuves sociales pour construire une relation de confiance immédiate avec vos prospects + https://www.prestashop.com/fr/blog/preuves-sociales-confiance + Si vous pensez que seul votre site e-commerce suffit à construire une relation de confiance solide avec vos clients, vous faîtes erreurs. + Fri, 30 Oct 2020 15:32:18 +0100 + YATEO + https://www.prestashop.com/fr/blog/preuves-sociales-confiance + + 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 @@ -76,14 +84,6 @@ Mon, 05 Oct 2020 17:03:17 +0200 Mickaël Benamran https://www.prestashop.com/fr/blog/livraison-jour-meme - - - Les paiements de A à Z – Chapitre 1 : optimisez l’expérience d’achat - https://www.prestashop.com/fr/blog/paiements-experience-achat - Un des enjeux majeurs du secteur de l’e-commerce réside dans le paiement en ligne. - Fri, 02 Oct 2020 16:26:05 +0200 - Lucie Gimon FR - https://www.prestashop.com/fr/blog/paiements-experience-achat diff --git a/config/xml/default_country_modules_list.xml b/config/xml/default_country_modules_list.xml index 346d75ed..3e41ca65 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 e6f855cd..35656e62 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 c6115b58..b41bcd72 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 8ed48e0a..7d620df6 100644 --- a/config/xml/trusted_modules_list.xml +++ b/config/xml/trusted_modules_list.xml @@ -1,2 +1,2 @@ - + diff --git a/config/xml/untrusted_modules_list.xml b/config/xml/untrusted_modules_list.xml index 886d3852..838b137e 100644 --- a/config/xml/untrusted_modules_list.xml +++ b/config/xml/untrusted_modules_list.xml @@ -1,2 +1,2 @@ - + diff --git a/img/s/12.jpg b/img/s/12.jpg new file mode 100644 index 00000000..56a3ec7a Binary files /dev/null and b/img/s/12.jpg differ diff --git a/img/s/13.jpg b/img/s/13.jpg new file mode 100644 index 00000000..e87d541e Binary files /dev/null and b/img/s/13.jpg differ diff --git a/img/s/14.jpg b/img/s/14.jpg new file mode 100644 index 00000000..e87d541e Binary files /dev/null and b/img/s/14.jpg differ diff --git a/img/s/15.jpg b/img/s/15.jpg new file mode 100644 index 00000000..e87d541e Binary files /dev/null and b/img/s/15.jpg differ diff --git a/img/s/16.jpg b/img/s/16.jpg new file mode 100644 index 00000000..56a3ec7a Binary files /dev/null and b/img/s/16.jpg differ diff --git a/img/s/17.jpg b/img/s/17.jpg new file mode 100644 index 00000000..e87d541e Binary files /dev/null and b/img/s/17.jpg differ diff --git a/img/s/18.jpg b/img/s/18.jpg new file mode 100644 index 00000000..e87d541e Binary files /dev/null and b/img/s/18.jpg differ diff --git a/img/s/19.jpg b/img/s/19.jpg new file mode 100644 index 00000000..e87d541e Binary files /dev/null and b/img/s/19.jpg differ diff --git a/img/tmp/carrier_mini_12_1.jpg b/img/tmp/carrier_mini_12_1.jpg new file mode 100644 index 00000000..56a3ec7a Binary files /dev/null and b/img/tmp/carrier_mini_12_1.jpg differ diff --git a/img/tmp/carrier_mini_13_1.jpg b/img/tmp/carrier_mini_13_1.jpg new file mode 100644 index 00000000..e87d541e Binary files /dev/null and b/img/tmp/carrier_mini_13_1.jpg differ diff --git a/img/tmp/carrier_mini_14_1.jpg b/img/tmp/carrier_mini_14_1.jpg new file mode 100644 index 00000000..e87d541e Binary files /dev/null and b/img/tmp/carrier_mini_14_1.jpg differ diff --git a/img/tmp/carrier_mini_15_1.jpg b/img/tmp/carrier_mini_15_1.jpg new file mode 100644 index 00000000..e87d541e Binary files /dev/null and b/img/tmp/carrier_mini_15_1.jpg differ diff --git a/img/tmp/carrier_mini_16_1.jpg b/img/tmp/carrier_mini_16_1.jpg new file mode 100644 index 00000000..56a3ec7a Binary files /dev/null and b/img/tmp/carrier_mini_16_1.jpg differ diff --git a/img/tmp/carrier_mini_17_1.jpg b/img/tmp/carrier_mini_17_1.jpg new file mode 100644 index 00000000..e87d541e Binary files /dev/null and b/img/tmp/carrier_mini_17_1.jpg differ diff --git a/img/tmp/carrier_mini_18_1.jpg b/img/tmp/carrier_mini_18_1.jpg new file mode 100644 index 00000000..e87d541e Binary files /dev/null and b/img/tmp/carrier_mini_18_1.jpg differ diff --git a/img/tmp/carrier_mini_19_1.jpg b/img/tmp/carrier_mini_19_1.jpg new file mode 100644 index 00000000..e87d541e Binary files /dev/null and b/img/tmp/carrier_mini_19_1.jpg differ diff --git a/img/tmp/category_3-thumb.jpg b/img/tmp/category_3-thumb.jpg new file mode 100644 index 00000000..b290ca96 Binary files /dev/null and b/img/tmp/category_3-thumb.jpg differ diff --git a/img/tmp/category_3.jpg b/img/tmp/category_3.jpg new file mode 100644 index 00000000..bd6fe8ad Binary files /dev/null and b/img/tmp/category_3.jpg differ diff --git a/modules/eicaptcha/config_fr.xml b/modules/eicaptcha/config_fr.xml new file mode 100644 index 00000000..7426d977 --- /dev/null +++ b/modules/eicaptcha/config_fr.xml @@ -0,0 +1,12 @@ + + + eicaptcha + + + + + + 1 + 1 + + \ No newline at end of file diff --git a/modules/mesCategories/mesCategories.php b/modules/mesCategories/mesCategories.php index 4540bf4a..fcfb9327 100644 --- a/modules/mesCategories/mesCategories.php +++ b/modules/mesCategories/mesCategories.php @@ -61,8 +61,6 @@ class MesCategories extends Module */ public function install() { - Configuration::updateValue('MESCATEGORIES_LIVE_MODE', false); - return parent::install() && $this->registerHook('header') && $this->registerHook('backOfficeHeader') && @@ -73,8 +71,6 @@ class MesCategories extends Module public function uninstall() { - Configuration::deleteByName('MESCATEGORIES_LIVE_MODE'); - return parent::uninstall(); } @@ -156,6 +152,31 @@ class MesCategories extends Module ) ), ), + array( + 'type' => 'text', + 'desc' => $this->l('Percent of categorie\' thumbnail opacity (between 0 and 100)'), + 'name' => 'MESCATEGORIES_IMAGE_OPACITY', + 'label' => $this->l('Opacity of thumbnails') + ), + array( + 'type' => 'switch', + 'desc' => $this->l('Display your subcategories with bold text'), + 'name' => 'MESCATEGORIES_BOLD_SUBCATEGORIES', + 'is_bool' => true, + 'label' => $this->l('Subcategories in bold'), + 'values' => array( + array( + 'id' => 'active_on', + 'value' => true, + 'label' => $this->l('Enabled') + ), + array( + 'id' => 'active_off', + 'value' => false, + 'label' => $this->l('Disabled') + ) + ) + ), ), 'submit' => array( 'title' => $this->l('Save'), @@ -171,6 +192,8 @@ class MesCategories extends Module { return array( 'MESCATEGORIES_SHOW_IMAGES' => Configuration::get('MESCATEGORIES_SHOW_IMAGES', true), + 'MESCATEGORIES_IMAGE_OPACITY' => Configuration::get('MESCATEGORIES_IMAGE_OPACITY', 50), + 'MESCATEGORIES_BOLD_SUBCATEGORIES' => Configuration::get('MESCATEGORIES_BOLD_SUBCATEGORIES', false), ); } @@ -238,6 +261,8 @@ class MesCategories extends Module $this->smarty->assign(array( 'categories' => $my_array, 'SHOW_IMAGES' => Configuration::get('MESCATEGORIES_SHOW_IMAGES', true), + 'IMAGE_OPACITY' => Configuration::get('MESCATEGORIES_IMAGE_OPACITY', true), + 'BOLD_SUBCATEGORIES' => Configuration::get('MESCATEGORIES_BOLD_SUBCATEGORIES', true), )); diff --git a/modules/mesCategories/translations/fr.php b/modules/mesCategories/translations/fr.php index d4c779a4..85935ccb 100644 --- a/modules/mesCategories/translations/fr.php +++ b/modules/mesCategories/translations/fr.php @@ -9,6 +9,10 @@ $_MODULE['<{mescategories}prestashop>mescategories_4861c3d5c88af6037e2bfb0d5c309 $_MODULE['<{mescategories}prestashop>mescategories_833a6f0f9fb2be7fe8082b41594a8043'] = 'Affiche les images de vos catégories sur la page au lieu de leur titre simplement'; $_MODULE['<{mescategories}prestashop>mescategories_00d23a76e43b46dae9ec7aa9dcbebb32'] = 'Oui'; $_MODULE['<{mescategories}prestashop>mescategories_b9f5c797ebbf55adccdd8539a65a0241'] = 'Non'; +$_MODULE['<{mescategories}prestashop>mescategories_d6cc16d06193b759f89e1bd9a0a68cfd'] = 'Pourcentage d\'opacité (entre 0 et 100) pour les vignettes de vos catégories'; +$_MODULE['<{mescategories}prestashop>mescategories_1b6a27028b34a0d2d05402842c9d6eb1'] = 'Opacité des vignettes'; +$_MODULE['<{mescategories}prestashop>mescategories_91d498010c32cd54cdeeaba7c921e6b2'] = 'Affiche vos sous-catégories en gras'; +$_MODULE['<{mescategories}prestashop>mescategories_8b6a7c7c9a604d37a5a6f2277ffb7ea6'] = 'Sous-catégories en gras'; $_MODULE['<{mescategories}prestashop>mescategories_c9cc8cce247e49bae79f15173ce97354'] = 'Enregistrer'; $_MODULE['<{mescategories}prestashop>configure_464e37a930f5702c14f862ab9497860d'] = 'Module d\'affichage de vos catégories'; $_MODULE['<{mescategories}prestashop>configure_0b79795d3efc95b9976c7c5b933afce2'] = 'Bienvenue sur le module d\'affichage de vos catégories !'; diff --git a/modules/mesCategories/views/css/front.css b/modules/mesCategories/views/css/front.css index ce52f347..b8dcad35 100644 --- a/modules/mesCategories/views/css/front.css +++ b/modules/mesCategories/views/css/front.css @@ -23,8 +23,10 @@ /* Catégorie (image + titre) */ .figure img { width: 150px; + height: 180px; + overflow: hidden; + text-align: center; border-radius: 5px; - opacity: 0.3; } .figure figcaption { margin-bottom: 10px; @@ -51,7 +53,7 @@ font-size: 0.95rem; font-family: "Raleway", sans-serif; color: black; - font-weight: normal; + /*font-weight: normal;*/ } .subcategories-list > a:hover { background-color: rgba(177,194,90,1); diff --git a/modules/mesCategories/views/templates/hook/displayHome.tpl b/modules/mesCategories/views/templates/hook/displayHome.tpl index 65b246d8..099e779f 100644 --- a/modules/mesCategories/views/templates/hook/displayHome.tpl +++ b/modules/mesCategories/views/templates/hook/displayHome.tpl @@ -9,7 +9,7 @@ {if $SHOW_IMAGES}
{$category.category_name}
- {$category.category_name|escape:'html':'UTF-8'} + {$category.category_name|escape:'html':'UTF-8'}
{else}

{$category.category_name}

@@ -19,7 +19,7 @@
{foreach from=$category.subcategories item=subcategory name=subcategory_list} + title="{$subcategory.subcategory_name|escape:'html':'UTF-8'}" {if $BOLD_SUBCATEGORIES}style="font-weight: bold"{/if}> {$subcategory.subcategory_name|escape:'html':'UTF-8'}
diff --git a/themes/classic-child/assets/css/custom.css b/themes/classic-child/assets/css/custom.css index 6e7191ee..07a63163 100644 --- a/themes/classic-child/assets/css/custom.css +++ b/themes/classic-child/assets/css/custom.css @@ -8,7 +8,9 @@ a { color: rgba(177,194,90,1); } - +#header .header-nav .cart-preview.active { + background: black; +} /* On occupe toute la largeur de l'écran */ .container { diff --git a/themes/classic-child/preview.png b/themes/classic-child/preview.png new file mode 100644 index 00000000..5e773167 Binary files /dev/null and b/themes/classic-child/preview.png differ