Merge pull request #141 from foodcoop-rostock/improve-delivery-workflow-further

Improve delivery workflow

app/models/delivery.rb

@@ -2,11 +2,15 @@ class Delivery < ActiveRecord::Base
 
   belongs_to :supplier
   has_one :invoice
-  has_many :stock_changes, :dependent => :destroy
+  has_many :stock_changes,
+    :dependent => :destroy,
+    :include => 'stock_article',
+    :order => 'articles.name ASC'
 
   scope :recent, :order => 'created_at DESC', :limit => 10
 
-  validates_presence_of :supplier_id
+  validates_presence_of :supplier_id, :delivered_on
+  validate :stock_articles_must_be_unique
 
   accepts_nested_attributes_for :stock_changes, :allow_destroy => :true
 
@@ -15,6 +19,18 @@ class Delivery < ActiveRecord::Base
       stock_changes.build(attributes) unless attributes[:quantity].to_i == 0
     end
   end
+
+  def includes_article?(article)
+    self.stock_changes.map{|stock_change| stock_change.stock_article.id}.include? article.id
+  end
+  
+  protected
+  
+  def stock_articles_must_be_unique
+    unless stock_changes.reject{|sc| sc.marked_for_destruction?}.map {|sc| sc.stock_article.id}.uniq!.nil?
+      errors.add(:base, I18n.t('model.delivery.each_stock_article_must_be_unique'))
+    end
+  end
   
 end