Patch code to handle method name conflict with permanent_records; 'de…

…leted'

app/models/mailboxer/receipt.rb

@@ -25,7 +25,17 @@ class Mailboxer::Receipt < ActiveRecord::Base
   scope :inbox, lambda { where(:mailbox_type => "inbox") }
   scope :trash, lambda { where(:trashed => true, :deleted => false) }
   scope :not_trash, lambda { where(:trashed => false) }
-  scope :deleted, lambda { where(:deleted => true) }
+
+  #TODO  Patched Victor Christensen at 2:40 PM on 6/11/16
+  # patched line below to deal with a conflict with permanent_records gem; method with same name
+  # scope :deleted, lambda { where(:deleted => true) }
+  if defined? deleted
+    scope :mb_deleted, lambda { where(:deleted => true) }
+  else
+    scope :deleted, lambda { where(:deleted => true) }
+  end
+
+
   scope :not_deleted, lambda { where(:deleted => false) }
   scope :is_read, lambda { where(:is_read => true) }
   scope :is_unread, lambda { where(:is_read => false) }