Foodsoft/foodsoft
1
1
Fork 0
Code Issues 36 Pull requests 5 Projects 1 Releases Wiki Activity

group order fix dancing quantity buttons

Browse source
This commit is contained in:
Philipp Rothmann 2023-02-22 14:29:46 +01:00
parent 9dca57dcef
commit c3761095e7
2 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
app/views/group_orders/_form.html.haml
View file

@ -25,9 +25,12 @@
.alert.alert-error#balance-alert{style: ('display:none')} .alert.alert-error#balance-alert{style: ('display:none')}
=t 'group_orders.errors.balance_alert' =t 'group_orders.errors.balance_alert'
.row-fluid .row-fluid
.well.span3 .span2
= render 'switch_order', current_order: @order .well
.well.span8 = render 'switch_order', current_order: @order
.well
= render 'explanations'
.well.span9
%h2= @order.name %h2= @order.name
%a(href='#tab1' data-toggle="collapse") %a(href='#tab1' data-toggle="collapse")
=t '.details' =t '.details'
@ -82,10 +85,11 @@
%span{id: "missing_units_#{order_article.id}"}= @ordering_data[:order_articles][order_article.id][:missing_units] %span{id: "missing_units_#{order_article.id}"}= @ordering_data[:order_articles][order_article.id][:missing_units]
%td.quantity %td.quantity
%input{id: "q_#{order_article.id}", name: "group_order[group_order_articles_attributes][#{order_article.id}][quantity]", type: "hidden", value: @ordering_data[:order_articles][order_article.id][:quantity], 'data-min' => (@ordering_data[:order_articles][order_article.id][:quantity] if @order.boxfill?), 'data-max' => (@ordering_data[:order_articles][order_article.id][:quantity]+@ordering_data[:order_articles][order_article.id][:missing_units] if @order.boxfill?)}/ .outer{style: "diyplay: inline-block; float: left; width: 50px;"}
%span.used{id: "q_used_#{order_article.id}"}= @ordering_data[:order_articles][order_article.id][:used_quantity] %input{id: "q_#{order_article.id}", name: "group_order[group_order_articles_attributes][#{order_article.id}][quantity]", type: "hidden", value: @ordering_data[:order_articles][order_article.id][:quantity], 'data-min' => (@ordering_data[:order_articles][order_article.id][:quantity] if @order.boxfill?), 'data-max' => (@ordering_data[:order_articles][order_article.id][:quantity]+@ordering_data[:order_articles][order_article.id][:missing_units] if @order.boxfill?)}/
+ %span.used{id: "q_used_#{order_article.id}"}= @ordering_data[:order_articles][order_article.id][:used_quantity]
%span.unused{id: "q_unused_#{order_article.id}"}= @ordering_data[:order_articles][order_article.id][:quantity] - @ordering_data[:order_articles][order_article.id][:used_quantity] +
%span.unused{id: "q_unused_#{order_article.id}"}= @ordering_data[:order_articles][order_article.id][:quantity] - @ordering_data[:order_articles][order_article.id][:used_quantity]
.btn-group .btn-group
%a.btn.btn-ordering{'data-decrease_quantity' => order_article.id} %a.btn.btn-ordering{'data-decrease_quantity' => order_article.id}
%i.icon-minus %i.icon-minus

4
app/views/group_orders/show.html.haml
View file

@ -8,9 +8,9 @@
.row-fluid .row-fluid
.well.span3 .well.span2
= render 'switch_order', current_order: @order = render 'switch_order', current_order: @order
.well.span8 .well.span9
%h2= t '.articles.title' %h2= t '.articles.title'
=render 'order_details' =render 'order_details'