Merge branch 'master' of https://github.com/thelia/thelia

CHANGELOG.txt

@@ -0,0 +1,11 @@
+2.0.0-beta2
+    http://doc.thelia.net is available in beta.
+    Increase performance in prod mode.
+    Front part (routes and controller) are now a dedicated module.
+    allow to create a customer in admin panel
+    translation is implemented :
+        - I18n directory in template or module.
+        - multiple extensions are available. We choose to used php but you can use other.
+        - You can translate your template or module from the admin.
+    Admin hook exists. With this hooks, a module can insert code in admin pages
+

install/import.php

@@ -159,7 +159,7 @@ function createProduct($faker, $categories, $template, $attribute, $feature, $co
                 }
 
                 $stock->setNewness($faker->randomNumber(0,1));
-                $stock->setWeight($faker->randomFloat(2, 100,10000));
+                $stock->setWeight($faker->randomFloat(2, 1,30));
                 $stock->save($con);
 
                 $productPrice = new \Thelia\Model\ProductPrice();

templates/frontOffice/default/assets/less/thelia/account.less

@@ -49,6 +49,7 @@
 }
 
 // Message if no order or no address
+.deliveries-warning,
 .address-warning,
 .orders-warning {
     clear: both;

templates/frontOffice/default/index.html

@@ -12,13 +12,13 @@
             <div class="carousel-wrapper">
                 <div class="carousel-inner">
                     <figure class="item active">
-                        {images file='assets/img/carousel/slider1.png'}<img src="{$asset_url}" alt="img1">{/images}
+                        {images file='assets/img/carousel/slider1.jpg'}<img src="{$asset_url}" alt="Slider image 1">{/images}
                     </figure>
                     <figure class="item">
-                        {images file='assets/img/carousel/slider2.png'}<img src="{$asset_url}" alt="img2">{/images}
+                        {images file='assets/img/carousel/slider2.jpg'}<img src="{$asset_url}" alt="Slider image 2">{/images}
                     </figure>
                     <figure class="item">
-                        {images file='assets/img/carousel/slider3.png'}<img src="{$asset_url}" alt="img3">{/images}
+                        {images file='assets/img/carousel/slider3.jpg'}<img src="{$asset_url}" alt="Slider image 3">{/images}
                     </figure>
                 </div>
             </div>

templates/frontOffice/default/order-delivery.html

@@ -139,6 +139,7 @@
                             {/form_field}
                         </div>
                         {/loop}
+                        {elseloop rel="deliveries"}<div class="deliveries-warning">{intl l="<strong>Sorry!</strong> We are not able to give you a delivery method for your order."}</div>{/elseloop}
                     </div>
                 </div>