ish_manager 0.1.8.498 → 0.1.8.499

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: 01f24c43ee2d5b50d59771c4eeedea644cd07a30accde9b1a189ddde004deeb7
4
- data.tar.gz: 942aefc0638ab813bbef8b065595e672c6eef459e19c78ffa2aba74b83a288fa
3
+ metadata.gz: 4c8f159ec2732b781f592e2fc7ba5af7a641abd6167a148bf3b7a64c99fdc5fb
4
+ data.tar.gz: 71273db7ddcea1fe38a5e497112c5a8c63366e9ba039fa48388ac293a69e1ee1
5
5
  SHA512:
6
- metadata.gz: 47a795e6bcb6d82e373fbc7841545c97af812be5684eb5c0a295035c351cf3e87a82dc1df93eb7d3d595146775bc62e2eda899cde4911a79fe4f68ede1c1bdf0
7
- data.tar.gz: 3ba886401812ad306fd5bf3f901e02b272c085951775610b11f6d186b08d159f41bb0cf17588932ee95b794df50d007b20c79019acbb4d13b6fcade2bcc1e0af
6
+ metadata.gz: 4bc1fed6a98ffb9f8e8dd76937e9055c73112d75cae9d109d3eefaf04c6503a3b39c8ca45a4787586571f041f3dd45203d31cd92e372aab107d6196f83ad158a
7
+ data.tar.gz: 4f2b8af32eed52b4c19e36017b01d88ba39c3d3a50b368532daf7cc03ad28a3d832dff68100563b4a39b1875e7f94d2de51e05b15e38c4f1b6aa4855811f59bb
@@ -1,4 +1,6 @@
1
1
 
2
+ -# = ctx.inspect
3
+
2
4
  .email-contexts--form
3
5
  - url = ctx.new_record? ? email_contexts_path : email_context_path(ctx)
4
6
  = form_for ctx, as: :ctx, url: url do |f|
@@ -11,16 +13,25 @@
11
13
  layout: #{ctx.tmpl.layout}
12
14
 
13
15
  .field.flex-row
14
- = f.label "From"
16
+ %label From
15
17
  = f.select :from_email, options_for_select(Ish::EmailTemplate.from_email_list, selected: ctx.from_email), {}, { class: 'select2' }
16
18
 
17
19
  .field.flex-row
18
- = f.label "To lead"
20
+ %label To lead
19
21
  = f.select :lead_id, options_for_select( @leads_list, selected: ctx.lead_id ), {}, { class: 'select2' }
20
22
 
23
+ .field.flex-row
24
+ %label cc
25
+ = f.text_field :cc, class: 'w-100'
26
+
27
+ -## unused b/c ccs is an array, i'm dealing with strings only here.
28
+ -# .field.flex-row
29
+ -# %label cc's
30
+ -# = f.text_field :ccs
31
+
21
32
  .field.field-subject
22
33
  = f.label :subject
23
- = f.text_field :subject
34
+ = f.text_field :subject, class: 'w-100'
24
35
 
25
36
 
26
37
 
@@ -30,7 +41,7 @@
30
41
  .label-save-preview= f.submit 'Save & Preview'
31
42
  .tabs
32
43
  .tab-raw
33
- = f.text_area :body
44
+ = f.text_area :body, class: 'tinymce'
34
45
  .tab-preview
35
46
  - if ctx.new_record?
36
47
  New record...
@@ -7,6 +7,13 @@
7
7
  - @email_messages.each do |msg|
8
8
  - lead = msg.lead || Lead.new(email: 'NO LEAD!', id: 'no lead')
9
9
 
10
+ - if msg.to
11
+ - new_from_email = Ish::EmailTemplate::FROM_EMAILS.select { |p| p.include?( msg.to ) }
12
+ - if new_from_email.blank?
13
+ - new_from_email = Ish::EmailTemplate::DEFAULT_FROM_EMAIL
14
+
15
+ - all_ccs = (msg.tos||[]) + (msg.ccs||[]) + (msg.froms||[])
16
+
10
17
  .item.msg-container{ data: { msg: { id: msg.id } } }
11
18
  .gray.row
12
19
  .col-md-6
@@ -41,9 +48,18 @@
41
48
  %iframe{ name: msg.message_id }
42
49
 
43
50
  = render 'ish_manager/email_contexts/form_reply', lead: lead
51
+
44
52
  .collapse-expand.wco-collapse Reply
45
53
  .bordered.mt-3.wco-collapsed
46
- = render 'ish_manager/email_contexts/form', ctx: Ctx.new({ lead_id: lead.id, email_template: Tmpl.blank_template, from_email: msg.to, subject: msg.subject, body: (msg.part_html||msg.part_txt) }), lead: lead
54
+ - new_ctx = Ctx.new({ email_template: Tmpl.blank_template })
55
+ - new_ctx[:lead_id] = lead.id
56
+ - new_ctx[:from_email] = new_from_email
57
+ - new_ctx[:subject] = msg.subject
58
+ - new_ctx[:body] = Ish::EmailTemplate::SIGNATURE + (msg.part_html||msg.part_txt||'')
59
+ - new_ctx[:cc] = all_ccs.join(', ')
60
+ = render 'ish_manager/email_contexts/form', ctx: new_ctx
61
+
62
+
47
63
  -# = button_to 'Reply'
48
64
  -# = button_to 'Reply All'
49
65
  -# = button_to 'New Template'
@@ -81,3 +97,9 @@
81
97
  .relative.inline-block
82
98
  %i.fa.fa-clock-o.expand-next{ style: "color: red;" }
83
99
  .expand-hide= render 'ish_manager/scheduled_email_actions/form', scheduled_email_action: Sch.new({ lead_id: lead.id })
100
+
101
+ .actions.email-conversation-actions
102
+ = form_tag Ishapi::Engine.routes.url_helpers.email_conversations_path, method: :delete do
103
+ = hidden_field_tag :jwt_token, @jwt_token
104
+ = hidden_field_tag 'ids[]', @email_conversation.id
105
+ = submit_tag 'Delete', data: { confirm: 'Are you sure?' }
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: ish_manager
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.8.498
4
+ version: 0.1.8.499
5
5
  platform: ruby
6
6
  authors:
7
7
  - piousbox