Foodsoft/foodsoft
1
1
Fork 0
Code Issues 36 Pull requests 5 Projects 1 Releases Wiki Activity

Fixed multi coop routing and changed config accessors.

Browse source
This commit is contained in:
benni 2012-08-24 19:52:38 +02:00
parent 2860a3ca44
commit ec2e761e7f
28 changed files with 124 additions and 88 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/models/article.rb
View file

@ -33,7 +33,7 @@ class Article < ActiveRecord::Base
# The price for the foodcoop-member.
def fc_price
(gross_price * (Foodsoft.config[:price_markup] / 100 + 1)).round(2)
(gross_price * (FoodsoftConfig[:price_markup] / 100 + 1)).round(2)
end
# Returns true if article has been updated at least 2 days ago
@ -120,8 +120,8 @@ class Article < ActiveRecord::Base
false
end
else # get factors for fc and supplier
fc_unit_factor = Foodsoft.config[:units][self.unit]
supplier_unit_factor = Foodsoft.config[:units][self.shared_article.unit]
fc_unit_factor = FoodsoftConfig[:units][self.unit]
supplier_unit_factor = FoodsoftConfig[:units][self.shared_article.unit]
if fc_unit_factor and supplier_unit_factor
convertion_factor = fc_unit_factor / supplier_unit_factor
new_price = BigDecimal((convertion_factor * shared_article.price).to_s).round(2)

2
app/models/article_price.rb
View file

@ -27,7 +27,7 @@ class ArticlePrice < ActiveRecord::Base
# The price for the foodcoop-member.
def fc_price
(gross_price * (Foodsoft.config[:price_markup] / 100 + 1)).round(2)
(gross_price * (FoodsoftConfig[:price_markup] / 100 + 1)).round(2)
end
end

2
app/models/group_order_article.rb
View file

@ -168,7 +168,7 @@ class GroupOrderArticle < ActiveRecord::Base
# will be the value depending of the article results.
def total_price
unless order_article.order.finished?
if Foodsoft.config[:tolerance_is_costly]
if FoodsoftConfig[:tolerance_is_costly]
order_article.article.fc_price * (quantity + tolerance)
else
order_article.article.fc_price * quantity

2
app/models/shared_article.rb
View file

@ -1,7 +1,7 @@
class SharedArticle < ActiveRecord::Base
# connect to database from sharedLists-Application
SharedArticle.establish_connection(Foodsoft.config[:shared_lists])
SharedArticle.establish_connection(FoodsoftConfig[:shared_lists])
# set correct table_name in external DB
set_table_name :articles

2
app/models/shared_supplier.rb
View file

@ -1,7 +1,7 @@
class SharedSupplier < ActiveRecord::Base
# connect to database from sharedLists-Application
SharedSupplier.establish_connection(Foodsoft.config[:shared_lists])
SharedSupplier.establish_connection(FoodsoftConfig[:shared_lists])
# set correct table_name in external DB
set_table_name :suppliers