Merge pull request #103 from ZeusWPI/letterlijk-1-lijn
Letterlijk 1 lijn
This commit is contained in:
commit
fb2d24e0fe
3 changed files with 2 additions and 3 deletions
|
@ -14,7 +14,6 @@ class OrderItem < ActiveRecord::Base
|
||||||
|
|
||||||
validates :product, presence: true
|
validates :product, presence: true
|
||||||
validates :count, presence: true, numericality: { only_integer: true,
|
validates :count, presence: true, numericality: { only_integer: true,
|
||||||
less_than_or_equal_to: ->(oi) { oi.product.try(:stock) || 100 },
|
|
||||||
greater_than_or_equal_to: 0 }
|
greater_than_or_equal_to: 0 }
|
||||||
|
|
||||||
before_destroy :put_back_in_stock!
|
before_destroy :put_back_in_stock!
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
.row
|
.row
|
||||||
.col-md-8.col-md-offset-2
|
.col-md-8.col-md-offset-2
|
||||||
%table.table.table-striped
|
%table.table.table-striped.table-responsive
|
||||||
%tr
|
%tr
|
||||||
%th
|
%th
|
||||||
%th Barcode
|
%th Barcode
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
!!!
|
!!!
|
||||||
%html
|
%html
|
||||||
%head
|
%head
|
||||||
%meta{content: "text/html; charset=UTF-8", "http-equiv" => "Content-Type"}/
|
%meta{:name => "viewport", :content => "width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no"}
|
||||||
%title Tap - Zeus WPIs drink ordering system
|
%title Tap - Zeus WPIs drink ordering system
|
||||||
= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track' => true
|
= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track' => true
|
||||||
= javascript_include_tag 'application', 'data-turbolinks-track' => true
|
= javascript_include_tag 'application', 'data-turbolinks-track' => true
|
||||||
|
|
Loading…
Reference in a new issue