e9_crm 0.1.32 → 0.1.33

data/lib/e9_crm/system_emails_controller.rb

@@ -3,10 +3,13 @@ module E9Crm
     extend ActiveSupport::Concern
 
     included do
-      alias :send_test_email_without_crm :send_test_email
+      alias :prepare_email_args_without_crm :prepare_email_args
 
-      def send_test_email(email, current_user)
-        if email.try(:identifier) == Offer::Identifiers::CONVERSION_EMAIL
+      def prepare_email_args
+        args    = prepare_email_args_without_crm.dup
+        options = args.extract_options!
+
+        if resource.try(:identifier) == Offer::Identifiers::CONVERSION_EMAIL
           offer = Offer.new(:name => 'TEST OFFER')
           lead  = Deal.new(:offer      => offer,
                            :lead_email => 'LEAD_EMAIL@example.com',
@@ -14,13 +17,10 @@ module E9Crm
                            :info       => 'Some Info',
                            :created_at => DateTime.now)
 
-          Offer.conversion_email.send!(current_user, {
-            :offer => offer, 
-            :lead => lead
-          })
-        else
-          send_test_email_without_crm(email)
+          options.merge! :offer => offer, :lead => lead
         end
+
+        (args << options)
       end
     end
   end

data/lib/e9_crm/version.rb

@@ -1,3 +1,3 @@
 module E9Crm
-  VERSION = '0.1.32'
+  VERSION = '0.1.33'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: e9_crm
 version: !ruby/object:Gem::Version
-  version: 0.1.32
+  version: 0.1.33
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-10-12 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: money
-  requirement: &7080820 !ruby/object:Gem::Requirement
+  requirement: &15422100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *7080820
+  version_requirements: *15422100
 - !ruby/object:Gem::Dependency
   name: kramdown
-  requirement: &7076600 !ruby/object:Gem::Requirement
+  requirement: &15420860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,7 +32,7 @@ dependencies:
         version: '0.13'
   type: :runtime
   prerelease: false
-  version_requirements: *7076600
+  version_requirements: *15420860
 description: ! "*NOTE his plugin requires the private e9_base CMS gem and WILL NOT
   WORK without it.*\n\nCRM Plugin for the e9 CMS\n=========================\n\nTo
   use, add as a gem and install by running:\n\n    rails g e9_crm:install\n\nThen