Merge branch master into i18n

app/models/order_article.rb

@@ -148,7 +148,10 @@ class OrderArticle < ActiveRecord::Base
   end
 
   def update_ordergroup_prices
-    group_order_articles.each { |goa| goa.group_order.update_price! }
+    # updates prices of ALL ordergroups - these are actually too many
+    # in case of performance issues, update only ordergroups, which ordered this article
+    # CAUTION: in after_destroy callback related records (e.g. group_order_articles) are already non-existent
+    order.group_orders.each { |go| go.update_price! }
   end
 
 end

app/models/ordergroup.rb

@@ -108,17 +108,7 @@ class Ordergroup < Group
 
   # Make sure, the name is uniq, add usefull message if uniq group is already deleted
   def uniqueness_of_name
-    id = new_record? ? '' : self.id
-    group = Ordergroup.with_deleted.where('groups.id != ? AND groups.name = ?', id, name).first
-    if group.present?
-      message = group.deleted? ? :taken_with_deleted : :taken
-      errors.add :name, message
-    end
-  end
-
-  # Make sure, the name is uniq, add usefull message if uniq group is already deleted
-  def uniqueness_of_name
-    id = new_record? ? '' : self.id
+    id = new_record? ? nil : self.id
     group = Ordergroup.where('groups.id != ? AND groups.name = ?', id, name).first
     if group.present?
       message = group.deleted? ? :taken_with_deleted : :taken

app/models/shared_supplier.rb

@@ -7,6 +7,12 @@ class SharedSupplier < ActiveRecord::Base
 
   has_one :supplier
   has_many :shared_articles, :foreign_key => :supplier_id
-  
+
+  # These set of attributes are used to autofill attributes of new supplier,
+  # when created by import from shared supplier feature.
+  def autofill_attributes
+    whitelist = %w(name address phone fax email url delivery_days note)
+    attributes.select { |k,_v| whitelist.include?(k) }
+  end
 end
 

app/models/supplier.rb

@@ -82,7 +82,7 @@ class Supplier < ActiveRecord::Base
 
   # Make sure, the name is uniq, add usefull message if uniq group is already deleted
   def uniqueness_of_name
-    id = new_record? ? '' : self.id
+    id = new_record? ? nil : self.id
     supplier = Supplier.where('suppliers.id != ? AND suppliers.name = ?', id, name).first
     if supplier.present?
       message = supplier.deleted? ? :taken_with_deleted : :taken