ish_models 0.0.33.212 → 0.0.33.214
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/ish/email_context.rb +11 -2
- data/lib/office/scheduled_email_action.rb +2 -2
- metadata +1 -1
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 77575baa0cc8d37ffcf019adfc0953fe9710a1806292d3d0838bd8fd4639894f
|
4
|
+
data.tar.gz: 9e23c48007b230e8c235dc10848f73354749fc301daa0946a706be63ddf64ae3
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 4fa4b33cd0ab4e36855bfb5306ab0ee4709fe2b612ca4348a9535034b42161ed93ec85d0fbff85b355a223647971c23cf32c1f51e3f0dd60fd0747b32cf5a7f4
|
7
|
+
data.tar.gz: aecf017b63ef06fb6f21087250005c9fa1b83ea14152c551a6c84b274741b49591a2bcb4a471361cd3329c7b9193b692dfb07ba9eab18012e077c0e40fc900d2
|
data/lib/ish/email_context.rb
CHANGED
@@ -11,13 +11,22 @@ class ::Ish::EmailContext
|
|
11
11
|
|
12
12
|
field :preview_str, type: :string
|
13
13
|
def preview_str
|
14
|
-
if self[:preview_str].presence
|
14
|
+
if self[:preview_str].presence
|
15
15
|
return self[:preview_str]
|
16
16
|
else
|
17
17
|
return tmpl.preview_str
|
18
18
|
end
|
19
19
|
end
|
20
20
|
|
21
|
+
field :body
|
22
|
+
def body
|
23
|
+
if self[:body].presence
|
24
|
+
return self[:body]
|
25
|
+
else
|
26
|
+
return tmpl.body
|
27
|
+
end
|
28
|
+
end
|
29
|
+
|
21
30
|
PAGE_PARAM_NAME = 'email_contexts_page'
|
22
31
|
|
23
32
|
field :from_email
|
@@ -26,7 +35,7 @@ class ::Ish::EmailContext
|
|
26
35
|
field :subject
|
27
36
|
# validates_presence_of :subject
|
28
37
|
|
29
|
-
|
38
|
+
|
30
39
|
|
31
40
|
belongs_to :email_template
|
32
41
|
def tmpl; email_template; end
|
@@ -12,9 +12,9 @@ class Office::ScheduledEmailAction
|
|
12
12
|
Lead.find( lead_id )
|
13
13
|
end
|
14
14
|
|
15
|
-
STATE_ACTIVE
|
15
|
+
STATE_ACTIVE = 'active'
|
16
16
|
STATE_INACTIVE = 'inactive'
|
17
|
-
STATES
|
17
|
+
STATES = [ STATE_ACTIVE, STATE_INACTIVE ]
|
18
18
|
field :state, type: :string
|
19
19
|
scope :active, ->{ where( state: STATE_ACTIVE ) }
|
20
20
|
|