Merge branch 'master' into barcode
This commit is contained in:
commit
046b2c382c
4 changed files with 8 additions and 2 deletions
|
@ -19,3 +19,8 @@
|
||||||
width: 150px;
|
width: 150px;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.warning {
|
||||||
|
border: 2px solid;
|
||||||
|
margin-bottom: 20px;
|
||||||
|
}
|
||||||
|
|
|
@ -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
|
|
||||||
|
|
|
@ -1,2 +1,4 @@
|
||||||
|
.warning.center
|
||||||
|
%h1 TESTFASE | GELIEVE STREEPJES TE BLIJVEN ZETTEN | TESTFASE
|
||||||
.row
|
.row
|
||||||
= render @users
|
= render @users
|
||||||
|
|
|
@ -21,7 +21,7 @@ Rails.application.routes.draw do
|
||||||
resources :users, only: [:show, :edit, :update] do
|
resources :users, only: [:show, :edit, :update] do
|
||||||
resources :orders, only: [:new, :create, :destroy]
|
resources :orders, only: [:new, :create, :destroy]
|
||||||
member do
|
member do
|
||||||
get 'quickpay' => 'users#quickpay'
|
get 'quickpay' => 'users#quickpay'
|
||||||
get 'dagschotel/edit' => 'users#edit_dagschotel', as: 'edit_dagschotel'
|
get 'dagschotel/edit' => 'users#edit_dagschotel', as: 'edit_dagschotel'
|
||||||
get 'dagschotel/:product_id' => 'users#update_dagschotel', as: 'dagschotel'
|
get 'dagschotel/:product_id' => 'users#update_dagschotel', as: 'dagschotel'
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in a new issue