e9_crm 0.1.1 → 0.1.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (60) hide show
  1. data/app/controllers/e9_crm/advertising_campaigns_controller.rb +1 -0
  2. data/app/controllers/e9_crm/affiliate_campaigns_controller.rb +1 -0
  3. data/app/controllers/e9_crm/campaign_groups_controller.rb +8 -0
  4. data/app/controllers/e9_crm/campaigns_controller.rb +38 -1
  5. data/app/controllers/e9_crm/companies_controller.rb +1 -0
  6. data/app/controllers/e9_crm/contact_emails_controller.rb +3 -7
  7. data/app/controllers/e9_crm/contacts_controller.rb +6 -4
  8. data/app/controllers/e9_crm/dated_costs_controller.rb +1 -0
  9. data/app/controllers/e9_crm/deals_controller.rb +66 -2
  10. data/app/controllers/e9_crm/email_campaigns_controller.rb +1 -0
  11. data/app/controllers/e9_crm/email_templates.controller.rb +1 -0
  12. data/app/controllers/e9_crm/offers_controller.rb +1 -0
  13. data/app/controllers/e9_crm/page_views_controller.rb +1 -0
  14. data/app/controllers/e9_crm/resources_controller.rb +2 -1
  15. data/app/controllers/e9_crm/sales_campaigns_controller.rb +1 -0
  16. data/app/helpers/e9_crm/campaign_groups_helper.rb +8 -0
  17. data/app/helpers/e9_crm/campaigns_helper.rb +42 -11
  18. data/app/helpers/e9_crm/contacts_helper.rb +1 -1
  19. data/app/helpers/e9_crm/deals_helper.rb +25 -0
  20. data/app/models/advertising_campaign.rb +0 -1
  21. data/app/models/campaign.rb +40 -8
  22. data/app/models/campaign_group.rb +6 -0
  23. data/app/models/contact.rb +22 -0
  24. data/app/models/contact_email.rb +29 -18
  25. data/app/models/deal.rb +93 -14
  26. data/app/models/no_campaign.rb +5 -0
  27. data/app/models/page_view.rb +13 -44
  28. data/app/models/tracking_cookie.rb +0 -6
  29. data/app/observers/deal_observer.rb +3 -0
  30. data/app/views/e9_crm/advertising_campaigns/_form_inner.html.haml +1 -0
  31. data/app/views/e9_crm/affiliate_campaigns/_form_inner.html.haml +10 -0
  32. data/app/views/e9_crm/campaign_groups/_footer.html.haml +0 -0
  33. data/app/views/e9_crm/campaign_groups/_header.html.haml +3 -0
  34. data/app/views/e9_crm/campaigns/_footer.html.haml +0 -0
  35. data/app/views/e9_crm/campaigns/_form_inner.html.haml +20 -4
  36. data/app/views/e9_crm/campaigns/_header.html.haml +16 -0
  37. data/app/views/e9_crm/campaigns/_reports_table.html.haml +31 -0
  38. data/app/views/e9_crm/campaigns/_table.html.haml +31 -0
  39. data/app/views/e9_crm/campaigns/reports.html.haml +13 -0
  40. data/app/views/e9_crm/contact_emails/_form_inner.html.haml +1 -1
  41. data/app/views/e9_crm/contacts/_header.html.haml +5 -4
  42. data/app/views/e9_crm/deals/_reports_table.html.haml +86 -0
  43. data/app/views/e9_crm/deals/reports.html.haml +19 -0
  44. data/app/views/e9_crm/deals/reports.js.erb +1 -0
  45. data/app/views/e9_crm/email_campaigns/_form_inner.html.haml +1 -0
  46. data/app/views/e9_crm/page_views/_table.html.haml +7 -7
  47. data/app/views/e9_crm/resources/_table.html.haml +1 -1
  48. data/app/views/e9_crm/sales_campaigns/_form_inner.html.haml +11 -0
  49. data/config/locales/e9.en.yml +11 -1
  50. data/config/locales/en.yml +16 -5
  51. data/config/routes.rb +15 -12
  52. data/e9_crm.gemspec +1 -1
  53. data/lib/e9_crm/rails_extensions.rb +7 -0
  54. data/lib/e9_crm/tracking_controller.rb +69 -52
  55. data/lib/e9_crm/version.rb +1 -1
  56. data/lib/generators/e9_crm/install_generator.rb +1 -1
  57. data/lib/generators/e9_crm/templates/{create_e9_crm_tables.rb → migration.rb} +6 -7
  58. metadata +20 -6
  59. data/app/controllers/e9_crm/record_attributes_controller.rb +0 -3
  60. data/app/controllers/e9_crm/reports_controller.rb +0 -2
@@ -1,3 +1,3 @@
1
1
  module E9Crm
2
- VERSION = '0.1.1'
2
+ VERSION = '0.1.4'
3
3
  end
@@ -17,7 +17,7 @@ module E9Crm
17
17
  end
18
18
 
19
19
  def generate_migrations
20
- migration_template 'create_e9_crm_tables.rb', 'db/migrate/create_e9_crm_tables.rb'
20
+ migration_template 'migration.rb', 'db/migrate/create_e9_crm_structure.rb'
21
21
  end
22
22
 
23
23
  def copy_initializer
@@ -1,4 +1,4 @@
1
- class CreateE9CrmTables < ActiveRecord::Migration
1
+ class CreateE9CrmStructure < ActiveRecord::Migration
2
2
  def self.up
3
3
  create_table :page_views, :force => true do |t|
4
4
  t.references :tracking_cookie, :campaign
@@ -21,11 +21,11 @@ class CreateE9CrmTables < ActiveRecord::Migration
21
21
  add_index 'tracking_cookies', 'user_id'
22
22
 
23
23
  create_table :contacts, :force => true do |t|
24
- t.string :type
25
24
  t.string :first_name
26
25
  t.string :last_name
27
26
  t.string :title
28
27
  t.string :avatar
28
+ t.string :status
29
29
  t.references :company
30
30
  t.timestamps
31
31
  end
@@ -54,7 +54,7 @@ class CreateE9CrmTables < ActiveRecord::Migration
54
54
  t.string :name
55
55
  t.references :campaign_group, :affiliate, :sales_person
56
56
  t.string :code, :limit => 32
57
- t.integer :affiliate_fee, :sales_fee, :default => 0
57
+ t.integer :affiliate_fee, :sales_fee, :new_visits, :repeat_visits, :default => 0
58
58
  t.boolean :active, :default => true
59
59
  t.timestamps
60
60
  end
@@ -69,8 +69,9 @@ class CreateE9CrmTables < ActiveRecord::Migration
69
69
  create_table :deals, :force => true do |t|
70
70
  t.string :type
71
71
  t.references :offer, :campaign, :tracking_cookie
72
- t.timestamp :created_at, :updated_at, :converted_at
72
+ t.timestamp :created_at, :updated_at, :converted_at, :closed_at
73
73
  t.string :status, :limit => 32
74
+ t.integer :value, :default => 0
74
75
  end
75
76
  add_index 'deals', 'offer_id'
76
77
  add_index 'deals', 'campaign_id'
@@ -80,12 +81,10 @@ class CreateE9CrmTables < ActiveRecord::Migration
80
81
  create_table :offers, :force => true do |t|
81
82
  t.string :type
82
83
  t.references :offer, :campaign, :tracking_cookie
83
- t.timestamp :created_at, :updated_at, :converted_at
84
+ t.timestamp :created_at, :updated_at, :converted_at, :closed_at
84
85
  t.string :status, :limit => 32
85
86
  end
86
87
 
87
-
88
-
89
88
  add_column :users, :contact_id, :integer rescue nil
90
89
  add_column :users, :options, :text, :limit => 1.kilobyte rescue nil
91
90
  end
metadata CHANGED
@@ -2,7 +2,7 @@
2
2
  name: e9_crm
3
3
  version: !ruby/object:Gem::Version
4
4
  prerelease:
5
- version: 0.1.1
5
+ version: 0.1.4
6
6
  platform: ruby
7
7
  authors:
8
8
  - Travis Cox
@@ -10,7 +10,7 @@ autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
12
 
13
- date: 2011-05-12 00:00:00 -04:00
13
+ date: 2011-05-16 00:00:00 -04:00
14
14
  default_executable:
15
15
  dependencies:
16
16
  - !ruby/object:Gem::Dependency
@@ -65,7 +65,7 @@ dependencies:
65
65
  requirements:
66
66
  - - ~>
67
67
  - !ruby/object:Gem::Version
68
- version: 0.0.11
68
+ version: 0.0.13
69
69
  type: :runtime
70
70
  version_requirements: *id005
71
71
  - !ruby/object:Gem::Dependency
@@ -152,11 +152,10 @@ files:
152
152
  - app/controllers/e9_crm/menu_options_controller.rb
153
153
  - app/controllers/e9_crm/offers_controller.rb
154
154
  - app/controllers/e9_crm/page_views_controller.rb
155
- - app/controllers/e9_crm/record_attributes_controller.rb
156
- - app/controllers/e9_crm/reports_controller.rb
157
155
  - app/controllers/e9_crm/resources_controller.rb
158
156
  - app/controllers/e9_crm/sales_campaigns_controller.rb
159
157
  - app/helpers/e9_crm/base_helper.rb
158
+ - app/helpers/e9_crm/campaign_groups_helper.rb
160
159
  - app/helpers/e9_crm/campaigns_helper.rb
161
160
  - app/helpers/e9_crm/contact_merges_helper.rb
162
161
  - app/helpers/e9_crm/contacts_helper.rb
@@ -178,6 +177,7 @@ files:
178
177
  - app/models/email_template.rb
179
178
  - app/models/instant_messaging_handle_attribute.rb
180
179
  - app/models/menu_option.rb
180
+ - app/models/no_campaign.rb
181
181
  - app/models/offer.rb
182
182
  - app/models/page_view.rb
183
183
  - app/models/phone_number_attribute.rb
@@ -188,7 +188,16 @@ files:
188
188
  - app/models/website_attribute.rb
189
189
  - app/observers/deal_observer.rb
190
190
  - app/uploaders/file_uploader.rb
191
+ - app/views/e9_crm/advertising_campaigns/_form_inner.html.haml
192
+ - app/views/e9_crm/affiliate_campaigns/_form_inner.html.haml
193
+ - app/views/e9_crm/campaign_groups/_footer.html.haml
194
+ - app/views/e9_crm/campaign_groups/_header.html.haml
195
+ - app/views/e9_crm/campaigns/_footer.html.haml
191
196
  - app/views/e9_crm/campaigns/_form_inner.html.haml
197
+ - app/views/e9_crm/campaigns/_header.html.haml
198
+ - app/views/e9_crm/campaigns/_reports_table.html.haml
199
+ - app/views/e9_crm/campaigns/_table.html.haml
200
+ - app/views/e9_crm/campaigns/reports.html.haml
192
201
  - app/views/e9_crm/contact_emails/_form.html.haml
193
202
  - app/views/e9_crm/contact_emails/_form_inner.html.haml
194
203
  - app/views/e9_crm/contact_emails/destroy.js.erb
@@ -206,7 +215,11 @@ files:
206
215
  - app/views/e9_crm/contacts/templates.js.erb
207
216
  - app/views/e9_crm/deals/_form_inner.html.haml
208
217
  - app/views/e9_crm/deals/_header.html.haml
218
+ - app/views/e9_crm/deals/_reports_table.html.haml
209
219
  - app/views/e9_crm/deals/leads.html.haml
220
+ - app/views/e9_crm/deals/reports.html.haml
221
+ - app/views/e9_crm/deals/reports.js.erb
222
+ - app/views/e9_crm/email_campaigns/_form_inner.html.haml
210
223
  - app/views/e9_crm/email_templates/_form_inner.html.haml
211
224
  - app/views/e9_crm/menu_options/_form_inner.html.haml
212
225
  - app/views/e9_crm/menu_options/_header.html.haml
@@ -234,6 +247,7 @@ files:
234
247
  - app/views/e9_crm/resources/new.html.haml
235
248
  - app/views/e9_crm/resources/show.html.haml
236
249
  - app/views/e9_crm/resources/update.js.erb
250
+ - app/views/e9_crm/sales_campaigns/_form_inner.html.haml
237
251
  - config/initializers/inflections.rb
238
252
  - config/locales/e9.en.yml
239
253
  - config/locales/en.yml
@@ -245,9 +259,9 @@ files:
245
259
  - lib/e9_crm/tracking_controller.rb
246
260
  - lib/e9_crm/version.rb
247
261
  - lib/generators/e9_crm/install_generator.rb
248
- - lib/generators/e9_crm/templates/create_e9_crm_tables.rb
249
262
  - lib/generators/e9_crm/templates/initializer.rb
250
263
  - lib/generators/e9_crm/templates/javascript.js
264
+ - lib/generators/e9_crm/templates/migration.rb
251
265
  - test/functional/e9_crm/campaign_types_controller_test.rb
252
266
  - test/functional/home_controller_test.rb
253
267
  has_rdoc: true
@@ -1,3 +0,0 @@
1
- class E9Crm::RecordAttributesController < ApplicationController
2
- helper 'e9_crm/base'
3
- end
@@ -1,2 +0,0 @@
1
- class E9Crm::ReportsController < E9Crm::BaseController
2
- end