ish_manager 0.1.8.445 → 0.1.8.447

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 9e51031178818cd067c18800cb04f5352b547715fc508529f3fa99839380dcf9
4
- data.tar.gz: fb2076b07b12246bf16c4947e20ee0f4180b5efff25cf9cb0f19a261830a9236
3
+ metadata.gz: c82c2edce8d7ee77c0d23ea1ebd16323230f78762a50cd6d6748923e9b2fbd46
4
+ data.tar.gz: 302240bccbbc518d86cd26ecfbfca3fae14244a0df5cac3961ac172625374491
5
5
  SHA512:
6
- metadata.gz: 56be446e68fe1868cd13eca2d8f990de0f7b7b91780fc378ceadc8fe339469eaa14bfae5513c3876b1a2c245e77e59ddaeba2e544b6dc05068b664144e0c18fc
7
- data.tar.gz: 2b6b9173b88e16b906610e690d40f0a5f1819950797ff6081986c49c9292ada18998b0e05d7a204f1c0374282121f5d5dfa7aacfd0525bb4fe1128646b43054a
6
+ metadata.gz: d2d2ee62bd0e210ce45d03940cc420d5c704d652df73e8ba238cb5cac350bba2a5b6e6c69525335e4e1a174147377a50539a4458703844927b13648d082c8a4d
7
+ data.tar.gz: 500986b1c214fa597643d397e117d45db1168eb998eefbcc9a0fa3a7eec2d933b54a20caf89fcd7b6df090ed4b80b5f3cfa79920465e26ce532da2e003025972
@@ -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,9 +15,14 @@ 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
- rendered_str = ac.render_to_string("ish_manager/email_templates/_#{@ctx.tmpl.layout}")
21
+ if 'plain' == @ctx.tmpl.layout
22
+ rendered_str = ERB.new( @ctx.body ).result( @ctx.get_binding ),
23
+ else
24
+ rendered_str = ac.render_to_string("ish_manager/email_templates/_#{@ctx.tmpl.layout}")
25
+ end
21
26
  @ctx.update({
22
27
  rendered_str: rendered_str,
23
28
  sent_at: Time.now.to_s,
@@ -25,8 +30,8 @@ class IshManager::OfficeMailer < IshManager::ApplicationMailer
25
30
 
26
31
  mail( from: @ctx.from_email,
27
32
  to: @ctx.to_email,
28
- subject: ERB.new( @ctx.subject ).result,
29
- template_name: "render/_#{@ctx.tmpl.layout}" )
33
+ subject: ERB.new( @ctx.subject ).result( @ctx.get_binding ),
34
+ body: rendered_str )
30
35
  end
31
36
 
32
37
  end
@@ -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
- .row
6
- .col-md-6
7
- .field.field-template
8
- = f.label "Template"
9
- = f.select :email_template_id, options_for_select(@email_templates_list, selected: params[:email_template_id] || ctx.email_template_id ), {}, { class: 'select2' }
10
- - if ctx.email_template_id
11
- = link_to 'view', email_template_path( ctx.email_template_id ), target: :_blank, class: [ 'action-view' ]
12
- = link_to '~', edit_email_template_path( ctx.email_template_id ), target: :_blank, class: [ 'action-view' ]
13
- layout: #{ctx.tmpl.layout}
14
-
15
- .field
16
- = f.label "From"
17
- = f.select :from_email, options_for_select(Ish::EmailContext.from_email_list, selected: ctx.from_email)
18
-
19
- .row
20
- .col-md-4
21
- .field.flex-row
22
- = f.label "To lead"
23
- = f.select :lead_id, options_for_select( @leads_list, selected: ctx.lead_id ), {}, { class: 'select2' }
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
 
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: ish_manager
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.8.445
4
+ version: 0.1.8.447
5
5
  platform: ruby
6
6
  authors:
7
7
  - piousbox
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2023-05-25 00:00:00.000000000 Z
11
+ date: 2023-05-26 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rails