Removed acts_as_paranoid. Implemented own version.

app/models/article.rb

@@ -1,16 +1,16 @@
 # encoding: utf-8
 class Article < ActiveRecord::Base
-  acts_as_paranoid  # Avoid deleting the article for consistency of order-results
   extend ActiveSupport::Memoizable    # Ability to cache method results. Use memoize :expensive_method
 
   # Replace numeric seperator with database format
   localize_input_of :price, :tax, :deposit
 
   # Associations
-  belongs_to :supplier, :with_deleted => true
+  belongs_to :supplier
   belongs_to :article_category
   has_many :article_prices, :order => "created_at DESC"
 
+  scope :undeleted, -> { where(deleted_at: nil) }
   scope :available, :conditions => {:availability => true}
   scope :not_in_stock, :conditions => {:type => nil}
 
@@ -136,6 +136,15 @@ class Article < ActiveRecord::Base
     end
   end
 
+  def deleted?
+    deleted_at.present?
+  end
+
+  def mark_as_deleted
+    check_article_in_use
+    update_column :deleted_at, Time.now
+  end
+
   protected
   
   # Checks if the article is in use before it will deleted

app/models/article_price.rb

@@ -1,6 +1,6 @@
 class ArticlePrice < ActiveRecord::Base
 
-  belongs_to :article, :with_deleted => true
+  belongs_to :article
   has_many :order_articles
 
   validates_presence_of :price, :tax, :deposit, :unit_quantity

app/models/delivery.rb

@@ -1,6 +1,6 @@
 class Delivery < ActiveRecord::Base
 
-  belongs_to :supplier, :with_deleted => true
+  belongs_to :supplier
   has_one :invoice
   has_many :stock_changes, :dependent => :destroy
 

app/models/financial_transaction.rb

@@ -1,7 +1,7 @@
 # financial transactions are the foodcoop internal financial transactions
 # only ordergroups have an account  balance and are happy to transfer money
 class FinancialTransaction < ActiveRecord::Base
-  belongs_to :ordergroup, :with_deleted => true
+  belongs_to :ordergroup
   belongs_to :user
   
   validates_presence_of :amount, :note, :user_id, :ordergroup_id

app/models/group.rb

@@ -1,13 +1,15 @@
 # Groups organize the User. 
 # A Member gets the roles from the Group
 class Group < ActiveRecord::Base
-  has_many :memberships, :dependent => :destroy
+  has_many :memberships
   has_many :users, :through => :memberships
 
   validates :name, :presence => true, :length => {:in => 1..25}
   
   attr_reader :user_tokens
-  
+
+  scope :undeleted, -> { where(deleted_at: nil) }
+
   # Returns true if the given user if is an member of this group.
   def member?(user)
     memberships.find_by_user_id(user.id)
@@ -21,7 +23,19 @@ class Group < ActiveRecord::Base
   def user_tokens=(ids)
     self.user_ids = ids.split(",")
   end
-  
+
+  def deleted?
+    deleted_at.present?
+  end
+
+  def mark_as_deleted
+    # TODO: Checks for participating in not closed orders
+    transaction do
+      memberships.destroy_all
+      # TODO: What should happen to users?
+      update_column :deleted_at, Time.now
+    end
+  end
 end
 
 

app/models/group_order.rb

@@ -4,7 +4,7 @@ class GroupOrder < ActiveRecord::Base
   attr_accessor :group_order_articles_attributes
 
   belongs_to :order
-  belongs_to :ordergroup, :with_deleted => true
+  belongs_to :ordergroup
   has_many :group_order_articles, :dependent => :destroy
   has_many :order_articles, :through => :group_order_articles
   belongs_to :updated_by, :class_name => "User", :foreign_key => "updated_by_user_id"

app/models/invoice.rb

@@ -1,6 +1,6 @@
 class Invoice < ActiveRecord::Base
 
-  belongs_to :supplier, :with_deleted => true
+  belongs_to :supplier
   belongs_to :delivery
   belongs_to :order
 

app/models/order.rb

@@ -10,7 +10,7 @@ class Order < ActiveRecord::Base
   has_one :invoice
   has_many :comments, :class_name => "OrderComment", :order => "created_at"
   has_many :stock_changes
-  belongs_to :supplier, :with_deleted => true
+  belongs_to :supplier
   belongs_to :updated_by, :class_name => 'User', :foreign_key => 'updated_by_user_id'
   belongs_to :created_by, :class_name => 'User', :foreign_key => 'created_by_user_id'
 

app/models/order_article.rb

@@ -4,7 +4,7 @@ class OrderArticle < ActiveRecord::Base
   attr_reader :update_current_price
 
   belongs_to :order
-  belongs_to :article, :with_deleted => true
+  belongs_to :article
   belongs_to :article_price
   has_many :group_order_articles, :dependent => :destroy
 

app/models/ordergroup.rb

@@ -8,7 +8,6 @@ class Ordergroup < Group
 
   APPLE_MONTH_AGO = 6                 # How many month back we will count tasks and orders sum
 
-  acts_as_paranoid                    # Avoid deleting the ordergroup for consistency of order-results
   serialize :stats
 
   has_many :financial_transactions
@@ -110,7 +109,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
+    group = Ordergroup.where('groups.id != ? AND groups.name = ?', id, name).first
     if group.present?
       message = group.deleted? ? :taken_with_deleted : :taken
       errors.add :name, message

app/models/stock_article.rb

@@ -1,10 +1,9 @@
 # encoding: utf-8
 class StockArticle < Article
-  acts_as_paranoid
-  
+
   has_many :stock_changes
 
-  scope :available, :conditions => "quantity > 0"
+  scope :available, -> { undeleted.where'quantity > 0' }
 
   before_destroy :check_quantity
 
@@ -23,6 +22,11 @@ class StockArticle < Article
     available.collect { |a| a.quantity * a.gross_price }.sum
   end
 
+  def mark_as_deleted
+    check_quantity
+    super
+  end
+
   protected
 
   def check_quantity

app/models/stock_change.rb

@@ -1,7 +1,7 @@
 class StockChange < ActiveRecord::Base
   belongs_to :delivery
   belongs_to :order
-  belongs_to :stock_article, with_deleted: true
+  belongs_to :stock_article
 
   validates_presence_of :stock_article_id, :quantity
   validates_numericality_of :quantity

app/models/supplier.rb

@@ -1,7 +1,7 @@
+# encoding: utf-8
 class Supplier < ActiveRecord::Base
-  acts_as_paranoid  # Avoid deleting the supplier for consistency of order-results
 
-  has_many :articles, :dependent => :destroy, :conditions => {:type => nil},
+  has_many :articles, :conditions => {:type => nil},
     :include => [:article_category], :order => 'article_categories.name, articles.name'
   has_many :stock_articles, :include => [:article_category], :order => 'article_categories.name, articles.name'
   has_many :orders
@@ -20,13 +20,15 @@ class Supplier < ActiveRecord::Base
   validates_length_of :address, :in => 8..50
   validate :uniqueness_of_name
 
+  scope :undeleted, -> { where(deleted_at: nil) }
+
   # sync all articles with the external database
   # returns an array with articles(and prices), which should be updated (to use in a form)
   # also returns an array with outlisted_articles, which should be deleted
   def sync_all
     updated_articles = Array.new
     outlisted_articles = Array.new
-    for article in articles
+    for article in articles.undeleted
       # try to find the associated shared_article
       shared_article = article.shared_article
 
@@ -65,12 +67,23 @@ class Supplier < ActiveRecord::Base
     return [updated_articles, outlisted_articles]
   end
 
+  def deleted?
+    deleted_at.present?
+  end
+
+  def mark_as_deleted
+    transaction do
+      update_column :deleted_at, Time.now
+      articles.each(&:mark_as_deleted)
+    end
+  end
+
   protected
 
   # Make sure, the name is uniq, add usefull message if uniq group is already deleted
   def uniqueness_of_name
     id = new_record? ? '' : self.id
-    supplier = Supplier.with_deleted.where('suppliers.id != ? AND suppliers.name = ?', id, name).first
+    supplier = Supplier.where('suppliers.id != ? AND suppliers.name = ?', id, name).first
     if supplier.present?
       message = supplier.deleted? ? :taken_with_deleted : :taken
       errors.add :name, message