midgard/tap
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'master' into barcode

Browse source
This commit is contained in:
benji 2015-09-21 19:07:03 +02:00
commit 046b2c382c
4 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/assets/stylesheets/overview.css.scss
View file

@ -19,3 +19,8 @@
width: 150px; width: 150px;
} }
} }
.warning {
border: 2px solid;
margin-bottom: 20px;
}

1
app/views/orders/new.html.haml
View file

@ -40,4 +40,3 @@
%td.total_price.euro %td.total_price.euro
= f.submit "Order!", class: "btn btn-primary form-control" = f.submit "Order!", class: "btn btn-primary form-control"
= render 'products_modal' = render 'products_modal'
- p @order.errors

2
app/views/orders/overview.html.haml
View file

@ -1,2 +1,4 @@
.warning.center
%h1 TESTFASE | GELIEVE STREEPJES TE BLIJVEN ZETTEN | TESTFASE
.row .row
= render @users = render @users