diff --git a/local/media/images/carousel/chxrouge-40-3.jpg b/local/media/images/carousel/chxrouge-40-3.jpg new file mode 100644 index 00000000..d285ad0b Binary files /dev/null and b/local/media/images/carousel/chxrouge-40-3.jpg differ diff --git a/local/media/images/carousel/kiwijaune-12-4.jpg b/local/media/images/carousel/kiwijaune-12-4.jpg new file mode 100644 index 00000000..163b2e1e Binary files /dev/null and b/local/media/images/carousel/kiwijaune-12-4.jpg differ diff --git a/local/media/images/product/ail-grosplan-59.jpg b/local/media/images/product/ail-grosplan-59.jpg new file mode 100644 index 00000000..ea0f7469 Binary files /dev/null and b/local/media/images/product/ail-grosplan-59.jpg differ diff --git a/local/media/images/product/ananas-4.jpg b/local/media/images/product/ananas-4.jpg new file mode 100644 index 00000000..898fc585 Binary files /dev/null and b/local/media/images/product/ananas-4.jpg differ diff --git a/local/media/images/product/avocat-25.jpg b/local/media/images/product/avocat-25.jpg new file mode 100644 index 00000000..816297ea Binary files /dev/null and b/local/media/images/product/avocat-25.jpg differ diff --git a/local/media/images/product/banane-3.jpg b/local/media/images/product/banane-3.jpg new file mode 100644 index 00000000..20c5e9c7 Binary files /dev/null and b/local/media/images/product/banane-3.jpg differ diff --git a/local/media/images/product/betteraverouge-auxbieauxlgumes-58.jpg b/local/media/images/product/betteraverouge-auxbieauxlgumes-58.jpg new file mode 100644 index 00000000..99f3dc89 Binary files /dev/null and b/local/media/images/product/betteraverouge-auxbieauxlgumes-58.jpg differ diff --git a/local/media/images/product/carottedetilques-27.png b/local/media/images/product/carottedetilques-27.png new file mode 100644 index 00000000..d858564e Binary files /dev/null and b/local/media/images/product/carottedetilques-27.png differ diff --git a/local/media/images/product/champignonblanc-36.jpg b/local/media/images/product/champignonblanc-36.jpg new file mode 100644 index 00000000..eb57d872 Binary files /dev/null and b/local/media/images/product/champignonblanc-36.jpg differ diff --git a/local/media/images/product/chou-fleur-60.jpg b/local/media/images/product/chou-fleur-60.jpg new file mode 100644 index 00000000..e67874b0 Binary files /dev/null and b/local/media/images/product/chou-fleur-60.jpg differ diff --git a/local/media/images/product/choublanc-38.jpg b/local/media/images/product/choublanc-38.jpg new file mode 100644 index 00000000..fa667539 Binary files /dev/null and b/local/media/images/product/choublanc-38.jpg differ diff --git a/local/media/images/product/choufrise-48.jpg b/local/media/images/product/choufrise-48.jpg new file mode 100644 index 00000000..2f5928ba Binary files /dev/null and b/local/media/images/product/choufrise-48.jpg differ diff --git a/local/media/images/product/chxrouge-40.jpg b/local/media/images/product/chxrouge-40.jpg new file mode 100644 index 00000000..d285ad0b Binary files /dev/null and b/local/media/images/product/chxrouge-40.jpg differ diff --git a/local/media/images/product/citronjaune-6.jpg b/local/media/images/product/citronjaune-6.jpg new file mode 100644 index 00000000..742c812b Binary files /dev/null and b/local/media/images/product/citronjaune-6.jpg differ diff --git a/local/media/images/product/citronvert-8.jpg b/local/media/images/product/citronvert-8.jpg new file mode 100644 index 00000000..ba8e000b Binary files /dev/null and b/local/media/images/product/citronvert-8.jpg differ diff --git a/local/media/images/product/cleri-auxbieauxlgumes-51.jpg b/local/media/images/product/cleri-auxbieauxlgumes-51.jpg new file mode 100644 index 00000000..2dd76bf6 Binary files /dev/null and b/local/media/images/product/cleri-auxbieauxlgumes-51.jpg differ diff --git a/local/media/images/product/clmentine-22.jpg b/local/media/images/product/clmentine-22.jpg new file mode 100644 index 00000000..73a23bfc Binary files /dev/null and b/local/media/images/product/clmentine-22.jpg differ diff --git a/local/media/images/product/concombre-53.jpg b/local/media/images/product/concombre-53.jpg new file mode 100644 index 00000000..304c3e74 Binary files /dev/null and b/local/media/images/product/concombre-53.jpg differ diff --git a/local/media/images/product/courgette-auxbieauxlgumes-57.jpg b/local/media/images/product/courgette-auxbieauxlgumes-57.jpg new file mode 100644 index 00000000..311af88a Binary files /dev/null and b/local/media/images/product/courgette-auxbieauxlgumes-57.jpg differ diff --git a/local/media/images/product/echalotte-47.jpg b/local/media/images/product/echalotte-47.jpg new file mode 100644 index 00000000..8ce73154 Binary files /dev/null and b/local/media/images/product/echalotte-47.jpg differ diff --git a/local/media/images/product/fraise-9.jpg b/local/media/images/product/fraise-9.jpg new file mode 100644 index 00000000..cc7f8436 Binary files /dev/null and b/local/media/images/product/fraise-9.jpg differ diff --git a/local/media/images/product/fruitdelapassion-20.jpg b/local/media/images/product/fruitdelapassion-20.jpg new file mode 100644 index 00000000..f7ae75a0 Binary files /dev/null and b/local/media/images/product/fruitdelapassion-20.jpg differ diff --git a/local/media/images/product/kiwijaune-12.jpg b/local/media/images/product/kiwijaune-12.jpg new file mode 100644 index 00000000..163b2e1e Binary files /dev/null and b/local/media/images/product/kiwijaune-12.jpg differ diff --git a/local/media/images/product/kiwivert-10.jpg b/local/media/images/product/kiwivert-10.jpg new file mode 100644 index 00000000..d5a28116 Binary files /dev/null and b/local/media/images/product/kiwivert-10.jpg differ diff --git a/local/media/images/product/mangue-21.jpg b/local/media/images/product/mangue-21.jpg new file mode 100644 index 00000000..801341af Binary files /dev/null and b/local/media/images/product/mangue-21.jpg differ diff --git a/local/media/images/product/melon-13.jpg b/local/media/images/product/melon-13.jpg new file mode 100644 index 00000000..e990229e Binary files /dev/null and b/local/media/images/product/melon-13.jpg differ diff --git a/local/media/images/product/navet-52.jpg b/local/media/images/product/navet-52.jpg new file mode 100644 index 00000000..37f15726 Binary files /dev/null and b/local/media/images/product/navet-52.jpg differ diff --git a/local/media/images/product/nectarine-14.jpg b/local/media/images/product/nectarine-14.jpg new file mode 100644 index 00000000..6a6c4f61 Binary files /dev/null and b/local/media/images/product/nectarine-14.jpg differ diff --git a/local/media/images/product/oignonrouge-44.jpg b/local/media/images/product/oignonrouge-44.jpg new file mode 100644 index 00000000..3911b0a9 Binary files /dev/null and b/local/media/images/product/oignonrouge-44.jpg differ diff --git a/local/media/images/product/oignonsblanc-42.jpg b/local/media/images/product/oignonsblanc-42.jpg new file mode 100644 index 00000000..dacfd4e2 Binary files /dev/null and b/local/media/images/product/oignonsblanc-42.jpg differ diff --git a/local/media/images/product/orange-15.jpg b/local/media/images/product/orange-15.jpg new file mode 100644 index 00000000..882b6167 Binary files /dev/null and b/local/media/images/product/orange-15.jpg differ diff --git a/local/media/images/product/orange-16.jpg b/local/media/images/product/orange-16.jpg new file mode 100644 index 00000000..882b6167 Binary files /dev/null and b/local/media/images/product/orange-16.jpg differ diff --git a/local/media/images/product/orangesanguine-23.jpg b/local/media/images/product/orangesanguine-23.jpg new file mode 100644 index 00000000..293b36bd Binary files /dev/null and b/local/media/images/product/orangesanguine-23.jpg differ diff --git a/local/media/images/product/patatedouce-61.jpg b/local/media/images/product/patatedouce-61.jpg new file mode 100644 index 00000000..06014588 Binary files /dev/null and b/local/media/images/product/patatedouce-61.jpg differ diff --git a/local/media/images/product/pdt-62.jpg b/local/media/images/product/pdt-62.jpg new file mode 100644 index 00000000..da3060a0 Binary files /dev/null and b/local/media/images/product/pdt-62.jpg differ diff --git a/local/media/images/product/pdt-cherie-63.jpg b/local/media/images/product/pdt-cherie-63.jpg new file mode 100644 index 00000000..da3060a0 Binary files /dev/null and b/local/media/images/product/pdt-cherie-63.jpg differ diff --git a/local/media/images/product/poire-49.jpg b/local/media/images/product/poire-49.jpg new file mode 100644 index 00000000..4d917709 Binary files /dev/null and b/local/media/images/product/poire-49.jpg differ diff --git a/local/media/images/product/poireau-auxbieauxlgumes-50.jpg b/local/media/images/product/poireau-auxbieauxlgumes-50.jpg new file mode 100644 index 00000000..53048b4b Binary files /dev/null and b/local/media/images/product/poireau-auxbieauxlgumes-50.jpg differ diff --git a/local/media/images/product/poivronrouge-54.jpg b/local/media/images/product/poivronrouge-54.jpg new file mode 100644 index 00000000..1567e6db Binary files /dev/null and b/local/media/images/product/poivronrouge-54.jpg differ diff --git a/local/media/images/product/poivronvert-56.jpg b/local/media/images/product/poivronvert-56.jpg new file mode 100644 index 00000000..43c1b260 Binary files /dev/null and b/local/media/images/product/poivronvert-56.jpg differ diff --git a/local/media/images/product/pomelo-18.jpg b/local/media/images/product/pomelo-18.jpg new file mode 100644 index 00000000..b8d4e8fc Binary files /dev/null and b/local/media/images/product/pomelo-18.jpg differ diff --git a/local/media/images/product/pommeboskoop-5.jpg b/local/media/images/product/pommeboskoop-5.jpg new file mode 100644 index 00000000..84d5711b Binary files /dev/null and b/local/media/images/product/pommeboskoop-5.jpg differ diff --git a/local/media/images/product/radis-auxbieauxlgumes-46.jpg b/local/media/images/product/radis-auxbieauxlgumes-46.jpg new file mode 100644 index 00000000..943a0e2c Binary files /dev/null and b/local/media/images/product/radis-auxbieauxlgumes-46.jpg differ diff --git a/local/media/images/product/raisin-24.jpg b/local/media/images/product/raisin-24.jpg new file mode 100644 index 00000000..1e39c1b1 Binary files /dev/null and b/local/media/images/product/raisin-24.jpg differ diff --git a/local/media/images/product/salade-chnerouge-32.jpg b/local/media/images/product/salade-chnerouge-32.jpg new file mode 100644 index 00000000..d5416e33 Binary files /dev/null and b/local/media/images/product/salade-chnerouge-32.jpg differ diff --git a/local/media/images/product/salade-chnerouge-34.jpg b/local/media/images/product/salade-chnerouge-34.jpg new file mode 100644 index 00000000..d5416e33 Binary files /dev/null and b/local/media/images/product/salade-chnerouge-34.jpg differ diff --git a/local/media/images/product/salade-chneverte-30.jpg b/local/media/images/product/salade-chneverte-30.jpg new file mode 100644 index 00000000..d5dc7d2a Binary files /dev/null and b/local/media/images/product/salade-chneverte-30.jpg differ diff --git a/local/media/images/product/salade-chneverte-35.jpg b/local/media/images/product/salade-chneverte-35.jpg new file mode 100644 index 00000000..d5dc7d2a Binary files /dev/null and b/local/media/images/product/salade-chneverte-35.jpg differ diff --git a/local/media/images/product/salade-laitue-28.jpg b/local/media/images/product/salade-laitue-28.jpg new file mode 100644 index 00000000..de6052c2 Binary files /dev/null and b/local/media/images/product/salade-laitue-28.jpg differ diff --git a/local/media/images/product/salade-laitue-33.jpg b/local/media/images/product/salade-laitue-33.jpg new file mode 100644 index 00000000..de6052c2 Binary files /dev/null and b/local/media/images/product/salade-laitue-33.jpg differ diff --git a/local/media/images/product/tomate-auxbieauxlgumes-41.jpg b/local/media/images/product/tomate-auxbieauxlgumes-41.jpg new file mode 100644 index 00000000..70895411 Binary files /dev/null and b/local/media/images/product/tomate-auxbieauxlgumes-41.jpg differ diff --git a/local/media/images/store/6017c6f9178ed-logo-rvb.jpg.ico b/local/media/images/store/6017c6f9178ed-logo-rvb.jpg.ico new file mode 100644 index 00000000..9a6cf0a3 Binary files /dev/null and b/local/media/images/store/6017c6f9178ed-logo-rvb.jpg.ico differ diff --git a/local/media/images/store/6017c7cc57b4b-logo.jpg b/local/media/images/store/6017c7cc57b4b-logo.jpg new file mode 100644 index 00000000..bb13ff5c Binary files /dev/null and b/local/media/images/store/6017c7cc57b4b-logo.jpg differ diff --git a/local/media/images/store/607722ee14ca8-favicon-auxbieauxlegumes.png b/local/media/images/store/607722ee14ca8-favicon-auxbieauxlegumes.png new file mode 100644 index 00000000..90db20a1 Binary files /dev/null and b/local/media/images/store/607722ee14ca8-favicon-auxbieauxlegumes.png differ diff --git a/local/media/images/store/6077231d7508c-logo.png b/local/media/images/store/6077231d7508c-logo.png new file mode 100644 index 00000000..768b18a1 Binary files /dev/null and b/local/media/images/store/6077231d7508c-logo.png differ diff --git a/local/modules/ClickAndCollect/Config/module.xml b/local/modules/ClickAndCollect/Config/module.xml index 2713abb8..62850d89 100644 --- a/local/modules/ClickAndCollect/Config/module.xml +++ b/local/modules/ClickAndCollect/Config/module.xml @@ -21,6 +21,9 @@ delivery + + PlanificationLivraison + 2.3.x beta 0 diff --git a/local/modules/PointRetrait/Config/module.xml b/local/modules/PointRetrait/Config/module.xml index b5018a01..117836af 100644 --- a/local/modules/PointRetrait/Config/module.xml +++ b/local/modules/PointRetrait/Config/module.xml @@ -21,6 +21,9 @@ delivery + + PlanificationLivraison + 2.3.x beta 0 diff --git a/templates/frontOffice/custom/Gruntfile.js b/templates/frontOffice/custom/Gruntfile.js index ce897e20..9099a8c1 100644 --- a/templates/frontOffice/custom/Gruntfile.js +++ b/templates/frontOffice/custom/Gruntfile.js @@ -216,7 +216,7 @@ module.exports = function (grunt) { } }, cssmin: { - files: ['assets/src/css/thelia.css'], + files: ['assets/src/css/thelia.css', 'assets/src/css/custom.css'], tasks: ['autoprefixer', 'cssmin'], options: { spawn: false, diff --git a/templates/frontOffice/custom/assets/dist/css/custom.min.css b/templates/frontOffice/custom/assets/dist/css/custom.min.css index 9aa1308e..9e7213e4 100644 --- a/templates/frontOffice/custom/assets/dist/css/custom.min.css +++ b/templates/frontOffice/custom/assets/dist/css/custom.min.css @@ -1 +1 @@ -@font-face{font-family:sofia_prolight;src:url(../fonts/sofiapro/sofiapro-light-webfont.woff2) format('woff2'),url(../../fonts/sofiapro/sofiapro-light-webfont.woff) format('woff');font-weight:400;font-style:normal}html{font-family:sofia_prolight,sans-serif!important}#products-new .overlay:after,#products-offer .overlay:after,#products-upsell .overlay:after,body{font-family:sofia_prolight,'Open Sans',sans-serif!important}s @media (min-width:1200px){.container{width:1170px}}@media (min-width:992px){.header__main{width:95%}}@media (min-width:768px){.header__content{flex-direction:column}}.header__content{display:flex}.header__main{align-items:center;display:flex;flex-direction:row;justify-content:space-between}.navbar-default{background-color:transparent}.navbar li>a.home:before{display:none}.nav>li{text-transform:uppercase}.header__content .container-fluid{padding-left:0;padding-right:0}.navbar-form .form-control{width:50px}.navbar-form .form-control.large{width:auto}.logo-boutique{width:200px} \ No newline at end of file +@font-face{font-family:sofia_prolight;src:url(../fonts/sofiapro/sofiapro-light-webfont.woff2) format('woff2'),url(../fonts/sofiapro/sofiapro-light-webfont.woff) format('woff');font-weight:400;font-style:normal}html{font-family:sofia_prolight,sans-serif!important}#products-new .overlay:after,#products-offer .overlay:after,#products-upsell .overlay:after,body{font-family:sofia_prolight,'Open Sans',sans-serif!important}div.container{width:90%!important}@media (min-width:992px){.header__main{width:90%}}@media (min-width:768px){.header__content{flex-direction:column}}.header__content{display:flex}.header__main{align-items:center;display:flex;flex-direction:row;justify-content:space-between}.header__secondary{display:inline-flex}.navbar-default{background-color:transparent}.navbar li>a.home:before{display:none}.nav>li{text-transform:uppercase}.header__content .container-fluid{padding-left:0;padding-right:0}.navbar-form .form-control{width:150px}.logo-boutique{width:160px}.navbar{margin-bottom:0}.glyphicon,a{color:#95c11e}.btn-primary{background-color:#95c11e;border-left:0;border-color:#95c11e}.navbar-default .navbar-nav>li>a{color:#3c3c3b}.nav>li>a:focus,.nav>li>a:hover,.navbar-default .navbar-nav>.active>a,.navbar-default .navbar-nav>.active>a:focus,.navbar-default .navbar-nav>.active>a:hover,.navbar-default .navbar-nav>li>a:focus,.navbar-default .navbar-nav>li>a:hover{background-color:#95c11e;color:#fff} \ No newline at end of file diff --git a/templates/frontOffice/custom/assets/src/css/custom.css b/templates/frontOffice/custom/assets/src/css/custom.css index 833c428a..3bab5fcc 100644 --- a/templates/frontOffice/custom/assets/src/css/custom.css +++ b/templates/frontOffice/custom/assets/src/css/custom.css @@ -1,7 +1,7 @@ @font-face { font-family: 'sofia_prolight'; src: url('../fonts/sofiapro/sofiapro-light-webfont.woff2') format('woff2'), - url('../../fonts/sofiapro/sofiapro-light-webfont.woff') format('woff'); + url('../fonts/sofiapro/sofiapro-light-webfont.woff') format('woff'); font-weight: normal; font-style: normal; } @@ -16,17 +16,15 @@ html { #products-offer .overlay:after, body { font-family: 'sofia_prolight', 'Open Sans', sans-serif !important; -}s - - -@media (min-width: 1200px) { - .container { - width: 1170px; - } } + +div.container { + width: 90% !important; + } + @media (min-width: 992px) { .header__main { - width: 95%; + width: 90%; } } @media (min-width: 768px) { @@ -44,6 +42,9 @@ body { flex-direction: row; justify-content: space-between; } +.header__secondary { + display: inline-flex; +} .navbar-default { background-color: transparent; @@ -61,11 +62,30 @@ body { padding-right: 0; } .navbar-form .form-control { - width: 50px; -} -.navbar-form .form-control.large { - width: auto; + width: 150px; } .logo-boutique { - width: 200px; + width: 160px; +} +.navbar { + margin-bottom: 0; +} +.glyphicon, a { + color: #95c11e; +} +.btn-primary { + background-color: #95c11e; + border-left: 0; + border-color: #95c11e; +} +.navbar-default .navbar-nav>li>a { + color: #3c3c3b; +} +.navbar-default .navbar-nav>.active>a, .navbar-default .navbar-nav>.active>a:focus, .navbar-default .navbar-nav>.active>a:hover, .navbar-default .navbar-nav>li>a:focus, .navbar-default .navbar-nav>li>a:hover { + background-color: #95c11e; + color: white; +} +.nav>li>a:focus, .nav>li>a:hover { + background-color: #95c11e; + color: white; } \ No newline at end of file diff --git a/templates/frontOffice/custom/assets/src/js/customJS.js b/templates/frontOffice/custom/assets/src/js/customJS.js index cf43da50..56242e1f 100644 --- a/templates/frontOffice/custom/assets/src/js/customJS.js +++ b/templates/frontOffice/custom/assets/src/js/customJS.js @@ -1,11 +1,5 @@ (function($) { - $('#search-icon').hover(function() { - $(".navbar-form .form-control").addClass("large"); - }); - $('#search-icon').mouseleave(function() { - $(".navbar-form .form-control").removeClass("large"); - }); })(jQuery); \ No newline at end of file diff --git a/templates/frontOffice/custom/layout.tpl b/templates/frontOffice/custom/layout.tpl index 47ded4a4..b476d9d4 100644 --- a/templates/frontOffice/custom/layout.tpl +++ b/templates/frontOffice/custom/layout.tpl @@ -134,7 +134,9 @@ GNU General Public License : http://www.gnu.org/licenses/ {hook name="main.navbar-primary"} - {hook name="main.navbar-secondary"} +
+ {hook name="main.navbar-secondary"} +
@@ -288,22 +290,8 @@ GNU General Public License : http://www.gnu.org/licenses/ - - {* *} - {hook name="main.body-bottom"} diff --git a/templates/frontOffice/custom/modules/HookCart/mini-cart.html b/templates/frontOffice/custom/modules/HookCart/mini-cart.html new file mode 100644 index 00000000..3cca8f5d --- /dev/null +++ b/templates/frontOffice/custom/modules/HookCart/mini-cart.html @@ -0,0 +1,73 @@ +{ifloop rel="cartloop"} +
  • + + {* {intl l="Cart" d="hookcart.fo.default"} *} {cart attr="count_item"} + +
    +
    + + + + + + + + {assign "total_price" 0} + {loop type="cart" name="cartloop"} + + + + + + {/loop} + + + + + + + +
    + {ifloop rel="pse-first-image"} + {loop type="product-sale-elements-image" name="pse-first-image" product_sale_elements_id=$PRODUCT_SALE_ELEMENTS_ID limit="1"} + {loop type="image" name="product-image" id=$PRODUCT_IMAGE_ID product=$PRODUCT_ID limit="1" width="118" height="60"} + {assign var="product_image_url" value=$IMAGE_URL} + {$TITLE} + {/loop} + {/loop} + {/ifloop} + {elseloop rel="pse-first-image"} + {loop type="image" name="product-image" product=$PRODUCT_ID limit="1" width="118" height="60"} + {$TITLE} + {/loop} + {/elseloop} + +

    + {$TITLE} +

    + {intl l="Remove" d="hookcart.fo.default"} +     		+ {$QUANTITY} X {format_money number=$REAL_TAXED_PRICE} +
    + {intl l="View Cart" d="hookcart.fo.default"} + {intl l="Checkout" d="hookcart.fo.default"} + {**} + +
    + {format_money number={cart attr='total_taxed_price_without_discount'}} +
    +
    +
    +
    +
    • +{/ifloop} +{elseloop rel="cartloop"} +
  • + + {* {intl l="Cart" d="hookcart.fo.default"} *} 0 + +
    +

    {intl l="You have no items in your shopping cart." d="hookcart.fo.default"}

    +
    +
    • +{/elseloop} diff --git a/local/modules/HookCustomer/templates/frontOffice/custom/main-navbar-secondary.html b/templates/frontOffice/custom/modules/HookCustomer/main-navbar-secondary.html similarity index 94% rename from local/modules/HookCustomer/templates/frontOffice/custom/main-navbar-secondary.html rename to templates/frontOffice/custom/modules/HookCustomer/main-navbar-secondary.html index 4e40c591..9d6b0196 100644 --- a/local/modules/HookCustomer/templates/frontOffice/custom/main-navbar-secondary.html +++ b/templates/frontOffice/custom/modules/HookCustomer/main-navbar-secondary.html @@ -1,4 +1,4 @@ -