Merge branch 'master' of github.com:ZeusWPI/Tap
This commit is contained in:
commit
d9cc0ee30e
4 changed files with 9 additions and 7 deletions
|
@ -41,8 +41,8 @@ disIfNec = (row) ->
|
||||||
$(row).find('.btn-inc').prop('disabled', counter == parseInt($(row).find('.row_counter').attr('max')))
|
$(row).find('.btn-inc').prop('disabled', counter == parseInt($(row).find('.row_counter').attr('max')))
|
||||||
|
|
||||||
recalculate = () ->
|
recalculate = () ->
|
||||||
value = ($(row).find('.row_counter').val() * $(row).find('.price').val() for row in $('.form_row')).reduce (a, b) -> a+b
|
value = ($(row).val() * $(row).data('price') for row in $('.row_counter')).reduce(((a, b) -> a+b), 0)
|
||||||
$('#order_price').val((value / 100.0).toFixed(2))
|
$('#order_price').html((value / 100.0).toFixed(2))
|
||||||
|
|
||||||
increment = (button, n) ->
|
increment = (button, n) ->
|
||||||
row = $(button).closest('.form_row')
|
row = $(button).closest('.form_row')
|
||||||
|
|
|
@ -55,3 +55,7 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#order_price {
|
||||||
|
width: 50px;
|
||||||
|
}
|
||||||
|
|
|
@ -12,10 +12,8 @@
|
||||||
<%= content_tag :span, product.name %>
|
<%= content_tag :span, product.name %>
|
||||||
<%= content_tag :small, euro(product.price) %>
|
<%= content_tag :small, euro(product.price) %>
|
||||||
</h4>
|
</h4>
|
||||||
<%= f.counter :count, min: 0, max: product.stock, skip_label: true, wrapper_class: "input-group", class: "row_counter" %>
|
<%= f.counter :count, min: 0, max: product.stock, skip_label: true, wrapper_class: "input-group", class: "row_counter", data: { price: f.object.product.price_cents } %>
|
||||||
<%= f.fields_for :product do |product| %>
|
<%= f.fields_for :product do |product| %>
|
||||||
<%= product.hidden_field :price_cents, class: :price %>
|
|
||||||
<%= product.hidden_field :stock, class: :stock %>
|
|
||||||
<% end %>
|
<% end %>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
<div class="col-md-3 form_total">
|
<div class="col-md-3 form_total">
|
||||||
<%= f.label :total_price %>
|
<strong>Total price</strong>
|
||||||
<div class="input-group">
|
<div class="input-group">
|
||||||
<span class="input-group-addon">€</span>
|
<span class="input-group-addon">€</span>
|
||||||
<%= f.number_field :price, disabled: true, skip_label: true, step: :any, class: 'form-control big-form-field' %>
|
<%= content_tag :span, "", id: "order_price", class: "input-group-addon" %>
|
||||||
<span class="input-group-btn">
|
<span class="input-group-btn">
|
||||||
<%= f.submit "Order!", class: "btn btn-primary big-form-button", skip_wrapper: true %>
|
<%= f.submit "Order!", class: "btn btn-primary big-form-button", skip_wrapper: true %>
|
||||||
</span>
|
</span>
|
||||||
|
|
Loading…
Reference in a new issue