e9_crm 0.1.29 → 0.1.30

data/app/controllers/e9_crm/contacts_controller.rb

@@ -16,6 +16,7 @@ class E9Crm::ContactsController < E9Crm::ResourcesController
   has_scope :search, :by_title, :by_company, :only => :index
   has_scope :tagged, :only => :index, :type => :array
   has_scope :by_company, :as => :company, :only => :index
+  has_scope :bounced_primary_emails, :as => :bounced, :type => :boolean
 
   # record attributes templates js
   #caches_action :templates

data/app/models/contact.rb

@@ -152,6 +152,7 @@ class Contact < ActiveRecord::Base
   scope :contacts, lambda { where(:status => Status::Contact) }
   scope :ordered, lambda { order(arel_table[:first_name].asc) }
 
+  scope :bounced_primary_emails, lambda { joins(:users).merge(User.primary.has_bounced) }
   scope :ok_to_email, lambda { where(:ok_to_email => true) }
   scope :by_title, lambda {|val| where(:title => val) }
   scope :by_company, lambda {|val| where(:company_id => val) }

data/app/views/e9_crm/contacts/_sidebar_search_form.html.haml

@@ -11,6 +11,12 @@
     %select{:name => 'company', :id => 'contact_company_select'}
       = company_select_options
 
+  = form_tag(resource_class, :method => :get, :class => 'scope-selects field') do
+    = label_tag 'bounced_select', User.human_attribute_name(:has_bounced)
+    %select{:name => 'bounced', :id => 'bounced_select'}
+      %option{:value => nil} No
+      %option{:value => '1'} Yes
+
   .field#contact_tag_list
     %label{:for => 'contact_tag_autocomplete'} Tags
     %input#contact_tag_autocomplete.list{:type => 'text', 'data-iname' => 'contact', 'data-field' => '[tagged]', :placeholder => t(:tag_search_placeholder)}

data/app/views/record_attributes/_user.html.haml

@@ -9,6 +9,10 @@
         = ff.label :primary_true, ff.object.class.human_attribute_name(:primary)
         = ff.radio_button :primary, true
 
+      - if f.object.has_bounced?
+        .field.radio.bad-email-flag
+          = User.human_attribute_name(:has_bounced_flag)
+
       = link_to_destroy_record_attribute
     
     - if f.object.persisted?
@@ -20,7 +24,6 @@
     - else
       .field.contact-email
         = f.text_field :email
-
   
     - if (types = User.email_types).present?
       .field

data/lib/e9_crm/version.rb

@@ -1,3 +1,3 @@
 module E9Crm
-  VERSION = '0.1.29'
+  VERSION = '0.1.30'
 end

data/lib/generators/e9_crm/templates/migration.rb

@@ -56,7 +56,7 @@ class CreateE9CrmStructure < ActiveRecord::Migration
       t.string :name
       t.references :campaign_group, :affiliate, :sales_person
       t.string :code, :limit => 32
-      t.integer :affiliate_fee, :sales_fee, :new_visits, :repeat_visits, :default => 0
+      t.integer :affiliate_fee, :sales_fee, :default => 0
       t.boolean :active, :default => true
       t.timestamps
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: e9_crm
 version: !ruby/object:Gem::Version
-  version: 0.1.29
+  version: 0.1.30
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-11 00:00:00.000000000Z
+date: 2011-10-12 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: money
-  requirement: &23190800 !ruby/object:Gem::Requirement
+  requirement: &13982540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *23190800
+  version_requirements: *13982540
 - !ruby/object:Gem::Dependency
   name: kramdown
-  requirement: &23189200 !ruby/object:Gem::Requirement
+  requirement: &13981380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,7 +32,7 @@ dependencies:
         version: '0.13'
   type: :runtime
   prerelease: false
-  version_requirements: *23189200
+  version_requirements: *13981380
 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