diff --git a/app/models/group_order_article.rb b/app/models/group_order_article.rb index 11f3b447..36e67828 100644 --- a/app/models/group_order_article.rb +++ b/app/models/group_order_article.rb @@ -167,7 +167,7 @@ class GroupOrderArticle < ActiveRecord::Base # the minimum price depending on configuration. When the order is finished it # will be the value depending of the article results. def total_price(order_article = self.order_article) - unless order_article.order.finished? + if order_article.order.open? if FoodsoftConfig[:tolerance_is_costly] order_article.article.fc_price * (quantity + tolerance) else diff --git a/db/migrate/20130702113610_update_group_order_totals.rb b/db/migrate/20130702113610_update_group_order_totals.rb new file mode 100644 index 00000000..4e45749f --- /dev/null +++ b/db/migrate/20130702113610_update_group_order_totals.rb @@ -0,0 +1,12 @@ +class UpdateGroupOrderTotals < ActiveRecord::Migration + def self.up + # The group_order total was updated to the total ordered amount instead of + # the amount received. Now this is fixed, the totals need to be updated. + GroupOrder.all.each do |go| + go.order.closed? and go.update_price! + end + end + + def self.down + end +end diff --git a/db/schema.rb b/db/schema.rb index 188ea83b..59f35c66 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,7 @@ # # It's strongly recommended to check this file into your version control system. -ActiveRecord::Schema.define(:version => 20121230142516) do +ActiveRecord::Schema.define(:version => 20130715233410) do create_table "article_categories", :force => true do |t| t.string "name", :default => "", :null => false