Merge branch 'master' into frontend

Conflicts: templates/default/layout.tpl
2013-10-25 14:51:34 +02:00
parent 46469541f7 4b157b30eb
commit 51cd9f4ee8
141 changed files with 3772 additions and 2614 deletions
--- a/templates/default/order-invoice.html
+++ b/templates/default/order-invoice.html
@@ -72,12 +72,11 @@
                    {loop type="cart" name="cartloop"}
                    <tr>
                        <td class="image">
-                            <a href="{$PRODUCT_URL}" class="thumbnail">

                            {assign "cart_count" $LOOP_COUNT}
                            {ifloop rel='product-image'}
                                {loop type="image" name="product-image" product=$PRODUCT_ID limit="1" width="118" height="85" force_return="true"}
-                                    <img src="{$IMAGE_URL}" alt="Product #{$cart_count}"></a>
+                                    <img src="{$IMAGE_URL}" alt="Product #{$cart_count}">
                                {/loop}
                            {/ifloop}
                            {elseloop rel="product-image"}