ish_manager 0.1.8.445 → 0.1.8.446
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.
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: d154ea6e45e455faaf2205d05c3519ae004d30847ed466651c5ae5fc348a6e31
|
|
4
|
+
data.tar.gz: 9506ac062f59a796ea1e3bfc320f2e685554c4778e3726347206e3e2e009a483
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 3552c244eaaedd76d6c4700ceaa47b854850dd86fc5fa5afea44a00813599a8a1b73aad84bd3723f922d1dd98e1e53b9a8ec81887e75c7bb3af05436998294f0
|
|
7
|
+
data.tar.gz: 9dde257591cdf0ca77aabddcab53fc4050103257f3c86092daf109b8fdac7503ecf3ba3c2922186031cf92b3ace295d78af011470cc5bc278bda804a592f6976
|
|
@@ -27,8 +27,6 @@
|
|
|
27
27
|
**/
|
|
28
28
|
|
|
29
29
|
a[target='_blank'] {
|
|
30
|
-
display: flex;
|
|
31
|
-
|
|
32
30
|
&::before {
|
|
33
31
|
content: '[ ';
|
|
34
32
|
display: inline;
|
|
@@ -36,8 +34,6 @@ a[target='_blank'] {
|
|
|
36
34
|
&::after {
|
|
37
35
|
content: ' ^]';
|
|
38
36
|
display: inline;
|
|
39
|
-
// content: ' ^]' !important;
|
|
40
|
-
// font-size: .5em;
|
|
41
37
|
}
|
|
42
38
|
}
|
|
43
39
|
html {
|
|
@@ -16,7 +16,6 @@
|
|
|
16
16
|
iframe {
|
|
17
17
|
min-height: 80vh;
|
|
18
18
|
}
|
|
19
|
-
|
|
20
19
|
}
|
|
21
20
|
|
|
22
21
|
.email-contexts--form,
|
|
@@ -24,6 +23,7 @@
|
|
|
24
23
|
|
|
25
24
|
.field-template {
|
|
26
25
|
display: flex;
|
|
26
|
+
flex-wrap: wrap;
|
|
27
27
|
}
|
|
28
28
|
|
|
29
29
|
textarea {
|
|
@@ -47,7 +47,6 @@
|
|
|
47
47
|
padding: 10px;
|
|
48
48
|
margin: 10px;
|
|
49
49
|
}
|
|
50
|
-
|
|
51
50
|
}
|
|
52
51
|
|
|
53
52
|
.email-contexts-index {
|
|
@@ -55,27 +54,12 @@
|
|
|
55
54
|
> .header {
|
|
56
55
|
display: flex;
|
|
57
56
|
justify-content: center;
|
|
58
|
-
|
|
59
|
-
// .title {
|
|
60
|
-
// a {
|
|
61
|
-
// &:before {
|
|
62
|
-
// content: '[';
|
|
63
|
-
// }
|
|
64
|
-
// &:after {
|
|
65
|
-
// content: ']';
|
|
66
|
-
// }
|
|
67
|
-
// }
|
|
68
|
-
// }
|
|
69
|
-
|
|
70
57
|
}
|
|
71
58
|
|
|
72
|
-
|
|
73
|
-
|
|
74
59
|
table {
|
|
75
60
|
th.actions {
|
|
76
61
|
min-width: 100px;
|
|
77
62
|
}
|
|
78
63
|
}
|
|
79
|
-
|
|
80
64
|
}
|
|
81
65
|
|
|
@@ -15,6 +15,7 @@ class IshManager::OfficeMailer < IshManager::ApplicationMailer
|
|
|
15
15
|
|
|
16
16
|
ac = ActionController::Base.new
|
|
17
17
|
ac.instance_variable_set( :@ctx, @ctx )
|
|
18
|
+
ac.instance_variable_set( :@lead, @ctx.lead )
|
|
18
19
|
ac.instance_variable_set( :@utm_tracking_str, @utm_tracking_str )
|
|
19
20
|
|
|
20
21
|
rendered_str = ac.render_to_string("ish_manager/email_templates/_#{@ctx.tmpl.layout}")
|
|
@@ -25,7 +26,7 @@ class IshManager::OfficeMailer < IshManager::ApplicationMailer
|
|
|
25
26
|
|
|
26
27
|
mail( from: @ctx.from_email,
|
|
27
28
|
to: @ctx.to_email,
|
|
28
|
-
subject: ERB.new( @ctx.subject ).result,
|
|
29
|
+
subject: ERB.new( @ctx.subject ).result( @ctx.get_binding ),
|
|
29
30
|
template_name: "render/_#{@ctx.tmpl.layout}" )
|
|
30
31
|
end
|
|
31
32
|
|
|
@@ -2,29 +2,25 @@
|
|
|
2
2
|
.email-contexts--form
|
|
3
3
|
- url = ctx.new_record? ? email_contexts_path : email_context_path(ctx)
|
|
4
4
|
= form_for ctx, as: :ctx, url: url do |f|
|
|
5
|
-
.
|
|
6
|
-
.
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
.col-md-8
|
|
25
|
-
.field.field-subject
|
|
26
|
-
= f.label :subject
|
|
27
|
-
= f.text_field :subject
|
|
5
|
+
.field.field-template
|
|
6
|
+
= f.label "Template"
|
|
7
|
+
= f.select :email_template_id, options_for_select(@email_templates_list, selected: params[:email_template_id] || ctx.email_template_id ), {}, { class: 'select2' }
|
|
8
|
+
- if ctx.email_template_id
|
|
9
|
+
= link_to 'view', email_template_path( ctx.email_template_id ), target: :_blank, class: [ 'action-view' ]
|
|
10
|
+
= link_to '~', edit_email_template_path( ctx.email_template_id ), target: :_blank, class: [ 'action-view' ]
|
|
11
|
+
layout: #{ctx.tmpl.layout}
|
|
12
|
+
|
|
13
|
+
.field
|
|
14
|
+
= f.label "From"
|
|
15
|
+
= f.select :from_email, options_for_select(Ish::EmailContext.from_email_list, selected: ctx.from_email)
|
|
16
|
+
|
|
17
|
+
.field.flex-row
|
|
18
|
+
= f.label "To lead"
|
|
19
|
+
= f.select :lead_id, options_for_select( @leads_list, selected: ctx.lead_id ), {}, { class: 'select2' }
|
|
20
|
+
|
|
21
|
+
.field.field-subject
|
|
22
|
+
= f.label :subject
|
|
23
|
+
= f.text_field :subject
|
|
28
24
|
|
|
29
25
|
|
|
30
26
|
|