re-add pictures
This commit is contained in:
parent
7bbf93741b
commit
78a0ae15bf
|
@ -25,7 +25,7 @@ class Product < ActiveRecord::Base
|
||||||
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, 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
|
validates_attachment :avatar, presence: true
|
||||||
|
|
||||||
def price
|
def price
|
||||||
self.price_cents / 100.0
|
self.price_cents / 100.0
|
||||||
|
|
|
@ -31,7 +31,7 @@ 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, default_url: "http://lorempixel.com/70/70/"
|
has_attached_file :avatar, styles: { large: "190x190>", 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
|
||||||
|
@ -41,7 +41,7 @@ class User < ActiveRecord::Base
|
||||||
validates :name, presence: true
|
validates :name, presence: true
|
||||||
validates :last_name, presence: true
|
validates :last_name, presence: true
|
||||||
validates_attachment :avatar, 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
|
validates_attachment :avatar, presence: true
|
||||||
|
|
||||||
scope :members, -> { where koelkast: false }
|
scope :members, -> { where koelkast: false }
|
||||||
|
|
||||||
|
|
|
@ -5,6 +5,6 @@
|
||||||
<% end %>
|
<% end %>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
|
||||||
<%= link_to image_tag(user.avatar , class: "img-circle avatar"), new_user_order_path(user) %>
|
<%= link_to image_tag(user.avatar(:large) , class: "img-circle avatar"), new_user_order_path(user) %>
|
||||||
<%= link_to user.name , new_user_order_path(user), class: "btn btn-info", style: get_color_style(user) %>
|
<%= link_to user.name , new_user_order_path(user), class: "btn btn-info", style: get_color_style(user) %>
|
||||||
</div>
|
</div>
|
||||||
|
|
26
db/seeds.rb
26
db/seeds.rb
|
@ -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,34 +41,34 @@ 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',
|
||||||
name: 'K.',
|
name: 'K.',
|
||||||
last_name: 'Koelkast',
|
last_name: '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')
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue