e9_crm 0.1.30 → 0.1.31
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.
- data/lib/e9_crm/controller.rb +4 -4
- data/lib/e9_crm/tracking_controller.rb +0 -2
- data/lib/e9_crm/version.rb +1 -1
- metadata +5 -5
data/lib/e9_crm/controller.rb
CHANGED
@@ -31,7 +31,7 @@ module E9Crm
|
|
31
31
|
#
|
32
32
|
def tracking_campaign
|
33
33
|
@_tracking_campaign ||= begin
|
34
|
-
tracking_cookie.code.present? && Campaign.find_by_code(tracking_cookie.code) || Campaign.default
|
34
|
+
tracking_cookie.code.present? && ::Campaign.find_by_code(tracking_cookie.code) || ::Campaign.default
|
35
35
|
end
|
36
36
|
end
|
37
37
|
|
@@ -54,7 +54,7 @@ module E9Crm
|
|
54
54
|
|
55
55
|
if hid = cookies[E9Crm.cookie_name]
|
56
56
|
E9Crm.log("Installed cookie found: hid(#{hid})")
|
57
|
-
@_tracking_cookie = TrackingCookie.find_by_hid(hid)
|
57
|
+
@_tracking_cookie = ::TrackingCookie.find_by_hid(hid)
|
58
58
|
|
59
59
|
unless @_tracking_cookie
|
60
60
|
# This should only happen in developemnt, as it means the cookie has been
|
@@ -82,7 +82,7 @@ module E9Crm
|
|
82
82
|
end
|
83
83
|
end
|
84
84
|
|
85
|
-
if code.present? && code != @_tracking_cookie.code && Campaign.find_by_code(code)
|
85
|
+
if code.present? && code != @_tracking_cookie.code && ::Campaign.find_by_code(code)
|
86
86
|
E9Crm.log "Code present and cookie code(#{@_tracking_cookie.code}) does not match (#{code}), changing..."
|
87
87
|
attrs[:code] = code
|
88
88
|
|
@@ -102,7 +102,7 @@ module E9Crm
|
|
102
102
|
@_tracking_cookie ||= begin
|
103
103
|
session[:new_visit] = true
|
104
104
|
|
105
|
-
TrackingCookie.create(:code => code, :user => current_user || _user_from_params).tap do |cookie|
|
105
|
+
::TrackingCookie.create(:code => code, :user => current_user || _user_from_params).tap do |cookie|
|
106
106
|
E9Crm.log "Installing new cookie (#{E9Crm.cookie_name} : #{cookie.hid})"
|
107
107
|
cookies.permanent[E9Crm.cookie_name] = cookie.hid
|
108
108
|
end
|
data/lib/e9_crm/version.rb
CHANGED
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: e9_crm
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.1.
|
4
|
+
version: 0.1.31
|
5
5
|
prerelease:
|
6
6
|
platform: ruby
|
7
7
|
authors:
|
@@ -13,7 +13,7 @@ date: 2011-10-12 00:00:00.000000000Z
|
|
13
13
|
dependencies:
|
14
14
|
- !ruby/object:Gem::Dependency
|
15
15
|
name: money
|
16
|
-
requirement: &
|
16
|
+
requirement: &10386060 !ruby/object:Gem::Requirement
|
17
17
|
none: false
|
18
18
|
requirements:
|
19
19
|
- - ! '>='
|
@@ -21,10 +21,10 @@ dependencies:
|
|
21
21
|
version: '0'
|
22
22
|
type: :runtime
|
23
23
|
prerelease: false
|
24
|
-
version_requirements: *
|
24
|
+
version_requirements: *10386060
|
25
25
|
- !ruby/object:Gem::Dependency
|
26
26
|
name: kramdown
|
27
|
-
requirement: &
|
27
|
+
requirement: &10385200 !ruby/object:Gem::Requirement
|
28
28
|
none: false
|
29
29
|
requirements:
|
30
30
|
- - ~>
|
@@ -32,7 +32,7 @@ dependencies:
|
|
32
32
|
version: '0.13'
|
33
33
|
type: :runtime
|
34
34
|
prerelease: false
|
35
|
-
version_requirements: *
|
35
|
+
version_requirements: *10385200
|
36
36
|
description: ! "*NOTE his plugin requires the private e9_base CMS gem and WILL NOT
|
37
37
|
WORK without it.*\n\nCRM Plugin for the e9 CMS\n=========================\n\nTo
|
38
38
|
use, add as a gem and install by running:\n\n rails g e9_crm:install\n\nThen
|