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

Merge pull request #211 from foodcoop-adam/group_order-cleanup

Browse source 
make order result calculation a bit cleaner
This commit is contained in:
wvengen 2013-12-17 06:29:15 -08:00
commit b26b124b0c
1 changed files with 23 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
app/models/group_order_article.rb
View file

@ -101,49 +101,51 @@ class GroupOrderArticle < ActiveRecord::Base
# See description of the ordering algorithm in the general application documentation for details. # See description of the ordering algorithm in the general application documentation for details.
def calculate_result def calculate_result
@calculate_result ||= begin @calculate_result ||= begin
quantity = tolerance = 0 quantity = tolerance = total_quantity = 0
stockit = order_article.article.is_a?(StockArticle)
# Get total # Get total
total = stockit ? order_article.article.quantity : order_article.units_to_order * order_article.price.unit_quantity if order_article.article.is_a?(StockArticle)
logger.debug("<#{order_article.article.name}>.unitsToOrder => items ordered: #{order_article.units_to_order} => #{total}") total = order_article.article.quantity
logger.debug "<#{order_article.article.name}> (stock) => #{total}"
else
total = order_article.units_to_order * order_article.price.unit_quantity
logger.debug "<#{order_article.article.name}> units_to_order #{order_article.units_to_order} => #{total}"
end
if (total > 0) if total > 0
# In total there are enough units ordered. Now check the individual result for the ordergroup (group_order). # In total there are enough units ordered. Now check the individual result for the ordergroup (group_order).
# #
# Get all GroupOrderArticleQuantities for this OrderArticle... # Get all GroupOrderArticleQuantities for this OrderArticle...
order_quantities = GroupOrderArticleQuantity.all( order_quantities = GroupOrderArticleQuantity.all(
:conditions => ["group_order_article_id IN (?)", order_article.group_order_article_ids], :order => 'created_on') :conditions => ["group_order_article_id IN (?)", order_article.group_order_article_ids], :order => 'created_on')
logger.debug("GroupOrderArticleQuantity records found: #{order_quantities.size}") logger.debug "GroupOrderArticleQuantity records found: #{order_quantities.size}"
# Determine quantities to be ordered... # Determine quantities to be ordered...
total_quantity = i = 0 order_quantities.each do |goaq|
while (i < order_quantities.size && total_quantity < total) q = [goaq.quantity, total - total_quantity].min
q = (order_quantities[i].quantity <= total - total_quantity ? order_quantities[i].quantity : total - total_quantity)
total_quantity += q total_quantity += q
if (order_quantities[i].group_order_article_id == self.id) if goaq.group_order_article_id == self.id
logger.debug("increasing quantity by #{q}") logger.debug "increasing quantity by #{q}"
quantity += q quantity += q
end end
i += 1 break if total_quantity >= total
end end
# Determine tolerance to be ordered... # Determine tolerance to be ordered...
if (total_quantity < total) if total_quantity < total
logger.debug("determining additional items to be ordered from tolerance") logger.debug "determining additional items to be ordered from tolerance"
i = 0 order_quantities.each do |goaq|
while (i < order_quantities.size && total_quantity < total) q = [goaq.tolerance, total - total_quantity].min
q = (order_quantities[i].tolerance <= total - total_quantity ? order_quantities[i].tolerance : total - total_quantity)
total_quantity += q total_quantity += q
if (order_quantities[i].group_order_article_id == self.id) if goaq.group_order_article_id == self.id
logger.debug("increasing tolerance by #{q}") logger.debug "increasing tolerance by #{q}"
tolerance += q tolerance += q
end end
i += 1 break if total_quantity >= total
end end
end end
logger.debug("determined quantity/tolerance/total: #{quantity} / #{tolerance} / #{quantity + tolerance}") logger.debug "determined quantity/tolerance/total: #{quantity} / #{tolerance} / #{quantity + tolerance}"
end end
{:quantity => quantity, :tolerance => tolerance, :total => quantity + tolerance} {:quantity => quantity, :tolerance => tolerance, :total => quantity + tolerance}