TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'frontend' of https://github.com/thelia/thelia into frontend

Browse Source
This commit is contained in:
touffies
2013-10-23 17:27:52 +02:00
parent cb560691eb 4660992d75
commit 0c4592a9dd
4 changed files with 13 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/lib/Thelia/Form/CartAdd.php
View File

@@ -99,8 +99,8 @@ class CartAdd extends BaseForm
"for" => "quantity" "for" => "quantity"
) )
)) ))
->add("append", "hidden") ->add("append", "integer")
->add("newness", "hidden") ->add("newness", "integer")
; ;
} }

2
templates/default/assets/js/script.js
View File

@@ -291,7 +291,7 @@
$.ajax({type:"POST", data: $(this).serialize(), url:url_action, $.ajax({type:"POST", data: $(this).serialize(), url:url_action,
success: function(data){ success: function(data){
console.log($(data).html());
$cartContainer.html($(data).html()); $cartContainer.html($(data).html());
$.ajax({url:"ajax/addCartMessage", $.ajax({url:"ajax/addCartMessage",

2
templates/default/includes/mini-cart.html
View File

@@ -60,7 +60,7 @@
</li> </li>
{/ifloop} {/ifloop}
{elseloop rel="cartloop"} {elseloop rel="cartloop"}
<li class="dropdown pull-right"> <li class="dropdown pull-right cart-container">
<a href="{url path="/cart"}" rel="nofollow" class="cart"> <a href="{url path="/cart"}" rel="nofollow" class="cart">
{intl l="Cart"} <span class="badge">0</span> {intl l="Cart"} <span class="badge">0</span>
</a> </a>

24
templates/default/product.html
View File

@@ -145,15 +145,7 @@
{if $form_error}<div class="alert alert-error">{$form_error_message}</div>{/if} {if $form_error}<div class="alert alert-error">{$form_error_message}</div>{/if}
{form_field form=$form field='product_sale_elements_id'}
{if $default_product_sale_elements }
<input type="hidden" name="{$name}" value="{$default_product_sale_elements}" {$attr}>
{else}
{loop name="productSaleElements_promo" type="product_sale_elements" product="{$ID}" limit="1"}
<input type="hidden" name="{$name}" value="{$ID}" {$attr}>
{/loop}
{/if}
{/form_field}
{form_field form=$form field="product"} {form_field form=$form field="product"}
<input id="{$label_attr.for}" type="hidden" name="{$name}" value="{$ID}" {$attr} > <input id="{$label_attr.for}" type="hidden" name="{$name}" value="{$ID}" {$attr} >
{/form_field} {/form_field}
@@ -163,13 +155,15 @@
<div class="option"> <div class="option">
<label for="options" class="option-heading">Options</label> <label for="options" class="option-heading">Options</label>
<div class="option-content"> <div class="option-content">
<select name="options" class="form-control"> {form_field form=$form field='product_sale_elements_id'}
{loop name="stock" type="product_sale_elements" product="$ID" order="min_price"} <select name="{$name}" class="form-control">
{loop name="combi" type="attribute_combination" product_sale_elements="$ID" order="alpha"} {loop name="stock" type="product_sale_elements" product="$ID" order="min_price"}
<option value="{$ID}" data-quantity="{$QUANTITY}" data-price="{format_number number="{$BEST_TAXED_PRICE}"} {currency attr="symbol"}" data-old-price="{format_number number="{$TAXED_PRICE}"} {currency attr="symbol"}">{$ATTRIBUTE_AVAILABILITY_TITLE}</small></option> {loop name="combi" type="attribute_combination" product_sale_elements="$ID" order="alpha"}
<option value="{$ID}" data-quantity="{$QUANTITY}" data-price="{format_number number="{$BEST_TAXED_PRICE}"} {currency attr="symbol"}" data-old-price="{format_number number="{$TAXED_PRICE}"} {currency attr="symbol"}">{$ATTRIBUTE_AVAILABILITY_TITLE}</option>
{/loop}
{/loop} {/loop}
{/loop} </select>
</select> {/form_field}
</div> </div>
</div> </div>
{/ifloop} {/ifloop}