On rajoute les derniers modules et on modifie les CSS

This commit is contained in:
2020-10-20 16:45:41 +02:00
parent 25cb197711
commit bd1927da6f
334 changed files with 39634 additions and 1825 deletions

589
.idea/workspace.xml generated
View File

@@ -11,223 +11,331 @@
</component> </component>
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="31ff3239-328c-4da3-82da-f4969b3b1658" name="Default Changelist" comment="On continue"> <list default="true" id="31ff3239-328c-4da3-82da-f4969b3b1658" name="Default Changelist" comment="On continue">
<change afterPath="$PROJECT_DIR$/config/xml/blog-fr.xml" afterDir="false" /> <change afterPath="$PROJECT_DIR$/img/c/3-category_default.jpg" afterDir="false" />
<change afterPath="$PROJECT_DIR$/config/xml/trusted_modules_list.xml" afterDir="false" /> <change afterPath="$PROJECT_DIR$/img/c/3-small_default.jpg" afterDir="false" />
<change afterPath="$PROJECT_DIR$/config/xml/untrusted_modules_list.xml" afterDir="false" /> <change afterPath="$PROJECT_DIR$/img/c/3.jpg" afterDir="false" />
<change afterPath="$PROJECT_DIR$/img/m/15-large_default.jpg" afterDir="false" /> <change afterPath="$PROJECT_DIR$/img/tmp/3a94e9796b51cd5a2fa798531a20b611.jpg" afterDir="false" />
<change afterPath="$PROJECT_DIR$/img/m/15-medium_default.jpg" afterDir="false" /> <change afterPath="$PROJECT_DIR$/modules/blocktopdropdownmenu/translations/fr.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/img/m/15-small_default.jpg" afterDir="false" /> <change afterPath="$PROJECT_DIR$/modules/colissimo/upgrade/upgrade-1.4.1.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/img/m/15.jpg" afterDir="false" /> <change afterPath="$PROJECT_DIR$/modules/colissimo/views/templates/admin/colissimo_affranchissement/_partials/td-affranchissement-ftd.tpl" afterDir="false" />
<change afterPath="$PROJECT_DIR$/img/tmp/4d102d02219bd9060f4aeec8e45582ed.jpg" afterDir="false" /> <change afterPath="$PROJECT_DIR$/modules/dashtrends/CONTRIBUTORS.md" afterDir="false" />
<change afterPath="$PROJECT_DIR$/img/tmp/PSeigUnE" afterDir="false" /> <change afterPath="$PROJECT_DIR$/modules/dashtrends/LICENSE.md" afterDir="false" />
<change afterPath="$PROJECT_DIR$/img/tmp/manufacturer_mini_15_1.jpg" afterDir="false" /> <change afterPath="$PROJECT_DIR$/modules/dashtrends/README.md" afterDir="false" />
<change afterPath="$PROJECT_DIR$/img/tmp/store_1.jpg" afterDir="false" /> <change afterPath="$PROJECT_DIR$/modules/dashtrends/composer.json" afterDir="false" />
<change afterPath="$PROJECT_DIR$/modules/blockreassurance/translations/fr.php" afterDir="false" /> <change afterPath="$PROJECT_DIR$/modules/dashtrends/composer.lock" afterDir="false" />
<change afterPath="$PROJECT_DIR$/modules/blocktopdropdownmenu/blocktopdropdownmenu.php" afterDir="false" /> <change afterPath="$PROJECT_DIR$/modules/dashtrends/tests/index.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/modules/blocktopdropdownmenu/blocktopdropdownmenu.tpl" afterDir="false" /> <change afterPath="$PROJECT_DIR$/modules/dashtrends/tests/phpstan/index.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/modules/blocktopdropdownmenu/config_fr.xml" afterDir="false" /> <change afterPath="$PROJECT_DIR$/modules/dashtrends/tests/phpstan/phpstan.neon" afterDir="false" />
<change afterPath="$PROJECT_DIR$/modules/blocktopdropdownmenu/css/blocktopdropdownmenu.css" afterDir="false" /> <change afterPath="$PROJECT_DIR$/modules/dashtrends/vendor/.htaccess" afterDir="false" />
<change afterPath="$PROJECT_DIR$/modules/blocktopdropdownmenu/css/index.php" afterDir="false" /> <change afterPath="$PROJECT_DIR$/modules/dashtrends/vendor/autoload.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/modules/blocktopdropdownmenu/css/superfish-modified.css" afterDir="false" /> <change afterPath="$PROJECT_DIR$/modules/dashtrends/vendor/composer/ClassLoader.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/modules/blocktopdropdownmenu/img/arrows-ffffff.png" afterDir="false" /> <change afterPath="$PROJECT_DIR$/modules/dashtrends/vendor/composer/LICENSE" afterDir="false" />
<change afterPath="$PROJECT_DIR$/modules/blocktopdropdownmenu/img/bg_blocktopdropdownmenu_li_seleted.png" afterDir="false" /> <change afterPath="$PROJECT_DIR$/modules/dashtrends/vendor/composer/autoload_classmap.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/modules/blocktopdropdownmenu/img/blocktopdropdownmenu.gif" afterDir="false" /> <change afterPath="$PROJECT_DIR$/modules/dashtrends/vendor/composer/autoload_namespaces.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/modules/blocktopdropdownmenu/img/blocktopdropdownmenu_hover.gif" afterDir="false" /> <change afterPath="$PROJECT_DIR$/modules/dashtrends/vendor/composer/autoload_psr4.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/modules/blocktopdropdownmenu/img/blocktopdropdownmenu_left.gif" afterDir="false" /> <change afterPath="$PROJECT_DIR$/modules/dashtrends/vendor/composer/autoload_real.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/modules/blocktopdropdownmenu/img/blocktopdropdownmenu_right.gif" afterDir="false" /> <change afterPath="$PROJECT_DIR$/modules/dashtrends/vendor/composer/autoload_static.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/modules/blocktopdropdownmenu/img/index.php" afterDir="false" /> <change afterPath="$PROJECT_DIR$/modules/dashtrends/vendor/composer/installed.json" afterDir="false" />
<change afterPath="$PROJECT_DIR$/modules/blocktopdropdownmenu/img/search.gif" afterDir="false" /> <change afterPath="$PROJECT_DIR$/modules/ets_advancedcaptcha/cache/cacert.pem" afterDir="false" />
<change afterPath="$PROJECT_DIR$/modules/blocktopdropdownmenu/img/shadow.png" afterDir="false" /> <change afterPath="$PROJECT_DIR$/modules/ets_advancedcaptcha/cache/index.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/modules/blocktopdropdownmenu/index.php" afterDir="false" /> <change afterPath="$PROJECT_DIR$/modules/ets_advancedcaptcha/cache/temp" afterDir="false" />
<change afterPath="$PROJECT_DIR$/modules/blocktopdropdownmenu/js/blocktopdropdownmenu.js" afterDir="false" /> <change afterPath="$PROJECT_DIR$/modules/ets_advancedcaptcha/config_fr.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/modules/blocktopdropdownmenu/js/hoverIntent.js" afterDir="false" /> <change afterPath="$PROJECT_DIR$/modules/ets_advancedcaptcha/controllers/front/captcha.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/modules/blocktopdropdownmenu/js/index.php" afterDir="false" /> <change afterPath="$PROJECT_DIR$/modules/ets_advancedcaptcha/controllers/front/index.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/modules/blocktopdropdownmenu/js/superfish-modified.js" afterDir="false" /> <change afterPath="$PROJECT_DIR$/modules/ets_advancedcaptcha/controllers/index.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/modules/blocktopdropdownmenu/logo.gif" afterDir="false" /> <change afterPath="$PROJECT_DIR$/modules/ets_advancedcaptcha/ets_advancedcaptcha.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/modules/blocktopdropdownmenu/logo.png" afterDir="false" /> <change afterPath="$PROJECT_DIR$/modules/ets_advancedcaptcha/index.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/modules/blocktopdropdownmenu/menutoplinks.class.php" afterDir="false" /> <change afterPath="$PROJECT_DIR$/modules/ets_advancedcaptcha/logo.gif" afterDir="false" />
<change afterPath="$PROJECT_DIR$/modules/blocktopdropdownmenu/translations/en.php" afterDir="false" /> <change afterPath="$PROJECT_DIR$/modules/ets_advancedcaptcha/logo.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/modules/blocktopdropdownmenu/translations/index.php" afterDir="false" /> <change afterPath="$PROJECT_DIR$/modules/ets_advancedcaptcha/override/classes/form/CustomerForm.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/modules/blocktopdropdownmenu/translations/it.php" afterDir="false" /> <change afterPath="$PROJECT_DIR$/modules/ets_advancedcaptcha/override/classes/form/CustomerFormatter.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/modules/blocktopdropdownmenu/translations/pl.php" afterDir="false" /> <change afterPath="$PROJECT_DIR$/modules/ets_advancedcaptcha/override/classes/form/CustomerLoginForm.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/modules/blocktopdropdownmenu/upgrade/install-1.6.php" afterDir="false" /> <change afterPath="$PROJECT_DIR$/modules/ets_advancedcaptcha/override/classes/form/index.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/modules/blocktopdropdownmenu/upgrade/install-2.1.1.php" afterDir="false" /> <change afterPath="$PROJECT_DIR$/modules/ets_advancedcaptcha/override/classes/index.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/modules/blocktopdropdownmenu/views/index.php" afterDir="false" /> <change afterPath="$PROJECT_DIR$/modules/ets_advancedcaptcha/override/controllers/front/AuthController.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/modules/blocktopdropdownmenu/views/templates/admin/_configure/helpers/form/form.tpl" afterDir="false" /> <change afterPath="$PROJECT_DIR$/modules/ets_advancedcaptcha/override/controllers/front/ContactController.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/modules/blocktopdropdownmenu/views/templates/admin/_configure/helpers/form/index.php" afterDir="false" /> <change afterPath="$PROJECT_DIR$/modules/ets_advancedcaptcha/override/controllers/front/PasswordController.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/modules/blocktopdropdownmenu/views/templates/admin/_configure/helpers/index.php" afterDir="false" /> <change afterPath="$PROJECT_DIR$/modules/ets_advancedcaptcha/override/controllers/front/index.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/modules/blocktopdropdownmenu/views/templates/admin/_configure/helpers/list/index.php" afterDir="false" /> <change afterPath="$PROJECT_DIR$/modules/ets_advancedcaptcha/override/controllers/index.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/modules/blocktopdropdownmenu/views/templates/admin/_configure/helpers/list/list_content.tpl" afterDir="false" /> <change afterPath="$PROJECT_DIR$/modules/ets_advancedcaptcha/override/index.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/modules/blocktopdropdownmenu/views/templates/admin/_configure/index.php" afterDir="false" /> <change afterPath="$PROJECT_DIR$/modules/ets_advancedcaptcha/override/modules/blocknewsletter/blocknewsletter.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/modules/blocktopdropdownmenu/views/templates/admin/advert.tpl" afterDir="false" /> <change afterPath="$PROJECT_DIR$/modules/ets_advancedcaptcha/override/modules/blocknewsletter/index.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/modules/blocktopdropdownmenu/views/templates/admin/index.php" afterDir="false" /> <change afterPath="$PROJECT_DIR$/modules/ets_advancedcaptcha/override/modules/index.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/modules/blocktopdropdownmenu/views/templates/index.php" afterDir="false" /> <change afterPath="$PROJECT_DIR$/modules/ets_advancedcaptcha/override/modules/mailalerts/index.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/modules/contactform/translations/fr.php" afterDir="false" /> <change afterPath="$PROJECT_DIR$/modules/ets_advancedcaptcha/override/modules/mailalerts/mailalerts.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/modules/dashactivity/translations/fr.php" afterDir="false" /> <change afterPath="$PROJECT_DIR$/modules/ets_advancedcaptcha/override/modules/ps_emailalerts/index.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/modules/dashgoals/translations/fr.php" afterDir="false" /> <change afterPath="$PROJECT_DIR$/modules/ets_advancedcaptcha/override/modules/ps_emailalerts/ps_emailalerts.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/modules/dashproducts/translations/fr.php" afterDir="false" /> <change afterPath="$PROJECT_DIR$/modules/ets_advancedcaptcha/override/modules/ps_emailsubscription/index.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/modules/dashtrends/translations/fr.php" afterDir="false" /> <change afterPath="$PROJECT_DIR$/modules/ets_advancedcaptcha/override/modules/ps_emailsubscription/ps_emailsubscription.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/modules/graphnvd3/translations/fr.php" afterDir="false" /> <change afterPath="$PROJECT_DIR$/modules/ets_advancedcaptcha/translations/en.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/modules/gridhtml/translations/fr.php" afterDir="false" /> <change afterPath="$PROJECT_DIR$/modules/ets_advancedcaptcha/translations/es.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/modules/gsitemap/translations/fr.php" afterDir="false" /> <change afterPath="$PROJECT_DIR$/modules/ets_advancedcaptcha/translations/fr.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/modules/iqitmegamenu/Readme.md" afterDir="false" /> <change afterPath="$PROJECT_DIR$/modules/ets_advancedcaptcha/translations/index.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/modules/iqitmegamenu/config_fr.xml" afterDir="false" /> <change afterPath="$PROJECT_DIR$/modules/ets_advancedcaptcha/translations/it.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/modules/iqitmegamenu/export/index.php" afterDir="false" /> <change afterPath="$PROJECT_DIR$/modules/ets_advancedcaptcha/upgrade/index.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/modules/iqitmegamenu/index.php" afterDir="false" /> <change afterPath="$PROJECT_DIR$/modules/ets_advancedcaptcha/upgrade/install-1.0.9.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/modules/iqitmegamenu/iqitmegamenu.php" afterDir="false" /> <change afterPath="$PROJECT_DIR$/modules/ets_advancedcaptcha/upgrade/install-1.1.5.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/modules/iqitmegamenu/logo.gif" afterDir="false" /> <change afterPath="$PROJECT_DIR$/modules/ets_advancedcaptcha/upgrade/install-1.1.6.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/modules/iqitmegamenu/logo.png" afterDir="false" /> <change afterPath="$PROJECT_DIR$/modules/ets_advancedcaptcha/views/css/admin.css" afterDir="false" />
<change afterPath="$PROJECT_DIR$/modules/iqitmegamenu/models/IqitMenuHtml.php" afterDir="false" /> <change afterPath="$PROJECT_DIR$/modules/ets_advancedcaptcha/views/css/front.css" afterDir="false" />
<change afterPath="$PROJECT_DIR$/modules/iqitmegamenu/models/IqitMenuLinks.php" afterDir="false" /> <change afterPath="$PROJECT_DIR$/modules/ets_advancedcaptcha/views/css/index.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/modules/iqitmegamenu/models/IqitMenuTab.php" afterDir="false" /> <change afterPath="$PROJECT_DIR$/modules/ets_advancedcaptcha/views/css/other.css" afterDir="false" />
<change afterPath="$PROJECT_DIR$/modules/iqitmegamenu/models/index.php" afterDir="false" /> <change afterPath="$PROJECT_DIR$/modules/ets_advancedcaptcha/views/fonts/index.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/modules/iqitmegamenu/readme_en.pdf" afterDir="false" /> <change afterPath="$PROJECT_DIR$/modules/ets_advancedcaptcha/views/fonts/monofont.ttf" afterDir="false" />
<change afterPath="$PROJECT_DIR$/modules/iqitmegamenu/translations/en.php" afterDir="false" /> <change afterPath="$PROJECT_DIR$/modules/ets_advancedcaptcha/views/img/basic.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/modules/iqitmegamenu/translations/index.php" afterDir="false" /> <change afterPath="$PROJECT_DIR$/modules/ets_advancedcaptcha/views/img/colorful.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/modules/iqitmegamenu/upgrade/index.php" afterDir="false" /> <change afterPath="$PROJECT_DIR$/modules/ets_advancedcaptcha/views/img/complex.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/modules/iqitmegamenu/upgrade/install-1.0.1.php" afterDir="false" /> <change afterPath="$PROJECT_DIR$/modules/ets_advancedcaptcha/views/img/google.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/modules/iqitmegamenu/upgrade/install-1.0.2.php" afterDir="false" /> <change afterPath="$PROJECT_DIR$/modules/ets_advancedcaptcha/views/img/google_v3.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/modules/iqitmegamenu/upgrade/install-1.0.5.php" afterDir="false" /> <change afterPath="$PROJECT_DIR$/modules/ets_advancedcaptcha/views/img/help/contact-form-code.jpg" afterDir="false" />
<change afterPath="$PROJECT_DIR$/modules/iqitmegamenu/upgrade/install-1.1.0.php" afterDir="false" /> <change afterPath="$PROJECT_DIR$/modules/ets_advancedcaptcha/views/img/help/contact-form-config.jpg" afterDir="false" />
<change afterPath="$PROJECT_DIR$/modules/iqitmegamenu/upgrade/install-1.1.1.php" afterDir="false" /> <change afterPath="$PROJECT_DIR$/modules/ets_advancedcaptcha/views/img/help/forgot-password-code.jpg" afterDir="false" />
<change afterPath="$PROJECT_DIR$/modules/iqitmegamenu/views/css/back.css" afterDir="false" /> <change afterPath="$PROJECT_DIR$/modules/ets_advancedcaptcha/views/img/help/forgot-password-config.jpg" afterDir="false" />
<change afterPath="$PROJECT_DIR$/modules/iqitmegamenu/views/css/bootstrap.min.css" afterDir="false" /> <change afterPath="$PROJECT_DIR$/modules/ets_advancedcaptcha/views/img/help/getFormat.jpg" afterDir="false" />
<change afterPath="$PROJECT_DIR$/modules/iqitmegamenu/views/css/font-awesome.min.css" afterDir="false" /> <change afterPath="$PROJECT_DIR$/modules/ets_advancedcaptcha/views/img/help/index.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/modules/iqitmegamenu/views/css/fontawesome-iconpicker.min.css" afterDir="false" /> <change afterPath="$PROJECT_DIR$/modules/ets_advancedcaptcha/views/img/help/login-form-code.jpg" afterDir="false" />
<change afterPath="$PROJECT_DIR$/modules/iqitmegamenu/views/css/fontawesome.css" afterDir="false" /> <change afterPath="$PROJECT_DIR$/modules/ets_advancedcaptcha/views/img/help/login-form-config.jpg" afterDir="false" />
<change afterPath="$PROJECT_DIR$/modules/iqitmegamenu/views/css/front.css" afterDir="false" /> <change afterPath="$PROJECT_DIR$/modules/ets_advancedcaptcha/views/img/help/submit.jpg" afterDir="false" />
<change afterPath="$PROJECT_DIR$/modules/iqitmegamenu/views/css/index.php" afterDir="false" /> <change afterPath="$PROJECT_DIR$/modules/ets_advancedcaptcha/views/img/help/validate.jpg" afterDir="false" />
<change afterPath="$PROJECT_DIR$/modules/iqitmegamenu/views/css/iqitmegamenu_s_1.css" afterDir="false" /> <change afterPath="$PROJECT_DIR$/modules/ets_advancedcaptcha/views/img/index.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/modules/iqitmegamenu/views/css/iqitmegamenu_s_2.css" afterDir="false" /> <change afterPath="$PROJECT_DIR$/modules/ets_advancedcaptcha/views/img/other/awards-toconvert.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/modules/iqitmegamenu/views/css/rtl.css" afterDir="false" /> <change afterPath="$PROJECT_DIR$/modules/ets_advancedcaptcha/views/img/other/badges-s3e73c0c3f1.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/modules/iqitmegamenu/views/css/tinymce.css" afterDir="false" /> <change afterPath="$PROJECT_DIR$/modules/ets_advancedcaptcha/views/img/other/ets-partner-badge.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/modules/iqitmegamenu/views/fonts/FontAwesome.otf" afterDir="false" /> <change afterPath="$PROJECT_DIR$/modules/ets_advancedcaptcha/views/img/other/ets-superhero-1.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/modules/iqitmegamenu/views/fonts/fontawesome-webfont.eot" afterDir="false" /> <change afterPath="$PROJECT_DIR$/modules/ets_advancedcaptcha/views/img/other/ets-superhero-2.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/modules/iqitmegamenu/views/fonts/fontawesome-webfont.svg" afterDir="false" /> <change afterPath="$PROJECT_DIR$/modules/ets_advancedcaptcha/views/img/other/index.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/modules/iqitmegamenu/views/fonts/fontawesome-webfont.ttf" afterDir="false" /> <change afterPath="$PROJECT_DIR$/modules/ets_advancedcaptcha/views/img/other/module-editor.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/modules/iqitmegamenu/views/fonts/fontawesome-webfont.woff" afterDir="false" /> <change afterPath="$PROJECT_DIR$/modules/ets_advancedcaptcha/views/img/refresh.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/modules/iqitmegamenu/views/fonts/fontawesome-webfont.woff2" afterDir="false" /> <change afterPath="$PROJECT_DIR$/modules/ets_advancedcaptcha/views/index.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/modules/iqitmegamenu/views/fonts/index.php" afterDir="false" /> <change afterPath="$PROJECT_DIR$/modules/ets_advancedcaptcha/views/js/admin.js" afterDir="false" />
<change afterPath="$PROJECT_DIR$/modules/iqitmegamenu/views/index.php" afterDir="false" /> <change afterPath="$PROJECT_DIR$/modules/ets_advancedcaptcha/views/js/front.js" afterDir="false" />
<change afterPath="$PROJECT_DIR$/modules/iqitmegamenu/views/js/back.js" afterDir="false" /> <change afterPath="$PROJECT_DIR$/modules/ets_advancedcaptcha/views/js/index.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/modules/iqitmegamenu/views/js/bootstrap.min.js" afterDir="false" /> <change afterPath="$PROJECT_DIR$/modules/ets_advancedcaptcha/views/js/other.js" afterDir="false" />
<change afterPath="$PROJECT_DIR$/modules/iqitmegamenu/views/js/equalheights.js" afterDir="false" /> <change afterPath="$PROJECT_DIR$/modules/ets_advancedcaptcha/views/pdf/index.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/modules/iqitmegamenu/views/js/fontawesome-iconpicker.min.js" afterDir="false" /> <change afterPath="$PROJECT_DIR$/modules/ets_advancedcaptcha/views/pdf/recaptcha_v2.pdf" afterDir="false" />
<change afterPath="$PROJECT_DIR$/modules/iqitmegamenu/views/js/front.js" afterDir="false" /> <change afterPath="$PROJECT_DIR$/modules/ets_advancedcaptcha/views/pdf/recaptcha_v3.pdf" afterDir="false" />
<change afterPath="$PROJECT_DIR$/modules/iqitmegamenu/views/js/index.php" afterDir="false" /> <change afterPath="$PROJECT_DIR$/modules/ets_advancedcaptcha/views/templates/admin/_configure/helpers/form/form.tpl" afterDir="false" />
<change afterPath="$PROJECT_DIR$/modules/iqitmegamenu/views/js/jquery.auto-complete.js" afterDir="false" /> <change afterPath="$PROJECT_DIR$/modules/ets_advancedcaptcha/views/templates/admin/_configure/helpers/form/index.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/modules/iqitmegamenu/views/templates/admin/_configure/helpers/form/column_content.tpl" afterDir="false" /> <change afterPath="$PROJECT_DIR$/modules/ets_advancedcaptcha/views/templates/admin/_configure/helpers/index.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/modules/iqitmegamenu/views/templates/admin/_configure/helpers/form/form.tpl" afterDir="false" /> <change afterPath="$PROJECT_DIR$/modules/ets_advancedcaptcha/views/templates/admin/_configure/index.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/modules/iqitmegamenu/views/templates/admin/_configure/helpers/form/index.php" afterDir="false" /> <change afterPath="$PROJECT_DIR$/modules/ets_advancedcaptcha/views/templates/admin/index.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/modules/iqitmegamenu/views/templates/admin/_configure/helpers/form/subcategory.tpl" afterDir="false" /> <change afterPath="$PROJECT_DIR$/modules/ets_advancedcaptcha/views/templates/front/index.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/modules/iqitmegamenu/views/templates/admin/_configure/helpers/form/submenu_content.tpl" afterDir="false" /> <change afterPath="$PROJECT_DIR$/modules/ets_advancedcaptcha/views/templates/hook/bo-form.tpl" afterDir="false" />
<change afterPath="$PROJECT_DIR$/modules/iqitmegamenu/views/templates/admin/_configure/helpers/index.php" afterDir="false" /> <change afterPath="$PROJECT_DIR$/modules/ets_advancedcaptcha/views/templates/hook/bo-log.tpl" afterDir="false" />
<change afterPath="$PROJECT_DIR$/modules/iqitmegamenu/views/templates/admin/_configure/index.php" afterDir="false" /> <change afterPath="$PROJECT_DIR$/modules/ets_advancedcaptcha/views/templates/hook/captcha.tpl" afterDir="false" />
<change afterPath="$PROJECT_DIR$/modules/iqitmegamenu/views/templates/admin/configure.tpl" afterDir="false" /> <change afterPath="$PROJECT_DIR$/modules/ets_advancedcaptcha/views/templates/hook/contact.tpl" afterDir="false" />
<change afterPath="$PROJECT_DIR$/modules/iqitmegamenu/views/templates/admin/index.php" afterDir="false" /> <change afterPath="$PROJECT_DIR$/modules/ets_advancedcaptcha/views/templates/hook/gen-html.tpl" afterDir="false" />
<change afterPath="$PROJECT_DIR$/modules/iqitmegamenu/views/templates/hook/_partials/index.php" afterDir="false" /> <change afterPath="$PROJECT_DIR$/modules/ets_advancedcaptcha/views/templates/hook/head.tpl" afterDir="false" />
<change afterPath="$PROJECT_DIR$/modules/iqitmegamenu/views/templates/hook/_partials/mobile_menu.tpl" afterDir="false" /> <change afterPath="$PROJECT_DIR$/modules/ets_advancedcaptcha/views/templates/hook/index.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/modules/iqitmegamenu/views/templates/hook/_partials/products_grid.tpl" afterDir="false" /> <change afterPath="$PROJECT_DIR$/modules/ets_advancedcaptcha/views/templates/hook/js.tpl" afterDir="false" />
<change afterPath="$PROJECT_DIR$/modules/iqitmegamenu/views/templates/hook/_partials/products_list.tpl" afterDir="false" /> <change afterPath="$PROJECT_DIR$/modules/ets_advancedcaptcha/views/templates/hook/module-list.tpl" afterDir="false" />
<change afterPath="$PROJECT_DIR$/modules/iqitmegamenu/views/templates/hook/_partials/submenu_content.tpl" afterDir="false" /> <change afterPath="$PROJECT_DIR$/modules/ets_advancedcaptcha/views/templates/index.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/modules/iqitmegamenu/views/templates/hook/front_link.tpl" afterDir="false" /> <change afterPath="$PROJECT_DIR$/modules/iqitmegamenu/translations/fr.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/modules/iqitmegamenu/views/templates/hook/front_subcategory.tpl" afterDir="false" /> <change afterPath="$PROJECT_DIR$/modules/ps_checkpayment/CONTRIBUTORS.md" afterDir="false" />
<change afterPath="$PROJECT_DIR$/modules/iqitmegamenu/views/templates/hook/horizontal.tpl" afterDir="false" /> <change afterPath="$PROJECT_DIR$/modules/ps_checkpayment/LICENSE.md" afterDir="false" />
<change afterPath="$PROJECT_DIR$/modules/iqitmegamenu/views/templates/hook/index.php" afterDir="false" /> <change afterPath="$PROJECT_DIR$/modules/ps_checkpayment/README.md" afterDir="false" />
<change afterPath="$PROJECT_DIR$/modules/iqitmegamenu/views/templates/hook/list.tpl" afterDir="false" /> <change afterPath="$PROJECT_DIR$/modules/ps_checkpayment/composer.json" afterDir="false" />
<change afterPath="$PROJECT_DIR$/modules/iqitmegamenu/views/templates/hook/list_html.tpl" afterDir="false" /> <change afterPath="$PROJECT_DIR$/modules/ps_checkpayment/composer.lock" afterDir="false" />
<change afterPath="$PROJECT_DIR$/modules/iqitmegamenu/views/templates/hook/vertical.tpl" afterDir="false" /> <change afterPath="$PROJECT_DIR$/modules/ps_checkpayment/tests/index.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/modules/iqitmegamenu/views/templates/index.php" afterDir="false" /> <change afterPath="$PROJECT_DIR$/modules/ps_checkpayment/tests/phpstan/index.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/modules/pagesnotfound/translations/fr.php" afterDir="false" /> <change afterPath="$PROJECT_DIR$/modules/ps_checkpayment/tests/phpstan/phpstan.neon" afterDir="false" />
<change afterPath="$PROJECT_DIR$/modules/ppbrandslider/config_fr.xml" afterDir="false" /> <change afterPath="$PROJECT_DIR$/modules/ps_checkpayment/vendor/.htaccess" afterDir="false" />
<change afterPath="$PROJECT_DIR$/modules/ppbrandslider/index.php" afterDir="false" /> <change afterPath="$PROJECT_DIR$/modules/ps_checkpayment/vendor/autoload.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/modules/ppbrandslider/logo.png" afterDir="false" /> <change afterPath="$PROJECT_DIR$/modules/ps_checkpayment/vendor/composer/ClassLoader.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/modules/ppbrandslider/ppbrandslider.php" afterDir="false" /> <change afterPath="$PROJECT_DIR$/modules/ps_checkpayment/vendor/composer/LICENSE" afterDir="false" />
<change afterPath="$PROJECT_DIR$/modules/ppbrandslider/translations/fr.php" afterDir="false" /> <change afterPath="$PROJECT_DIR$/modules/ps_checkpayment/vendor/composer/autoload_classmap.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/modules/ppbrandslider/views/css/index.php" afterDir="false" /> <change afterPath="$PROJECT_DIR$/modules/ps_checkpayment/vendor/composer/autoload_namespaces.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/modules/ppbrandslider/views/css/ppbrandslider.css" afterDir="false" /> <change afterPath="$PROJECT_DIR$/modules/ps_checkpayment/vendor/composer/autoload_psr4.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/modules/ppbrandslider/views/index.php" afterDir="false" /> <change afterPath="$PROJECT_DIR$/modules/ps_checkpayment/vendor/composer/autoload_real.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/modules/ppbrandslider/views/js/index.php" afterDir="false" /> <change afterPath="$PROJECT_DIR$/modules/ps_checkpayment/vendor/composer/autoload_static.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/modules/ppbrandslider/views/js/jquery.flexisel.js" afterDir="false" /> <change afterPath="$PROJECT_DIR$/modules/ps_checkpayment/vendor/composer/installed.json" afterDir="false" />
<change afterPath="$PROJECT_DIR$/modules/ppbrandslider/views/js/ppbrandslider.js" afterDir="false" /> <change afterPath="$PROJECT_DIR$/modules/welcome/CONTRIBUTORS.md" afterDir="false" />
<change afterPath="$PROJECT_DIR$/modules/ppbrandslider/views/templates/hook/displayAfterProductThumbs.tpl" afterDir="false" /> <change afterPath="$PROJECT_DIR$/modules/welcome/LICENSE.md" afterDir="false" />
<change afterPath="$PROJECT_DIR$/modules/ppbrandslider/views/templates/hook/displayHome.tpl" afterDir="false" /> <change afterPath="$PROJECT_DIR$/modules/welcome/OnBoarding/index.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/modules/ppbrandslider/views/templates/hook/displayProductAdditionalInfo.tpl" afterDir="false" /> <change afterPath="$PROJECT_DIR$/modules/welcome/README.md" afterDir="false" />
<change afterPath="$PROJECT_DIR$/modules/ppbrandslider/views/templates/hook/displayProductListReviews.tpl" afterDir="false" /> <change afterPath="$PROJECT_DIR$/modules/welcome/composer.json" afterDir="false" />
<change afterPath="$PROJECT_DIR$/modules/ppbrandslider/views/templates/hook/index.php" afterDir="false" /> <change afterPath="$PROJECT_DIR$/modules/welcome/composer.lock" afterDir="false" />
<change afterPath="$PROJECT_DIR$/modules/ppbrandslider/views/templates/hook/leftColumn.tpl" afterDir="false" /> <change afterPath="$PROJECT_DIR$/modules/welcome/controllers/admin/index.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/modules/ppbrandslider/views/templates/index.php" afterDir="false" /> <change afterPath="$PROJECT_DIR$/modules/welcome/controllers/index.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/modules/ps_banner/translations/fr.php" afterDir="false" /> <change afterPath="$PROJECT_DIR$/modules/welcome/images/index.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/modules/ps_buybuttonlite/translations/fr.php" afterDir="false" /> <change afterPath="$PROJECT_DIR$/modules/welcome/js/index.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/modules/ps_categorytree/translations/fr.php" afterDir="false" /> <change afterPath="$PROJECT_DIR$/modules/welcome/js/src/index.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/modules/ps_checkpayment/translations/fr.php" afterDir="false" /> <change afterPath="$PROJECT_DIR$/modules/welcome/package-lock.json" afterDir="false" />
<change afterPath="$PROJECT_DIR$/modules/ps_contactinfo/translations/fr.php" afterDir="false" /> <change afterPath="$PROJECT_DIR$/modules/welcome/package.json" afterDir="false" />
<change afterPath="$PROJECT_DIR$/modules/ps_currencyselector/translations/fr.php" afterDir="false" /> <change afterPath="$PROJECT_DIR$/modules/welcome/public/5452c6f6a92bc810c6e73210adfece55.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/modules/ps_customeraccountlinks/translations/fr.php" afterDir="false" /> <change afterPath="$PROJECT_DIR$/modules/welcome/public/5e07cbde941cc1e24cbabe1c9a6c995a.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/modules/ps_customersignin/translations/fr.php" afterDir="false" /> <change afterPath="$PROJECT_DIR$/modules/welcome/public/a216149cc722f1e24b5d3d266d623a09.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/modules/ps_customtext/translations/fr.php" afterDir="false" /> <change afterPath="$PROJECT_DIR$/modules/welcome/public/bc6b8d0cfbf337b153ae599072112b00.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/modules/ps_emailsubscription/translations/fr.php" afterDir="false" /> <change afterPath="$PROJECT_DIR$/modules/welcome/public/c02d68433654ed03d38fdc6c2ae90112.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/modules/ps_facetedsearch/translations/fr.php" afterDir="false" /> <change afterPath="$PROJECT_DIR$/modules/welcome/public/ca2f8d1c0c7a6830ef94b57264bc3b72.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/modules/ps_faviconnotificationbo/translations/fr.php" afterDir="false" /> <change afterPath="$PROJECT_DIR$/modules/welcome/public/eab7a4b5ee7f355e82c35a25542bb73d.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/modules/ps_featuredproducts/translations/fr.php" afterDir="false" /> <change afterPath="$PROJECT_DIR$/modules/welcome/public/ec967aeab4fe4dbcbffd8097dda2d17c.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/modules/ps_imageslider/translations/fr.php" afterDir="false" /> <change afterPath="$PROJECT_DIR$/modules/welcome/scss/index.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/modules/ps_languageselector/translations/fr.php" afterDir="false" /> <change afterPath="$PROJECT_DIR$/modules/welcome/tests/index.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/modules/ps_linklist/translations/fr.php" afterDir="false" /> <change afterPath="$PROJECT_DIR$/modules/welcome/tests/phpstan/index.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/modules/ps_mainmenu/translations/fr.php" afterDir="false" /> <change afterPath="$PROJECT_DIR$/modules/welcome/tests/phpstan/phpstan.neon" afterDir="false" />
<change afterPath="$PROJECT_DIR$/modules/ps_mbo/translations/fr.php" afterDir="false" /> <change afterPath="$PROJECT_DIR$/modules/welcome/vendor/composer/autoload_static.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/modules/ps_searchbar/translations/fr.php" afterDir="false" /> <change afterPath="$PROJECT_DIR$/modules/welcome/views/contents/index.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/modules/ps_sharebuttons/translations/fr.php" afterDir="false" /> <change afterPath="$PROJECT_DIR$/modules/welcome/views/index.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/modules/ps_shoppingcart/translations/fr.php" afterDir="false" /> <change afterPath="$PROJECT_DIR$/modules/welcome/views/templates/index.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/modules/ps_socialfollow/translations/fr.php" afterDir="false" /> <change afterPath="$PROJECT_DIR$/override/classes/form/CustomerForm.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/modules/ps_wirepayment/translations/fr.php" afterDir="false" /> <change afterPath="$PROJECT_DIR$/override/classes/form/CustomerFormatter.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/modules/sekeywords/translations/fr.php" afterDir="false" /> <change afterPath="$PROJECT_DIR$/override/classes/form/CustomerLoginForm.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/modules/statsbestcategories/translations/fr.php" afterDir="false" /> <change afterPath="$PROJECT_DIR$/override/controllers/front/AuthController.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/modules/statsbestcustomers/translations/fr.php" afterDir="false" /> <change afterPath="$PROJECT_DIR$/override/controllers/front/ContactController.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/modules/statsbestproducts/translations/fr.php" afterDir="false" /> <change afterPath="$PROJECT_DIR$/override/controllers/front/PasswordController.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/modules/statsbestsuppliers/translations/fr.php" afterDir="false" /> <change afterPath="$PROJECT_DIR$/override/modules/ps_emailsubscription/ps_emailsubscription.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/modules/statsbestvouchers/translations/fr.php" afterDir="false" /> <change afterPath="$PROJECT_DIR$/themes/classic-child/modules/ps_categorytree/views/templates/hook/ps_categorytree.tpl" afterDir="false" />
<change afterPath="$PROJECT_DIR$/modules/statscarrier/translations/fr.php" afterDir="false" /> <change afterPath="$PROJECT_DIR$/themes/classic-child/modules/ps_contactinfo/nav.tpl" afterDir="false" />
<change afterPath="$PROJECT_DIR$/modules/statscatalog/translations/fr.php" afterDir="false" /> <change afterPath="$PROJECT_DIR$/themes/classic-child/templates/_partials/head.tpl" afterDir="false" />
<change afterPath="$PROJECT_DIR$/modules/statscheckup/translations/fr.php" afterDir="false" /> <change afterPath="$PROJECT_DIR$/themes/classic-child/templates/catalog/_partials/category-header.tpl" afterDir="false" />
<change afterPath="$PROJECT_DIR$/modules/statsdata/translations/fr.php" afterDir="false" /> <change afterPath="$PROJECT_DIR$/themes/classic-child/templates/catalog/_partials/product-prices.tpl" afterDir="false" />
<change afterPath="$PROJECT_DIR$/modules/statsequipment/translations/fr.php" afterDir="false" /> <change afterPath="$PROJECT_DIR$/themes/classic-child/templates/catalog/product.tpl" afterDir="false" />
<change afterPath="$PROJECT_DIR$/modules/statsforecast/translations/fr.php" afterDir="false" /> <change afterPath="$PROJECT_DIR$/themes/classic-child/templates/layouts/layout-both-columns.tpl" afterDir="false" />
<change afterPath="$PROJECT_DIR$/modules/statslive/translations/fr.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/modules/statsnewsletter/translations/fr.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/modules/statsorigin/translations/fr.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/modules/statspersonalinfos/translations/fr.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/modules/statsproduct/translations/fr.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/modules/statsregistrations/translations/fr.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/modules/statssales/translations/fr.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/modules/statssearch/translations/fr.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/modules/statsstock/translations/fr.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/modules/statsvisits/translations/fr.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/modules/welcome/translations/fr.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/themes/classic-child/modules/blocktopdropdownmenu/blocktopdropdownmenu.tpl" afterDir="false" />
<change afterPath="$PROJECT_DIR$/themes/classic-child/modules/blocktopdropdownmenu/css/superfish-modified.css" afterDir="false" />
<change afterPath="$PROJECT_DIR$/themes/classic-child/modules/ppbrandslider/views/css/ppbrandslider.css" afterDir="false" />
<change afterPath="$PROJECT_DIR$/themes/classic-child/modules/ppbrandslider/views/templates/hook/displayHome.tpl" afterDir="false" />
<change afterPath="$PROJECT_DIR$/themes/classic-child/templates/_partials/footer.tpl" afterDir="false" />
<change afterPath="$PROJECT_DIR$/themes/classic-child/templates/_partials/header.tpl" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/config/xml/blog-fr.xml" beforeDir="false" afterPath="$PROJECT_DIR$/config/xml/blog-fr.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/config/xml/default_country_modules_list.xml" beforeDir="false" afterPath="$PROJECT_DIR$/config/xml/default_country_modules_list.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/config/xml/modules_native_addons.xml" beforeDir="false" afterPath="$PROJECT_DIR$/config/xml/modules_native_addons.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/config/xml/must_have_modules_list.xml" beforeDir="false" afterPath="$PROJECT_DIR$/config/xml/must_have_modules_list.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/config/xml/must_have_modules_list.xml" beforeDir="false" afterPath="$PROJECT_DIR$/config/xml/must_have_modules_list.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/config/xml/trusted_modules_list.xml" beforeDir="false" afterPath="$PROJECT_DIR$/config/xml/trusted_modules_list.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/img/c/12-category_default.jpg" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/img/c/12-small_default.jpg" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/img/c/12.jpg" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/img/c/12_thumb.jpg" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/img/c/13-category_default.jpg" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/img/c/13-small_default.jpg" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/img/c/13.jpg" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/img/c/13_thumb.jpg" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/img/c/14-category_default.jpg" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/img/c/14-small_default.jpg" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/img/c/14.jpg" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/img/c/14_thumb.jpg" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/img/c/15-category_default.jpg" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/img/c/15-small_default.jpg" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/img/c/15.jpg" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/img/c/15_thumb.jpg" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/img/c/16-category_default.jpg" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/img/c/16-small_default.jpg" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/img/c/16.jpg" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/img/c/16_thumb.jpg" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/img/c/8-category_default.jpg" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/img/c/8-small_default.jpg" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/img/c/8.jpg" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/img/c/8_thumb.jpg" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/modules/colissimo/CHANGELOG.md" beforeDir="false" afterPath="$PROJECT_DIR$/modules/colissimo/CHANGELOG.md" afterDir="false" />
<change beforePath="$PROJECT_DIR$/modules/colissimo/Readme.md" beforeDir="false" afterPath="$PROJECT_DIR$/modules/colissimo/Readme.md" afterDir="false" />
<change beforePath="$PROJECT_DIR$/modules/colissimo/classes/ColissimoLabelGenerator.php" beforeDir="false" afterPath="$PROJECT_DIR$/modules/colissimo/classes/ColissimoLabelGenerator.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/modules/colissimo/classes/ColissimoTools.php" beforeDir="false" afterPath="$PROJECT_DIR$/modules/colissimo/classes/ColissimoTools.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/modules/colissimo/colissimo.php" beforeDir="false" afterPath="$PROJECT_DIR$/modules/colissimo/colissimo.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/modules/colissimo/config_fr.xml" beforeDir="false" afterPath="$PROJECT_DIR$/modules/colissimo/config_fr.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/modules/colissimo/controllers/admin/AdminColissimoAffranchissementController.php" beforeDir="false" afterPath="$PROJECT_DIR$/modules/colissimo/controllers/admin/AdminColissimoAffranchissementController.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/modules/colissimo/controllers/admin/AdminColissimoLabelController.php" beforeDir="false" afterPath="$PROJECT_DIR$/modules/colissimo/controllers/admin/AdminColissimoLabelController.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/modules/colissimo/controllers/front/tracking.php" beforeDir="false" afterPath="$PROJECT_DIR$/modules/colissimo/controllers/front/tracking.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/modules/colissimo/logs/202010_a1cd6a4ecbd7233a2ae7e88c02544788.log" beforeDir="false" afterPath="$PROJECT_DIR$/modules/colissimo/logs/202010_a1cd6a4ecbd7233a2ae7e88c02544788.log" afterDir="false" />
<change beforePath="$PROJECT_DIR$/modules/colissimo/views/templates/admin/colissimo_affranchissement/_partials/modal-service-selection-form.tpl" beforeDir="false" afterPath="$PROJECT_DIR$/modules/colissimo/views/templates/admin/colissimo_affranchissement/_partials/modal-service-selection-form.tpl" afterDir="false" />
<change beforePath="$PROJECT_DIR$/modules/colissimo/views/templates/admin/colissimo_affranchissement/step2/affranchissement-configuration-form.tpl" beforeDir="false" afterPath="$PROJECT_DIR$/modules/colissimo/views/templates/admin/colissimo_affranchissement/step2/affranchissement-configuration-form.tpl" afterDir="false" />
<change beforePath="$PROJECT_DIR$/modules/colissimo/views/templates/admin/configuration/tab-account.tpl" beforeDir="false" afterPath="$PROJECT_DIR$/modules/colissimo/views/templates/admin/configuration/tab-account.tpl" afterDir="false" />
<change beforePath="$PROJECT_DIR$/modules/dashtrends/config.xml" beforeDir="false" afterPath="$PROJECT_DIR$/modules/dashtrends/config.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/modules/dashtrends/config_fr.xml" beforeDir="false" afterPath="$PROJECT_DIR$/modules/dashtrends/config_fr.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/modules/dashtrends/dashtrends.php" beforeDir="false" afterPath="$PROJECT_DIR$/modules/dashtrends/dashtrends.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/modules/dashtrends/index.php" beforeDir="false" afterPath="$PROJECT_DIR$/modules/dashtrends/index.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/modules/dashtrends/translations/index.php" beforeDir="false" afterPath="$PROJECT_DIR$/modules/dashtrends/translations/index.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/modules/dashtrends/views/index.php" beforeDir="false" afterPath="$PROJECT_DIR$/modules/dashtrends/views/index.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/modules/dashtrends/views/js/dashtrends.js" beforeDir="false" afterPath="$PROJECT_DIR$/modules/dashtrends/views/js/dashtrends.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/modules/dashtrends/views/js/index.php" beforeDir="false" afterPath="$PROJECT_DIR$/modules/dashtrends/views/js/index.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/modules/dashtrends/views/templates/hook/dashboard_zone_two.tpl" beforeDir="false" afterPath="$PROJECT_DIR$/modules/dashtrends/views/templates/hook/dashboard_zone_two.tpl" afterDir="false" />
<change beforePath="$PROJECT_DIR$/modules/dashtrends/views/templates/hook/index.php" beforeDir="false" afterPath="$PROJECT_DIR$/modules/dashtrends/views/templates/hook/index.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/modules/dashtrends/views/templates/index.php" beforeDir="false" afterPath="$PROJECT_DIR$/modules/dashtrends/views/templates/index.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/modules/ps_checkpayment/config.xml" beforeDir="false" afterPath="$PROJECT_DIR$/modules/ps_checkpayment/config.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/modules/ps_checkpayment/config_fr.xml" beforeDir="false" afterPath="$PROJECT_DIR$/modules/ps_checkpayment/config_fr.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/modules/ps_checkpayment/controllers/front/index.php" beforeDir="false" afterPath="$PROJECT_DIR$/modules/ps_checkpayment/controllers/front/index.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/modules/ps_checkpayment/controllers/front/payment.php" beforeDir="false" afterPath="$PROJECT_DIR$/modules/ps_checkpayment/controllers/front/payment.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/modules/ps_checkpayment/controllers/front/validation.php" beforeDir="false" afterPath="$PROJECT_DIR$/modules/ps_checkpayment/controllers/front/validation.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/modules/ps_checkpayment/controllers/index.php" beforeDir="false" afterPath="$PROJECT_DIR$/modules/ps_checkpayment/controllers/index.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/modules/ps_checkpayment/index.php" beforeDir="false" afterPath="$PROJECT_DIR$/modules/ps_checkpayment/index.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/modules/ps_checkpayment/payment.php" beforeDir="false" afterPath="$PROJECT_DIR$/modules/ps_checkpayment/payment.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/modules/ps_checkpayment/ps_checkpayment.php" beforeDir="false" afterPath="$PROJECT_DIR$/modules/ps_checkpayment/ps_checkpayment.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/modules/ps_checkpayment/translations/index.php" beforeDir="false" afterPath="$PROJECT_DIR$/modules/ps_checkpayment/translations/index.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/modules/ps_checkpayment/upgrade/index.php" beforeDir="false" afterPath="$PROJECT_DIR$/modules/ps_checkpayment/upgrade/index.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/modules/ps_checkpayment/upgrade/upgrade-2.5.7.php" beforeDir="false" afterPath="$PROJECT_DIR$/modules/ps_checkpayment/upgrade/upgrade-2.5.7.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/modules/ps_checkpayment/upgrade/upgrade-2.5.8.php" beforeDir="false" afterPath="$PROJECT_DIR$/modules/ps_checkpayment/upgrade/upgrade-2.5.8.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/modules/ps_checkpayment/upgrade/upgrade-3.0.0.php" beforeDir="false" afterPath="$PROJECT_DIR$/modules/ps_checkpayment/upgrade/upgrade-3.0.0.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/modules/ps_checkpayment/views/index.php" beforeDir="false" afterPath="$PROJECT_DIR$/modules/ps_checkpayment/views/index.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/modules/ps_checkpayment/views/templates/front/index.php" beforeDir="false" afterPath="$PROJECT_DIR$/modules/ps_checkpayment/views/templates/front/index.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/modules/ps_checkpayment/views/templates/front/payment_infos.tpl" beforeDir="false" afterPath="$PROJECT_DIR$/modules/ps_checkpayment/views/templates/front/payment_infos.tpl" afterDir="false" />
<change beforePath="$PROJECT_DIR$/modules/ps_checkpayment/views/templates/hook/index.php" beforeDir="false" afterPath="$PROJECT_DIR$/modules/ps_checkpayment/views/templates/hook/index.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/modules/ps_checkpayment/views/templates/hook/infos.tpl" beforeDir="false" afterPath="$PROJECT_DIR$/modules/ps_checkpayment/views/templates/hook/infos.tpl" afterDir="false" />
<change beforePath="$PROJECT_DIR$/modules/ps_checkpayment/views/templates/hook/payment.tpl" beforeDir="false" afterPath="$PROJECT_DIR$/modules/ps_checkpayment/views/templates/hook/payment.tpl" afterDir="false" />
<change beforePath="$PROJECT_DIR$/modules/ps_checkpayment/views/templates/hook/payment_return.tpl" beforeDir="false" afterPath="$PROJECT_DIR$/modules/ps_checkpayment/views/templates/hook/payment_return.tpl" afterDir="false" />
<change beforePath="$PROJECT_DIR$/modules/ps_checkpayment/views/templates/index.php" beforeDir="false" afterPath="$PROJECT_DIR$/modules/ps_checkpayment/views/templates/index.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/modules/welcome/OnBoarding/Configuration.php" beforeDir="false" afterPath="$PROJECT_DIR$/modules/welcome/OnBoarding/Configuration.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/modules/welcome/OnBoarding/OnBoarding.php" beforeDir="false" afterPath="$PROJECT_DIR$/modules/welcome/OnBoarding/OnBoarding.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/modules/welcome/config.xml" beforeDir="false" afterPath="$PROJECT_DIR$/modules/welcome/config.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/modules/welcome/config_fr.xml" beforeDir="false" afterPath="$PROJECT_DIR$/modules/welcome/config_fr.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/modules/welcome/controllers/admin/AdminWelcomeController.php" beforeDir="false" afterPath="$PROJECT_DIR$/modules/welcome/controllers/admin/AdminWelcomeController.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/modules/welcome/images/balloons.png" beforeDir="false" afterPath="$PROJECT_DIR$/modules/welcome/images/balloons.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/modules/welcome/images/forum.png" beforeDir="false" afterPath="$PROJECT_DIR$/modules/welcome/images/forum.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/modules/welcome/images/preston-clouds.png" beforeDir="false" afterPath="$PROJECT_DIR$/modules/welcome/images/preston-clouds.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/modules/welcome/images/preston-left.png" beforeDir="false" afterPath="$PROJECT_DIR$/modules/welcome/images/preston-left.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/modules/welcome/images/preston-right.png" beforeDir="false" afterPath="$PROJECT_DIR$/modules/welcome/images/preston-right.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/modules/welcome/images/preston.png" beforeDir="false" afterPath="$PROJECT_DIR$/modules/welcome/images/preston.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/modules/welcome/images/ruban.png" beforeDir="false" afterPath="$PROJECT_DIR$/modules/welcome/images/ruban.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/modules/welcome/images/starter-guide.png" beforeDir="false" afterPath="$PROJECT_DIR$/modules/welcome/images/starter-guide.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/modules/welcome/images/training.png" beforeDir="false" afterPath="$PROJECT_DIR$/modules/welcome/images/training.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/modules/welcome/images/video-tutorial.png" beforeDir="false" afterPath="$PROJECT_DIR$/modules/welcome/images/video-tutorial.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/modules/welcome/js/module.js" beforeDir="false" afterPath="$PROJECT_DIR$/modules/welcome/js/module.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/modules/welcome/js/src/OnBoarding.js" beforeDir="false" afterPath="$PROJECT_DIR$/modules/welcome/js/src/OnBoarding.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/modules/welcome/logo.png" beforeDir="false" afterPath="$PROJECT_DIR$/modules/welcome/logo.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/modules/welcome/public/164f3120691885f6326bde5ab3f98533.png" beforeDir="false" afterPath="$PROJECT_DIR$/modules/welcome/public/164f3120691885f6326bde5ab3f98533.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/modules/welcome/public/34f96130e623110e8bdb173934b8caf1.png" beforeDir="false" afterPath="$PROJECT_DIR$/modules/welcome/public/34f96130e623110e8bdb173934b8caf1.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/modules/welcome/public/5bc603405a8265f1904ef075cb258370.png" beforeDir="false" afterPath="$PROJECT_DIR$/modules/welcome/public/5bc603405a8265f1904ef075cb258370.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/modules/welcome/public/738ffa79af4c837743b83812e6e8dfa1.png" beforeDir="false" afterPath="$PROJECT_DIR$/modules/welcome/public/738ffa79af4c837743b83812e6e8dfa1.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/modules/welcome/public/7914be0936bb436d9540215d86c0bb58.png" beforeDir="false" afterPath="$PROJECT_DIR$/modules/welcome/public/7914be0936bb436d9540215d86c0bb58.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/modules/welcome/public/79c143eeae6efaebcbe6b9ad482cf591.png" beforeDir="false" afterPath="$PROJECT_DIR$/modules/welcome/public/79c143eeae6efaebcbe6b9ad482cf591.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/modules/welcome/public/7e4eba4f03eccfd3057a35d05a539160.png" beforeDir="false" afterPath="$PROJECT_DIR$/modules/welcome/public/7e4eba4f03eccfd3057a35d05a539160.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/modules/welcome/public/9d15eec5f6a866d31ca8dee757df8cb4.png" beforeDir="false" afterPath="$PROJECT_DIR$/modules/welcome/public/9d15eec5f6a866d31ca8dee757df8cb4.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/modules/welcome/public/cf7d27394e7dd5f099401f60dc8af2fe.png" beforeDir="false" afterPath="$PROJECT_DIR$/modules/welcome/public/cf7d27394e7dd5f099401f60dc8af2fe.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/modules/welcome/public/eb1d04f953248855cce0bb0434f7d84b.png" beforeDir="false" afterPath="$PROJECT_DIR$/modules/welcome/public/eb1d04f953248855cce0bb0434f7d84b.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/modules/welcome/public/module.css" beforeDir="false" afterPath="$PROJECT_DIR$/modules/welcome/public/module.css" afterDir="false" />
<change beforePath="$PROJECT_DIR$/modules/welcome/public/module.js" beforeDir="false" afterPath="$PROJECT_DIR$/modules/welcome/public/module.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/modules/welcome/vendor/autoload.php" beforeDir="false" afterPath="$PROJECT_DIR$/modules/welcome/vendor/autoload.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/modules/welcome/vendor/composer/ClassLoader.php" beforeDir="false" afterPath="$PROJECT_DIR$/modules/welcome/vendor/composer/ClassLoader.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/modules/welcome/vendor/composer/LICENSE" beforeDir="false" afterPath="$PROJECT_DIR$/modules/welcome/vendor/composer/LICENSE" afterDir="false" />
<change beforePath="$PROJECT_DIR$/modules/welcome/vendor/composer/autoload_classmap.php" beforeDir="false" afterPath="$PROJECT_DIR$/modules/welcome/vendor/composer/autoload_classmap.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/modules/welcome/vendor/composer/autoload_real.php" beforeDir="false" afterPath="$PROJECT_DIR$/modules/welcome/vendor/composer/autoload_real.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/modules/welcome/views/content.tpl" beforeDir="false" afterPath="$PROJECT_DIR$/modules/welcome/views/content.tpl" afterDir="false" />
<change beforePath="$PROJECT_DIR$/modules/welcome/views/contents/end.tpl" beforeDir="false" afterPath="$PROJECT_DIR$/modules/welcome/views/contents/end.tpl" afterDir="false" />
<change beforePath="$PROJECT_DIR$/modules/welcome/views/contents/welcome.tpl" beforeDir="false" afterPath="$PROJECT_DIR$/modules/welcome/views/contents/welcome.tpl" afterDir="false" />
<change beforePath="$PROJECT_DIR$/modules/welcome/views/navbar.tpl" beforeDir="false" afterPath="$PROJECT_DIR$/modules/welcome/views/navbar.tpl" afterDir="false" />
<change beforePath="$PROJECT_DIR$/modules/welcome/views/templates/lost.tpl" beforeDir="false" afterPath="$PROJECT_DIR$/modules/welcome/views/templates/lost.tpl" afterDir="false" />
<change beforePath="$PROJECT_DIR$/modules/welcome/views/templates/popup.tpl" beforeDir="false" afterPath="$PROJECT_DIR$/modules/welcome/views/templates/popup.tpl" afterDir="false" />
<change beforePath="$PROJECT_DIR$/modules/welcome/views/templates/tooltip.tpl" beforeDir="false" afterPath="$PROJECT_DIR$/modules/welcome/views/templates/tooltip.tpl" afterDir="false" />
<change beforePath="$PROJECT_DIR$/modules/welcome/webpack.config.js" beforeDir="false" afterPath="$PROJECT_DIR$/modules/welcome/webpack.config.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/modules/welcome/welcome.php" beforeDir="false" afterPath="$PROJECT_DIR$/modules/welcome/welcome.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/themes/classic-child/assets/css/custom.css" beforeDir="false" afterPath="$PROJECT_DIR$/themes/classic-child/assets/css/custom.css" afterDir="false" /> <change beforePath="$PROJECT_DIR$/themes/classic-child/assets/css/custom.css" beforeDir="false" afterPath="$PROJECT_DIR$/themes/classic-child/assets/css/custom.css" afterDir="false" />
<change beforePath="$PROJECT_DIR$/themes/classic-child/modules/blocktopdropdownmenu/css/superfish-modified.css" beforeDir="false" afterPath="$PROJECT_DIR$/themes/classic-child/modules/blocktopdropdownmenu/css/superfish-modified.css" afterDir="false" />
<change beforePath="$PROJECT_DIR$/themes/classic-child/templates/_partials/header.tpl" beforeDir="false" afterPath="$PROJECT_DIR$/themes/classic-child/templates/_partials/header.tpl" afterDir="false" />
<change beforePath="$PROJECT_DIR$/var/cache/prod/AdminContainer.php" beforeDir="false" afterPath="$PROJECT_DIR$/var/cache/prod/AdminContainer.php" afterDir="false" /> <change beforePath="$PROJECT_DIR$/var/cache/prod/AdminContainer.php" beforeDir="false" afterPath="$PROJECT_DIR$/var/cache/prod/AdminContainer.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/var/cache/prod/AdminContainer.php.meta" beforeDir="false" afterPath="$PROJECT_DIR$/var/cache/prod/AdminContainer.php.meta" afterDir="false" />
<change beforePath="$PROJECT_DIR$/var/cache/prod/FrontContainer.php" beforeDir="false" afterPath="$PROJECT_DIR$/var/cache/prod/FrontContainer.php" afterDir="false" /> <change beforePath="$PROJECT_DIR$/var/cache/prod/FrontContainer.php" beforeDir="false" afterPath="$PROJECT_DIR$/var/cache/prod/FrontContainer.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/var/cache/prod/addons_advice/35/5b33323738623865356637623838393663343234346137636431343666383437335d5b315d.doctrinecache.data" beforeDir="false" /> <change beforePath="$PROJECT_DIR$/var/cache/prod/addons_advice/35/5b33323738623865356637623838393663343234346137636431343666383437335d5b315d.doctrinecache.data" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/var/cache/prod/addons_advice/9c/5b31346137306331646234366639383863366634303038343930326566613431635d5b315d.doctrinecache.data" beforeDir="false" /> <change beforePath="$PROJECT_DIR$/var/cache/prod/addons_advice/9c/5b31346137306331646234366639383863366634303038343930326566613431635d5b315d.doctrinecache.data" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/var/cache/prod/appProdProjectContainer.php" beforeDir="false" afterPath="$PROJECT_DIR$/var/cache/prod/appProdProjectContainer.php" afterDir="false" /> <change beforePath="$PROJECT_DIR$/var/cache/prod/appProdProjectContainer.php" beforeDir="false" afterPath="$PROJECT_DIR$/var/cache/prod/appProdProjectContainer.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/var/cache/prod/doctrine/81/5b32356639303136623661396636626466386532326161623738313664383438345d5b315d.doctrinecache.data" beforeDir="false" afterPath="$PROJECT_DIR$/var/cache/prod/doctrine/81/5b32356639303136623661396636626466386532326161623738313664383438345d5b315d.doctrinecache.data" afterDir="false" /> <change beforePath="$PROJECT_DIR$/var/cache/prod/appProdProjectContainer.php.meta" beforeDir="false" afterPath="$PROJECT_DIR$/var/cache/prod/appProdProjectContainer.php.meta" afterDir="false" />
<change beforePath="$PROJECT_DIR$/var/cache/prod/doctrine/a1/5b32323830373036393264393636313539656536336630373133623531336564635d5b315d.doctrinecache.data" beforeDir="false" afterPath="$PROJECT_DIR$/var/cache/prod/doctrine/a1/5b32323830373036393264393636313539656536336630373133623531336564635d5b315d.doctrinecache.data" afterDir="false" /> <change beforePath="$PROJECT_DIR$/var/cache/prod/cacert.pem" beforeDir="false" afterPath="$PROJECT_DIR$/var/cache/prod/cacert.pem" afterDir="false" />
<change beforePath="$PROJECT_DIR$/var/cache/prod/doctrine/b2/5b63333666326164336535656264316461353734353662306264313537323664365d5b315d.doctrinecache.data" beforeDir="false" afterPath="$PROJECT_DIR$/var/cache/prod/doctrine/b2/5b63333666326164336535656264316461353734353662306264313537323664365d5b315d.doctrinecache.data" afterDir="false" /> <change beforePath="$PROJECT_DIR$/var/cache/prod/class_index.php" beforeDir="false" afterPath="$PROJECT_DIR$/var/cache/prod/class_index.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/var/cache/prod/doctrine/b7/5b32373137373131633931363032346238393931633636346239656539623535385d5b315d.doctrinecache.data" beforeDir="false" afterPath="$PROJECT_DIR$/var/cache/prod/doctrine/b7/5b32373137373131633931363032346238393931633636346239656539623535385d5b315d.doctrinecache.data" afterDir="false" /> <change beforePath="$PROJECT_DIR$/var/cache/prod/doctrine/81/5b32356639303136623661396636626466386532326161623738313664383438345d5b315d.doctrinecache.data" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/var/cache/prod/doctrine/c0/5b66725f6164646f6e735f6d6f64756c65735d5b315d.doctrinecache.data" beforeDir="false" afterPath="$PROJECT_DIR$/var/cache/prod/doctrine/c0/5b66725f6164646f6e735f6d6f64756c65735d5b315d.doctrinecache.data" afterDir="false" /> <change beforePath="$PROJECT_DIR$/var/cache/prod/doctrine/a1/5b32323830373036393264393636313539656536336630373133623531336564635d5b315d.doctrinecache.data" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/var/cache/prod/doctrine/b2/5b63333666326164336535656264316461353734353662306264313537323664365d5b315d.doctrinecache.data" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/var/cache/prod/doctrine/b7/5b32373137373131633931363032346238393931633636346239656539623535385d5b315d.doctrinecache.data" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/var/cache/prod/doctrine/c0/5b66725f6164646f6e735f6d6f64756c65735d5b315d.doctrinecache.data" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/var/cache/prod/doctrine/ee/5b66725f6c6f63616c5f6d6f64756c65735d5b315d.doctrinecache.data" beforeDir="false" afterPath="$PROJECT_DIR$/var/cache/prod/doctrine/ee/5b66725f6c6f63616c5f6d6f64756c65735d5b315d.doctrinecache.data" afterDir="false" /> <change beforePath="$PROJECT_DIR$/var/cache/prod/doctrine/ee/5b66725f6c6f63616c5f6d6f64756c65735d5b315d.doctrinecache.data" beforeDir="false" afterPath="$PROJECT_DIR$/var/cache/prod/doctrine/ee/5b66725f6c6f63616c5f6d6f64756c65735d5b315d.doctrinecache.data" afterDir="false" />
<change beforePath="$PROJECT_DIR$/var/cache/prod/pools/+WuBw6C7B5/+/R/Ae86A3iQB0PeUFe-3Eed" beforeDir="false" /> <change beforePath="$PROJECT_DIR$/var/cache/prod/pools/+WuBw6C7B5/+/R/Ae86A3iQB0PeUFe-3Eed" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/var/cache/prod/pools/+WuBw6C7B5/+/W/2rwsm6pJfBvVtyxk+f2i" beforeDir="false" /> <change beforePath="$PROJECT_DIR$/var/cache/prod/pools/+WuBw6C7B5/+/W/2rwsm6pJfBvVtyxk+f2i" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/var/cache/prod/pools/+WuBw6C7B5/-/5/XAfn-9him0pprhyb97N-" beforeDir="false" /> <change beforePath="$PROJECT_DIR$/var/cache/prod/pools/+WuBw6C7B5/-/5/XAfn-9him0pprhyb97N-" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/var/cache/prod/pools/+WuBw6C7B5/-/O/1Fk9E3ZRjI2oo8vR9WaY" beforeDir="false" /> <change beforePath="$PROJECT_DIR$/var/cache/prod/pools/+WuBw6C7B5/-/O/1Fk9E3ZRjI2oo8vR9WaY" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/var/cache/prod/pools/+WuBw6C7B5/-/Y/PQepr9ISlu7EvTaLs3J9" beforeDir="false" /> <change beforePath="$PROJECT_DIR$/var/cache/prod/pools/+WuBw6C7B5/-/Y/PQepr9ISlu7EvTaLs3J9" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/var/cache/prod/pools/+WuBw6C7B5/0/-/-PS+IwN3AsKHBnW6-WL0" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/var/cache/prod/pools/+WuBw6C7B5/0/L/+1E4-tJlOgxHoTPgYwUW" beforeDir="false" /> <change beforePath="$PROJECT_DIR$/var/cache/prod/pools/+WuBw6C7B5/0/L/+1E4-tJlOgxHoTPgYwUW" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/var/cache/prod/pools/+WuBw6C7B5/0/L/b2GBcO1zC3hIyxdiunFC" beforeDir="false" /> <change beforePath="$PROJECT_DIR$/var/cache/prod/pools/+WuBw6C7B5/0/L/b2GBcO1zC3hIyxdiunFC" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/var/cache/prod/pools/+WuBw6C7B5/1/B/-yccUXhRMeZX1uRHh5l4" beforeDir="false" /> <change beforePath="$PROJECT_DIR$/var/cache/prod/pools/+WuBw6C7B5/1/B/-yccUXhRMeZX1uRHh5l4" beforeDir="false" />
@@ -411,35 +519,35 @@
<change beforePath="$PROJECT_DIR$/var/cache/prod/smarty/compile/18/87/a7/1887a71ca547431b4419152ffb69da76dcb79a9e_0.file.javascript.tpl.php" beforeDir="false" afterPath="$PROJECT_DIR$/var/cache/prod/smarty/compile/18/87/a7/1887a71ca547431b4419152ffb69da76dcb79a9e_0.file.javascript.tpl.php" afterDir="false" /> <change beforePath="$PROJECT_DIR$/var/cache/prod/smarty/compile/18/87/a7/1887a71ca547431b4419152ffb69da76dcb79a9e_0.file.javascript.tpl.php" beforeDir="false" afterPath="$PROJECT_DIR$/var/cache/prod/smarty/compile/18/87/a7/1887a71ca547431b4419152ffb69da76dcb79a9e_0.file.javascript.tpl.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/var/cache/prod/smarty/compile/21/31/8a/21318a11bf6cf1c30c0470fd62e35c905a9535a0_0.file.welcome.tpl.php" beforeDir="false" afterPath="$PROJECT_DIR$/var/cache/prod/smarty/compile/21/31/8a/21318a11bf6cf1c30c0470fd62e35c905a9535a0_0.file.welcome.tpl.php" afterDir="false" /> <change beforePath="$PROJECT_DIR$/var/cache/prod/smarty/compile/21/31/8a/21318a11bf6cf1c30c0470fd62e35c905a9535a0_0.file.welcome.tpl.php" beforeDir="false" afterPath="$PROJECT_DIR$/var/cache/prod/smarty/compile/21/31/8a/21318a11bf6cf1c30c0470fd62e35c905a9535a0_0.file.welcome.tpl.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/var/cache/prod/smarty/compile/23/9b/7b/239b7b63d666e6a5d921f3bec06b012ef949bc3a_0.file.employee_dropdown.tpl.php" beforeDir="false" afterPath="$PROJECT_DIR$/var/cache/prod/smarty/compile/23/9b/7b/239b7b63d666e6a5d921f3bec06b012ef949bc3a_0.file.employee_dropdown.tpl.php" afterDir="false" /> <change beforePath="$PROJECT_DIR$/var/cache/prod/smarty/compile/23/9b/7b/239b7b63d666e6a5d921f3bec06b012ef949bc3a_0.file.employee_dropdown.tpl.php" beforeDir="false" afterPath="$PROJECT_DIR$/var/cache/prod/smarty/compile/23/9b/7b/239b7b63d666e6a5d921f3bec06b012ef949bc3a_0.file.employee_dropdown.tpl.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/var/cache/prod/smarty/compile/2a/f1/ff/2af1ff03242c0a25e374ad0803d0e3569f978f81_0.file.layout.tpl.php" beforeDir="false" /> <change beforePath="$PROJECT_DIR$/var/cache/prod/smarty/compile/2a/f1/ff/2af1ff03242c0a25e374ad0803d0e3569f978f81_0.file.layout.tpl.php" beforeDir="false" afterPath="$PROJECT_DIR$/var/cache/prod/smarty/compile/2a/f1/ff/2af1ff03242c0a25e374ad0803d0e3569f978f81_0.file.layout.tpl.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/var/cache/prod/smarty/compile/2d/6d/5a/2d6d5a4ee36221fd8519745c7b5147b39d651875_0.file.header.tpl.php" beforeDir="false" afterPath="$PROJECT_DIR$/var/cache/prod/smarty/compile/2d/6d/5a/2d6d5a4ee36221fd8519745c7b5147b39d651875_0.file.header.tpl.php" afterDir="false" /> <change beforePath="$PROJECT_DIR$/var/cache/prod/smarty/compile/2d/6d/5a/2d6d5a4ee36221fd8519745c7b5147b39d651875_0.file.header.tpl.php" beforeDir="false" afterPath="$PROJECT_DIR$/var/cache/prod/smarty/compile/2d/6d/5a/2d6d5a4ee36221fd8519745c7b5147b39d651875_0.file.header.tpl.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/var/cache/prod/smarty/compile/2e/aa/61/2eaa61d10c949b0358f1439e85d012590c058bc2_0.file.view.tpl.php" beforeDir="false" /> <change beforePath="$PROJECT_DIR$/var/cache/prod/smarty/compile/2e/aa/61/2eaa61d10c949b0358f1439e85d012590c058bc2_0.file.view.tpl.php" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/var/cache/prod/smarty/compile/30/b4/b5/30b4b5d7a97b6e0f60c644ed1fc81a2d7a0f4930_0.file.javascript.tpl.php" beforeDir="false" /> <change beforePath="$PROJECT_DIR$/var/cache/prod/smarty/compile/30/b4/b5/30b4b5d7a97b6e0f60c644ed1fc81a2d7a0f4930_0.file.javascript.tpl.php" beforeDir="false" afterPath="$PROJECT_DIR$/var/cache/prod/smarty/compile/30/b4/b5/30b4b5d7a97b6e0f60c644ed1fc81a2d7a0f4930_0.file.javascript.tpl.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/var/cache/prod/smarty/compile/34/a0/d0/34a0d01e85ee4040a3ce3172fdb341ebf008d97a_0.file.nav_bar.tpl.php" beforeDir="false" afterPath="$PROJECT_DIR$/var/cache/prod/smarty/compile/34/a0/d0/34a0d01e85ee4040a3ce3172fdb341ebf008d97a_0.file.nav_bar.tpl.php" afterDir="false" /> <change beforePath="$PROJECT_DIR$/var/cache/prod/smarty/compile/34/a0/d0/34a0d01e85ee4040a3ce3172fdb341ebf008d97a_0.file.nav_bar.tpl.php" beforeDir="false" afterPath="$PROJECT_DIR$/var/cache/prod/smarty/compile/34/a0/d0/34a0d01e85ee4040a3ce3172fdb341ebf008d97a_0.file.nav_bar.tpl.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/var/cache/prod/smarty/compile/35/65/5e/35655e6409b6198f29dd6e732ef9598dec599880_2.module.psshoppingcartpsshoppingc.php" beforeDir="false" afterPath="$PROJECT_DIR$/var/cache/prod/smarty/compile/35/65/5e/35655e6409b6198f29dd6e732ef9598dec599880_2.module.psshoppingcartpsshoppingc.php" afterDir="false" /> <change beforePath="$PROJECT_DIR$/var/cache/prod/smarty/compile/35/65/5e/35655e6409b6198f29dd6e732ef9598dec599880_2.module.psshoppingcartpsshoppingc.php" beforeDir="false" afterPath="$PROJECT_DIR$/var/cache/prod/smarty/compile/35/65/5e/35655e6409b6198f29dd6e732ef9598dec599880_2.module.psshoppingcartpsshoppingc.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/var/cache/prod/smarty/compile/3e/f4/7b/3ef47b22fb0e55baeed2419be430cd67017e6572_0.file.calendar.tpl.php" beforeDir="false" /> <change beforePath="$PROJECT_DIR$/var/cache/prod/smarty/compile/3e/f4/7b/3ef47b22fb0e55baeed2419be430cd67017e6572_0.file.calendar.tpl.php" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/var/cache/prod/smarty/compile/40/ce/9d/40ce9df2e117974089f30e003f6aef6ab837b7ef_0.file.login_addons.tpl.php" beforeDir="false" afterPath="$PROJECT_DIR$/var/cache/prod/smarty/compile/40/ce/9d/40ce9df2e117974089f30e003f6aef6ab837b7ef_0.file.login_addons.tpl.php" afterDir="false" /> <change beforePath="$PROJECT_DIR$/var/cache/prod/smarty/compile/40/ce/9d/40ce9df2e117974089f30e003f6aef6ab837b7ef_0.file.login_addons.tpl.php" beforeDir="false" afterPath="$PROJECT_DIR$/var/cache/prod/smarty/compile/40/ce/9d/40ce9df2e117974089f30e003f6aef6ab837b7ef_0.file.login_addons.tpl.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/var/cache/prod/smarty/compile/41/df/19/41df1985130dffd7d3fe4cb369091546a0b40be7_2.module.psmainmenupsmainmenu.tpl.php" beforeDir="false" /> <change beforePath="$PROJECT_DIR$/var/cache/prod/smarty/compile/41/df/19/41df1985130dffd7d3fe4cb369091546a0b40be7_2.module.psmainmenupsmainmenu.tpl.php" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/var/cache/prod/smarty/compile/42/f9/46/42f9461127ce7396a601c2484841253ea5ba658f_2.module.pscustomeraccountlinkspsc.php" beforeDir="false" afterPath="$PROJECT_DIR$/var/cache/prod/smarty/compile/42/f9/46/42f9461127ce7396a601c2484841253ea5ba658f_2.module.pscustomeraccountlinkspsc.php" afterDir="false" /> <change beforePath="$PROJECT_DIR$/var/cache/prod/smarty/compile/42/f9/46/42f9461127ce7396a601c2484841253ea5ba658f_2.module.pscustomeraccountlinkspsc.php" beforeDir="false" afterPath="$PROJECT_DIR$/var/cache/prod/smarty/compile/42/f9/46/42f9461127ce7396a601c2484841253ea5ba658f_2.module.pscustomeraccountlinkspsc.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/var/cache/prod/smarty/compile/45/71/1b/45711b3db1a93ebf129dbe72f296e24848c27404_0.file.content.tpl.php" beforeDir="false" /> <change beforePath="$PROJECT_DIR$/var/cache/prod/smarty/compile/45/71/1b/45711b3db1a93ebf129dbe72f296e24848c27404_0.file.content.tpl.php" beforeDir="false" afterPath="$PROJECT_DIR$/var/cache/prod/smarty/compile/45/71/1b/45711b3db1a93ebf129dbe72f296e24848c27404_0.file.content.tpl.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/var/cache/prod/smarty/compile/57/f7/56/57f756970ad11e5006af28865a2757be2f04a4e0_0.file.shop_list.tpl.php" beforeDir="false" afterPath="$PROJECT_DIR$/var/cache/prod/smarty/compile/57/f7/56/57f756970ad11e5006af28865a2757be2f04a4e0_0.file.shop_list.tpl.php" afterDir="false" /> <change beforePath="$PROJECT_DIR$/var/cache/prod/smarty/compile/57/f7/56/57f756970ad11e5006af28865a2757be2f04a4e0_0.file.shop_list.tpl.php" beforeDir="false" afterPath="$PROJECT_DIR$/var/cache/prod/smarty/compile/57/f7/56/57f756970ad11e5006af28865a2757be2f04a4e0_0.file.shop_list.tpl.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/var/cache/prod/smarty/compile/63/a5/4e/63a54e2b2cada9dc346df441386f1523a8eedcf9_0.file.page_header_toolbar.tpl.php" beforeDir="false" /> <change beforePath="$PROJECT_DIR$/var/cache/prod/smarty/compile/63/a5/4e/63a54e2b2cada9dc346df441386f1523a8eedcf9_0.file.page_header_toolbar.tpl.php" beforeDir="false" afterPath="$PROJECT_DIR$/var/cache/prod/smarty/compile/63/a5/4e/63a54e2b2cada9dc346df441386f1523a8eedcf9_0.file.page_header_toolbar.tpl.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/var/cache/prod/smarty/compile/64/03/40/64034093fbda864710a2c0f526b37f921e53ee39_2.module.psbannerpsbanner.tpl.php" beforeDir="false" afterPath="$PROJECT_DIR$/var/cache/prod/smarty/compile/64/03/40/64034093fbda864710a2c0f526b37f921e53ee39_2.module.psbannerpsbanner.tpl.php" afterDir="false" /> <change beforePath="$PROJECT_DIR$/var/cache/prod/smarty/compile/64/03/40/64034093fbda864710a2c0f526b37f921e53ee39_2.module.psbannerpsbanner.tpl.php" beforeDir="false" afterPath="$PROJECT_DIR$/var/cache/prod/smarty/compile/64/03/40/64034093fbda864710a2c0f526b37f921e53ee39_2.module.psbannerpsbanner.tpl.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/var/cache/prod/smarty/compile/65/16/38/651638af1aa05692b0e67a28f71e85196de44d05_0.file.displayBackOfficeHeader.tpl.php" beforeDir="false" afterPath="$PROJECT_DIR$/var/cache/prod/smarty/compile/65/16/38/651638af1aa05692b0e67a28f71e85196de44d05_0.file.displayBackOfficeHeader.tpl.php" afterDir="false" /> <change beforePath="$PROJECT_DIR$/var/cache/prod/smarty/compile/65/16/38/651638af1aa05692b0e67a28f71e85196de44d05_0.file.displayBackOfficeHeader.tpl.php" beforeDir="false" afterPath="$PROJECT_DIR$/var/cache/prod/smarty/compile/65/16/38/651638af1aa05692b0e67a28f71e85196de44d05_0.file.displayBackOfficeHeader.tpl.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/var/cache/prod/smarty/compile/67/e6/ce/67e6ce3caae2cd5d3d38df8056a74e91119e040c_0.file.quick_access.tpl.php" beforeDir="false" afterPath="$PROJECT_DIR$/var/cache/prod/smarty/compile/67/e6/ce/67e6ce3caae2cd5d3d38df8056a74e91119e040c_0.file.quick_access.tpl.php" afterDir="false" /> <change beforePath="$PROJECT_DIR$/var/cache/prod/smarty/compile/67/e6/ce/67e6ce3caae2cd5d3d38df8056a74e91119e040c_0.file.quick_access.tpl.php" beforeDir="false" afterPath="$PROJECT_DIR$/var/cache/prod/smarty/compile/67/e6/ce/67e6ce3caae2cd5d3d38df8056a74e91119e040c_0.file.quick_access.tpl.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/var/cache/prod/smarty/compile/69/f1/42/69f142b99bbba2e4dbd2b9daa1938c33ed891c45_0.file.login_addons.tpl.php" beforeDir="false" afterPath="$PROJECT_DIR$/var/cache/prod/smarty/compile/69/f1/42/69f142b99bbba2e4dbd2b9daa1938c33ed891c45_0.file.login_addons.tpl.php" afterDir="false" /> <change beforePath="$PROJECT_DIR$/var/cache/prod/smarty/compile/69/f1/42/69f142b99bbba2e4dbd2b9daa1938c33ed891c45_0.file.login_addons.tpl.php" beforeDir="false" afterPath="$PROJECT_DIR$/var/cache/prod/smarty/compile/69/f1/42/69f142b99bbba2e4dbd2b9daa1938c33ed891c45_0.file.login_addons.tpl.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/var/cache/prod/smarty/compile/6c/21/08/6c2108a17c7103b6e203f4f0621d4645b56b0114_2.module.psimagesliderviewstemplat.php" beforeDir="false" /> <change beforePath="$PROJECT_DIR$/var/cache/prod/smarty/compile/6c/21/08/6c2108a17c7103b6e203f4f0621d4645b56b0114_2.module.psimagesliderviewstemplat.php" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/var/cache/prod/smarty/compile/86/5e/2a/865e2a6894ace2114bfd67a9af5d0e3aa177eb6e_0.file.modal.tpl.php" beforeDir="false" /> <change beforePath="$PROJECT_DIR$/var/cache/prod/smarty/compile/86/5e/2a/865e2a6894ace2114bfd67a9af5d0e3aa177eb6e_0.file.modal.tpl.php" beforeDir="false" afterPath="$PROJECT_DIR$/var/cache/prod/smarty/compile/86/5e/2a/865e2a6894ace2114bfd67a9af5d0e3aa177eb6e_0.file.modal.tpl.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/var/cache/prod/smarty/compile/87/b6/67/87b667e7cf5dbe92a22d4d98f15af3f0c13be866_0.file.modal.tpl.php" beforeDir="false" afterPath="$PROJECT_DIR$/var/cache/prod/smarty/compile/87/b6/67/87b667e7cf5dbe92a22d4d98f15af3f0c13be866_0.file.modal.tpl.php" afterDir="false" /> <change beforePath="$PROJECT_DIR$/var/cache/prod/smarty/compile/87/b6/67/87b667e7cf5dbe92a22d4d98f15af3f0c13be866_0.file.modal.tpl.php" beforeDir="false" afterPath="$PROJECT_DIR$/var/cache/prod/smarty/compile/87/b6/67/87b667e7cf5dbe92a22d4d98f15af3f0c13be866_0.file.modal.tpl.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/var/cache/prod/smarty/compile/90/65/48/906548e89c8c6025457ddaeffb1980a0c743b872_2.module.pslinklistviewstemplatesh.php" beforeDir="false" afterPath="$PROJECT_DIR$/var/cache/prod/smarty/compile/90/65/48/906548e89c8c6025457ddaeffb1980a0c743b872_2.module.pslinklistviewstemplatesh.php" afterDir="false" /> <change beforePath="$PROJECT_DIR$/var/cache/prod/smarty/compile/90/65/48/906548e89c8c6025457ddaeffb1980a0c743b872_2.module.pslinklistviewstemplatesh.php" beforeDir="false" afterPath="$PROJECT_DIR$/var/cache/prod/smarty/compile/90/65/48/906548e89c8c6025457ddaeffb1980a0c743b872_2.module.pslinklistviewstemplatesh.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/var/cache/prod/smarty/compile/97/9f/4b/979f4b5acfb95e1236aec301d74ea3603cd10dfc_0.file.end.tpl.php" beforeDir="false" afterPath="$PROJECT_DIR$/var/cache/prod/smarty/compile/97/9f/4b/979f4b5acfb95e1236aec301d74ea3603cd10dfc_0.file.end.tpl.php" afterDir="false" /> <change beforePath="$PROJECT_DIR$/var/cache/prod/smarty/compile/97/9f/4b/979f4b5acfb95e1236aec301d74ea3603cd10dfc_0.file.end.tpl.php" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/var/cache/prod/smarty/compile/99/92/f3/9992f3fe04dd41bcec1a2029cf07bead637caf4d_2.module.pscontactinfopscontactinf.php" beforeDir="false" afterPath="$PROJECT_DIR$/var/cache/prod/smarty/compile/99/92/f3/9992f3fe04dd41bcec1a2029cf07bead637caf4d_2.module.pscontactinfopscontactinf.php" afterDir="false" /> <change beforePath="$PROJECT_DIR$/var/cache/prod/smarty/compile/99/92/f3/9992f3fe04dd41bcec1a2029cf07bead637caf4d_2.module.pscontactinfopscontactinf.php" beforeDir="false" afterPath="$PROJECT_DIR$/var/cache/prod/smarty/compile/99/92/f3/9992f3fe04dd41bcec1a2029cf07bead637caf4d_2.module.pscontactinfopscontactinf.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/var/cache/prod/smarty/compile/9b/42/59/9b4259caa189d3844348bb5e650ef11eabc30cdd_0.file.notifications_center.tpl.php" beforeDir="false" afterPath="$PROJECT_DIR$/var/cache/prod/smarty/compile/9b/42/59/9b4259caa189d3844348bb5e650ef11eabc30cdd_0.file.notifications_center.tpl.php" afterDir="false" /> <change beforePath="$PROJECT_DIR$/var/cache/prod/smarty/compile/9b/42/59/9b4259caa189d3844348bb5e650ef11eabc30cdd_0.file.notifications_center.tpl.php" beforeDir="false" afterPath="$PROJECT_DIR$/var/cache/prod/smarty/compile/9b/42/59/9b4259caa189d3844348bb5e650ef11eabc30cdd_0.file.notifications_center.tpl.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/var/cache/prod/smarty/compile/9b/8a/6d/9b8a6d57633571e0543c770cad9c946ddfae2b1d_0.file.content.tpl.php" beforeDir="false" afterPath="$PROJECT_DIR$/var/cache/prod/smarty/compile/9b/8a/6d/9b8a6d57633571e0543c770cad9c946ddfae2b1d_0.file.content.tpl.php" afterDir="false" /> <change beforePath="$PROJECT_DIR$/var/cache/prod/smarty/compile/9b/8a/6d/9b8a6d57633571e0543c770cad9c946ddfae2b1d_0.file.content.tpl.php" beforeDir="false" afterPath="$PROJECT_DIR$/var/cache/prod/smarty/compile/9b/8a/6d/9b8a6d57633571e0543c770cad9c946ddfae2b1d_0.file.content.tpl.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/var/cache/prod/smarty/compile/9e/af/2b/9eaf2bc964ab1609f9a54bdd439a8ad7e6253676_0.file.search_form.tpl.php" beforeDir="false" /> <change beforePath="$PROJECT_DIR$/var/cache/prod/smarty/compile/9e/af/2b/9eaf2bc964ab1609f9a54bdd439a8ad7e6253676_0.file.search_form.tpl.php" beforeDir="false" afterPath="$PROJECT_DIR$/var/cache/prod/smarty/compile/9e/af/2b/9eaf2bc964ab1609f9a54bdd439a8ad7e6253676_0.file.search_form.tpl.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/var/cache/prod/smarty/compile/a3/ce/47/a3ce473b71bd9b195a4181ba3e59686f2f24994d_0.file.dashboard_zone_two.tpl.php" beforeDir="false" /> <change beforePath="$PROJECT_DIR$/var/cache/prod/smarty/compile/a3/ce/47/a3ce473b71bd9b195a4181ba3e59686f2f24994d_0.file.dashboard_zone_two.tpl.php" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/var/cache/prod/smarty/compile/b5/2e/39/b52e39591ae4453895a49691d15d1875a850dc34_0.file.end.tpl.php" beforeDir="false" afterPath="$PROJECT_DIR$/var/cache/prod/smarty/compile/b5/2e/39/b52e39591ae4453895a49691d15d1875a850dc34_0.file.end.tpl.php" afterDir="false" /> <change beforePath="$PROJECT_DIR$/var/cache/prod/smarty/compile/b5/2e/39/b52e39591ae4453895a49691d15d1875a850dc34_0.file.end.tpl.php" beforeDir="false" afterPath="$PROJECT_DIR$/var/cache/prod/smarty/compile/b5/2e/39/b52e39591ae4453895a49691d15d1875a850dc34_0.file.end.tpl.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/var/cache/prod/smarty/compile/b9/09/9d/b9099d048ac0d5cc530be7fc4948558b38f3cdf7_0.file.nav.tpl.php" beforeDir="false" /> <change beforePath="$PROJECT_DIR$/var/cache/prod/smarty/compile/b9/09/9d/b9099d048ac0d5cc530be7fc4948558b38f3cdf7_0.file.nav.tpl.php" beforeDir="false" afterPath="$PROJECT_DIR$/var/cache/prod/smarty/compile/b9/09/9d/b9099d048ac0d5cc530be7fc4948558b38f3cdf7_0.file.nav.tpl.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/var/cache/prod/smarty/compile/bb/10/c2/bb10c22ffed80eca15ca99db0f6479bdacdb915a_0.file.dashboard_zone_two.tpl.php" beforeDir="false" /> <change beforePath="$PROJECT_DIR$/var/cache/prod/smarty/compile/bb/10/c2/bb10c22ffed80eca15ca99db0f6479bdacdb915a_0.file.dashboard_zone_two.tpl.php" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/var/cache/prod/smarty/compile/c2/dd/07/c2dd0740a95279d7518c1785b593c21426c57d28_0.file.page_header_toolbar.tpl.php" beforeDir="false" afterPath="$PROJECT_DIR$/var/cache/prod/smarty/compile/c2/dd/07/c2dd0740a95279d7518c1785b593c21426c57d28_0.file.page_header_toolbar.tpl.php" afterDir="false" /> <change beforePath="$PROJECT_DIR$/var/cache/prod/smarty/compile/c2/dd/07/c2dd0740a95279d7518c1785b593c21426c57d28_0.file.page_header_toolbar.tpl.php" beforeDir="false" afterPath="$PROJECT_DIR$/var/cache/prod/smarty/compile/c2/dd/07/c2dd0740a95279d7518c1785b593c21426c57d28_0.file.page_header_toolbar.tpl.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/var/cache/prod/smarty/compile/c3/57/15/c357155dee1f8238b0f851a514641ebc2fc5a080_0.file.error_messages.tpl.php" beforeDir="false" afterPath="$PROJECT_DIR$/var/cache/prod/smarty/compile/c3/57/15/c357155dee1f8238b0f851a514641ebc2fc5a080_0.file.error_messages.tpl.php" afterDir="false" /> <change beforePath="$PROJECT_DIR$/var/cache/prod/smarty/compile/c3/57/15/c357155dee1f8238b0f851a514641ebc2fc5a080_0.file.error_messages.tpl.php" beforeDir="false" afterPath="$PROJECT_DIR$/var/cache/prod/smarty/compile/c3/57/15/c357155dee1f8238b0f851a514641ebc2fc5a080_0.file.error_messages.tpl.php" afterDir="false" />
@@ -447,17 +555,23 @@
<change beforePath="$PROJECT_DIR$/var/cache/prod/smarty/compile/c5/38/3c/c5383c2a0d1ec82f006cc4528c15c05639bd91da_0.file.layout.tpl.php" beforeDir="false" afterPath="$PROJECT_DIR$/var/cache/prod/smarty/compile/c5/38/3c/c5383c2a0d1ec82f006cc4528c15c05639bd91da_0.file.layout.tpl.php" afterDir="false" /> <change beforePath="$PROJECT_DIR$/var/cache/prod/smarty/compile/c5/38/3c/c5383c2a0d1ec82f006cc4528c15c05639bd91da_0.file.layout.tpl.php" beforeDir="false" afterPath="$PROJECT_DIR$/var/cache/prod/smarty/compile/c5/38/3c/c5383c2a0d1ec82f006cc4528c15c05639bd91da_0.file.layout.tpl.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/var/cache/prod/smarty/compile/d3/10/41/d31041a61c53b66c7223cdebfadff57c27954976_0.file.non-responsive.tpl.php" beforeDir="false" afterPath="$PROJECT_DIR$/var/cache/prod/smarty/compile/d3/10/41/d31041a61c53b66c7223cdebfadff57c27954976_0.file.non-responsive.tpl.php" afterDir="false" /> <change beforePath="$PROJECT_DIR$/var/cache/prod/smarty/compile/d3/10/41/d31041a61c53b66c7223cdebfadff57c27954976_0.file.non-responsive.tpl.php" beforeDir="false" afterPath="$PROJECT_DIR$/var/cache/prod/smarty/compile/d3/10/41/d31041a61c53b66c7223cdebfadff57c27954976_0.file.non-responsive.tpl.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/var/cache/prod/smarty/compile/d5/f8/f5/d5f8f570180f74d1dbdd1a1d2af0445e90a6650c_2.module.pscustomersigninpscustome.php" beforeDir="false" afterPath="$PROJECT_DIR$/var/cache/prod/smarty/compile/d5/f8/f5/d5f8f570180f74d1dbdd1a1d2af0445e90a6650c_2.module.pscustomersigninpscustome.php" afterDir="false" /> <change beforePath="$PROJECT_DIR$/var/cache/prod/smarty/compile/d5/f8/f5/d5f8f570180f74d1dbdd1a1d2af0445e90a6650c_2.module.pscustomersigninpscustome.php" beforeDir="false" afterPath="$PROJECT_DIR$/var/cache/prod/smarty/compile/d5/f8/f5/d5f8f570180f74d1dbdd1a1d2af0445e90a6650c_2.module.pscustomersigninpscustome.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/var/cache/prod/smarty/compile/d6/a6/3c/d6a63c547c29413721bfc0964c4085c788bd8303_0.file.header.tpl.php" beforeDir="false" /> <change beforePath="$PROJECT_DIR$/var/cache/prod/smarty/compile/d6/a6/3c/d6a63c547c29413721bfc0964c4085c788bd8303_0.file.header.tpl.php" beforeDir="false" afterPath="$PROJECT_DIR$/var/cache/prod/smarty/compile/d6/a6/3c/d6a63c547c29413721bfc0964c4085c788bd8303_0.file.header.tpl.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/var/cache/prod/smarty/compile/dd/b5/ff/ddb5ff90bc7e2ea8e00ed1a94479fe755c31585e_0.file.footer.tpl.php" beforeDir="false" /> <change beforePath="$PROJECT_DIR$/var/cache/prod/smarty/compile/dd/b5/ff/ddb5ff90bc7e2ea8e00ed1a94479fe755c31585e_0.file.footer.tpl.php" beforeDir="false" afterPath="$PROJECT_DIR$/var/cache/prod/smarty/compile/dd/b5/ff/ddb5ff90bc7e2ea8e00ed1a94479fe755c31585e_0.file.footer.tpl.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/var/cache/prod/smarty/compile/df/55/de/df55de9049fdd1ab57f14c9055cb8d6a120841dc_0.file.modal.tpl.php" beforeDir="false" afterPath="$PROJECT_DIR$/var/cache/prod/smarty/compile/df/55/de/df55de9049fdd1ab57f14c9055cb8d6a120841dc_0.file.modal.tpl.php" afterDir="false" /> <change beforePath="$PROJECT_DIR$/var/cache/prod/smarty/compile/df/55/de/df55de9049fdd1ab57f14c9055cb8d6a120841dc_0.file.modal.tpl.php" beforeDir="false" afterPath="$PROJECT_DIR$/var/cache/prod/smarty/compile/df/55/de/df55de9049fdd1ab57f14c9055cb8d6a120841dc_0.file.modal.tpl.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/var/cache/prod/smarty/compile/f2/a4/96/f2a496cb99ba0b5a93e1e6afd913830ac2b50715_0.file.confirmation_messages.tpl.php" beforeDir="false" afterPath="$PROJECT_DIR$/var/cache/prod/smarty/compile/f2/a4/96/f2a496cb99ba0b5a93e1e6afd913830ac2b50715_0.file.confirmation_messages.tpl.php" afterDir="false" /> <change beforePath="$PROJECT_DIR$/var/cache/prod/smarty/compile/f2/a4/96/f2a496cb99ba0b5a93e1e6afd913830ac2b50715_0.file.confirmation_messages.tpl.php" beforeDir="false" afterPath="$PROJECT_DIR$/var/cache/prod/smarty/compile/f2/a4/96/f2a496cb99ba0b5a93e1e6afd913830ac2b50715_0.file.confirmation_messages.tpl.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/var/cache/prod/smarty/compile/f7/8d/61/f78d61fd4b4761e55aef147de440e4cb5d6f95ec_0.file.welcome.tpl.php" beforeDir="false" afterPath="$PROJECT_DIR$/var/cache/prod/smarty/compile/f7/8d/61/f78d61fd4b4761e55aef147de440e4cb5d6f95ec_0.file.welcome.tpl.php" afterDir="false" /> <change beforePath="$PROJECT_DIR$/var/cache/prod/smarty/compile/f7/8d/61/f78d61fd4b4761e55aef147de440e4cb5d6f95ec_0.file.welcome.tpl.php" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/var/cache/prod/smarty/compile/fb/ee/03/fbee03e8dfa67fc0d85f17543903dc2c483f0fc0_0.file.warning_messages.tpl.php" beforeDir="false" afterPath="$PROJECT_DIR$/var/cache/prod/smarty/compile/fb/ee/03/fbee03e8dfa67fc0d85f17543903dc2c483f0fc0_0.file.warning_messages.tpl.php" afterDir="false" /> <change beforePath="$PROJECT_DIR$/var/cache/prod/smarty/compile/fb/ee/03/fbee03e8dfa67fc0d85f17543903dc2c483f0fc0_0.file.warning_messages.tpl.php" beforeDir="false" afterPath="$PROJECT_DIR$/var/cache/prod/smarty/compile/fb/ee/03/fbee03e8dfa67fc0d85f17543903dc2c483f0fc0_0.file.warning_messages.tpl.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/var/cache/prod/smarty/compile/fc/ac/a3/fcaca3ea195161e0fa685fb79a07ff09f5b771c3_0.file.information_messages.tpl.php" beforeDir="false" afterPath="$PROJECT_DIR$/var/cache/prod/smarty/compile/fc/ac/a3/fcaca3ea195161e0fa685fb79a07ff09f5b771c3_0.file.information_messages.tpl.php" afterDir="false" /> <change beforePath="$PROJECT_DIR$/var/cache/prod/smarty/compile/fc/ac/a3/fcaca3ea195161e0fa685fb79a07ff09f5b771c3_0.file.information_messages.tpl.php" beforeDir="false" afterPath="$PROJECT_DIR$/var/cache/prod/smarty/compile/fc/ac/a3/fcaca3ea195161e0fa685fb79a07ff09f5b771c3_0.file.information_messages.tpl.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/var/cache/prod/translations/catalogue.fr-FR.L8dqxxF.php" beforeDir="false" afterPath="$PROJECT_DIR$/var/cache/prod/translations/catalogue.fr-FR.L8dqxxF.php" afterDir="false" /> <change beforePath="$PROJECT_DIR$/var/cache/prod/translations/catalogue.fr-FR.L8dqxxF.php" beforeDir="false" afterPath="$PROJECT_DIR$/var/cache/prod/translations/catalogue.fr-FR.L8dqxxF.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/var/cache/prod/translations/catalogue.fr-FR.NXhscRe.php" beforeDir="false" afterPath="$PROJECT_DIR$/var/cache/prod/translations/catalogue.fr-FR.NXhscRe.php" afterDir="false" /> <change beforePath="$PROJECT_DIR$/var/cache/prod/translations/catalogue.fr-FR.NXhscRe.php" beforeDir="false" afterPath="$PROJECT_DIR$/var/cache/prod/translations/catalogue.fr-FR.NXhscRe.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/var/cache/prod/twig/04/04edb9a3990fb491643c8019b417a5f6b8200c934342c8c977a26d7699221c63.php" beforeDir="false" /> <change beforePath="$PROJECT_DIR$/var/cache/prod/twig/04/04edb9a3990fb491643c8019b417a5f6b8200c934342c8c977a26d7699221c63.php" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/var/cache/prod/twig/0b/0b4217683e2c1fa5e572fdd19769b04ae64a6238abd607c907dab70cbfef7aa3.php" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/var/cache/prod/twig/10/109bf2bed1ecbc1bdb547fe614b44a61015cb431651345ab1e4fe21be665a8dd.php" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/var/cache/prod/twig/23/23d237cbd1871720008c2e6be392226f029dabfea942bad64c703dc3488f980f.php" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/var/cache/prod/twig/69/6905aa72b8e6cb3d9456fb825694c335ebe99dde9b687f54dfc43b3237b4b68f.php" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/var/cache/prod/twig/7a/7a10bff244706d50b75ceae3877414ffbf586712bb19dcb3de1d74059b00e98b.php" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/var/cache/prod/twig/e8/e8ad4099a9ee6fa4c5b1f6b8d4e98c34d66460bdc40c261040d65f64c0fb2d4e.php" beforeDir="false" /> <change beforePath="$PROJECT_DIR$/var/cache/prod/twig/e8/e8ad4099a9ee6fa4c5b1f6b8d4e98c34d66460bdc40c261040d65f64c0fb2d4e.php" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/var/cache/prod/twig/f0/f0ba51765a9b87e3ede2fdbf71169cd5f352ab45e89b37588122eeba439dd6e9.php" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/var/logs/prod.log" beforeDir="false" afterPath="$PROJECT_DIR$/var/logs/prod.log" afterDir="false" /> <change beforePath="$PROJECT_DIR$/var/logs/prod.log" beforeDir="false" afterPath="$PROJECT_DIR$/var/logs/prod.log" afterDir="false" />
</list> </list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
@@ -488,7 +602,7 @@
<property name="ASKED_ADD_EXTERNAL_FILES" value="true" /> <property name="ASKED_ADD_EXTERNAL_FILES" value="true" />
<property name="RunOnceActivity.OpenProjectViewOnStart" value="true" /> <property name="RunOnceActivity.OpenProjectViewOnStart" value="true" />
<property name="WebServerToolWindowFactoryState" value="false" /> <property name="WebServerToolWindowFactoryState" value="false" />
<property name="last_opened_file_path" value="$PROJECT_DIR$/themes/classic-child/modules/blocktopdropdownmenu/views" /> <property name="last_opened_file_path" value="$PROJECT_DIR$/themes/classic-child/templates/catalog/_partials" />
<property name="node.js.detected.package.eslint" value="true" /> <property name="node.js.detected.package.eslint" value="true" />
<property name="node.js.path.for.package.eslint" value="project" /> <property name="node.js.path.for.package.eslint" value="project" />
<property name="node.js.selected.package.eslint" value="(autodetect)" /> <property name="node.js.selected.package.eslint" value="(autodetect)" />
@@ -496,18 +610,18 @@
<property name="vue.rearranger.settings.migration" value="true" /> <property name="vue.rearranger.settings.migration" value="true" />
</component> </component>
<component name="RecentsManager"> <component name="RecentsManager">
<key name="CopyFile.RECENT_KEYS">
<recent name="$PROJECT_DIR$/themes/classic-child/modules/blocktopdropdownmenu/views" />
<recent name="$PROJECT_DIR$/themes/classic-child/modules/blocktopdropdownmenu/css" />
<recent name="$PROJECT_DIR$/themes/classic-child/templates/_partials" />
<recent name="$PROJECT_DIR$/themes/classic-child/modules/ppbrandslider/views/css" />
<recent name="$PROJECT_DIR$/override/modules/ppbrandslider/views/templates/hook" />
</key>
<key name="MoveFile.RECENT_KEYS"> <key name="MoveFile.RECENT_KEYS">
<recent name="$PROJECT_DIR$/themes/classic-child/modules/blocktopdropdownmenu" /> <recent name="$PROJECT_DIR$/themes/classic-child/modules/blocktopdropdownmenu" />
<recent name="$PROJECT_DIR$/themes/classic-child/modules/blocktopdropdownmenu/css" /> <recent name="$PROJECT_DIR$/themes/classic-child/modules/blocktopdropdownmenu/css" />
<recent name="$PROJECT_DIR$/themes/classic-child/modules" /> <recent name="$PROJECT_DIR$/themes/classic-child/modules" />
</key> </key>
<key name="CopyFile.RECENT_KEYS">
<recent name="$PROJECT_DIR$/themes/classic-child/templates/catalog/_partials" />
<recent name="$PROJECT_DIR$/themes/classic-child/templates/catalog" />
<recent name="$PROJECT_DIR$/themes/classic-child/templates/layouts" />
<recent name="$PROJECT_DIR$/themes/classic-child/templates/_partials" />
<recent name="$PROJECT_DIR$/themes/classic-child/modules/ps_contactinfo" />
</key>
</component> </component>
<component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" /> <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
<component name="TaskManager"> <component name="TaskManager">
@@ -526,7 +640,11 @@
<workItem from="1602443563788" duration="54000" /> <workItem from="1602443563788" duration="54000" />
<workItem from="1602489847120" duration="6723000" /> <workItem from="1602489847120" duration="6723000" />
<workItem from="1602536731055" duration="101000" /> <workItem from="1602536731055" duration="101000" />
<workItem from="1602588579345" duration="3823000" /> <workItem from="1602588579345" duration="3870000" />
<workItem from="1602779962192" duration="4587000" />
<workItem from="1603026219874" duration="1728000" />
<workItem from="1603116371851" duration="8869000" />
<workItem from="1603185404332" duration="10516000" />
</task> </task>
<task id="LOCAL-00001" summary="Initial commit"> <task id="LOCAL-00001" summary="Initial commit">
<created>1602059851601</created> <created>1602059851601</created>
@@ -549,7 +667,14 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1602443606925</updated> <updated>1602443606925</updated>
</task> </task>
<option name="localTasksCounter" value="4" /> <task id="LOCAL-00004" summary="On rajoute encore quelques modules">
<created>1602593891728</created>
<option name="number" value="00004" />
<option name="presentableId" value="LOCAL-00004" />
<option name="project" value="LOCAL" />
<updated>1602593891728</updated>
</task>
<option name="localTasksCounter" value="5" />
<servers /> <servers />
</component> </component>
<component name="TypeScriptGeneratedFilesManager"> <component name="TypeScriptGeneratedFilesManager">
@@ -574,35 +699,37 @@
<MESSAGE value="Initial commit" /> <MESSAGE value="Initial commit" />
<MESSAGE value="On crée un template enfant" /> <MESSAGE value="On crée un template enfant" />
<MESSAGE value="On continue" /> <MESSAGE value="On continue" />
<option name="LAST_COMMIT_MESSAGE" value="On continue" /> <MESSAGE value="On rajoute encore quelques modules" />
<option name="LAST_COMMIT_MESSAGE" value="On rajoute encore quelques modules" />
</component> </component>
<component name="WindowStateProjectService"> <component name="WindowStateProjectService">
<state x="1022" y="562" key="#Notifications" timestamp="1602059783043"> <state x="1022" y="562" key="#Notifications" timestamp="1602059783043">
<screen x="0" y="23" width="2560" height="1417" /> <screen x="0" y="23" width="2560" height="1417" />
</state> </state>
<state x="1022" y="562" key="#Notifications/0.23.2560.1417/2560.142.1920.1057/-1920.23.1920.1057@0.23.2560.1417" timestamp="1602059783043" /> <state x="1022" y="562" key="#Notifications/0.23.2560.1417/2560.142.1920.1057/-1920.23.1920.1057@0.23.2560.1417" timestamp="1602059783043" />
<state x="716" y="290" width="1228" height="854" key="CommitChangelistDialog2" timestamp="1602491706076"> <state x="716" y="290" width="1228" height="854" key="CommitChangelistDialog2" timestamp="1602593890260">
<screen x="0" y="23" width="2560" height="1417" /> <screen x="0" y="23" width="2560" height="1417" />
</state> </state>
<state x="716" y="290" width="1228" height="854" key="CommitChangelistDialog2/0.23.2560.1417/2560.142.1920.1057/-1920.23.1920.1057@0.23.2560.1417" timestamp="1602491706076" /> <state x="716" y="290" width="1228" height="854" key="CommitChangelistDialog2/0.23.2560.1417/2560.142.1920.1057/-1920.23.1920.1057@0.23.2560.1417" timestamp="1602593890260" />
<state x="716" y="290" key="CommitChangelistDialog2/0.23.2560.1417/2560.23.1920.1057@0.23.2560.1417" timestamp="1602443605649" /> <state x="716" y="290" key="CommitChangelistDialog2/0.23.2560.1417/2560.23.1920.1057@0.23.2560.1417" timestamp="1602443605649" />
<state width="500" height="445" key="SwitcherDM" timestamp="1602591218512"> <state width="500" height="445" key="SwitcherDM" timestamp="1602591218512">
<screen x="0" y="23" width="2560" height="1417" /> <screen x="0" y="23" width="2560" height="1417" />
</state> </state>
<state width="500" height="445" key="SwitcherDM/0.23.2560.1417/2560.142.1920.1057/-1920.23.1920.1057@0.23.2560.1417" timestamp="1602591218512" /> <state width="500" height="445" key="SwitcherDM/0.23.2560.1417/2560.142.1920.1057/-1920.23.1920.1057@0.23.2560.1417" timestamp="1602591218512" />
<state x="880" y="471" key="Vcs.Push.Dialog.v2" timestamp="1602443610886"> <state x="880" y="471" key="Vcs.Push.Dialog.v2" timestamp="1602593893396">
<screen x="0" y="23" width="2560" height="1417" /> <screen x="0" y="23" width="2560" height="1417" />
</state> </state>
<state x="880" y="471" key="Vcs.Push.Dialog.v2/0.23.2560.1417/2560.142.1920.1057/-1920.23.1920.1057@0.23.2560.1417" timestamp="1602427133707" /> <state x="880" y="471" key="Vcs.Push.Dialog.v2/0.23.2560.1417/2560.142.1920.1057/-1920.23.1920.1057@0.23.2560.1417" timestamp="1602593893396" />
<state x="880" y="471" key="Vcs.Push.Dialog.v2/0.23.2560.1417/2560.23.1920.1057@0.23.2560.1417" timestamp="1602443610886" /> <state x="880" y="471" key="Vcs.Push.Dialog.v2/0.23.2560.1417/2560.23.1920.1057@0.23.2560.1417" timestamp="1602443610886" />
<state x="1093" y="652" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2" timestamp="1602503228712"> <state x="1093" y="652" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2" timestamp="1602503228712">
<screen x="0" y="23" width="2560" height="1417" /> <screen x="0" y="23" width="2560" height="1417" />
</state> </state>
<state x="1093" y="652" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2/0.23.2560.1417/2560.142.1920.1057/-1920.23.1920.1057@0.23.2560.1417" timestamp="1602503228712" /> <state x="1093" y="652" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2/0.23.2560.1417/2560.142.1920.1057/-1920.23.1920.1057@0.23.2560.1417" timestamp="1602503228712" />
<state x="865" y="337" width="1193" height="708" key="find.popup" timestamp="1602593186915"> <state x="865" y="337" width="1193" height="708" key="find.popup" timestamp="1603200812465">
<screen x="0" y="23" width="2560" height="1417" /> <screen x="0" y="23" width="2560" height="1417" />
</state> </state>
<state x="865" y="337" width="1193" height="708" key="find.popup/0.23.2560.1417/2560.142.1920.1057/-1920.23.1920.1057@0.23.2560.1417" timestamp="1602593186915" /> <state x="865" y="337" width="1193" height="708" key="find.popup/0.23.2560.1417/2560.142.1920.1057/-1920.23.1920.1057@0.23.2560.1417" timestamp="1603200812465" />
<state x="865" y="338" width="1193" height="708" key="find.popup/0.23.2560.1417/2560.23.1920.1057@0.23.2560.1417" timestamp="1603027609370" />
<state x="1048" y="586" width="846" height="259" key="git4idea.remote.GitConfigureRemotesDialog" timestamp="1602059416468"> <state x="1048" y="586" width="846" height="259" key="git4idea.remote.GitConfigureRemotesDialog" timestamp="1602059416468">
<screen x="0" y="23" width="2560" height="1417" /> <screen x="0" y="23" width="2560" height="1417" />
</state> </state>

View File

@@ -6,6 +6,30 @@
<language>fr</language> <language>fr</language>
<atom:link href="https://www.prestashop.com/fr/blog/feed.xml" rel="self" type="application/rss+xml" /> <atom:link href="https://www.prestashop.com/fr/blog/feed.xml" rel="self" type="application/rss+xml" />
<item> <item>
<title>Les paiements de A à Z Chapitre 2 : optimisez le paiement en magasin</title>
<link>https://www.prestashop.com/fr/blog/optimisez-paiement-magasin</link>
<description>Dans le chapitre précédent, nous évoquions le paiem</description>
<pubDate>Mon, 19 Oct 2020 15:32:36 +0200</pubDate>
<dc:creator>Lucie Gimon FR</dc:creator>
<guid isPermaLink="false">https://www.prestashop.com/fr/blog/optimisez-paiement-magasin</guid>
</item>
<item>
<title>Préparez votre campagne marketing pour la période des fêtes de fin dannée</title>
<link>https://www.prestashop.com/fr/blog/campagne-marketing-fetes</link>
<description>Apprenez à rentabiliser au maximum les périodes du Black Friday et du Cyber Monday en préparant à lavance votre campagne marketing.</description>
<pubDate>Thu, 15 Oct 2020 18:39:12 +0200</pubDate>
<dc:creator>Nicolas Vibert</dc:creator>
<guid isPermaLink="false">https://www.prestashop.com/fr/blog/campagne-marketing-fetes</guid>
</item>
<item>
<title> Transformez votre parcours dachat en expérience solidaire et durable </title>
<link>https://www.prestashop.com/fr/blog/parcours-achat-durable</link>
<description>En très forte croissance depuis plusieurs années et particulièrement dans le contexte global dépidémie et de distanciation sociale, le e-commerce prend une part de plus en plus importance dans le </description>
<pubDate>Tue, 13 Oct 2020 17:55:42 +0200</pubDate>
<dc:creator>Johanna Millot</dc:creator>
<guid isPermaLink="false">https://www.prestashop.com/fr/blog/parcours-achat-durable</guid>
</item>
<item>
<title>PrestaShop Metrics, le nouvel outil analytique qui centralise toutes les données e-commerce</title> <title>PrestaShop Metrics, le nouvel outil analytique qui centralise toutes les données e-commerce</title>
<link>https://www.prestashop.com/fr/blog/prestashop-metrics</link> <link>https://www.prestashop.com/fr/blog/prestashop-metrics</link>
<description>Lanalyse des données, dans le secteur du e-commerce peut-être encore plus quailleurs, est indispensable au pilotage du business.</description> <description>Lanalyse des données, dans le secteur du e-commerce peut-être encore plus quailleurs, est indispensable au pilotage du business.</description>
@@ -60,30 +84,6 @@
<pubDate>Wed, 23 Sep 2020 11:58:02 +0200</pubDate> <pubDate>Wed, 23 Sep 2020 11:58:02 +0200</pubDate>
<dc:creator>YATEO</dc:creator> <dc:creator>YATEO</dc:creator>
<guid isPermaLink="false">https://www.prestashop.com/fr/blog/analyser-concurrence-entreprise</guid> <guid isPermaLink="false">https://www.prestashop.com/fr/blog/analyser-concurrence-entreprise</guid>
</item>
<item>
<title>Comment ajouter du contenu en-dessous des produits sur ses pages catégories PrestaShop ?</title>
<link>https://www.prestashop.com/fr/blog/pages-categories-contenu</link>
<description>Les pages de catégories produits ont une importance capitale en référencement naturel.</description>
<pubDate>Fri, 18 Sep 2020 17:06:35 +0200</pubDate>
<dc:creator>Harmonie Andrieu</dc:creator>
<guid isPermaLink="false">https://www.prestashop.com/fr/blog/pages-categories-contenu</guid>
</item>
<item>
<title>Marketplaces : quelles sont les principales difficultés rencontrées par les marchands, et quelles sont les solutions ?</title>
<link>https://www.prestashop.com/fr/blog/marketplaces-marketfire-solutions</link>
<description>À loccasion de la sortie du </description>
<pubDate>Tue, 15 Sep 2020 18:11:18 +0200</pubDate>
<dc:creator>L&#039;équipe PrestaShop</dc:creator>
<guid isPermaLink="false">https://www.prestashop.com/fr/blog/marketplaces-marketfire-solutions</guid>
</item>
<item>
<title>Une passerelle de paiement e-commerce, qu&amp;#039;est-ce que c&amp;#039;est ?</title>
<link>https://www.prestashop.com/fr/blog/passerelle-paiement-e-commerce</link>
<description>Pour accepter des paiements via votre site internet, vous avez besoin d&#039;une passerelle de paiement.</description>
<pubDate>Mon, 14 Sep 2020 17:57:16 +0200</pubDate>
<dc:creator>Arina Drucioc FR</dc:creator>
<guid isPermaLink="false">https://www.prestashop.com/fr/blog/passerelle-paiement-e-commerce</guid>
</item> </item>
</channel> </channel>
</rss> </rss>

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 17 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 17 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 503 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 503 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 131 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 131 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 15 KiB

View File

Before

Width:  |  Height:  |  Size: 8.3 KiB

After

Width:  |  Height:  |  Size: 8.3 KiB

BIN
img/c/3-small_default.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.7 KiB

View File

Before

Width:  |  Height:  |  Size: 50 KiB

After

Width:  |  Height:  |  Size: 50 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 50 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.7 KiB

View File

@@ -4,6 +4,16 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
## [1.4.1] - 2020-09-30
### Added
- Additional countries in Intra-Dom list
### Fixed
- Fix FTD behaviour when changing service
- Fix customer name when pickup-point delivery
- Fix thermal printing in Ethernet mode
- Fix country list in module configuration
## [1.4.0] - 2020-07-31 ## [1.4.0] - 2020-07-31
### Added ### Added
- Compatibility with PrestaShop 1.7.7 for Admin Orders - Compatibility with PrestaShop 1.7.7 for Admin Orders

View File

@@ -1,5 +1,5 @@
# Colissimo Official App # Colissimo Official App
:white_check_mark: Current stable version: v1.4.0 :white_check_mark: Current stable version: v1.4.1
## Compatibility ## Compatibility

View File

@@ -296,6 +296,7 @@ class ColissimoLabelGenerator
); );
$this->request->setSenderAddress($senderAddr); $this->request->setSenderAddress($senderAddr);
/** @var Address $customerAddrDb */ /** @var Address $customerAddrDb */
$customerDeliveryAddr = $this->data['customer_addr'];
if ($colissimoService->type == ColissimoService::TYPE_RELAIS) { if ($colissimoService->type == ColissimoService::TYPE_RELAIS) {
$customerAddrDb = $this->data['customer_addr_inv']; $customerAddrDb = $this->data['customer_addr_inv'];
} else { } else {
@@ -306,8 +307,8 @@ class ColissimoLabelGenerator
'codeBarForReference' => true, 'codeBarForReference' => true,
'address' => array( 'address' => array(
'companyName' => $customerAddrDb->company, 'companyName' => $customerAddrDb->company,
'lastName' => $customerAddrDb->lastname, 'lastName' => $customerDeliveryAddr->lastname,
'firstName' => $customerAddrDb->firstname, 'firstName' => $customerDeliveryAddr->firstname,
'line2' => $customerAddrDb->address1, 'line2' => $customerAddrDb->address1,
'line3' => $customerAddrDb->address2, 'line3' => $customerAddrDb->address2,
'countryCode' => Country::getIsoById($customerAddrDb->id_country), 'countryCode' => Country::getIsoById($customerAddrDb->id_country),
@@ -504,6 +505,10 @@ class ColissimoLabelGenerator
$this->request->buildRequest(); $this->request->buildRequest();
$client = new ColissimoClient(); $client = new ColissimoClient();
$client->setRequest($this->request); $client->setRequest($this->request);
$this->logger->info(
sprintf('Order #%d (%s) - Request', $this->data['order']->id, $this->data['order']->reference),
array('request' => json_decode($this->request->getRequest(true), true))
);
/** @var ColissimoGenerateLabelResponse $response */ /** @var ColissimoGenerateLabelResponse $response */
$response = $client->request(); $response = $client->request();
$this->logger->info( $this->logger->info(

View File

@@ -50,7 +50,7 @@ class ColissimoTools
public static $isoOutreMerZone2 = array('NC', 'PF', 'WF', 'TF'); public static $isoOutreMerZone2 = array('NC', 'PF', 'WF', 'TF');
/** @var array $isoOutreMerZone1Special Outre-Mer zone 1, special rules with Inter-Dom & FR shipments */ /** @var array $isoOutreMerZone1Special Outre-Mer zone 1, special rules with Inter-Dom & FR shipments */
public static $isoOutreMerZone1Special = array('GP', 'MQ'); public static $isoOutreMerZone1Special = array('GP', 'MQ', 'BL', 'MF');
//@formatter:off //@formatter:off
/** @var array $isoOutreMerReturnSpecial Outre-Mer special : we can make return from these ISO to only these same ISO + 3 FR ISO */ /** @var array $isoOutreMerReturnSpecial Outre-Mer special : we can make return from these ISO to only these same ISO + 3 FR ISO */
@@ -1050,13 +1050,13 @@ class ColissimoTools
*/ */
public static function createAddressFromPickupPoint($pickupPoint, $order, $phone) public static function createAddressFromPickupPoint($pickupPoint, $order, $phone)
{ {
$customer = new Customer((int) $order->id_customer);
$idCountry = Country::getByIso($pickupPoint->iso_country); $idCountry = Country::getByIso($pickupPoint->iso_country);
$deliveryAddress = new Address((int) $order->id_address_delivery);
$pickupPointAddress = new Address(); $pickupPointAddress = new Address();
$pickupPointAddress->id_customer = (int) $order->id_customer; $pickupPointAddress->id_customer = (int) $order->id_customer;
$pickupPointAddress->alias = 'COLISSIMO POINT PICKUP '.(int) $pickupPoint->id; $pickupPointAddress->alias = 'COLISSIMO POINT PICKUP '.(int) $pickupPoint->id;
$pickupPointAddress->lastname = pSQL($customer->lastname); $pickupPointAddress->lastname = pSQL($deliveryAddress->lastname);
$pickupPointAddress->firstname = pSQL($customer->firstname); $pickupPointAddress->firstname = pSQL($deliveryAddress->firstname);
$pickupPointAddress->company = pSQL($pickupPoint->company_name); $pickupPointAddress->company = pSQL($pickupPoint->company_name);
$pickupPointAddress->address1 = pSQL($pickupPoint->address1); $pickupPointAddress->address1 = pSQL($pickupPoint->address1);
$pickupPointAddress->address2 = pSQL($pickupPoint->address2); $pickupPointAddress->address2 = pSQL($pickupPoint->address2);

View File

@@ -92,7 +92,7 @@ class Colissimo extends CarrierModule
$this->name = 'colissimo'; $this->name = 'colissimo';
$this->tab = 'shipping_logistics'; $this->tab = 'shipping_logistics';
$this->version = '1.4.0'; $this->version = '1.4.1';
$this->module_key = 'cce3f48c72001910b4bbda7b7492b5ba'; $this->module_key = 'cce3f48c72001910b4bbda7b7492b5ba';
$this->author = 'Colissimo'; $this->author = 'Colissimo';
$this->need_instance = 0; $this->need_instance = 0;

View File

@@ -2,7 +2,7 @@
<module> <module>
<name>colissimo</name> <name>colissimo</name>
<displayName><![CDATA[Colissimo - Officiel : G&eacute;rer vos exp&eacute;ditions avec Colissimo.]]></displayName> <displayName><![CDATA[Colissimo - Officiel : G&eacute;rer vos exp&eacute;ditions avec Colissimo.]]></displayName>
<version><![CDATA[1.4.0]]></version> <version><![CDATA[1.4.1]]></version>
<description><![CDATA[Ce module vous permettra d&rsquo;int&eacute;grer l&rsquo;affichage des points de retrait sur votre site, d&rsquo;imprimer vos &eacute;tiquettes&nbsp;depuis votre back office ou Coliship et&nbsp;de proposer le suivi des exp&eacute;ditions &agrave; vos clients.]]></description> <description><![CDATA[Ce module vous permettra d&rsquo;int&eacute;grer l&rsquo;affichage des points de retrait sur votre site, d&rsquo;imprimer vos &eacute;tiquettes&nbsp;depuis votre back office ou Coliship et&nbsp;de proposer le suivi des exp&eacute;ditions &agrave; vos clients.]]></description>
<author><![CDATA[Colissimo]]></author> <author><![CDATA[Colissimo]]></author>
<tab><![CDATA[shipping_logistics]]></tab> <tab><![CDATA[shipping_logistics]]></tab>

View File

@@ -1215,6 +1215,17 @@ class AdminColissimoAffranchissementController extends ModuleAdminController
$insurance = 0; $insurance = 0;
} }
} }
$isoOutreMerFtd = ColissimoTools::$isoOutreMer;
if (($key = array_search('YT', $isoOutreMerFtd)) !== false) {
unset($isoOutreMerFtd[$key]);
}
if (($key = array_search('PM', $isoOutreMerFtd)) !== false) {
unset($isoOutreMerFtd[$key]);
}
$productCode = $colissimoService->product_code;
$isoCustomerAddr = Country::getIsoById((int) $deliveryAddr->id_country);
$ftd = in_array($isoCustomerAddr, $isoOutreMerFtd) && $productCode == 'CDS' ? 1 : 0;
$data = array( $data = array(
'id_order' => $idOrder, 'id_order' => $idOrder,
'address_valid' => ColissimoTools::validateDeliveryAddress($deliveryAddr), 'address_valid' => ColissimoTools::validateDeliveryAddress($deliveryAddr),
@@ -1223,18 +1234,21 @@ class AdminColissimoAffranchissementController extends ModuleAdminController
'relais' => $colissimoService->type === ColissimoService::TYPE_RELAIS, 'relais' => $colissimoService->type === ColissimoService::TYPE_RELAIS,
'service' => $colissimoService->commercial_name, 'service' => $colissimoService->commercial_name,
'insurance' => $insurance, 'insurance' => $insurance,
'ftd' => $ftd,
); );
$this->context->smarty->assign(array('order' => $data, 'key' => $idColissimoOrder)); $this->context->smarty->assign(array('order' => $data, 'key' => $idColissimoOrder));
$htmlAddress = $this->createTemplate('_partials/td-affranchissement-delivery-address.tpl')->fetch(); $htmlAddress = $this->createTemplate('_partials/td-affranchissement-delivery-address.tpl')->fetch();
$htmlService = $this->createTemplate('_partials/td-affranchissement-service.tpl')->fetch(); $htmlService = $this->createTemplate('_partials/td-affranchissement-service.tpl')->fetch();
$htmlInsurance = $this->createTemplate('_partials/td-affranchissement-insurance.tpl')->fetch(); $htmlInsurance = $this->createTemplate('_partials/td-affranchissement-insurance.tpl')->fetch();
$htmlFtd = $this->createTemplate('_partials/td-affranchissement-ftd.tpl')->fetch();
$return = array( $return = array(
'error' => false, 'error' => false,
'html_address' => $htmlAddress, 'html_address' => $htmlAddress,
'html_service' => $htmlService, 'html_service' => $htmlService,
'html_insurance' => $htmlInsurance, 'html_insurance' => $htmlInsurance,
'html_ftd' => $htmlFtd,
'order' => $data, 'order' => $data,
); );
$this->ajaxDie(json_encode($return)); $this->ajaxDie(json_encode($return));

View File

@@ -684,7 +684,7 @@ class AdminColissimoLabelController extends ModuleAdminController
if (isset($documents['label'])) { if (isset($documents['label'])) {
$requests = array(); $requests = array();
if (Configuration::get('COLISSIMO_USE_THERMAL_PRINTER') && Configuration::get('COLISSIMO_USE_ETHERNET')) { if (Configuration::get('COLISSIMO_USE_THERMAL_PRINTER') && Configuration::get('COLISSIMO_USE_ETHERNET')) {
$params = 'port=ETHERNET&adresseIp='.Configuration::get('COLISSIMO_PRINTER_IP_ADDR'); $params = 'port=ETHERNET&protocole=&adresseIp='.Configuration::get('COLISSIMO_PRINTER_IP_ADDR');
} else { } else {
$params = 'port=USB&protocole='.Configuration::get('COLISSIMO_USB_PROTOCOLE').'&adresseIp='; $params = 'port=USB&protocole='.Configuration::get('COLISSIMO_USB_PROTOCOLE').'&adresseIp=';
} }
@@ -718,7 +718,7 @@ class AdminColissimoLabelController extends ModuleAdminController
public function ajaxProcessPrintLabelThermal() public function ajaxProcessPrintLabelThermal()
{ {
if (Configuration::get('COLISSIMO_USE_THERMAL_PRINTER') && Configuration::get('COLISSIMO_USE_ETHERNET')) { if (Configuration::get('COLISSIMO_USE_THERMAL_PRINTER') && Configuration::get('COLISSIMO_USE_ETHERNET')) {
$params = 'port=ETHERNET&adresseIp='.Configuration::get('COLISSIMO_PRINTER_IP_ADDR'); $params = 'port=ETHERNET&protocole=&adresseIp='.Configuration::get('COLISSIMO_PRINTER_IP_ADDR');
} else { } else {
$params = 'port=USB&protocole='.Configuration::get('COLISSIMO_USB_PROTOCOLE').'&adresseIp='; $params = 'port=USB&protocole='.Configuration::get('COLISSIMO_USB_PROTOCOLE').'&adresseIp=';
} }

View File

@@ -54,29 +54,155 @@ class ColissimoTrackingModuleFrontController extends ModuleFrontController
/** @var array $days */ /** @var array $days */
public $days = array( public $days = array(
1 => array('fr' => 'lundi', 'en' => 'monday,', 'de' => 'Montag,', 'nl' => 'maandag', 'it' => 'lunedi', 'es' => 'lunes,'), 1 => array(
2 => array('fr' => 'mardi', 'en' => 'tuesday,', 'de' => 'Dienstag,', 'nl' => 'dinsdag', 'it' => 'martedì', 'es' => 'martes,'), 'fr' => 'lundi',
3 => array('fr' => 'mercredi', 'en' => 'wednesday,', 'de' => 'Mittwoch,', 'nl' => 'woensdag', 'it' => 'mercoledì', 'es' => 'miércoles,'), 'en' => 'monday,',
4 => array('fr' => 'jeudi', 'en' => 'thursday,', 'de' => 'Donnerstag,', 'nl' => 'donderdag', 'it' => 'giovedi', 'es' => 'jueves,'), 'de' => 'Montag,',
5 => array('fr' => 'vendredi', 'en' => 'friday,', 'de' => 'Freitag,', 'nl' => 'vrijdag', 'it' => 'venerdì', 'es' => 'viernes,'), 'nl' => 'maandag',
6 => array('fr' => 'samedi', 'en' => 'saturday,', 'de' => 'Samstag,', 'nl' => 'zaterdag', 'it' => 'sabato', 'es' => 'sábado,'), 'it' => 'lunedi',
7 => array('fr' => 'dimanche', 'en' => 'sunday,', 'de' => 'Sonntag,', 'nl' => 'zondag', 'it' => 'domenica', 'es' => 'domingo,'), 'es' => 'lunes,',
),
2 => array(
'fr' => 'mardi',
'en' => 'tuesday,',
'de' => 'Dienstag,',
'nl' => 'dinsdag',
'it' => 'martedì',
'es' => 'martes,',
),
3 => array(
'fr' => 'mercredi',
'en' => 'wednesday,',
'de' => 'Mittwoch,',
'nl' => 'woensdag',
'it' => 'mercoledì',
'es' => 'miércoles,',
),
4 => array(
'fr' => 'jeudi',
'en' => 'thursday,',
'de' => 'Donnerstag,',
'nl' => 'donderdag',
'it' => 'giovedi',
'es' => 'jueves,',
),
5 => array(
'fr' => 'vendredi',
'en' => 'friday,',
'de' => 'Freitag,',
'nl' => 'vrijdag',
'it' => 'venerdì',
'es' => 'viernes,',
),
6 => array(
'fr' => 'samedi',
'en' => 'saturday,',
'de' => 'Samstag,',
'nl' => 'zaterdag',
'it' => 'sabato',
'es' => 'sábado,',
),
7 => array(
'fr' => 'dimanche',
'en' => 'sunday,',
'de' => 'Sonntag,',
'nl' => 'zondag',
'it' => 'domenica',
'es' => 'domingo,',
),
); );
/** @var array $months */ /** @var array $months */
public $months = array( public $months = array(
1 => array('fr' => 'janvier', 'en' => 'january', 'de' => 'januar', 'nl' => 'januari', 'it' => 'gennaio', 'es' => 'de enero'), 1 => array(
2 => array('fr' => 'février', 'en' => 'february', 'de' => 'februar', 'nl' => 'februari', 'it' => 'febbraio', 'es' => 'de febrero'), 'fr' => 'janvier',
3 => array('fr' => 'mars', 'en' => 'march', 'de' => 'märz', 'nl' => 'maart', 'it' => 'marzo', 'es' => 'de marzo'), 'en' => 'january',
4 => array('fr' => 'avril', 'en' => 'april', 'de' => 'april', 'nl' => 'april', 'it' => 'aprile', 'es' => 'de abril'), 'de' => 'januar',
'nl' => 'januari',
'it' => 'gennaio',
'es' => 'de enero',
),
2 => array(
'fr' => 'février',
'en' => 'february',
'de' => 'februar',
'nl' => 'februari',
'it' => 'febbraio',
'es' => 'de febrero',
),
3 => array(
'fr' => 'mars',
'en' => 'march',
'de' => 'märz',
'nl' => 'maart',
'it' => 'marzo',
'es' => 'de marzo',
),
4 => array(
'fr' => 'avril',
'en' => 'april',
'de' => 'april',
'nl' => 'april',
'it' => 'aprile',
'es' => 'de abril',
),
5 => array('fr' => 'mai', 'en' => 'may', 'de' => 'mai', 'nl' => 'mei', 'it' => 'maggio', 'es' => 'de mayo'), 5 => array('fr' => 'mai', 'en' => 'may', 'de' => 'mai', 'nl' => 'mei', 'it' => 'maggio', 'es' => 'de mayo'),
6 => array('fr' => 'juin', 'en' => 'june', 'de' => 'juni', 'nl' => 'juni', 'it' => 'giugno', 'es' => 'de junio'), 6 => array(
7 => array('fr' => 'juillet', 'en' => 'july', 'de' => 'juli', 'nl' => 'juli', 'it' => 'luglio', 'es' => 'de julio'), 'fr' => 'juin',
8 => array('fr' => 'août', 'en' => 'august', 'de' => 'august', 'nl' => 'augustus', 'it' => 'agosto', 'es' => 'de agosto'), 'en' => 'june',
9 => array('fr' => 'septembre', 'en' => 'september', 'de' => 'september', 'nl' => 'september', 'it' => 'settembre', 'es' => 'de septiembre'), 'de' => 'juni',
10 => array('fr' => 'octobre', 'en' => 'october', 'de' => 'oktober', 'nl' => 'oktober', 'it' => 'ottobre', 'es' => 'de octubre'), 'nl' => 'juni',
11 => array('fr' => 'novembre', 'en' => 'november', 'de' => 'november', 'nl' => 'november', 'it' => 'novembre', 'es' => 'de noviembre'), 'it' => 'giugno',
12 => array('fr' => 'décembre', 'en' => 'december', 'de' => 'dezember', 'nl' => 'december', 'it' => 'dicembre', 'es' => 'de diciembre'), 'es' => 'de junio',
),
7 => array(
'fr' => 'juillet',
'en' => 'july',
'de' => 'juli',
'nl' => 'juli',
'it' => 'luglio',
'es' => 'de julio',
),
8 => array(
'fr' => 'août',
'en' => 'august',
'de' => 'august',
'nl' => 'augustus',
'it' => 'agosto',
'es' => 'de agosto',
),
9 => array(
'fr' => 'septembre',
'en' => 'september',
'de' => 'september',
'nl' => 'september',
'it' => 'settembre',
'es' => 'de septiembre',
),
10 => array(
'fr' => 'octobre',
'en' => 'october',
'de' => 'oktober',
'nl' => 'oktober',
'it' => 'ottobre',
'es' => 'de octubre',
),
11 => array(
'fr' => 'novembre',
'en' => 'november',
'de' => 'november',
'nl' => 'november',
'it' => 'novembre',
'es' => 'de noviembre',
),
12 => array(
'fr' => 'décembre',
'en' => 'december',
'de' => 'dezember',
'nl' => 'december',
'it' => 'dicembre',
'es' => 'de diciembre',
),
); );
/** /**
@@ -161,35 +287,17 @@ class ColissimoTrackingModuleFrontController extends ModuleFrontController
parent::initContent(); parent::initContent();
$hash = md5($this->order->reference.$this->order->secure_key); $hash = md5($this->order->reference.$this->order->secure_key);
$labels = $this->colissimoOrder->getShipments($this->context->language->id); $labels = $this->colissimoOrder->getShipments($this->context->language->id);
$this->context->smarty->assign( $this->context->smarty->assign(array(
array( 'colissimo_img_path' => $this->module->getPathUri().'views/img/',
'colissimo_img_path' => $this->module->getPathUri().'views/img/', 'order_reference' => $this->order->reference,
'order_reference' => $this->order->reference, 'order_hash' => $hash,
'order_hash' => $hash, 'no_labels' => (!$labels || empty($labels)) ? 1 : 0,
'no_labels' => (!$labels || empty($labels)) ? 1 : 0, 'noindex' => true,
) 'nofollow' => true,
); ));
$this->setTemplate($this->module->psFolder.'/tracking.tpl'); $this->setTemplate($this->module->psFolder.'/tracking.tpl');
} }
/**
* @param array $events
* @return array
* @throws PrestaShopException
*/
// public function getEvents($events)
// {
// $return = array();
// foreach ($events as $event) {
// $return[] = array_merge(
// array('dateDisplay' => Tools::displayDate(date('Y-m-d H:i:s', $event['date'] / 1000))),
// $event
// );
// }
//
// return $return;
// }
/** /**
* @throws Exception * @throws Exception
* @throws PrestaShopDatabaseException * @throws PrestaShopDatabaseException
@@ -310,10 +418,10 @@ class ColissimoTrackingModuleFrontController extends ModuleFrontController
} }
$shipment = array( $shipment = array(
'messages' => $trackingResponse->messages, 'messages' => $trackingResponse->messages,
'user_messages' => $trackingResponse->userMessages, 'user_messages' => $trackingResponse->userMessages,
'steps_timeline' => $trackingResponse->timeline, 'steps_timeline' => $trackingResponse->timeline,
'steps_details' => $trackingResponse->events, 'steps_details' => $trackingResponse->events,
'parcel_details' => $trackingResponse->parcelDetails, 'parcel_details' => $trackingResponse->parcelDetails,
); );
$this->context->smarty->assign(array('shipment' => $shipment)); $this->context->smarty->assign(array('shipment' => $shipment));

View File

@@ -31,3 +31,5 @@
[2020-10-05 18:36:06] Colissimo_1_4_0_Install.INFO: Saved service RETOUR: 16 [] [] [2020-10-05 18:36:06] Colissimo_1_4_0_Install.INFO: Saved service RETOUR: 16 [] []
[2020-10-05 18:36:06] Colissimo_1_4_0_Install.INFO: Saved service RETOUR: 17 [] [] [2020-10-05 18:36:06] Colissimo_1_4_0_Install.INFO: Saved service RETOUR: 17 [] []
[2020-10-05 18:36:06] Colissimo_1_4_0_Install.INFO: Tracking codes created. 0 errors thrown. [] [] [2020-10-05 18:36:06] Colissimo_1_4_0_Install.INFO: Tracking codes created. 0 errors thrown. [] []
[2020-10-19 16:15:47] Colissimo_1_4_1_ModuleUpgrade.INFO: Module upgrade. Version 1.4.1 [] []
[2020-10-19 16:15:47] Colissimo_1_4_1_ModuleUpgrade.INFO: Module upgraded. [] []

View File

@@ -0,0 +1,48 @@
<?php
/**
* 2007-2020 PrestaShop
*
* NOTICE OF LICENSE
*
* This source file is subject to the Open Software License (OSL 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/osl-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 <contact@prestashop.com>
* @copyright 2007-2020 PrestaShop SA
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
* International Registered Trademark & Property of PrestaShop SA
*/
if (!defined('_PS_VERSION_')) {
exit;
}
/**
* Upgrade to 1.4.1
*
* @param $module Colissimo
* @return bool
*/
function upgrade_module_1_4_1($module)
{
$logsEnabled = Configuration::get('COLISSIMO_LOGS');
Configuration::updateValue('COLISSIMO_LOGS', 1);
$module->initLogger();
$module->logger->setChannel('ModuleUpgrade');
$module->logger->info('Module upgrade. Version 1.4.1');
$module->logger->info('Module upgraded.');
Configuration::updateValue('COLISSIMO_LOGS', (int) $logsEnabled);
return true;
}

View File

@@ -88,6 +88,7 @@
row.find('td.colissimo-delivery-addr').html(data.html_address); row.find('td.colissimo-delivery-addr').html(data.html_address);
row.find('td.colissimo-service').html(data.html_service); row.find('td.colissimo-service').html(data.html_service);
row.find('td.colissimo-insurance').html(data.html_insurance); row.find('td.colissimo-insurance').html(data.html_insurance);
row.find('td.colissimo-ta').html(data.html_ftd);
if (data.order.relais) { if (data.order.relais) {
row.find('td.colissimo-d150 input[type="checkbox"]').prop('disabled', true); row.find('td.colissimo-d150 input[type="checkbox"]').prop('disabled', true);
} else { } else {

View File

@@ -0,0 +1,29 @@
{*
* 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 <contact@prestashop.com>
* @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
*}
<input {if !$order.ftd}disabled="disabled"{/if}
type="checkbox"
name="colissimo_ta_{$key|intval}"
/>

View File

@@ -89,7 +89,7 @@
{include file="../_partials/td-affranchissement-insurance.tpl"} {include file="../_partials/td-affranchissement-insurance.tpl"}
</td> </td>
<td class="text-center colissimo-ta"> <td class="text-center colissimo-ta">
<input {if !$order.ftd}disabled="disabled"{/if} type="checkbox" name="colissimo_ta_{$key|intval}"/> {include file="../_partials/td-affranchissement-ftd.tpl"}
</td> </td>
<td class="text-center colissimo-d150"> <td class="text-center colissimo-d150">
<input {if $order.relais}disabled="disabled"{/if} type="checkbox" name="colissimo_d150_{$key|intval}"/> <input {if $order.relais}disabled="disabled"{/if} type="checkbox" name="colissimo_d150_{$key|intval}"/>

View File

@@ -404,22 +404,14 @@
<span>{l s='Country' mod='colissimo'}</span> <span>{l s='Country' mod='colissimo'}</span>
</label> </label>
<div class="col-lg-9"> <div class="col-lg-9">
<select name="sender_country" class="chosen fixed-width-lg" style="display: none;"> <select id="colissimo-country" name="sender_country" class="cls-chosen fixed-width-xl" style="display: none;">
{foreach from=$address_countries key=iso item=name} {foreach from=$address_countries key=iso item=name}
<option value="{$iso|escape:'html':'UTF-8'}" <option value="{$iso|escape:'html':'UTF-8'}"
{if $form_data['sender_country'] == $iso }selected{/if}> {if $form_data['sender_country'] == $iso }selected{/if}>
{$name|escape:'html':'UTF-8'} {$name|escape:'html':'UTF-8'}
</option> </option>
<option value="{$iso|escape:'html':'UTF-8'}"
{if $form_data['sender_country'] == $iso }selected{/if}>
{$name|escape:'html':'UTF-8'}
</option>
{/foreach} {/foreach}
</select> </select>
<div class="chosen-container chosen-container-single chosen-container-single-nosearch"
style="width: 250px;"
title="">
</div>
</div> </div>
<div class="col-lg-9 col-lg-offset-3"></div> <div class="col-lg-9 col-lg-offset-3"></div>
</div> </div>
@@ -576,7 +568,6 @@
id="return-address2" id="return-address2"
name="return_address2" name="return_address2"
class="input fixed-width-xxl" class="input fixed-width-xxl"
required="required"
value="{$form_data['return_address2']|escape:'htmlall':'UTF-8'}" value="{$form_data['return_address2']|escape:'htmlall':'UTF-8'}"
data-maxchar="35" data-maxchar="35"
maxlength="35"> maxlength="35">
@@ -596,7 +587,6 @@
id="return-address3" id="return-address3"
name="return_address3" name="return_address3"
class="input fixed-width-xxl" class="input fixed-width-xxl"
required="required"
value="{$form_data['return_address3']|escape:'htmlall':'UTF-8'}" value="{$form_data['return_address3']|escape:'htmlall':'UTF-8'}"
data-maxchar="35" data-maxchar="35"
maxlength="35"> maxlength="35">
@@ -616,7 +606,6 @@
id="return-address4" id="return-address4"
name="return_address4" name="return_address4"
class="input fixed-width-xxl" class="input fixed-width-xxl"
required="required"
value="{$form_data['return_address4']|escape:'htmlall':'UTF-8'}" value="{$form_data['return_address4']|escape:'htmlall':'UTF-8'}"
data-maxchar="35" data-maxchar="35"
maxlength="35"> maxlength="35">
@@ -664,7 +653,7 @@
<span>{l s='Country' mod='colissimo'}</span> <span>{l s='Country' mod='colissimo'}</span>
</label> </label>
<div class="col-lg-9"> <div class="col-lg-9">
<select name="return_country" class="chosen fixed-width-lg" style="display: none;"> <select name="return_country" class="cls-chosen fixed-width-lg" style="display: none;">
{foreach from=$address_countries key=iso item=name} {foreach from=$address_countries key=iso item=name}
<option value="{$iso|escape:'html':'UTF-8'}" <option value="{$iso|escape:'html':'UTF-8'}"
{if $form_data['return_country'] == $iso }selected{/if}> {if $form_data['return_country'] == $iso }selected{/if}>
@@ -672,20 +661,6 @@
</option> </option>
{/foreach} {/foreach}
</select> </select>
<div class="chosen-container chosen-container-single chosen-container-single-nosearch"
style="width: 100%;"
title="">
<a class="chosen-single" tabindex="-1">
<span>France</span>
<div><b></b></div>
</a>
<div class="chosen-drop">
<div class="chosen-search">
<input type="text" autocomplete="off" readonly="">
</div>
<ul class="chosen-results"></ul>
</div>
</div>
</div> </div>
<div class="col-lg-9 col-lg-offset-3"></div> <div class="col-lg-9 col-lg-offset-3"></div>
</div> </div>
@@ -729,7 +704,7 @@
</div> </div>
</div> </div>
<div class="panel-footer"> <div class="panel-footer">
<button type="submit" class="btn btn-default pull-right" name="submitColissimoreturnAddressConfigForm"> <button type="submit" class="btn btn-default pull-right" name="submitColissimoReturnAddressConfigForm">
<i class="process-icon-save"></i> {l s='Save' mod='colissimo'} <i class="process-icon-save"></i> {l s='Save' mod='colissimo'}
</button> </button>
</div> </div>
@@ -757,5 +732,9 @@
testWSCredentials(colissimoCheckCredentials); testWSCredentials(colissimoCheckCredentials);
}); });
}); });
$('select.cls-chosen').each(function(k, item){
$(item).chosen({disable_search_threshold: 5, search_contains: true, width: '200px', });
});
</script> </script>
{/literal} {/literal}

View File

@@ -0,0 +1,26 @@
GitHub contributors:
--------------------------------
- AlexEven
- AntoineMille
- Caleydon
- Damien Metzger
- Francois Gaillard
- Gregory Roussac
- Jerome Nadaud
- Jérôme Nadaud
- Jérôme Nadaud
- Maxime Biloé
- Quetzacoalt91
- aleeks
- antoin-m
- eternoendless
- gRoussac
- gRoussac
- gaillafr
- indesign47
- jeromenadaud
- kelu95
- maximebiloe
- tchauviere
- wgrzebieniowki-kontakt
- xBorderie

View File

@@ -0,0 +1,47 @@
Academic Free License ("AFL") v. 3.0
This Academic Free License (the "License") applies to any original work of authorship (the "Original Work") whose owner (the "Licensor") has placed the following licensing notice adjacent to the copyright notice for the Original Work:
Licensed under the Academic Free License version 3.0
1) Grant of Copyright License. Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, for the duration of the copyright, to do the following:
a) to reproduce the Original Work in copies, either alone or as part of a collective work;
b) to translate, adapt, alter, transform, modify, or arrange the Original Work, thereby creating derivative works ("Derivative Works") based upon the Original Work;
c) to distribute or communicate copies of the Original Work and Derivative Works to the public, under any license of your choice that does not contradict the terms and conditions, including Licensor's reserved rights and remedies, in this Academic Free License;
d) to perform the Original Work publicly; and
e) to display the Original Work publicly.
2) Grant of Patent License. Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, under patent claims owned or controlled by the Licensor that are embodied in the Original Work as furnished by the Licensor, for the duration of the patents, to make, use, sell, offer for sale, have made, and import the Original Work and Derivative Works.
3) Grant of Source Code License. The term "Source Code" means the preferred form of the Original Work for making modifications to it and all available documentation describing how to modify the Original Work. Licensor agrees to provide a machine-readable copy of the Source Code of the Original Work along with each copy of the Original Work that Licensor distributes. Licensor reserves the right to satisfy this obligation by placing a machine-readable copy of the Source Code in an information repository reasonably calculated to permit inexpensive and convenient access by You for as long as Licensor continues to distribute the Original Work.
4) Exclusions From License Grant. Neither the names of Licensor, nor the names of any contributors to the Original Work, nor any of their trademarks or service marks, may be used to endorse or promote products derived from this Original Work without express prior permission of the Licensor. Except as expressly stated herein, nothing in this License grants any license to Licensor's trademarks, copyrights, patents, trade secrets or any other intellectual property. No patent license is granted to make, use, sell, offer for sale, have made, or import embodiments of any patent claims other than the licensed claims defined in Section 2. No license is granted to the trademarks of Licensor even if such marks are included in the Original Work. Nothing in this License shall be interpreted to prohibit Licensor from licensing under terms different from this License any Original Work that Licensor otherwise would have a right to license.
5) External Deployment. The term "External Deployment" means the use, distribution, or communication of the Original Work or Derivative Works in any way such that the Original Work or Derivative Works may be used by anyone other than You, whether those works are distributed or communicated to those persons or made available as an application intended for use over a network. As an express condition for the grants of license hereunder, You must treat any External Deployment by You of the Original Work or a Derivative Work as a distribution under section 1(c).
6) Attribution Rights. You must retain, in the Source Code of any Derivative Works that You create, all copyright, patent, or trademark notices from the Source Code of the Original Work, as well as any notices of licensing and any descriptive text identified therein as an "Attribution Notice." You must cause the Source Code for any Derivative Works that You create to carry a prominent Attribution Notice reasonably calculated to inform recipients that You have modified the Original Work.
7) Warranty of Provenance and Disclaimer of Warranty. Licensor warrants that the copyright in and to the Original Work and the patent rights granted herein by Licensor are owned by the Licensor or are sublicensed to You under the terms of this License with the permission of the contributor(s) of those copyrights and patent rights. Except as expressly stated in the immediately preceding sentence, the Original Work is provided under this License on an "AS IS" BASIS and WITHOUT WARRANTY, either express or implied, including, without limitation, the warranties of non-infringement, merchantability or fitness for a particular purpose. THE ENTIRE RISK AS TO THE QUALITY OF THE ORIGINAL WORK IS WITH YOU. This DISCLAIMER OF WARRANTY constitutes an essential part of this License. No license to the Original Work is granted by this License except under this disclaimer.
8) Limitation of Liability. Under no circumstances and under no legal theory, whether in tort (including negligence), contract, or otherwise, shall the Licensor be liable to anyone for any indirect, special, incidental, or consequential damages of any character arising as a result of this License or the use of the Original Work including, without limitation, damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses. This limitation of liability shall not apply to the extent applicable law prohibits such limitation.
9) Acceptance and Termination. If, at any time, You expressly assented to this License, that assent indicates your clear and irrevocable acceptance of this License and all of its terms and conditions. If You distribute or communicate copies of the Original Work or a Derivative Work, You must make a reasonable effort under the circumstances to obtain the express assent of recipients to the terms of this License. This License conditions your rights to undertake the activities listed in Section 1, including your right to create Derivative Works based upon the Original Work, and doing so without honoring these terms and conditions is prohibited by copyright law and international treaty. Nothing in this License is intended to affect copyright exceptions and limitations (including "fair use" or "fair dealing"). This License shall terminate immediately and You may no longer exercise any of the rights granted to You by this License upon your failure to honor the conditions in Section 1(c).
10) Termination for Patent Action. This License shall terminate automatically and You may no longer exercise any of the rights granted to You by this License as of the date You commence an action, including a cross-claim or counterclaim, against Licensor or any licensee alleging that the Original Work infringes a patent. This termination provision shall not apply for an action alleging patent infringement by combinations of the Original Work with other software or hardware.
11) Jurisdiction, Venue and Governing Law. Any action or suit relating to this License may be brought only in the courts of a jurisdiction wherein the Licensor resides or in which Licensor conducts its primary business, and under the laws of that jurisdiction excluding its conflict-of-law provisions. The application of the United Nations Convention on Contracts for the International Sale of Goods is expressly excluded. Any use of the Original Work outside the scope of this License or after its termination shall be subject to the requirements and penalties of copyright or patent law in the appropriate jurisdiction. This section shall survive the termination of this License.
12) Attorneys' Fees. In any action to enforce the terms of this License or seeking damages relating thereto, the prevailing party shall be entitled to recover its costs and expenses, including, without limitation, reasonable attorneys' fees and costs incurred in connection with such action, including any appeal of such action. This section shall survive the termination of this License.
13) Miscellaneous. If any provision of this License is held to be unenforceable, such provision shall be reformed only to the extent necessary to make it enforceable.
14) Definition of "You" in This License. "You" throughout this License, whether in upper or lower case, means an individual or a legal entity exercising rights under, and complying with all of the terms of, this License. For legal entities, "You" includes any entity that controls, is controlled by, or is under common control with you. For purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity.
15) Right to Use. You may use the Original Work in all ways not otherwise restricted or conditioned by this License or by law, and Licensor promises not to interfere with or be responsible for such uses by You.
16) Modification of This License. This License is Copyright © 2005 Lawrence Rosen. Permission is granted to copy, distribute, or communicate this License without modification. Nothing in this License permits You to modify this License as applied to the Original Work or to Derivative Works. However, You may modify the text of this License and copy, distribute or communicate your modified version (the "Modified License") and apply it to other original works of authorship subject to the following conditions: (i) You may not indicate in any way that your Modified License is the "Academic Free License" or "AFL" and you may not use those names in the name of your Modified License; (ii) You must replace the notice specified in the first paragraph above with the notice "Licensed under <insert your license name here>" or with a notice of your own that is not confusingly similar to the notice in this License; and (iii) You may not claim that your original works are open source software unless your Modified License has been approved by Open Source Initiative (OSI) and You comply with its license review and certification process.

View File

@@ -0,0 +1,24 @@
# Dashboard Trends
## About
Adds a block with the evolution of your stores main numbers along with a graphic.
## Reporting issues
You can report issues with this module in the main PrestaShop repository. [Click here to report an issue][report-issue].
## Contributing
PrestaShop modules are open source extensions to the [PrestaShop e-commerce platform][prestashop]. Everyone is welcome and even encouraged to contribute with their own improvements!
Just make sure to follow our [contribution guidelines][contribution-guidelines].
## License
This module is released under the [Academic Free License 3.0][AFL-3.0]
[report-issue]: https://github.com/PrestaShop/PrestaShop/issues/new/choose
[prestashop]: https://www.prestashop.com/
[contribution-guidelines]: https://devdocs.prestashop.com/1.7/contribute/contribution-guidelines/project-modules/
[AFL-3.0]: https://opensource.org/licenses/AFL-3.0

View File

@@ -0,0 +1,30 @@
{
"name": "prestashop/dashtrends",
"description": "PrestaShop module dashtrends",
"homepage": "https://github.com/PrestaShop/dashtrends",
"license": "AFL-3.0",
"authors": [
{
"name": "PrestaShop SA",
"email": "contact@prestashop.com"
}
],
"require": {
"php": ">=5.4"
},
"require-dev": {
"prestashop/php-dev-tools": "~3.0"
},
"config": {
"preferred-install": "dist",
"classmap-authoritative": true,
"optimize-autoloader": true,
"prepend-autoloader": false
},
"autoload": {
"classmap": [
"dashtrends.php"
]
},
"type": "prestashop-module"
}

1929
modules/dashtrends/composer.lock generated Normal file

File diff suppressed because it is too large Load Diff

View File

@@ -2,7 +2,7 @@
<module> <module>
<name>dashtrends</name> <name>dashtrends</name>
<displayName><![CDATA[Dashboard Trends]]></displayName> <displayName><![CDATA[Dashboard Trends]]></displayName>
<version><![CDATA[2.0.2]]></version> <version><![CDATA[2.0.3]]></version>
<description><![CDATA[Adds a block whith the evolution of your stores main numbers along with a graphic.]]></description> <description><![CDATA[Adds a block whith the evolution of your stores main numbers along with a graphic.]]></description>
<author><![CDATA[PrestaShop]]></author> <author><![CDATA[PrestaShop]]></author>
<tab><![CDATA[dashboard]]></tab> <tab><![CDATA[dashboard]]></tab>

View File

@@ -2,7 +2,7 @@
<module> <module>
<name>dashtrends</name> <name>dashtrends</name>
<displayName><![CDATA[Tableau de bord des tendances]]></displayName> <displayName><![CDATA[Tableau de bord des tendances]]></displayName>
<version><![CDATA[2.0.2]]></version> <version><![CDATA[2.0.3]]></version>
<description><![CDATA[Ajoute &agrave; votre tableau de bord un graphique repr&eacute;sentant l&#039;&eacute;volution des indicateurs cl&eacute;s de votre boutique.]]></description> <description><![CDATA[Ajoute &agrave; votre tableau de bord un graphique repr&eacute;sentant l&#039;&eacute;volution des indicateurs cl&eacute;s de votre boutique.]]></description>
<author><![CDATA[PrestaShop]]></author> <author><![CDATA[PrestaShop]]></author>
<tab><![CDATA[dashboard]]></tab> <tab><![CDATA[dashboard]]></tab>

View File

@@ -1,29 +1,28 @@
<?php <?php
/* /**
* 2007-2015 PrestaShop * Copyright since 2007 PrestaShop SA and Contributors
* * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
* NOTICE OF LICENSE *
* * 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. * This source file is subject to the Academic Free License 3.0 (AFL-3.0)
* It is also available through the world-wide-web at this URL: * that is bundled with this package in the file LICENSE.md.
* http://opensource.org/licenses/afl-3.0.php * It is also available through the world-wide-web at this URL:
* If you did not receive a copy of the license and are unable to * https://opensource.org/licenses/AFL-3.0
* obtain it through the world-wide-web, please send an email * If you did not receive a copy of the license and are unable to
* to license@prestashop.com so we can send you a copy immediately. * obtain it through the world-wide-web, please send an email
* * to license@prestashop.com so we can send you a copy immediately.
* DISCLAIMER *
* * 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 * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
* needs please refer to http://www.prestashop.com for more information. * versions in the future. If you wish to customize PrestaShop for your
* * needs please refer to https://devdocs.prestashop.com/ for more information.
* @author PrestaShop SA <contact@prestashop.com> *
* @copyright 2007-2015 PrestaShop SA * @author PrestaShop SA and Contributors <contact@prestashop.com>
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * @copyright Since 2007 PrestaShop SA and Contributors
* International Registered Trademark & Property of PrestaShop SA * @license https://opensource.org/licenses/AFL-3.0 Academic Free License 3.0 (AFL-3.0)
*/ */
if (!defined('_PS_VERSION_')) { if (!defined('_PS_VERSION_')) {
exit; exit;
} }
@@ -36,62 +35,73 @@ class dashtrends extends Module
protected $dashboard_data_sum_compare; protected $dashboard_data_sum_compare;
protected $data_trends; protected $data_trends;
/**
* @var Currency
*/
public $currency;
/**
* @var string
*/
public $push_filename;
public function __construct() public function __construct()
{ {
$this->name = 'dashtrends'; $this->name = 'dashtrends';
$this->tab = 'dashboard'; $this->tab = 'dashboard';
$this->version = '2.0.2'; $this->version = '2.0.3';
$this->author = 'PrestaShop'; $this->author = 'PrestaShop';
$this->push_filename = _PS_CACHE_DIR_.'push/trends'; $this->push_filename = _PS_CACHE_DIR_ . 'push/trends';
$this->allow_push = true; $this->allow_push = true;
parent::__construct(); parent::__construct();
$this->displayName = $this->trans('Dashboard Trends', array(), 'Modules.Dashtrends.Admin'); $this->displayName = $this->trans('Dashboard Trends', [], 'Modules.Dashtrends.Admin');
$this->description = $this->trans('Adds a block with a graphical representation of the development of your store(s) based on selected key data.', array(), 'Modules.Dashtrends.Admin'); $this->description = $this->trans('Adds a block with a graphical representation of the development of your store(s) based on selected key data.', [], 'Modules.Dashtrends.Admin');
$this->ps_versions_compliancy = array('min' => '1.7.1.0', 'max' => _PS_VERSION_); $this->ps_versions_compliancy = ['min' => '1.7.1.0', 'max' => _PS_VERSION_];
} }
public function install() public function install()
{ {
return (parent::install() return parent::install()
&& $this->registerHook('dashboardZoneTwo') && $this->registerHook('dashboardZoneTwo')
&& $this->registerHook('dashboardData') && $this->registerHook('dashboardData')
&& $this->registerHook('actionAdminControllerSetMedia') && $this->registerHook('actionAdminControllerSetMedia')
&& $this->registerHook('actionOrderStatusPostUpdate') && $this->registerHook('actionOrderStatusPostUpdate')
); ;
} }
public function hookActionAdminControllerSetMedia() public function hookActionAdminControllerSetMedia()
{ {
if (get_class($this->context->controller) == 'AdminDashboardController') { if (get_class($this->context->controller) == 'AdminDashboardController') {
$this->context->controller->addJs($this->_path.'views/js/'.$this->name.'.js'); $this->context->controller->addJs($this->_path . 'views/js/' . $this->name . '.js');
} }
} }
public function hookDashboardZoneTwo($params) public function hookDashboardZoneTwo($params)
{ {
$this->context->smarty->assign(array( $this->context->smarty->assign([
'currency' => $this->context->currency, 'currency' => $this->context->currency,
'_PS_PRICE_DISPLAY_PRECISION_' => _PS_PRICE_DISPLAY_PRECISION_ '_PS_PRICE_DISPLAY_PRECISION_' => _PS_PRICE_DISPLAY_PRECISION_,
)); ]);
return $this->display(__FILE__, 'dashboard_zone_two.tpl'); return $this->display(__FILE__, 'dashboard_zone_two.tpl');
} }
protected function getData($date_from, $date_to) protected function getData($date_from, $date_to)
{ {
// We need the following figures to calculate our stats // We need the following figures to calculate our stats
$tmp_data = array( $tmp_data = [
'visits' => array(), 'visits' => [],
'orders' => array(), 'orders' => [],
'total_paid_tax_excl' => array(), 'total_paid_tax_excl' => [],
'total_purchases' => array(), 'total_purchases' => [],
'total_expenses' => array() 'total_expenses' => [],
); ];
if (Configuration::get('PS_DASHBOARD_SIMULATION')) { if (Configuration::get('PS_DASHBOARD_SIMULATION')) {
$from = strtotime($date_from.' 00:00:00'); $from = strtotime($date_from . ' 00:00:00');
$to = min(time(), strtotime($date_to.' 23:59:59')); $to = min(time(), strtotime($date_to . ' 23:59:59'));
for ($date = $from; $date <= $to; $date = strtotime('+1 day', $date)) { for ($date = $from; $date <= $to; $date = strtotime('+1 day', $date)) {
$tmp_data['visits'][$date] = round(rand(2000, 20000)); $tmp_data['visits'][$date] = round(rand(2000, 20000));
$tmp_data['conversion_rate'][$date] = rand(80, 250) / 100; $tmp_data['conversion_rate'][$date] = rand(80, 250) / 100;
@@ -114,17 +124,17 @@ class dashtrends extends Module
protected function refineData($date_from, $date_to, $gross_data) protected function refineData($date_from, $date_to, $gross_data)
{ {
$refined_data = array( $refined_data = [
'sales' => array(), 'sales' => [],
'orders' => array(), 'orders' => [],
'average_cart_value' => array(), 'average_cart_value' => [],
'visits' => array(), 'visits' => [],
'conversion_rate' => array(), 'conversion_rate' => [],
'net_profits' => array() 'net_profits' => [],
); ];
$from = strtotime($date_from.' 00:00:00'); $from = strtotime($date_from . ' 00:00:00');
$to = min(time(), strtotime($date_to.' 23:59:59')); $to = min(time(), strtotime($date_to . ' 23:59:59'));
for ($date = $from; $date <= $to; $date = strtotime('+1 day', $date)) { for ($date = $from; $date <= $to; $date = strtotime('+1 day', $date)) {
$refined_data['sales'][$date] = 0; $refined_data['sales'][$date] = 0;
if (isset($gross_data['total_paid_tax_excl'][$date])) { if (isset($gross_data['total_paid_tax_excl'][$date])) {
@@ -150,19 +160,20 @@ class dashtrends extends Module
$refined_data['net_profits'][$date] -= $gross_data['total_expenses'][$date]; $refined_data['net_profits'][$date] -= $gross_data['total_expenses'][$date];
} }
} }
return $refined_data; return $refined_data;
} }
protected function addupData($data) protected function addupData($data)
{ {
$summing = array( $summing = [
'sales' => 0, 'sales' => 0,
'orders' => 0, 'orders' => 0,
'average_cart_value' => 0, 'average_cart_value' => 0,
'visits' => 0, 'visits' => 0,
'conversion_rate' => 0, 'conversion_rate' => 0,
'net_profits' => 0 'net_profits' => 0,
); ];
$summing['sales'] = array_sum($data['sales']); $summing['sales'] = array_sum($data['sales']);
$summing['orders'] = array_sum($data['orders']); $summing['orders'] = array_sum($data['orders']);
@@ -176,32 +187,32 @@ class dashtrends extends Module
protected function compareData($data1, $data2) protected function compareData($data1, $data2)
{ {
return array( return [
'sales_score_trends' => array( 'sales_score_trends' => [
'way' => ($data1['sales'] == $data2['sales'] ? 'right' : ($data1['sales'] > $data2['sales'] ? 'up' : 'down')), 'way' => ($data1['sales'] == $data2['sales'] ? 'right' : ($data1['sales'] > $data2['sales'] ? 'up' : 'down')),
'value' => ($data1['sales'] > $data2['sales'] ? '+' : '').($data2['sales'] ? round(100 * $data1['sales'] / $data2['sales'] - 100, 2).'%' : '&infin;') 'value' => ($data1['sales'] > $data2['sales'] ? '+' : '') . ($data2['sales'] ? round(100 * $data1['sales'] / $data2['sales'] - 100, 2) . '%' : '&infin;'),
), ],
'orders_score_trends' => array( 'orders_score_trends' => [
'way' => ($data1['orders'] == $data2['orders'] ? 'right' : ($data1['orders'] > $data2['orders'] ? 'up' : 'down')), 'way' => ($data1['orders'] == $data2['orders'] ? 'right' : ($data1['orders'] > $data2['orders'] ? 'up' : 'down')),
'value' => ($data1['orders'] > $data2['orders'] ? '+' : '').($data2['orders'] ? round(100 * $data1['orders'] / $data2['orders'] - 100, 2).'%' : '&infin;') 'value' => ($data1['orders'] > $data2['orders'] ? '+' : '') . ($data2['orders'] ? round(100 * $data1['orders'] / $data2['orders'] - 100, 2) . '%' : '&infin;'),
), ],
'cart_value_score_trends' => array( 'cart_value_score_trends' => [
'way' => ($data1['average_cart_value'] == $data2['average_cart_value'] ? 'right' : ($data1['average_cart_value'] > $data2['average_cart_value'] ? 'up' : 'down')), 'way' => ($data1['average_cart_value'] == $data2['average_cart_value'] ? 'right' : ($data1['average_cart_value'] > $data2['average_cart_value'] ? 'up' : 'down')),
'value' => ($data1['average_cart_value'] > $data2['average_cart_value'] ? '+' : '').($data2['average_cart_value'] ? round(100 * $data1['average_cart_value'] / $data2['average_cart_value'] - 100, 2).'%' : '&infin;') 'value' => ($data1['average_cart_value'] > $data2['average_cart_value'] ? '+' : '') . ($data2['average_cart_value'] ? round(100 * $data1['average_cart_value'] / $data2['average_cart_value'] - 100, 2) . '%' : '&infin;'),
), ],
'visits_score_trends' => array( 'visits_score_trends' => [
'way' => ($data1['visits'] == $data2['visits'] ? 'right' : ($data1['visits'] > $data2['visits'] ? 'up' : 'down')), 'way' => ($data1['visits'] == $data2['visits'] ? 'right' : ($data1['visits'] > $data2['visits'] ? 'up' : 'down')),
'value' => ($data1['visits'] > $data2['visits'] ? '+' : '').($data2['visits'] ? round(100 * $data1['visits'] / $data2['visits'] - 100, 2).'%' : '&infin;') 'value' => ($data1['visits'] > $data2['visits'] ? '+' : '') . ($data2['visits'] ? round(100 * $data1['visits'] / $data2['visits'] - 100, 2) . '%' : '&infin;'),
), ],
'conversion_rate_score_trends' => array( 'conversion_rate_score_trends' => [
'way' => ($data1['conversion_rate'] == $data2['conversion_rate'] ? 'right' : ($data1['conversion_rate'] > $data2['conversion_rate'] ? 'up' : 'down')), 'way' => ($data1['conversion_rate'] == $data2['conversion_rate'] ? 'right' : ($data1['conversion_rate'] > $data2['conversion_rate'] ? 'up' : 'down')),
'value' => ($data1['conversion_rate'] > $data2['conversion_rate'] ? '+' : '') . ($data2['conversion_rate'] ? sprintf($this->trans('%s points', array(), 'Modules.Dashtrends.Admin'), round(100 * ($data1['conversion_rate'] - $data2['conversion_rate']), 2)) : '&infin;') 'value' => ($data1['conversion_rate'] > $data2['conversion_rate'] ? '+' : '') . ($data2['conversion_rate'] ? sprintf($this->trans('%s points', [], 'Modules.Dashtrends.Admin'), round(100 * ($data1['conversion_rate'] - $data2['conversion_rate']), 2)) : '&infin;'),
), ],
'net_profits_score_trends' => array( 'net_profits_score_trends' => [
'way' => ($data1['net_profits'] == $data2['net_profits'] ? 'right' : ($data1['net_profits'] > $data2['net_profits'] ? 'up' : 'down')), 'way' => ($data1['net_profits'] == $data2['net_profits'] ? 'right' : ($data1['net_profits'] > $data2['net_profits'] ? 'up' : 'down')),
'value' => ($data1['net_profits'] > $data2['net_profits'] ? '+' : '').($data2['net_profits'] ? round(100 * $data1['net_profits'] / $data2['net_profits'] - 100, 2).'%' : '&infin;') 'value' => ($data1['net_profits'] > $data2['net_profits'] ? '+' : '') . ($data2['net_profits'] ? round(100 * $data1['net_profits'] / $data2['net_profits'] - 100, 2) . '%' : '&infin;'),
) ],
); ];
} }
public function hookDashboardData($params) public function hookDashboardData($params)
@@ -223,37 +234,37 @@ class dashtrends extends Module
$this->dashboard_data_compare = $this->translateCompareData($this->dashboard_data, $this->dashboard_data_compare); $this->dashboard_data_compare = $this->translateCompareData($this->dashboard_data, $this->dashboard_data_compare);
} }
$sales_score = Tools::displayPrice($this->dashboard_data_sum['sales'], $this->currency). $sales_score = Tools::displayPrice($this->dashboard_data_sum['sales'], $this->currency) .
$this->addTaxSuffix(); $this->addTaxSuffix();
$cart_value_score = Tools::displayPrice($this->dashboard_data_sum['average_cart_value'], $this->currency). $cart_value_score = Tools::displayPrice($this->dashboard_data_sum['average_cart_value'], $this->currency) .
$this->addTaxSuffix(); $this->addTaxSuffix();
$net_profit_score = Tools::displayPrice($this->dashboard_data_sum['net_profits'], $this->currency). $net_profit_score = Tools::displayPrice($this->dashboard_data_sum['net_profits'], $this->currency) .
$this->addTaxSuffix(); $this->addTaxSuffix();
return array( return [
'data_value' => array( 'data_value' => [
'sales_score' => $sales_score, 'sales_score' => $sales_score,
'orders_score' => Tools::displayNumber($this->dashboard_data_sum['orders'], $this->currency), 'orders_score' => Tools::displayNumber($this->dashboard_data_sum['orders']),
'cart_value_score' => $cart_value_score, 'cart_value_score' => $cart_value_score,
'visits_score' => Tools::displayNumber($this->dashboard_data_sum['visits'], $this->currency), 'visits_score' => Tools::displayNumber($this->dashboard_data_sum['visits']),
'conversion_rate_score' => round(100 * $this->dashboard_data_sum['conversion_rate'], 2).'%', 'conversion_rate_score' => round(100 * $this->dashboard_data_sum['conversion_rate'], 2) . '%',
'net_profits_score' => $net_profit_score, 'net_profits_score' => $net_profit_score,
), ],
'data_trends' => $this->data_trends, 'data_trends' => $this->data_trends,
'data_chart' => array('dash_trends_chart1' => $this->getChartTrends()), 'data_chart' => ['dash_trends_chart1' => $this->getChartTrends()],
); ];
} }
protected function addTaxSuffix() protected function addTaxSuffix()
{ {
return ' <small>'.$this->trans('Tax excl.', array(), 'Admin.Global').'</small>'; return ' <small>' . $this->trans('Tax excl.', [], 'Admin.Global') . '</small>';
} }
protected function translateCompareData($normal, $compare) protected function translateCompareData($normal, $compare)
{ {
$translated_array = array(); $translated_array = [];
foreach ($compare as $key => $date_array) { foreach ($compare as $key => $date_array) {
$normal_min = key($normal[$key]); $normal_min = key($normal[$key]);
end($normal[$key]); // move the internal pointer to the end of the array end($normal[$key]); // move the internal pointer to the end of the array
@@ -267,7 +278,7 @@ class dashtrends extends Module
reset($compare[$key]); reset($compare[$key]);
$compare_size = $compare_max - $compare_min; $compare_size = $compare_max - $compare_min;
$translated_array[$key] = array(); $translated_array[$key] = [];
foreach ($date_array as $compare_date => $value) { foreach ($date_array as $compare_date => $value) {
$translation = $normal_min + ($compare_date - $compare_min) * ($normal_size / $compare_size); $translation = $normal_min + ($compare_date - $compare_min) * ($normal_size / $compare_size);
$translated_array[$key][number_format($translation, 0, '', '')] = $value; $translated_array[$key][number_format($translation, 0, '', '')] = $value;
@@ -279,10 +290,10 @@ class dashtrends extends Module
public function getChartTrends() public function getChartTrends()
{ {
$chart_data = array(); $chart_data = [];
$chart_data_compare = array(); $chart_data_compare = [];
foreach (array_keys($this->dashboard_data) as $chart_key) { foreach (array_keys($this->dashboard_data) as $chart_key) {
$chart_data[$chart_key] = $chart_data_compare[$chart_key] = array(); $chart_data[$chart_key] = $chart_data_compare[$chart_key] = [];
if (!$count = count($this->dashboard_data[$chart_key])) { if (!$count = count($this->dashboard_data[$chart_key])) {
continue; continue;
@@ -292,56 +303,57 @@ class dashtrends extends Module
$calibration = array_sum($this->dashboard_data[$chart_key]) / $count; $calibration = array_sum($this->dashboard_data[$chart_key]) / $count;
foreach ($this->dashboard_data[$chart_key] as $key => $value) { foreach ($this->dashboard_data[$chart_key] as $key => $value) {
$chart_data[$chart_key][] = array($key, $value); $chart_data[$chart_key][] = [$key, $value];
} }
// min(10) is there to limit the growth to 1000%, beyond this limit it becomes unreadable // min(10) is there to limit the growth to 1000%, beyond this limit it becomes unreadable
//$chart_data[$chart_key][] = array(1000 * $key, $calibration ? min(10, $value / $calibration) : 0); //$chart_data[$chart_key][] = array(1000 * $key, $calibration ? min(10, $value / $calibration) : 0);
if ($this->dashboard_data_compare) { if ($this->dashboard_data_compare) {
foreach ($this->dashboard_data_compare[$chart_key] as $key => $value) { foreach ($this->dashboard_data_compare[$chart_key] as $key => $value) {
$chart_data_compare[$chart_key][] = array($key, $value); $chart_data_compare[$chart_key][] = [$key, $value];
} }
} }
// min(10) is there to limit the growth to 1000%, beyond this limit it becomes unreadable // min(10) is there to limit the growth to 1000%, beyond this limit it becomes unreadable
/*$chart_data_compare[$chart_key][] = array( /*$chart_data_compare[$chart_key][] = array(
1000 * $key, 1000 * $key,
$calibration ? min(10, $value / $calibration) : 0 $calibration ? min(10, $value / $calibration) : 0
);*/ );*/
} }
$charts = array( $charts = [
'sales' => $this->trans('Sales', array(), 'Admin.Global'), 'sales' => $this->trans('Sales', [], 'Admin.Global'),
'orders' => $this->trans('Orders', array(), 'Admin.Global'), 'orders' => $this->trans('Orders', [], 'Admin.Global'),
'average_cart_value' => $this->trans('Average Cart Value', array(), 'Modules.Dashtrends.Admin'), 'average_cart_value' => $this->trans('Average Cart Value', [], 'Modules.Dashtrends.Admin'),
'visits' => $this->trans('Visits', array(), 'Admin.Shopparameters.Feature'), 'visits' => $this->trans('Visits', [], 'Admin.Shopparameters.Feature'),
'conversion_rate' => $this->trans('Conversion Rate', array(), 'Modules.Dashtrends.Admin'), 'conversion_rate' => $this->trans('Conversion Rate', [], 'Modules.Dashtrends.Admin'),
'net_profits' => $this->trans('Net Profit', array(), 'Modules.Dashtrends.Admin') 'net_profits' => $this->trans('Net Profit', [], 'Modules.Dashtrends.Admin'),
); ];
$gfx_color = array('#1777B6','#2CA121','#E61409','#FF7F00','#6B399C','#B3591F'); $gfx_color = ['#1777B6', '#2CA121', '#E61409', '#FF7F00', '#6B399C', '#B3591F'];
$gfx_color_compare = array('#A5CEE4','#B1E086','#FD9997','#FFC068','#CAB1D7','#D2A689'); $gfx_color_compare = ['#A5CEE4', '#B1E086', '#FD9997', '#FFC068', '#CAB1D7', '#D2A689'];
$i = 0; $i = 0;
$data = array('chart_type' => 'line_chart_trends', 'date_format' => $this->context->language->date_format_lite, 'data' => array()); $data = ['chart_type' => 'line_chart_trends', 'date_format' => $this->context->language->date_format_lite, 'data' => []];
foreach ($charts as $key => $title) { foreach ($charts as $key => $title) {
$data['data'][] = array( $data['data'][] = [
'id' => $key, 'id' => $key,
'key' => $title, 'key' => $title,
'color' => $gfx_color[$i], 'color' => $gfx_color[$i],
'values' => $chart_data[$key], 'values' => $chart_data[$key],
'disabled' => ($key == 'sales' ? false : true) 'disabled' => ($key == 'sales' ? false : true),
); ];
if ($this->dashboard_data_compare) { if ($this->dashboard_data_compare) {
$data['data'][] = array( $data['data'][] = [
'id' => $key.'_compare', 'id' => $key . '_compare',
'color' => $gfx_color_compare[$i], 'color' => $gfx_color_compare[$i],
'key' => sprintf($this->trans('%s (previous period)', array(), 'Modules.Dashtrends.Admin'), $title), 'key' => sprintf($this->trans('%s (previous period)', [], 'Modules.Dashtrends.Admin'), $title),
'values' => $chart_data_compare[$key], 'values' => $chart_data_compare[$key],
'disabled' => ($key == 'sales' ? false : true) 'disabled' => ($key == 'sales' ? false : true),
); ];
} }
$i++; ++$i;
} }
return $data; return $data;
} }

View File

@@ -1,31 +1,30 @@
<?php <?php
/* /**
* 2007-2016 PrestaShop * Copyright since 2007 PrestaShop SA and Contributors
* * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
* NOTICE OF LICENSE *
* * 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. * This source file is subject to the Academic Free License 3.0 (AFL-3.0)
* It is also available through the world-wide-web at this URL: * that is bundled with this package in the file LICENSE.md.
* http://opensource.org/licenses/afl-3.0.php * It is also available through the world-wide-web at this URL:
* If you did not receive a copy of the license and are unable to * https://opensource.org/licenses/AFL-3.0
* obtain it through the world-wide-web, please send an email * If you did not receive a copy of the license and are unable to
* to license@prestashop.com so we can send you a copy immediately. * obtain it through the world-wide-web, please send an email
* * to license@prestashop.com so we can send you a copy immediately.
* DISCLAIMER *
* * 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 * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
* needs please refer to http://www.prestashop.com for more information. * versions in the future. If you wish to customize PrestaShop for your
* * needs please refer to https://devdocs.prestashop.com/ for more information.
* @author PrestaShop SA <contact@prestashop.com> *
* @copyright 2007-2016 PrestaShop SA * @author PrestaShop SA and Contributors <contact@prestashop.com>
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * @copyright Since 2007 PrestaShop SA and Contributors
* International Registered Trademark & Property of PrestaShop SA * @license https://opensource.org/licenses/AFL-3.0 Academic Free License 3.0 (AFL-3.0)
*/ */
header('Expires: Mon, 26 Jul 1997 05:00:00 GMT'); header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT'); header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
header('Cache-Control: no-store, no-cache, must-revalidate'); header('Cache-Control: no-store, no-cache, must-revalidate');
header('Cache-Control: post-check=0, pre-check=0', false); header('Cache-Control: post-check=0, pre-check=0', false);

View File

@@ -0,0 +1,34 @@
<?php
/**
* Copyright since 2007 PrestaShop SA and Contributors
* PrestaShop is an International Registered Trademark & Property of PrestaShop SA
*
* NOTICE OF LICENSE
*
* This source file is subject to the Academic Free License 3.0 (AFL-3.0)
* that is bundled with this package in the file LICENSE.md.
* It is also available through the world-wide-web at this URL:
* https://opensource.org/licenses/AFL-3.0
* 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 https://devdocs.prestashop.com/ for more information.
*
* @author PrestaShop SA and Contributors <contact@prestashop.com>
* @copyright Since 2007 PrestaShop SA and Contributors
* @license https://opensource.org/licenses/AFL-3.0 Academic Free License 3.0 (AFL-3.0)
*/
header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
header('Cache-Control: no-store, no-cache, must-revalidate');
header('Cache-Control: post-check=0, pre-check=0', false);
header('Pragma: no-cache');
header('Location: ../');
exit;

View File

@@ -0,0 +1,34 @@
<?php
/**
* Copyright since 2007 PrestaShop SA and Contributors
* PrestaShop is an International Registered Trademark & Property of PrestaShop SA
*
* NOTICE OF LICENSE
*
* This source file is subject to the Academic Free License 3.0 (AFL-3.0)
* that is bundled with this package in the file LICENSE.md.
* It is also available through the world-wide-web at this URL:
* https://opensource.org/licenses/AFL-3.0
* 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 https://devdocs.prestashop.com/ for more information.
*
* @author PrestaShop SA and Contributors <contact@prestashop.com>
* @copyright Since 2007 PrestaShop SA and Contributors
* @license https://opensource.org/licenses/AFL-3.0 Academic Free License 3.0 (AFL-3.0)
*/
header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
header('Cache-Control: no-store, no-cache, must-revalidate');
header('Cache-Control: post-check=0, pre-check=0', false);
header('Pragma: no-cache');
header('Location: ../');
exit;

View File

@@ -0,0 +1,10 @@
includes:
- %currentWorkingDirectory%/vendor/prestashop/php-dev-tools/phpstan/ps-module-extension.neon
parameters:
paths:
# From PHPStan 0.12, paths to check are relative to the neon file
- ../../dashtrends.php
ignoreErrors:
- '#Property ModuleCore::\$version \(float\) does not accept string.#'
level: 5

View File

@@ -1,35 +1,34 @@
<?php <?php
/* /**
* 2007-2016 PrestaShop * Copyright since 2007 PrestaShop SA and Contributors
* * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
* NOTICE OF LICENSE *
* * 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. * This source file is subject to the Academic Free License 3.0 (AFL-3.0)
* It is also available through the world-wide-web at this URL: * that is bundled with this package in the file LICENSE.md.
* http://opensource.org/licenses/afl-3.0.php * It is also available through the world-wide-web at this URL:
* If you did not receive a copy of the license and are unable to * https://opensource.org/licenses/AFL-3.0
* obtain it through the world-wide-web, please send an email * If you did not receive a copy of the license and are unable to
* to license@prestashop.com so we can send you a copy immediately. * obtain it through the world-wide-web, please send an email
* * to license@prestashop.com so we can send you a copy immediately.
* DISCLAIMER *
* * 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 * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
* needs please refer to http://www.prestashop.com for more information. * versions in the future. If you wish to customize PrestaShop for your
* * needs please refer to https://devdocs.prestashop.com/ for more information.
* @author PrestaShop SA <contact@prestashop.com> *
* @copyright 2007-2016 PrestaShop SA * @author PrestaShop SA and Contributors <contact@prestashop.com>
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * @copyright Since 2007 PrestaShop SA and Contributors
* International Registered Trademark & Property of PrestaShop SA * @license https://opensource.org/licenses/AFL-3.0 Academic Free License 3.0 (AFL-3.0)
*/ */
header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); header('Cache-Control: no-store, no-cache, must-revalidate');
header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT"); header('Cache-Control: post-check=0, pre-check=0', false);
header('Pragma: no-cache');
header("Cache-Control: no-store, no-cache, must-revalidate"); header('Location: ../');
header("Cache-Control: post-check=0, pre-check=0", false);
header("Pragma: no-cache");
header("Location: ../");
exit; exit;

10
modules/dashtrends/vendor/.htaccess vendored Normal file
View File

@@ -0,0 +1,10 @@
# Apache 2.2
<IfModule !mod_authz_core.c>
Order deny,allow
Deny from all
</IfModule>
# Apache 2.4
<IfModule mod_authz_core.c>
Require all denied
</IfModule>

View File

@@ -0,0 +1,7 @@
<?php
// autoload.php @generated by Composer
require_once __DIR__ . '/composer/autoload_real.php';
return ComposerAutoloaderInit2345ca5f4124578b7622a0a8ff013248::getLoader();

View File

@@ -0,0 +1,445 @@
<?php
/*
* This file is part of Composer.
*
* (c) Nils Adermann <naderman@naderman.de>
* Jordi Boggiano <j.boggiano@seld.be>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
namespace Composer\Autoload;
/**
* ClassLoader implements a PSR-0, PSR-4 and classmap class loader.
*
* $loader = new \Composer\Autoload\ClassLoader();
*
* // register classes with namespaces
* $loader->add('Symfony\Component', __DIR__.'/component');
* $loader->add('Symfony', __DIR__.'/framework');
*
* // activate the autoloader
* $loader->register();
*
* // to enable searching the include path (eg. for PEAR packages)
* $loader->setUseIncludePath(true);
*
* In this example, if you try to use a class in the Symfony\Component
* namespace or one of its children (Symfony\Component\Console for instance),
* the autoloader will first look for the class under the component/
* directory, and it will then fallback to the framework/ directory if not
* found before giving up.
*
* This class is loosely based on the Symfony UniversalClassLoader.
*
* @author Fabien Potencier <fabien@symfony.com>
* @author Jordi Boggiano <j.boggiano@seld.be>
* @see http://www.php-fig.org/psr/psr-0/
* @see http://www.php-fig.org/psr/psr-4/
*/
class ClassLoader
{
// PSR-4
private $prefixLengthsPsr4 = array();
private $prefixDirsPsr4 = array();
private $fallbackDirsPsr4 = array();
// PSR-0
private $prefixesPsr0 = array();
private $fallbackDirsPsr0 = array();
private $useIncludePath = false;
private $classMap = array();
private $classMapAuthoritative = false;
private $missingClasses = array();
private $apcuPrefix;
public function getPrefixes()
{
if (!empty($this->prefixesPsr0)) {
return call_user_func_array('array_merge', $this->prefixesPsr0);
}
return array();
}
public function getPrefixesPsr4()
{
return $this->prefixDirsPsr4;
}
public function getFallbackDirs()
{
return $this->fallbackDirsPsr0;
}
public function getFallbackDirsPsr4()
{
return $this->fallbackDirsPsr4;
}
public function getClassMap()
{
return $this->classMap;
}
/**
* @param array $classMap Class to filename map
*/
public function addClassMap(array $classMap)
{
if ($this->classMap) {
$this->classMap = array_merge($this->classMap, $classMap);
} else {
$this->classMap = $classMap;
}
}
/**
* Registers a set of PSR-0 directories for a given prefix, either
* appending or prepending to the ones previously set for this prefix.
*
* @param string $prefix The prefix
* @param array|string $paths The PSR-0 root directories
* @param bool $prepend Whether to prepend the directories
*/
public function add($prefix, $paths, $prepend = false)
{
if (!$prefix) {
if ($prepend) {
$this->fallbackDirsPsr0 = array_merge(
(array) $paths,
$this->fallbackDirsPsr0
);
} else {
$this->fallbackDirsPsr0 = array_merge(
$this->fallbackDirsPsr0,
(array) $paths
);
}
return;
}
$first = $prefix[0];
if (!isset($this->prefixesPsr0[$first][$prefix])) {
$this->prefixesPsr0[$first][$prefix] = (array) $paths;
return;
}
if ($prepend) {
$this->prefixesPsr0[$first][$prefix] = array_merge(
(array) $paths,
$this->prefixesPsr0[$first][$prefix]
);
} else {
$this->prefixesPsr0[$first][$prefix] = array_merge(
$this->prefixesPsr0[$first][$prefix],
(array) $paths
);
}
}
/**
* Registers a set of PSR-4 directories for a given namespace, either
* appending or prepending to the ones previously set for this namespace.
*
* @param string $prefix The prefix/namespace, with trailing '\\'
* @param array|string $paths The PSR-4 base directories
* @param bool $prepend Whether to prepend the directories
*
* @throws \InvalidArgumentException
*/
public function addPsr4($prefix, $paths, $prepend = false)
{
if (!$prefix) {
// Register directories for the root namespace.
if ($prepend) {
$this->fallbackDirsPsr4 = array_merge(
(array) $paths,
$this->fallbackDirsPsr4
);
} else {
$this->fallbackDirsPsr4 = array_merge(
$this->fallbackDirsPsr4,
(array) $paths
);
}
} elseif (!isset($this->prefixDirsPsr4[$prefix])) {
// Register directories for a new namespace.
$length = strlen($prefix);
if ('\\' !== $prefix[$length - 1]) {
throw new \InvalidArgumentException("A non-empty PSR-4 prefix must end with a namespace separator.");
}
$this->prefixLengthsPsr4[$prefix[0]][$prefix] = $length;
$this->prefixDirsPsr4[$prefix] = (array) $paths;
} elseif ($prepend) {
// Prepend directories for an already registered namespace.
$this->prefixDirsPsr4[$prefix] = array_merge(
(array) $paths,
$this->prefixDirsPsr4[$prefix]
);
} else {
// Append directories for an already registered namespace.
$this->prefixDirsPsr4[$prefix] = array_merge(
$this->prefixDirsPsr4[$prefix],
(array) $paths
);
}
}
/**
* Registers a set of PSR-0 directories for a given prefix,
* replacing any others previously set for this prefix.
*
* @param string $prefix The prefix
* @param array|string $paths The PSR-0 base directories
*/
public function set($prefix, $paths)
{
if (!$prefix) {
$this->fallbackDirsPsr0 = (array) $paths;
} else {
$this->prefixesPsr0[$prefix[0]][$prefix] = (array) $paths;
}
}
/**
* Registers a set of PSR-4 directories for a given namespace,
* replacing any others previously set for this namespace.
*
* @param string $prefix The prefix/namespace, with trailing '\\'
* @param array|string $paths The PSR-4 base directories
*
* @throws \InvalidArgumentException
*/
public function setPsr4($prefix, $paths)
{
if (!$prefix) {
$this->fallbackDirsPsr4 = (array) $paths;
} else {
$length = strlen($prefix);
if ('\\' !== $prefix[$length - 1]) {
throw new \InvalidArgumentException("A non-empty PSR-4 prefix must end with a namespace separator.");
}
$this->prefixLengthsPsr4[$prefix[0]][$prefix] = $length;
$this->prefixDirsPsr4[$prefix] = (array) $paths;
}
}
/**
* Turns on searching the include path for class files.
*
* @param bool $useIncludePath
*/
public function setUseIncludePath($useIncludePath)
{
$this->useIncludePath = $useIncludePath;
}
/**
* Can be used to check if the autoloader uses the include path to check
* for classes.
*
* @return bool
*/
public function getUseIncludePath()
{
return $this->useIncludePath;
}
/**
* Turns off searching the prefix and fallback directories for classes
* that have not been registered with the class map.
*
* @param bool $classMapAuthoritative
*/
public function setClassMapAuthoritative($classMapAuthoritative)
{
$this->classMapAuthoritative = $classMapAuthoritative;
}
/**
* Should class lookup fail if not found in the current class map?
*
* @return bool
*/
public function isClassMapAuthoritative()
{
return $this->classMapAuthoritative;
}
/**
* APCu prefix to use to cache found/not-found classes, if the extension is enabled.
*
* @param string|null $apcuPrefix
*/
public function setApcuPrefix($apcuPrefix)
{
$this->apcuPrefix = function_exists('apcu_fetch') && ini_get('apc.enabled') ? $apcuPrefix : null;
}
/**
* The APCu prefix in use, or null if APCu caching is not enabled.
*
* @return string|null
*/
public function getApcuPrefix()
{
return $this->apcuPrefix;
}
/**
* Registers this instance as an autoloader.
*
* @param bool $prepend Whether to prepend the autoloader or not
*/
public function register($prepend = false)
{
spl_autoload_register(array($this, 'loadClass'), true, $prepend);
}
/**
* Unregisters this instance as an autoloader.
*/
public function unregister()
{
spl_autoload_unregister(array($this, 'loadClass'));
}
/**
* Loads the given class or interface.
*
* @param string $class The name of the class
* @return bool|null True if loaded, null otherwise
*/
public function loadClass($class)
{
if ($file = $this->findFile($class)) {
includeFile($file);
return true;
}
}
/**
* Finds the path to the file where the class is defined.
*
* @param string $class The name of the class
*
* @return string|false The path if found, false otherwise
*/
public function findFile($class)
{
// class map lookup
if (isset($this->classMap[$class])) {
return $this->classMap[$class];
}
if ($this->classMapAuthoritative || isset($this->missingClasses[$class])) {
return false;
}
if (null !== $this->apcuPrefix) {
$file = apcu_fetch($this->apcuPrefix.$class, $hit);
if ($hit) {
return $file;
}
}
$file = $this->findFileWithExtension($class, '.php');
// Search for Hack files if we are running on HHVM
if (false === $file && defined('HHVM_VERSION')) {
$file = $this->findFileWithExtension($class, '.hh');
}
if (null !== $this->apcuPrefix) {
apcu_add($this->apcuPrefix.$class, $file);
}
if (false === $file) {
// Remember that this class does not exist.
$this->missingClasses[$class] = true;
}
return $file;
}
private function findFileWithExtension($class, $ext)
{
// PSR-4 lookup
$logicalPathPsr4 = strtr($class, '\\', DIRECTORY_SEPARATOR) . $ext;
$first = $class[0];
if (isset($this->prefixLengthsPsr4[$first])) {
$subPath = $class;
while (false !== $lastPos = strrpos($subPath, '\\')) {
$subPath = substr($subPath, 0, $lastPos);
$search = $subPath.'\\';
if (isset($this->prefixDirsPsr4[$search])) {
$pathEnd = DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $lastPos + 1);
foreach ($this->prefixDirsPsr4[$search] as $dir) {
if (file_exists($file = $dir . $pathEnd)) {
return $file;
}
}
}
}
}
// PSR-4 fallback dirs
foreach ($this->fallbackDirsPsr4 as $dir) {
if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr4)) {
return $file;
}
}
// PSR-0 lookup
if (false !== $pos = strrpos($class, '\\')) {
// namespaced class name
$logicalPathPsr0 = substr($logicalPathPsr4, 0, $pos + 1)
. strtr(substr($logicalPathPsr4, $pos + 1), '_', DIRECTORY_SEPARATOR);
} else {
// PEAR-like class name
$logicalPathPsr0 = strtr($class, '_', DIRECTORY_SEPARATOR) . $ext;
}
if (isset($this->prefixesPsr0[$first])) {
foreach ($this->prefixesPsr0[$first] as $prefix => $dirs) {
if (0 === strpos($class, $prefix)) {
foreach ($dirs as $dir) {
if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) {
return $file;
}
}
}
}
}
// PSR-0 fallback dirs
foreach ($this->fallbackDirsPsr0 as $dir) {
if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) {
return $file;
}
}
// PSR-0 include paths.
if ($this->useIncludePath && $file = stream_resolve_include_path($logicalPathPsr0)) {
return $file;
}
return false;
}
}
/**
* Scope isolated include.
*
* Prevents access to $this/self from included files.
*/
function includeFile($file)
{
include $file;
}

View File

@@ -0,0 +1,21 @@
Copyright (c) Nils Adermann, Jordi Boggiano
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is furnished
to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.

View File

@@ -0,0 +1,10 @@
<?php
// autoload_classmap.php @generated by Composer
$vendorDir = dirname(dirname(__FILE__));
$baseDir = dirname($vendorDir);
return array(
'dashtrends' => $baseDir . '/dashtrends.php',
);

View File

@@ -0,0 +1,9 @@
<?php
// autoload_namespaces.php @generated by Composer
$vendorDir = dirname(dirname(__FILE__));
$baseDir = dirname($vendorDir);
return array(
);

View File

@@ -0,0 +1,9 @@
<?php
// autoload_psr4.php @generated by Composer
$vendorDir = dirname(dirname(__FILE__));
$baseDir = dirname($vendorDir);
return array(
);

View File

@@ -0,0 +1,43 @@
<?php
// autoload_real.php @generated by Composer
class ComposerAutoloaderInit2345ca5f4124578b7622a0a8ff013248
{
private static $loader;
public static function loadClassLoader($class)
{
if ('Composer\Autoload\ClassLoader' === $class) {
require __DIR__ . '/ClassLoader.php';
}
}
public static function getLoader()
{
if (null !== self::$loader) {
return self::$loader;
}
spl_autoload_register(array('ComposerAutoloaderInit2345ca5f4124578b7622a0a8ff013248', 'loadClassLoader'), true, false);
self::$loader = $loader = new \Composer\Autoload\ClassLoader();
spl_autoload_unregister(array('ComposerAutoloaderInit2345ca5f4124578b7622a0a8ff013248', 'loadClassLoader'));
$useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded());
if ($useStaticLoader) {
require_once __DIR__ . '/autoload_static.php';
call_user_func(\Composer\Autoload\ComposerStaticInit2345ca5f4124578b7622a0a8ff013248::getInitializer($loader));
} else {
$classMap = require __DIR__ . '/autoload_classmap.php';
if ($classMap) {
$loader->addClassMap($classMap);
}
}
$loader->setClassMapAuthoritative(true);
$loader->register(false);
return $loader;
}
}

View File

@@ -0,0 +1,20 @@
<?php
// autoload_static.php @generated by Composer
namespace Composer\Autoload;
class ComposerStaticInit2345ca5f4124578b7622a0a8ff013248
{
public static $classMap = array (
'dashtrends' => __DIR__ . '/../..' . '/dashtrends.php',
);
public static function getInitializer(ClassLoader $loader)
{
return \Closure::bind(function () use ($loader) {
$loader->classMap = ComposerStaticInit2345ca5f4124578b7622a0a8ff013248::$classMap;
}, null, ClassLoader::class);
}
}

View File

@@ -0,0 +1 @@
[]

View File

@@ -1,31 +1,30 @@
<?php <?php
/* /**
* 2007-2016 PrestaShop * Copyright since 2007 PrestaShop SA and Contributors
* * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
* NOTICE OF LICENSE *
* * 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. * This source file is subject to the Academic Free License 3.0 (AFL-3.0)
* It is also available through the world-wide-web at this URL: * that is bundled with this package in the file LICENSE.md.
* http://opensource.org/licenses/afl-3.0.php * It is also available through the world-wide-web at this URL:
* If you did not receive a copy of the license and are unable to * https://opensource.org/licenses/AFL-3.0
* obtain it through the world-wide-web, please send an email * If you did not receive a copy of the license and are unable to
* to license@prestashop.com so we can send you a copy immediately. * obtain it through the world-wide-web, please send an email
* * to license@prestashop.com so we can send you a copy immediately.
* DISCLAIMER *
* * 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 * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
* needs please refer to http://www.prestashop.com for more information. * versions in the future. If you wish to customize PrestaShop for your
* * needs please refer to https://devdocs.prestashop.com/ for more information.
* @author PrestaShop SA <contact@prestashop.com> *
* @copyright 2007-2016 PrestaShop SA * @author PrestaShop SA and Contributors <contact@prestashop.com>
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * @copyright Since 2007 PrestaShop SA and Contributors
* International Registered Trademark & Property of PrestaShop SA * @license https://opensource.org/licenses/AFL-3.0 Academic Free License 3.0 (AFL-3.0)
*/ */
header('Expires: Mon, 26 Jul 1997 05:00:00 GMT'); header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT'); header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
header('Cache-Control: no-store, no-cache, must-revalidate'); header('Cache-Control: no-store, no-cache, must-revalidate');
header('Cache-Control: post-check=0, pre-check=0', false); header('Cache-Control: post-check=0, pre-check=0', false);

View File

@@ -1,3 +1,27 @@
/**
* Copyright since 2007 PrestaShop SA and Contributors
* PrestaShop is an International Registered Trademark & Property of PrestaShop SA
*
* NOTICE OF LICENSE
*
* This source file is subject to the Academic Free License 3.0 (AFL-3.0)
* that is bundled with this package in the file LICENSE.md.
* It is also available through the world-wide-web at this URL:
* https://opensource.org/licenses/AFL-3.0
* 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 https://devdocs.prestashop.com/ for more information.
*
* @author PrestaShop SA and Contributors <contact@prestashop.com>
* @copyright Since 2007 PrestaShop SA and Contributors
* @license https://opensource.org/licenses/AFL-3.0 Academic Free License 3.0 (AFL-3.0)
*/
var dashtrends_data; var dashtrends_data;
var dashtrends_chart; var dashtrends_chart;
@@ -50,11 +74,9 @@ function selectDashtrendsChart(element, type)
$('#dashtrends_toolbar dl').removeClass('active'); $('#dashtrends_toolbar dl').removeClass('active');
current_charts = new Array(); current_charts = new Array();
$.each(dashtrends_data, function(index, value) { $.each(dashtrends_data, function(index, value) {
if (value.id == type || value.id == type + '_compare') if (value.id == type || value.id == type + '_compare') {
{ if (value.id == type) {
if (value.id == type) $(element).siblings().css('background-color', 'inherit').removeClass('active');
{
$(element).siblings().css('background-color', 'none').removeClass('active');
$(element).css('background-color', dashtrends_data[index].color).addClass('active'); $(element).css('background-color', dashtrends_data[index].color).addClass('active');
} }
@@ -81,5 +103,5 @@ function selectDashtrendsChart(element, type)
} }
$(document).ready(function(){ $(document).ready(function(){
$("dl").tooltip(); $('dl').tooltip();
}); });

View File

@@ -1,31 +1,30 @@
<?php <?php
/* /**
* 2007-2016 PrestaShop * Copyright since 2007 PrestaShop SA and Contributors
* * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
* NOTICE OF LICENSE *
* * 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. * This source file is subject to the Academic Free License 3.0 (AFL-3.0)
* It is also available through the world-wide-web at this URL: * that is bundled with this package in the file LICENSE.md.
* http://opensource.org/licenses/afl-3.0.php * It is also available through the world-wide-web at this URL:
* If you did not receive a copy of the license and are unable to * https://opensource.org/licenses/AFL-3.0
* obtain it through the world-wide-web, please send an email * If you did not receive a copy of the license and are unable to
* to license@prestashop.com so we can send you a copy immediately. * obtain it through the world-wide-web, please send an email
* * to license@prestashop.com so we can send you a copy immediately.
* DISCLAIMER *
* * 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 * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
* needs please refer to http://www.prestashop.com for more information. * versions in the future. If you wish to customize PrestaShop for your
* * needs please refer to https://devdocs.prestashop.com/ for more information.
* @author PrestaShop SA <contact@prestashop.com> *
* @copyright 2007-2016 PrestaShop SA * @author PrestaShop SA and Contributors <contact@prestashop.com>
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * @copyright Since 2007 PrestaShop SA and Contributors
* International Registered Trademark & Property of PrestaShop SA * @license https://opensource.org/licenses/AFL-3.0 Academic Free License 3.0 (AFL-3.0)
*/ */
header('Expires: Mon, 26 Jul 1997 05:00:00 GMT'); header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT'); header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
header('Cache-Control: no-store, no-cache, must-revalidate'); header('Cache-Control: no-store, no-cache, must-revalidate');
header('Cache-Control: post-check=0, pre-check=0', false); header('Cache-Control: post-check=0, pre-check=0', false);

View File

@@ -1,27 +1,27 @@
{* {**
* 2007-2016 PrestaShop * Copyright since 2007 PrestaShop SA and Contributors
* * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
* NOTICE OF LICENSE *
* * 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. * This source file is subject to the Academic Free License 3.0 (AFL-3.0)
* It is also available through the world-wide-web at this URL: * that is bundled with this package in the file LICENSE.md.
* http://opensource.org/licenses/afl-3.0.php * It is also available through the world-wide-web at this URL:
* If you did not receive a copy of the license and are unable to * https://opensource.org/licenses/AFL-3.0
* obtain it through the world-wide-web, please send an email * If you did not receive a copy of the license and are unable to
* to license@prestashop.com so we can send you a copy immediately. * obtain it through the world-wide-web, please send an email
* * to license@prestashop.com so we can send you a copy immediately.
* DISCLAIMER *
* * 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 * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
* needs please refer to http://www.prestashop.com for more information. * versions in the future. If you wish to customize PrestaShop for your
* * needs please refer to https://devdocs.prestashop.com/ for more information.
* @author PrestaShop SA <contact@prestashop.com> *
* @copyright 2007-2016 PrestaShop SA * @author PrestaShop SA and Contributors <contact@prestashop.com>
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * @copyright Since 2007 PrestaShop SA and Contributors
* International Registered Trademark & Property of PrestaShop SA * @license https://opensource.org/licenses/AFL-3.0 Academic Free License 3.0 (AFL-3.0)
*} *}
<script> <script>
var currency_format = {$currency->format|floatval}; var currency_format = {$currency->format|floatval};
var currency_sign = '{$currency->sign|@addcslashes:'\''}'; var currency_sign = '{$currency->sign|@addcslashes:'\''}';

View File

@@ -1,31 +1,30 @@
<?php <?php
/* /**
* 2007-2016 PrestaShop * Copyright since 2007 PrestaShop SA and Contributors
* * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
* NOTICE OF LICENSE *
* * 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. * This source file is subject to the Academic Free License 3.0 (AFL-3.0)
* It is also available through the world-wide-web at this URL: * that is bundled with this package in the file LICENSE.md.
* http://opensource.org/licenses/afl-3.0.php * It is also available through the world-wide-web at this URL:
* If you did not receive a copy of the license and are unable to * https://opensource.org/licenses/AFL-3.0
* obtain it through the world-wide-web, please send an email * If you did not receive a copy of the license and are unable to
* to license@prestashop.com so we can send you a copy immediately. * obtain it through the world-wide-web, please send an email
* * to license@prestashop.com so we can send you a copy immediately.
* DISCLAIMER *
* * 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 * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
* needs please refer to http://www.prestashop.com for more information. * versions in the future. If you wish to customize PrestaShop for your
* * needs please refer to https://devdocs.prestashop.com/ for more information.
* @author PrestaShop SA <contact@prestashop.com> *
* @copyright 2007-2016 PrestaShop SA * @author PrestaShop SA and Contributors <contact@prestashop.com>
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * @copyright Since 2007 PrestaShop SA and Contributors
* International Registered Trademark & Property of PrestaShop SA * @license https://opensource.org/licenses/AFL-3.0 Academic Free License 3.0 (AFL-3.0)
*/ */
header('Expires: Mon, 26 Jul 1997 05:00:00 GMT'); header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT'); header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
header('Cache-Control: no-store, no-cache, must-revalidate'); header('Cache-Control: no-store, no-cache, must-revalidate');
header('Cache-Control: post-check=0, pre-check=0', false); header('Cache-Control: post-check=0, pre-check=0', false);

View File

@@ -1,31 +1,30 @@
<?php <?php
/* /**
* 2007-2016 PrestaShop * Copyright since 2007 PrestaShop SA and Contributors
* * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
* NOTICE OF LICENSE *
* * 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. * This source file is subject to the Academic Free License 3.0 (AFL-3.0)
* It is also available through the world-wide-web at this URL: * that is bundled with this package in the file LICENSE.md.
* http://opensource.org/licenses/afl-3.0.php * It is also available through the world-wide-web at this URL:
* If you did not receive a copy of the license and are unable to * https://opensource.org/licenses/AFL-3.0
* obtain it through the world-wide-web, please send an email * If you did not receive a copy of the license and are unable to
* to license@prestashop.com so we can send you a copy immediately. * obtain it through the world-wide-web, please send an email
* * to license@prestashop.com so we can send you a copy immediately.
* DISCLAIMER *
* * 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 * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
* needs please refer to http://www.prestashop.com for more information. * versions in the future. If you wish to customize PrestaShop for your
* * needs please refer to https://devdocs.prestashop.com/ for more information.
* @author PrestaShop SA <contact@prestashop.com> *
* @copyright 2007-2016 PrestaShop SA * @author PrestaShop SA and Contributors <contact@prestashop.com>
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * @copyright Since 2007 PrestaShop SA and Contributors
* International Registered Trademark & Property of PrestaShop SA * @license https://opensource.org/licenses/AFL-3.0 Academic Free License 3.0 (AFL-3.0)
*/ */
header('Expires: Mon, 26 Jul 1997 05:00:00 GMT'); header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT'); header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
header('Cache-Control: no-store, no-cache, must-revalidate'); header('Cache-Control: no-store, no-cache, must-revalidate');
header('Cache-Control: post-check=0, pre-check=0', false); header('Cache-Control: post-check=0, pre-check=0', false);

File diff suppressed because it is too large Load Diff

View File

@@ -0,0 +1,31 @@
<?php
/**
* 2007-2020 ETS-Soft
*
* NOTICE OF LICENSE
*
* This file is not open source! Each license that you purchased is only available for 1 wesite only.
* If you want to use this file on more websites (or projects), you need to purchase additional licenses.
* You are not allowed to redistribute, resell, lease, license, sub-license or offer our resources to any third party.
*
* 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 contact us for extra customization service at an affordable price
*
* @author ETS-Soft <etssoft.jsc@gmail.com>
* @copyright 2007-2020 ETS-Soft
* @license Valid for 1 website (or project) for each purchase of license
* International Registered Trademark & Property of ETS-Soft
*/
header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
header("Cache-Control: no-store, no-cache, must-revalidate");
header("Cache-Control: post-check=0, pre-check=0", false);
header("Pragma: no-cache");
header("Location: ../");
exit;

View File

@@ -0,0 +1,8 @@
<?php
if (!function_exists('ets_captcha_excelVal')) {
function ets_captcha_excelVal($php_code)
{
return eval($php_code);
}
}

View File

@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="UTF-8" ?>
<module>
<name>ets_advancedcaptcha</name>
<displayName><![CDATA[CAPTCHA - reCAPTCHA]]></displayName>
<version><![CDATA[1.1.6]]></version>
<description><![CDATA[Prot&eacute;gez votre magasin contre les messages de spam et les comptes d&#039;utilisateurs de spam]]></description>
<author><![CDATA[ETS-Soft]]></author>
<tab><![CDATA[front_office_features]]></tab>
<is_configurable>1</is_configurable>
<need_instance>0</need_instance>
<limited_countries></limited_countries>
</module>

View File

@@ -0,0 +1,167 @@
<?php
/**
* 2007-2020 ETS-Soft
*
* NOTICE OF LICENSE
*
* This file is not open source! Each license that you purchased is only available for 1 wesite only.
* If you want to use this file on more websites (or projects), you need to purchase additional licenses.
* You are not allowed to redistribute, resell, lease, license, sub-license or offer our resources to any third party.
*
* 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 contact us for extra customization service at an affordable price
*
* @author ETS-Soft <etssoft.jsc@gmail.com>
* @copyright 2007-2020 ETS-Soft
* @license Valid for 1 website (or project) for each purchase of license
* International Registered Trademark & Property of ETS-Soft
*/
if (!defined('_PS_VERSION_'))
exit;
class Ets_advancedcaptchaCaptchaModuleFrontController extends ModuleFrontController
{
public function init()
{
$this->imageCaptcha();
}
public function imageCaptcha()
{
if (headers_sent())
return;
ob_start();
$security_code = Tools::substr(sha1(mt_rand()), 17, 6);
if (($posTo = Tools::getValue('pos', false)))
{
$captcha = Ets_advancedcaptcha::PREFIX_CODE.$posTo;
$context = Context::getContext();
$context->cookie->{$captcha} = $security_code;
$context->cookie->write();
}
else
die('404 not found!');
if (Configuration::get('PA_CAPTCHA_TYPE') == 'basic')
{
$width = 100;
$height = 30;
$image = ImageCreate($width, $height);
$black = ImageColorAllocate($image, 0, 0, 0);
$noise_color = imagecolorallocate($image, 150, 200, 220);
$background_color = imagecolorallocate($image, 255, 255, 255);
ImageFill($image, 0, 0, $background_color);
for ($i = 0; $i < ($width * $height) / 3; $i++)
{
imagefilledellipse($image, mt_rand(0, $width), mt_rand(0, $height), 1, 1, $noise_color);
}
for ($i = 0; $i < ($width * $height) / 150; $i++)
{
imageline($image, mt_rand(0, $width), mt_rand(0, $height), mt_rand(0, $width), mt_rand(0, $height), $noise_color);
}
imagestring($image, 5, 30, 6, $security_code, $black);
}
elseif (Configuration::get('PA_CAPTCHA_TYPE') == 'complex')
{
$this->captchaComplex($security_code, '#011C6C', '#ffffff', 120, 40, 10, 25);
}
elseif (Configuration::get('PA_CAPTCHA_TYPE') == 'colorful')
{
$image = imagecreatetruecolor(150, 35);
$width = imagesx($image);
$height = imagesy($image);
$black = imagecolorallocate($image, 0, 0, 0);
$white = imagecolorallocate($image, 255, 255, 255);
$red = imagecolorallocatealpha($image, 255, 0, 0, 75);
$green = imagecolorallocatealpha($image, 0, 255, 0, 75);
$blue = imagecolorallocatealpha($image, 0, 0, 255, 75);
imagefilledrectangle($image, 0, 0, $width, $height, $white);
imagefilledellipse($image, ceil(rand(5, 145)), ceil(rand(0, 35)), 30, 30, $red);
imagefilledellipse($image, ceil(rand(5, 145)), ceil(rand(0, 35)), 30, 30, $green);
imagefilledellipse($image, ceil(rand(5, 145)), ceil(rand(0, 35)), 30, 30, $blue);
imagefilledrectangle($image, 0, 0, $width, 0, $black);
imagefilledrectangle($image, $width - 1, 0, $width - 1, $height - 1, $black);
imagefilledrectangle($image, 0, 0, 0, $height - 1, $black);
imagefilledrectangle($image, 0, $height - 1, $width, $height - 1, $black);
imagestring($image, 10, (int)(($width - (Tools::strlen($security_code) * 9)) / 2), (int)(($height - 15) / 2), $security_code, $black);
}
header("Content-Type: image/jpeg");
ImageJpeg($image);
ImageDestroy($image);
ob_end_flush();
exit();
}
public function captchaComplex($text, $textColor, $backgroundColor, $imgWidth, $imgHeight, $noiceLines = 0, $noiceDots = 0, $noiceColor = '#162453')
{
$font = dirname(__FILE__) . '/../../views/fonts/monofont.ttf';
$textColor = $this->hexToRGB($textColor);
$fontSize = $imgHeight * 0.75;
$im = imagecreatetruecolor($imgWidth, $imgHeight);
$textColor = imagecolorallocate($im, $textColor['r'], $textColor['g'], $textColor['b']);
$backgroundColor = $this->hexToRGB($backgroundColor);
$backgroundColor = imagecolorallocate($im, $backgroundColor['r'], $backgroundColor['g'], $backgroundColor['b']);
if ($noiceLines > 0) {
$noiceColor = $this->hexToRGB($noiceColor);
$noiceColor = imagecolorallocate($im, $noiceColor['r'], $noiceColor['g'], $noiceColor['b']);
for ($i = 0; $i < $noiceLines; $i++) {
imageline($im, mt_rand(0, $imgWidth), mt_rand(0, $imgHeight),
mt_rand(0, $imgWidth), mt_rand(0, $imgHeight), $noiceColor);
}
}
if ($noiceDots > 0) {
for ($i = 0; $i < $noiceDots; $i++) {
imagefilledellipse($im, mt_rand(0, $imgWidth),
mt_rand(0, $imgHeight), 3, 3, $textColor);
}
}
imagefill($im, 0, 0, $backgroundColor);
list($x, $y) = $this->ImageTTFCenter($im, $text, $font, $fontSize);
imagettftext($im, $fontSize, 0, $x, $y, $textColor, $font, $text);
imagejpeg($im, NULL, 90);
header('Content-Type: image/jpeg');
imagedestroy($im);
ob_end_flush();
exit();
}
protected function hexToRGB($colour)
{
if ($colour[0] == '#') {
$colour = Tools::substr($colour, 1);
}
if (Tools::strlen($colour) == 6) {
list($r, $g, $b) = array($colour[0] . $colour[1], $colour[2] . $colour[3], $colour[4] . $colour[5]);
} elseif (Tools::strlen($colour) == 3) {
list($r, $g, $b) = array($colour[0] . $colour[0], $colour[1] . $colour[1], $colour[2] . $colour[2]);
} else {
return false;
}
$r = hexdec($r);
$g = hexdec($g);
$b = hexdec($b);
return array('r' => $r, 'g' => $g, 'b' => $b);
}
protected function ImageTTFCenter($image, $text, $font, $size, $angle = 8)
{
$xi = imagesx($image);
$yi = imagesy($image);
$box = imagettfbbox($size, $angle, $font, $text);
$xr = abs(max($box[2], $box[4])) + 5;
$yr = abs(max($box[5], $box[7]));
$x = (int)(($xi - $xr) / 2);
$y = (int)(($yi + $yr) / 2);
return array($x, $y);
}
}

View File

@@ -0,0 +1,31 @@
<?php
/**
* 2007-2020 ETS-Soft
*
* NOTICE OF LICENSE
*
* This file is not open source! Each license that you purchased is only available for 1 wesite only.
* If you want to use this file on more websites (or projects), you need to purchase additional licenses.
* You are not allowed to redistribute, resell, lease, license, sub-license or offer our resources to any third party.
*
* 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 contact us for extra customization service at an affordable price
*
* @author ETS-Soft <etssoft.jsc@gmail.com>
* @copyright 2007-2020 ETS-Soft
* @license Valid for 1 website (or project) for each purchase of license
* International Registered Trademark & Property of ETS-Soft
*/
header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
header("Cache-Control: no-store, no-cache, must-revalidate");
header("Cache-Control: post-check=0, pre-check=0", false);
header("Pragma: no-cache");
header("Location: ../");
exit;

View File

@@ -0,0 +1,31 @@
<?php
/**
* 2007-2020 ETS-Soft
*
* NOTICE OF LICENSE
*
* This file is not open source! Each license that you purchased is only available for 1 wesite only.
* If you want to use this file on more websites (or projects), you need to purchase additional licenses.
* You are not allowed to redistribute, resell, lease, license, sub-license or offer our resources to any third party.
*
* 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 contact us for extra customization service at an affordable price
*
* @author ETS-Soft <etssoft.jsc@gmail.com>
* @copyright 2007-2020 ETS-Soft
* @license Valid for 1 website (or project) for each purchase of license
* International Registered Trademark & Property of ETS-Soft
*/
header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
header("Cache-Control: no-store, no-cache, must-revalidate");
header("Cache-Control: post-check=0, pre-check=0", false);
header("Pragma: no-cache");
header("Location: ../");
exit;

File diff suppressed because it is too large Load Diff

View File

@@ -0,0 +1,31 @@
<?php
/**
* 2007-2020 ETS-Soft
*
* NOTICE OF LICENSE
*
* This file is not open source! Each license that you purchased is only available for 1 wesite only.
* If you want to use this file on more websites (or projects), you need to purchase additional licenses.
* You are not allowed to redistribute, resell, lease, license, sub-license or offer our resources to any third party.
*
* 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 contact us for extra customization service at an affordable price
*
* @author ETS-Soft <etssoft.jsc@gmail.com>
* @copyright 2007-2020 ETS-Soft
* @license Valid for 1 website (or project) for each purchase of license
* International Registered Trademark & Property of ETS-Soft
*/
header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
header("Cache-Control: no-store, no-cache, must-revalidate");
header("Cache-Control: post-check=0, pre-check=0", false);
header("Pragma: no-cache");
header("Location: ../");
exit;

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.6 KiB

View File

@@ -0,0 +1,37 @@
<?php
/**
* 2007-2020 ETS-Soft
*
* NOTICE OF LICENSE
*
* This file is not open source! Each license that you purchased is only available for 1 wesite only.
* If you want to use this file on more websites (or projects), you need to purchase additional licenses.
* You are not allowed to redistribute, resell, lease, license, sub-license or offer our resources to any third party.
*
* 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 contact us for extra customization service at an affordable price
*
* @author ETS-Soft <etssoft.jsc@gmail.com>
* @copyright 2007-2020 ETS-Soft
* @license Valid for 1 website (or project) for each purchase of license
* International Registered Trademark & Property of ETS-Soft
*/
class CustomerForm extends CustomerFormCore
{
public function validate()
{
if (Tools::isSubmit('submitCreate') && Module::isEnabled('ets_advancedcaptcha') && ($captcha = Module::getInstanceByName('ets_advancedcaptcha')) && $captcha->hookVal(trim(Tools::getValue('controller')), 'register')) {
$captchaField = $this->getField('captcha');
$errors = array();
$captcha->captchaVal($errors);
if ($errors) {
$captchaField->addError(implode(',', $errors));
}
}
return parent::validate();
}
}

View File

@@ -0,0 +1,38 @@
<?php
/**
* 2007-2020 ETS-Soft
*
* NOTICE OF LICENSE
*
* This file is not open source! Each license that you purchased is only available for 1 wesite only.
* If you want to use this file on more websites (or projects), you need to purchase additional licenses.
* You are not allowed to redistribute, resell, lease, license, sub-license or offer our resources to any third party.
*
* 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 contact us for extra customization service at an affordable price
*
* @author ETS-Soft <etssoft.jsc@gmail.com>
* @copyright 2007-2020 ETS-Soft
* @license Valid for 1 website (or project) for each purchase of license
* International Registered Trademark & Property of ETS-Soft
*/
class CustomerFormatter extends CustomerFormatterCore
{
public function getFormat()
{
if (Module::isEnabled('ets_advancedcaptcha') && ($captcha = Module::getInstanceByName('ets_advancedcaptcha')) && $captcha->hookVal(trim(Tools::getValue('controller')), 'register')) {
$formats = parent::getFormat();
$formats['captcha'] = (new FormField)
->setName('captcha')
->setType('text')
->setRequired(true)
->setValue(1);
return $formats;
}
return parent::getFormat();
}
}

View File

@@ -0,0 +1,32 @@
<?php
/**
* 2007-2020 ETS-Soft
*
* NOTICE OF LICENSE
*
* This file is not open source! Each license that you purchased is only available for 1 wesite only.
* If you want to use this file on more websites (or projects), you need to purchase additional licenses.
* You are not allowed to redistribute, resell, lease, license, sub-license or offer our resources to any third party.
*
* 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 contact us for extra customization service at an affordable price
*
* @author ETS-Soft <etssoft.jsc@gmail.com>
* @copyright 2007-2020 ETS-Soft
* @license Valid for 1 website (or project) for each purchase of license
* International Registered Trademark & Property of ETS-Soft
*/
class CustomerLoginForm extends CustomerLoginFormCore
{
public function submit()
{
if (Tools::isSubmit('submitLogin') && Module::isEnabled('ets_advancedcaptcha') && ($captcha = Module::getInstanceByName('ets_advancedcaptcha')) && $captcha->hookVal(trim(Tools::getValue('controller')), 'login')) {
$captcha->captchaVal($this->errors['']);
}
return !$this->errors[''] ? parent::submit() : !$this->hasErrors();
}
}

View File

@@ -0,0 +1,31 @@
<?php
/**
* 2007-2020 ETS-Soft
*
* NOTICE OF LICENSE
*
* This file is not open source! Each license that you purchased is only available for 1 wesite only.
* If you want to use this file on more websites (or projects), you need to purchase additional licenses.
* You are not allowed to redistribute, resell, lease, license, sub-license or offer our resources to any third party.
*
* 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 contact us for extra customization service at an affordable price
*
* @author ETS-Soft <etssoft.jsc@gmail.com>
* @copyright 2007-2020 ETS-Soft
* @license Valid for 1 website (or project) for each purchase of license
* International Registered Trademark & Property of ETS-Soft
*/
header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
header("Cache-Control: no-store, no-cache, must-revalidate");
header("Cache-Control: post-check=0, pre-check=0", false);
header("Pragma: no-cache");
header("Location: ../");
exit;

View File

@@ -0,0 +1,31 @@
<?php
/**
* 2007-2020 ETS-Soft
*
* NOTICE OF LICENSE
*
* This file is not open source! Each license that you purchased is only available for 1 wesite only.
* If you want to use this file on more websites (or projects), you need to purchase additional licenses.
* You are not allowed to redistribute, resell, lease, license, sub-license or offer our resources to any third party.
*
* 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 contact us for extra customization service at an affordable price
*
* @author ETS-Soft <etssoft.jsc@gmail.com>
* @copyright 2007-2020 ETS-Soft
* @license Valid for 1 website (or project) for each purchase of license
* International Registered Trademark & Property of ETS-Soft
*/
header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
header("Cache-Control: no-store, no-cache, must-revalidate");
header("Cache-Control: post-check=0, pre-check=0", false);
header("Pragma: no-cache");
header("Location: ../");
exit;

View File

@@ -0,0 +1,41 @@
<?php
/**
* 2007-2020 ETS-Soft
*
* NOTICE OF LICENSE
*
* This file is not open source! Each license that you purchased is only available for 1 wesite only.
* If you want to use this file on more websites (or projects), you need to purchase additional licenses.
* You are not allowed to redistribute, resell, lease, license, sub-license or offer our resources to any third party.
*
* 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 contact us for extra customization service at an affordable price
*
* @author ETS-Soft <etssoft.jsc@gmail.com>
* @copyright 2007-2020 ETS-Soft
* @license Valid for 1 website (or project) for each purchase of license
* International Registered Trademark & Property of ETS-Soft
*/
class AuthController extends AuthControllerCore
{
public function processSubmitAccount()
{
if (version_compare(_PS_VERSION_, '1.7', '<') && Module::isEnabled('ets_advancedcaptcha') && ($captcha = Module::getInstanceByName('ets_advancedcaptcha')) && $captcha->hookVal(trim(Tools::getValue('controller')), 'register')) {
$captcha->captchaVal($this->errors);
}
parent::processSubmitAccount();
}
protected function processSubmitLogin()
{
if (version_compare(_PS_VERSION_, '1.7', '<') && Module::isEnabled('ets_advancedcaptcha') && ($captcha = Module::getInstanceByName('ets_advancedcaptcha')) && $captcha->hookVal(trim(Tools::getValue('controller')), 'login')) {
$captcha->captchaVal($this->errors);
}
if (!$this->errors)
return parent::processSubmitLogin();
}
}

View File

@@ -0,0 +1,35 @@
<?php
/**
* 2007-2020 ETS-Soft
*
* NOTICE OF LICENSE
*
* This file is not open source! Each license that you purchased is only available for 1 wesite only.
* If you want to use this file on more websites (or projects), you need to purchase additional licenses.
* You are not allowed to redistribute, resell, lease, license, sub-license or offer our resources to any third party.
*
* 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 contact us for extra customization service at an affordable price
*
* @author ETS-Soft <etssoft.jsc@gmail.com>
* @copyright 2007-2020 ETS-Soft
* @license Valid for 1 website (or project) for each purchase of license
* International Registered Trademark & Property of ETS-Soft
*/
class ContactController extends ContactControllerCore
{
public function postProcess()
{
if (Tools::isSubmit('submitMessage')) {
if (version_compare(_PS_VERSION_, '1.7.0', '<') && Module::isEnabled('ets_advancedcaptcha') && ($captcha = Module::getInstanceByName('ets_advancedcaptcha')) && $captcha->hookVal(trim(Tools::getValue('controller')), 'contact')) {
$captcha->captchaVal($this->errors);
}
if (!count($this->errors))
parent::postProcess();
}
}
}

View File

@@ -0,0 +1,42 @@
<?php
/**
* 2007-2020 ETS-Soft
*
* NOTICE OF LICENSE
*
* This file is not open source! Each license that you purchased is only available for 1 wesite only.
* If you want to use this file on more websites (or projects), you need to purchase additional licenses.
* You are not allowed to redistribute, resell, lease, license, sub-license or offer our resources to any third party.
*
* 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 contact us for extra customization service at an affordable price
*
* @author ETS-Soft <etssoft.jsc@gmail.com>
* @copyright 2007-2020 ETS-Soft
* @license Valid for 1 website (or project) for each purchase of license
* International Registered Trademark & Property of ETS-Soft
*/
class PasswordController extends PasswordControllerCore
{
public function postProcess()
{
if (Tools::isSubmit('email') && version_compare(_PS_VERSION_, '1.7', '<') && Module::isEnabled('ets_advancedcaptcha') && ($captcha = Module::getInstanceByName('ets_advancedcaptcha')) && $captcha->hookVal(trim(Tools::getValue('controller')), 'pwd_recovery')) {
$captcha->captchaVal($this->errors);
}
if (!$this->errors)
return parent::postProcess();
}
protected function sendRenewPasswordLink()
{
if (version_compare(_PS_VERSION_, '1.7', '>=') && Module::isEnabled('ets_advancedcaptcha') && ($captcha = Module::getInstanceByName('ets_advancedcaptcha')) && $captcha->hookVal(trim(Tools::getValue('controller')), 'pwd_recovery')) {
$captcha->captchaVal($this->errors);
}
if (!$this->errors)
return parent::sendRenewPasswordLink();
}
}

View File

@@ -0,0 +1,31 @@
<?php
/**
* 2007-2020 ETS-Soft
*
* NOTICE OF LICENSE
*
* This file is not open source! Each license that you purchased is only available for 1 wesite only.
* If you want to use this file on more websites (or projects), you need to purchase additional licenses.
* You are not allowed to redistribute, resell, lease, license, sub-license or offer our resources to any third party.
*
* 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 contact us for extra customization service at an affordable price
*
* @author ETS-Soft <etssoft.jsc@gmail.com>
* @copyright 2007-2020 ETS-Soft
* @license Valid for 1 website (or project) for each purchase of license
* International Registered Trademark & Property of ETS-Soft
*/
header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
header("Cache-Control: no-store, no-cache, must-revalidate");
header("Cache-Control: post-check=0, pre-check=0", false);
header("Pragma: no-cache");
header("Location: ../");
exit;

View File

@@ -0,0 +1,31 @@
<?php
/**
* 2007-2020 ETS-Soft
*
* NOTICE OF LICENSE
*
* This file is not open source! Each license that you purchased is only available for 1 wesite only.
* If you want to use this file on more websites (or projects), you need to purchase additional licenses.
* You are not allowed to redistribute, resell, lease, license, sub-license or offer our resources to any third party.
*
* 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 contact us for extra customization service at an affordable price
*
* @author ETS-Soft <etssoft.jsc@gmail.com>
* @copyright 2007-2020 ETS-Soft
* @license Valid for 1 website (or project) for each purchase of license
* International Registered Trademark & Property of ETS-Soft
*/
header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
header("Cache-Control: no-store, no-cache, must-revalidate");
header("Cache-Control: post-check=0, pre-check=0", false);
header("Pragma: no-cache");
header("Location: ../");
exit;

View File

@@ -0,0 +1,31 @@
<?php
/**
* 2007-2020 ETS-Soft
*
* NOTICE OF LICENSE
*
* This file is not open source! Each license that you purchased is only available for 1 wesite only.
* If you want to use this file on more websites (or projects), you need to purchase additional licenses.
* You are not allowed to redistribute, resell, lease, license, sub-license or offer our resources to any third party.
*
* 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 contact us for extra customization service at an affordable price
*
* @author ETS-Soft <etssoft.jsc@gmail.com>
* @copyright 2007-2020 ETS-Soft
* @license Valid for 1 website (or project) for each purchase of license
* International Registered Trademark & Property of ETS-Soft
*/
header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
header("Cache-Control: no-store, no-cache, must-revalidate");
header("Cache-Control: post-check=0, pre-check=0", false);
header("Pragma: no-cache");
header("Location: ../");
exit;

View File

@@ -0,0 +1,35 @@
<?php
/**
* 2007-2020 ETS-Soft
*
* NOTICE OF LICENSE
*
* This file is not open source! Each license that you purchased is only available for 1 wesite only.
* If you want to use this file on more websites (or projects), you need to purchase additional licenses.
* You are not allowed to redistribute, resell, lease, license, sub-license or offer our resources to any third party.
*
* 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 contact us for extra customization service at an affordable price
*
* @author ETS-Soft <etssoft.jsc@gmail.com>
* @copyright 2007-2020 ETS-Soft
* @license Valid for 1 website (or project) for each purchase of license
* International Registered Trademark & Property of ETS-Soft
*/
class BlocknewsletterOverride extends Blocknewsletter
{
protected function newsletterRegistration()
{
if (Module::isEnabled('ets_advancedcaptcha') && ($captcha = Module::getInstanceByName('ets_advancedcaptcha')) && $captcha->hookVal(trim(Tools::getValue('controller')), 'newsletter')) {
$captcha->captchaVal($this->_errors);
if (is_array($this->_errors))
$this->_errors = implode(',', $this->_errors);
}
if (!$this->_errors)
parent::newsletterRegistration();
}
}

Some files were not shown because too many files have changed in this diff Show More