add suppliers/lists ui styling and security fixes

This commit is contained in:
2012-09-07 15:19:02 +02:00
parent 2be6c0ee03
commit 76424f972f
33 changed files with 773 additions and 22 deletions
+19
View File
@@ -7,6 +7,7 @@ class List
property :needs_payment, type: :boolean, default: false
property :closed_at, type: Time
property :join_requests, type: Array, default: []
property :price, type: Float
has_many :orders, dependent: :destroy
belongs_to :table
@@ -50,13 +51,31 @@ class List
end
end
def self.for_user_created_at(user, range, options = {})
database.view(for_user_view({startkey: [user.id, range.last], endkey: [user.id, range.first], include_docs: true, reduce: false, descending: true}.merge(options)))
end
def close!
orders.include_relation(:product_orders)
set_price
orders.map(&:close!)
self.state = 'closed'
self.closed_at = Time.now
save
end
def set_price
list_total = 0.0
for order in orders
order_total = 0.0
for product_order in order.product_orders
order_total += (product_order.amount * product_order.price).round(2)
end
list_total += order_total.round(2)
end
self.price = list_total.round(2)
end
def table_number
@table_number ||= table.number
end
+2 -1
View File
@@ -5,6 +5,7 @@ class Supplier
property :name
property :open, type: :boolean, default: false
property :night_offset, type: Float
#WIFI
property :offer_wifi
@@ -16,6 +17,7 @@ class Supplier
has_many :products, dependent: :destroy
has_many :product_categories, dependent: :destroy
has_many :tables, dependent: :destroy
has_many :lists, dependent: :destroy
#has_many :lists, through: :tables
has_many :orders
has_many :sections, dependent: :destroy
@@ -63,7 +65,6 @@ class Supplier
self.open = false
save
end
private
def add_section_on_create