Merge branch 'release/1.0.0'

.gitignore

@@ -32,7 +32,6 @@ Temporary Items
 # Private files
 # The following files contain your database credentials and other personal data.
 
-config/settings.*.php
 
 # Cache, temp and generated files
 # The following files are generated by PrestaShop.
@@ -48,25 +47,13 @@ admin-dev/autoupgrade/
 !/cache/sandbox/index.php
 !/cache/smarty/index.php
 !/cache/tcpdf/index.php
-config/xml/*.xml
 /log/*
-*sitemap.xml
 themes/*/cache/
-modules/*/config*.xml
+themes/node_modules/
+/var/cache/
+/var/logs/
+app/config/parameters.php
 
 # Site content
 # The following folders contain product images, virtual products, CSV's, etc.
-
-admin-dev/backups/
-admin-dev/export/
-admin-dev/import/
-download/
-/img/*
-upload/
-/app/Resources/translations/*-*/
-/config/themes/
-/var/cache/
-/var/logs/
-/vendor/
-/var/bootstrap.php.cache
 /themes/cadouri/_dev/node_modules/

.htaccess

@@ -10,32 +10,32 @@ SetEnv HTTP_MOD_REWRITE On
 RewriteEngine on
 
 
-#Domain: cadouri-new.test
+#Domain: 127.0.0.1
 RewriteRule . - [E=REWRITEBASE:/]
 RewriteRule ^api$ api/ [L]
 
 RewriteRule ^api/(.*)$ %{ENV:REWRITEBASE}webservice/dispatcher.php?url=$1 [QSA,L]
 
 # Images
-RewriteCond %{HTTP_HOST} ^cadouri-new.test$
+RewriteCond %{HTTP_HOST} ^127.0.0.1$
 RewriteRule ^([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$1$2$3.jpg [L]
-RewriteCond %{HTTP_HOST} ^cadouri-new.test$
+RewriteCond %{HTTP_HOST} ^127.0.0.1$
 RewriteRule ^([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$1$2$3$4.jpg [L]
-RewriteCond %{HTTP_HOST} ^cadouri-new.test$
+RewriteCond %{HTTP_HOST} ^127.0.0.1$
 RewriteRule ^([0-9])([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$3/$1$2$3$4$5.jpg [L]
-RewriteCond %{HTTP_HOST} ^cadouri-new.test$
+RewriteCond %{HTTP_HOST} ^127.0.0.1$
 RewriteRule ^([0-9])([0-9])([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$3/$4/$1$2$3$4$5$6.jpg [L]
-RewriteCond %{HTTP_HOST} ^cadouri-new.test$
+RewriteCond %{HTTP_HOST} ^127.0.0.1$
 RewriteRule ^([0-9])([0-9])([0-9])([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$3/$4/$5/$1$2$3$4$5$6$7.jpg [L]
-RewriteCond %{HTTP_HOST} ^cadouri-new.test$
+RewriteCond %{HTTP_HOST} ^127.0.0.1$
 RewriteRule ^([0-9])([0-9])([0-9])([0-9])([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$3/$4/$5/$6/$1$2$3$4$5$6$7$8.jpg [L]
-RewriteCond %{HTTP_HOST} ^cadouri-new.test$
+RewriteCond %{HTTP_HOST} ^127.0.0.1$
 RewriteRule ^([0-9])([0-9])([0-9])([0-9])([0-9])([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$3/$4/$5/$6/$7/$1$2$3$4$5$6$7$8$9.jpg [L]
-RewriteCond %{HTTP_HOST} ^cadouri-new.test$
+RewriteCond %{HTTP_HOST} ^127.0.0.1$
 RewriteRule ^([0-9])([0-9])([0-9])([0-9])([0-9])([0-9])([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$3/$4/$5/$6/$7/$8/$1$2$3$4$5$6$7$8$9$10.jpg [L]
-RewriteCond %{HTTP_HOST} ^cadouri-new.test$
+RewriteCond %{HTTP_HOST} ^127.0.0.1$
 RewriteRule ^c/([0-9]+)(\-[\.*_a-zA-Z0-9-]*)(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/c/$1$2$3.jpg [L]
-RewriteCond %{HTTP_HOST} ^cadouri-new.test$
+RewriteCond %{HTTP_HOST} ^127.0.0.1$
 RewriteRule ^c/([a-zA-Z_-]+)(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/c/$1$2.jpg [L]
 # AlphaImageLoader for IE and fancybox
 RewriteRule ^images_ie/?([^/]+)\.(jpe?g|png|gif)$ js/jquery/plugins/fancybox/images/$1.$2 [L]

_css-experiments/megamenu.html

@@ -0,0 +1,89 @@
+<div id="pts-top-menu">
+    <ul class="nav megamenu">
+        <li class="aligned-left nav-item parent dropdown ">
+            <a class="has-subhtml" href="http://cadouri.test/ru/2-home" target="_self"><span
+                    class="menu-title">МАГАЗИН</span></a><i class="material-icons click-canavs-menu hidden-lg-up">expand_more</i>
+            <div class="dropdown-menu level1">
+                <div class="dropdown-menu-inner">
+                    <ul>
+                        <li class=" "><a href="http://cadouri.test/ru/2-home"><span class="menu-title">Все Товары</span></a>
+                        </li>
+                        <li class=" "><a href="http://cadouri.test/ru/28-podarki-s-ekspress-dostavkoj"><span
+                                class="menu-title">Подарки с Экспресс Доставкой</span></a></li>
+                    </ul>
+                </div>
+            </div>
+        </li>
+        <li class="aligned-left nav-item parent dropdown ">
+            <a class="has-subhtml" href="http://cadouri.test/ru/3-cvety" target="_self"><span
+                    class="menu-title">ЦВЕТЫ</span></a><i class="material-icons click-canavs-menu hidden-lg-up">expand_more</i>
+            <div class="dropdown-menu level1">
+                <div class="dropdown-menu-inner">
+                    <ul>
+                        <li class=" "><a href="http://cadouri.test/ru/3-cvety"><span class="menu-title">Все Цветы</span></a>
+                        </li>
+                        <li class=" "><a href="http://cadouri.test/ru/12-rozy"><span class="menu-title">Розы</span></a>
+                        </li>
+                        <li class=" "><a href="http://cadouri.test/ru/33-tyulpany"><span
+                                class="menu-title">Тюльпаны</span></a></li>
+                        <li class=" "><a href="http://cadouri.test/ru/32-mono-bukety"><span class="menu-title">Моно Букеты </span></a>
+                        </li>
+                        <li class=" "><a href="http://cadouri.test/ru/19-smeshannye-bukety"><span class="menu-title">Смешанные Букеты</span></a>
+                        </li>
+                        <li class=" "><a href="http://cadouri.test/ru/22-cvety-v-shlyapnykh-korobkakh"><span
+                                class="menu-title">Цветы в Шляпных Коробках</span></a></li>
+                        <li class=" "><a href="http://cadouri.test/ru/13-komnatnye-rasteniya"><span class="menu-title">Комнатные Цветы</span></a>
+                        </li>
+                    </ul>
+                </div>
+            </div>
+        </li>
+        <li class="aligned-left nav-item parent dropdown ">
+            <a class="has-subhtml" href="http://cadouri.test/ru/25-podarki" target="_self"><span class="menu-title">ПОДАРКИ</span></a><i
+                class="material-icons click-canavs-menu hidden-lg-up">expand_more</i>
+            <div class="dropdown-menu level1">
+                <div class="dropdown-menu-inner">
+                    <ul>
+                        <li class="parent dropdown-submenu "><a href="http://cadouri.test/ru/11-gift-boksy"><span
+                                class="menu-title">Гифт Боксы</span></a><i
+                                class="material-icons click-canavs-menu hidden-lg-up">expand_more</i>
+                            <div class="dropdown-menu level2">
+                                <div class="dropdown-menu-inner">
+                                    <ul>
+                                        <li class=" "><a href="http://cadouri.test/ru/18-spa-boxes"><span
+                                                class="menu-title">SPA Наборы</span></a></li>
+                                        <li class=" "><a href="http://cadouri.test/ru/17-sweet-boxes"><span
+                                                class="menu-title">Сладкие Наборы</span></a></li>
+                                    </ul>
+                                </div>
+                            </div>
+                        </li>
+                        <li class=" "><a href="http://cadouri.test/ru/31-podarochnye-korziny"><span class="menu-title">Подарочные Корзины </span></a>
+                        </li>
+                        <li class=" "><a href="http://cadouri.test/ru/15-plush-toys"><span class="menu-title">Плюшевые Игрушки</span></a>
+                        </li>
+                        <li class=" "><a href="http://cadouri.test/ru/21-sweets"><span
+                                class="menu-title">Вкусняшки</span></a></li>
+                        <li class=" "><a href="http://cadouri.test/ru/27-dlya-muzhchin"><span class="menu-title">Для Мужчин </span></a>
+                        </li>
+                        <li class=" "><a href="http://cadouri.test/ru/30-dlya-detej"><span
+                                class="menu-title">Для Детей </span></a></li>
+                    </ul>
+                </div>
+            </div>
+        </li>
+        <li class="aligned-left nav-item parent dropdown ">
+            <a class="has-subhtml" href="http://cadouri.test/ru/content/4-about-us" target="_self"><span
+                    class="menu-title">О НАС</span></a><i class="material-icons click-canavs-menu hidden-lg-up">expand_more</i>
+            <div class="dropdown-menu level1">
+                <div class="dropdown-menu-inner">
+                    <ul>
+                        <li class=" "><a href="http://cadouri.test/ru/contact-us"><span
+                                class="menu-title">Контакты</span></a></li>
+                        <li class=" "><a href="https://cadouri.md/blog/"><span class="menu-title">Блог</span></a></li>
+                    </ul>
+                </div>
+            </div>
+        </li>
+    </ul>
+</div>

_css-experiments/menu.html

@@ -0,0 +1,74 @@
+<div class="menu js-top-menu position-static hidden-sm-down" id="_desktop_top_menu">
+
+    <ul class="top-menu" id="top-menu" data-depth="0">
+        <li class="category" id="category-3">
+            <a class="dropdown-item" href="http://cadouri-new.test/ru/3-clothes" data-depth="0">
+                                                                      <span class="float-xs-right hidden-md-up">
+                    <span data-target="#top_sub_menu_66249" data-toggle="collapse"
+                          class="navbar-toggler collapse-icons">
+                      <i class="icon icon-plus-circled add"></i>
+                      <i class="icon icon-close remove"></i>
+                    </span>
+                  </span>
+                Clothes
+            </a>
+            <div class="popover sub-menu js-sub-menu collapse" id="top_sub_menu_66249"
+                 style="top: 253px; display: none;">
+
+                <ul class="top-menu" data-depth="1">
+                    <li class="category" id="category-4">
+                        <a class="dropdown-item dropdown-submenu" href="http://cadouri-new.test/ru/4-men"
+                           data-depth="1">
+                            Men
+                        </a>
+                    </li>
+                    <li class="category" id="category-5">
+                        <a class="dropdown-item dropdown-submenu" href="http://cadouri-new.test/ru/5-women"
+                           data-depth="1">
+                            Women
+                        </a>
+                    </li>
+                </ul>
+
+            </div>
+        </li>
+        <li class="category" id="category-6">
+            <a class="dropdown-item" href="http://cadouri-new.test/ru/6-accessories" data-depth="0">
+                                                                      <span class="float-xs-right hidden-md-up">
+                    <span data-target="#top_sub_menu_84496" data-toggle="collapse"
+                          class="navbar-toggler collapse-icons">
+                      <i class="icon icon-plus-circled add"></i>
+                      <i class="icon icon-close remove"></i>
+                    </span>
+                  </span>
+                Сопутствующие товары
+            </a>
+            <div class="popover sub-menu js-sub-menu collapse" id="top_sub_menu_84496"
+                 style="top: 285px; display: none;">
+
+                <ul class="top-menu" data-depth="1">
+                    <li class="category" id="category-7">
+                        <a class="dropdown-item dropdown-submenu" href="http://cadouri-new.test/ru/7-stationery"
+                           data-depth="1">
+                            Stationery
+                        </a>
+                    </li>
+                    <li class="category" id="category-8">
+                        <a class="dropdown-item dropdown-submenu" href="http://cadouri-new.test/ru/8-home-accessories"
+                           data-depth="1">
+                            Home Accessories
+                        </a>
+                    </li>
+                </ul>
+
+            </div>
+        </li>
+        <li class="category" id="category-9">
+            <a class="dropdown-item" href="http://cadouri-new.test/ru/9-art" data-depth="0">
+                Art
+            </a>
+        </li>
+    </ul>
+
+    <div class="clearfix"></div>
+</div>