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

remove pictures required

Browse source
This commit is contained in:
benji 2015-02-10 13:04:35 +01:00
parent f37bc6acb0
commit f745de8153
3 changed files with 19 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/models/product.rb
View file

@ -17,14 +17,15 @@
class Product < ActiveRecord::Base class Product < ActiveRecord::Base
has_many :order_items has_many :order_items
has_attached_file :avatar, styles: { medium: "100x100>" }, default_style: :medium has_attached_file :avatar, styles: { medium: "100x100>" }, default_style: :medium, default_url: "http://lorempixel.com/70/70/"
enum category: %w(food beverages other) enum category: %w(food beverages other)
validates :name, presence: true validates :name, presence: true
validates :price_cents, numericality: { only_integer: true, greater_than_or_equal_to: 0 } validates :price_cents, numericality: { only_integer: true, greater_than_or_equal_to: 0 }
validates :stock, numericality: { only_integer: true, greater_than_or_equal_to: 0 } validates :stock, numericality: { only_integer: true, greater_than_or_equal_to: 0 }
validates_attachment :avatar, presence: true, content_type: { content_type: ["image/jpeg", "image/gif", "image/png"] } validates_attachment :avatar, content_type: { content_type: ["image/jpeg", "image/gif", "image/png"] }
# validates_attachment :avatar, presence: true
def price def price
self.price_cents / 100.0 self.price_cents / 100.0

5
app/models/user.rb
View file

@ -31,14 +31,15 @@ class User < ActiveRecord::Base
has_paper_trail only: [:balance, :admin, :orders_count, :koelkast] has_paper_trail only: [:balance, :admin, :orders_count, :koelkast]
has_attached_file :avatar, styles: { medium: "100x100>" }, default_style: :medium has_attached_file :avatar, styles: { medium: "100x100>" }, default_style: :medium, default_url: "http://lorempixel.com/70/70/"
has_many :orders, -> { includes :products } has_many :orders, -> { includes :products }
has_many :products, through: :orders has_many :products, through: :orders
belongs_to :dagschotel, class_name: 'Product' belongs_to :dagschotel, class_name: 'Product'
validates :nickname, presence: true, uniqueness: true validates :nickname, presence: true, uniqueness: true
validates_attachment :avatar, presence: true, content_type: { content_type: ["image/jpeg", "image/gif", "image/png"] } validates_attachment :avatar, content_type: { content_type: ["image/jpeg", "image/gif", "image/png"] }
# validates_attachment :avatar, presence: true
scope :members, -> { where koelkast: false } scope :members, -> { where koelkast: false }

26
db/seeds.rb
View file

@ -13,22 +13,22 @@ products = [
name: 'Fanta', name: 'Fanta',
price: 0.6, price: 0.6,
category: 'beverages', category: 'beverages',
stock: 25, stock: 25
avatar: File.new('public/seeds/products/fanta.jpg', 'r') # avatar: File.new('public/seeds/products/fanta.jpg', 'r')
}, },
{ {
name: 'Club Mate', name: 'Club Mate',
price: 1.2, price: 1.2,
category: 'beverages', category: 'beverages',
stock: 25, stock: 25
avatar: File.new('public/seeds/products/club_mate.jpg', 'r') # avatar: File.new('public/seeds/products/club_mate.jpg', 'r')
}, },
{ {
name: 'Kinder Bueno', name: 'Kinder Bueno',
price: 0.6, price: 0.6,
category: 'food', category: 'food',
stock: 15, stock: 15
avatar: File.new('public/seeds/products/bueno.jpg', 'r') # avatar: File.new('public/seeds/products/bueno.jpg', 'r')
} }
] ]
@ -41,32 +41,32 @@ users = [
nickname: 'admin', nickname: 'admin',
name: 'A.', name: 'A.',
last_name: 'Admin', last_name: 'Admin',
avatar: File.new('public/seeds/users/admin.jpg', 'r'), # avatar: File.new('public/seeds/users/admin.jpg', 'r'),
admin: true admin: true
}, },
{ {
nickname: 'koelkast', nickname: 'koelkast',
avatar: File.new('public/seeds/users/admin.jpg', 'r'), # avatar: File.new('public/seeds/users/admin.jpg', 'r'),
koelkast: true koelkast: true
}, },
{ {
nickname: 'benji', nickname: 'benji',
name: 'Benjamin', name: 'Benjamin',
last_name: 'Cousaert', last_name: 'Cousaert',
avatar: File.new('public/seeds/users/benji.jpg', 'r'), # avatar: File.new('public/seeds/users/benji.jpg', 'r'),
dagschotel: Product.first dagschotel: Product.first
}, },
{ {
nickname: 'don', nickname: 'don',
name: 'Lorin', name: 'Lorin',
last_name: 'Werthen', last_name: 'Werthen'
avatar: File.new('public/seeds/users/don.jpg', 'r') # avatar: File.new('public/seeds/users/don.jpg', 'r')
}, },
{ {
nickname: 'silox', nickname: 'silox',
name: 'Tom', name: 'Tom',
last_name: 'Naessens', last_name: 'Naessens'
avatar: File.new('public/seeds/users/silox.jpg', 'r') # avatar: File.new('public/seeds/users/silox.jpg', 'r')
} }
] ]