Merge branch 'master' into barcode

app/assets/stylesheets/overview.css.scss

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

app/views/orders/new.html.haml

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

app/views/orders/overview.html.haml

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

config/routes.rb

@@ -21,7 +21,7 @@ Rails.application.routes.draw do
   resources :users, only: [:show, :edit, :update] do
     resources :orders, only: [:new, :create, :destroy]
     member do
-      get 'quickpay'               => 'users#quickpay'
+     get 'quickpay'               => 'users#quickpay'
       get 'dagschotel/edit'        => 'users#edit_dagschotel', as: 'edit_dagschotel'
       get 'dagschotel/:product_id' => 'users#update_dagschotel', as: 'dagschotel'
     end