ish_manager 0.1.8.354 → 0.1.8.356

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.
Files changed (90) hide show
  1. checksums.yaml +4 -4
  2. data/app/assets/javascripts/ish_manager/application.js +105 -10
  3. data/app/assets/javascripts/ish_manager/email_contexts.js +1 -1
  4. data/app/assets/javascripts/ish_manager/email_templates.js +20 -0
  5. data/app/assets/stylesheets/ish_manager/application.scss +91 -8
  6. data/app/assets/stylesheets/ish_manager/email.scss +44 -0
  7. data/app/assets/stylesheets/ish_manager/email_contexts.scss +84 -0
  8. data/app/assets/stylesheets/ish_manager/email_conversations.scss +143 -0
  9. data/app/assets/stylesheets/ish_manager/email_iframe.css +4 -0
  10. data/app/assets/stylesheets/ish_manager/email_messages.scss +15 -0
  11. data/app/assets/stylesheets/ish_manager/email_templates.scss +33 -53
  12. data/app/assets/stylesheets/ish_manager/leads_leadsets.scss +114 -0
  13. data/app/assets/stylesheets/ish_manager/scheduled_actions_emails.scss +25 -0
  14. data/app/assets/stylesheets/ish_manager/tags.scss +5 -0
  15. data/app/controllers/ish_manager/application_controller.rb +17 -2
  16. data/app/controllers/ish_manager/categories_controller.rb +14 -0
  17. data/app/controllers/ish_manager/email_actions_controller.rb +80 -0
  18. data/app/controllers/ish_manager/email_campaigns_controller.rb +13 -0
  19. data/app/controllers/ish_manager/email_contexts_controller.rb +41 -48
  20. data/app/controllers/ish_manager/email_conversations_controller.rb +20 -0
  21. data/app/controllers/ish_manager/email_filters_controller.rb +47 -0
  22. data/app/controllers/ish_manager/email_messages_controller.rb +21 -3
  23. data/app/controllers/ish_manager/email_templates_controller.rb +23 -10
  24. data/app/controllers/ish_manager/leads_controller.rb +3 -9
  25. data/app/controllers/ish_manager/leadset_tags_controller.rb +18 -0
  26. data/app/controllers/ish_manager/leadsets_controller.rb +28 -1
  27. data/app/controllers/ish_manager/scheduled_email_actions_controller.rb +38 -0
  28. data/app/helpers/ish_manager/application_helper.rb +17 -11
  29. data/app/mailers/ish_manager/office_mailer.rb +10 -9
  30. data/app/views/ish_manager/application/_alerts_notices.haml +18 -0
  31. data/app/views/ish_manager/application/_debug.haml +5 -4
  32. data/app/views/ish_manager/application/_main_footer.haml +1 -0
  33. data/app/views/ish_manager/application/_main_header_admin.haml +48 -59
  34. data/app/views/ish_manager/application/home.haml +1 -1
  35. data/app/views/ish_manager/categories/_subtree.haml +12 -0
  36. data/app/views/ish_manager/categories/index.haml +11 -0
  37. data/app/views/ish_manager/email_actions/_form.haml +42 -0
  38. data/app/views/ish_manager/email_actions/edit.haml +7 -0
  39. data/app/views/ish_manager/email_actions/index.haml +24 -0
  40. data/app/views/ish_manager/email_actions/new.haml +7 -0
  41. data/app/views/ish_manager/email_contexts/_form.haml +32 -30
  42. data/app/views/ish_manager/email_contexts/edit.haml +1 -1
  43. data/app/views/ish_manager/email_contexts/index.haml +27 -22
  44. data/app/views/ish_manager/email_contexts/show.haml +26 -15
  45. data/app/views/ish_manager/email_conversations/index.haml +49 -0
  46. data/app/views/ish_manager/email_conversations/show.haml +62 -0
  47. data/app/views/ish_manager/email_filters/_form.haml +12 -0
  48. data/app/views/ish_manager/email_filters/edit.haml +5 -0
  49. data/app/views/ish_manager/email_filters/index.haml +24 -0
  50. data/app/views/ish_manager/email_filters/new.haml +5 -0
  51. data/app/views/ish_manager/email_messages/_show_iframe.haml +8 -0
  52. data/app/views/ish_manager/email_messages/index.haml +2 -2
  53. data/app/views/ish_manager/email_messages/show.haml +28 -1
  54. data/app/views/ish_manager/email_messages/show_iframe.haml +6 -0
  55. data/app/views/ish_manager/email_messages/show_source.haml +5 -0
  56. data/app/views/ish_manager/email_messages/show_stripped.haml +2 -0
  57. data/app/views/ish_manager/email_templates/_form.haml +30 -14
  58. data/app/views/ish_manager/email_templates/_form_reply_2_mini.haml +15 -0
  59. data/app/views/ish_manager/email_templates/_form_reply_mini.haml +8 -0
  60. data/app/views/ish_manager/email_templates/_form_schedule_mini.haml +11 -0
  61. data/app/views/ish_manager/email_templates/_index.haml +24 -11
  62. data/app/views/ish_manager/email_templates/_piousbox_roundborders.html.erb +4 -1
  63. data/app/views/ish_manager/email_templates/done/_form.haml +22 -0
  64. data/app/views/ish_manager/email_templates/done/_form2.haml +26 -0
  65. data/app/views/ish_manager/email_templates/edit.haml +2 -1
  66. data/app/views/ish_manager/email_templates/iframe_src.haml +4 -3
  67. data/app/views/ish_manager/email_templates/new.haml +5 -0
  68. data/app/views/ish_manager/email_templates/show.haml +9 -3
  69. data/app/views/ish_manager/leads/_form.haml +11 -6
  70. data/app/views/ish_manager/leads/_form_import.haml +3 -3
  71. data/app/views/ish_manager/leads/edit.haml +19 -16
  72. data/app/views/ish_manager/leads/index.haml +25 -16
  73. data/app/views/ish_manager/leads/new.haml +8 -7
  74. data/app/views/ish_manager/leadsets/index.haml +67 -13
  75. data/app/views/ish_manager/leadsets/index_dataTables.haml +33 -0
  76. data/app/views/ish_manager/scheduled_actions/_form_mini.haml +16 -0
  77. data/app/views/ish_manager/scheduled_email_actions/_form.haml +26 -0
  78. data/app/views/ish_manager/scheduled_email_actions/index.haml +15 -0
  79. data/app/views/ish_manager/scheduled_email_actions/new.haml +4 -0
  80. data/app/views/ish_manager/scheduled_email_actions/show.haml +0 -0
  81. data/app/views/layouts/ish_manager/application.haml +2 -2
  82. data/app/views/layouts/ish_manager/application_fullwidth.haml +45 -0
  83. data/app/views/layouts/ish_manager/email_iframe.haml +6 -0
  84. data/config/routes.rb +18 -2
  85. data/lib/ish_manager/engine.rb +1 -0
  86. metadata +48 -6
  87. data/app/assets/stylesheets/ish_manager/leads.scss +0 -10
  88. data/app/controllers/ish_manager/office_actions_controller.rb +0 -59
  89. data/app/views/ish_manager/office_actions/_form.haml +0 -83
  90. data/app/views/ish_manager/office_actions/index.haml +0 -9
@@ -1,19 +1,22 @@
1
1
 
2
- %h1 Edit lead
3
- = render 'form', :lead => @lead
2
+ .leads-edit.max-width
3
+ .header
4
+ %h2.title Edit lead
4
5
 
5
- %hr
6
- %h1 Email Campaigns:
7
- %ul
8
- - @lead.email_campaign_leads.each do |x|
9
- %li
10
- <b>Sent on ::</b> #{x.sent_at.to_s[0..10]}
11
- <b>Slug ::</b> #{x.email_campaign.slug}
6
+ = render 'form', :lead => @lead
12
7
 
13
- %hr
14
- %h1 Single Emails:
15
- %ul
16
- - @lead.email_contexts.each do |x|
17
- %li
18
- <b>Sent at ::</b> #{x.sent_at.to_s[0..10]}
19
- <b>Subject ::</b> #{x.subject}
8
+ -# %hr
9
+ -# %h1 Email Campaigns:
10
+ -# %ul
11
+ -# - @lead.email_campaign_leads.each do |x|
12
+ -# %li
13
+ -# <b>Sent on ::</b> #{x.sent_at.to_s[0..10]}
14
+ -# <b>Slug ::</b> #{x.email_campaign.slug}
15
+
16
+ -# %hr
17
+ -# %h1 Single Emails:
18
+ -# %ul
19
+ -# - @lead.email_contexts.each do |x|
20
+ -# %li
21
+ -# <b>Sent at ::</b> #{x.sent_at.to_s[0..10]}
22
+ -# <b>Subject ::</b> #{x.subject}
@@ -1,37 +1,46 @@
1
1
 
2
- .manager-leads-index
3
- %h5
4
- SQL #{link_to 'Leads', leads_path} (#{::Lead.all.count})
5
- = link_to raw("<i class='fa fa-plus-square'></i>"), new_lead_path
2
+ .leads-index
3
+ .header
4
+ %h2.title
5
+ #{link_to 'Leads', leads_path} (#{::Lead.all.count})
6
+ = link_to raw("<i class='fa fa-plus-square'></i>"), new_lead_path
6
7
 
7
8
  = form_tag leads_bulkop_path do
8
9
  = label_tag 'Act on Selected:'
9
10
  = select_tag :a, options_for_select( %w| delete add_to_campaign | )
10
- = select_tag :email_campaign_id, options_for_select( @email_campaigns_list )
11
+ -# = select_tag :email_campaign_id, options_for_select( @email_campaigns_list )
11
12
  = submit_tag 'Go'
12
13
 
13
- %table#dataTable.display.compact
14
+ %table.bordered
14
15
  %thead
15
16
  %tr
16
17
  %th &nbsp;
17
- %th Name
18
+ %th Name/Email
18
19
  %th Company
19
- %th Email
20
20
  %th Tag
21
21
  %th created_at
22
- %th n campaign sends
23
- %th n single sends
22
+ %th (c,s) sends
23
+ %th Scheduled Actions
24
24
 
25
25
  %tbody
26
26
  - @leads.each do |lead|
27
27
  %tr
28
28
  %td= check_box_tag 'lead_ids[]', lead.id
29
- %td= link_to lead.name, lead_path( lead )
30
- %td= lead.leadset&.id
31
- %td= lead.email
32
- %td= lead.tag
29
+ %td= link_to "#{lead.name} <#{lead.email}>", lead_path( lead )
30
+ %td= lead.leadsets.first&.name
31
+ %td= lead.wp_tags.map(&:name).join(", ")
33
32
  %td= lead.created_at.to_s[0..10]
34
- %td= lead.email_campaign_leads.count
35
- %td= @email_contexts[lead.email] || '-'
33
+ %td #{lead.email_campaign_leads.count || '-'}, #{@email_contexts[lead.email] || '-'}
34
+ %td
35
+ = lead.scheduled_email_actions.length
36
+ = link_to '[+]', new_scheduled_email_action_path( lead_id: lead.id )
37
+ %ul
38
+ - lead.scheduled_email_actions.map do |sch_a|
39
+ %li
40
+ = link_to sch_a.email_action.slug, edit_scheduled_email_action_path( sch_a )
41
+ [x]
42
+
43
+
44
+
36
45
 
37
46
 
@@ -1,8 +1,9 @@
1
1
 
2
- .row
3
- .col-sm-12.col-md-6
4
- %h1 New Lead
5
- = render 'form', :lead => @new_lead
6
- .col-sm-12.col-md-6
7
- %h1 Import Leads
8
- = render 'form_import'
2
+ .leads-new.max-width
3
+ .row
4
+ .col-sm-12.col-md-6
5
+ %h1 New Lead
6
+ = render 'form', :lead => @new_lead
7
+ .col-sm-12.col-md-6
8
+ %h1 Import Leads
9
+ = render 'form_import'
@@ -1,26 +1,80 @@
1
1
 
2
2
  .manager-leadsets-index
3
3
  %h5
4
- SQL
5
4
  = link_to 'Leadsets', leadsets_path
6
- (#{Leadset.all.count})
5
+ (#{Leadset.kept.length})
6
+ (trash: #{Leadset.discarded.length})
7
7
  = link_to raw("<i class='fa fa-plus-square'></i>"), new_leadset_path
8
8
 
9
- %table#dataTable.display.compact
9
+ .actions
10
+ %label.select-all
11
+ = check_box_tag :select_all
12
+ select all
13
+ .n-selected -
14
+ = button_tag 'Delete', method: :delete, class: 'delete-btn'
15
+
16
+ %table
10
17
  %thead
11
18
  %tr
12
19
  %th &nbsp;
13
- %th created at
14
- %th Name
15
- %th Tag
20
+ -# %th created at
21
+ -# %th Name
16
22
  %th.company-url Company Url
17
- %th Location
23
+ %th Tags
24
+ %th +
25
+ %th.leads Leads
18
26
  %tbody
19
- - @leadsets.each do |leadset|
27
+ - @leadsets.each_with_index do |leadset, idx1|
20
28
  %tr
21
- %td= check_box_tag leadset.id
22
- %td= leadset.created_at.strftime("%Y-%m-%d %H:%M")
23
- %td= link_to leadset.name, leadset_path( leadset )
24
- %td= leadset.tag
29
+ %td= check_box_tag 'leadset_ids[]', leadset.id, nil, { class: 'i-sel' }
30
+ -# %td= leadset.created_at.strftime("%Y-%m-%d %H:%M%P")
31
+ -# %td= link_to leadset.name, leadset_path( leadset )
25
32
  %td= link_to leadset.company_url, leadset.company_url
26
- %td= leadset.location
33
+ %td.tags
34
+
35
+ - leadset.wp_tags.each_with_index do |tag, idx2|
36
+ .chip
37
+ = tag.name
38
+
39
+ %td.tags-add
40
+ %i.fa.fa-plus.expand-next
41
+ = form_tag leadset_tags_path, { class: 'tags--form-mini form-mini', style: 'display: none' } do
42
+ .header
43
+ %h5 Add a Tag
44
+ = hidden_field_tag :leadset_id, leadset.id.to_s
45
+ = select_tag :term_id, options_for_select( @tags_list ), class: [ 'select2' ]
46
+ .actions
47
+ = submit_tag 'Add'
48
+
49
+ %td.leads
50
+ -# = leadset.leads.count
51
+ - leadset.leads.each do |lead|
52
+ .item
53
+
54
+ .chip
55
+ -# = lead.email
56
+ = link_to lead.name, lead_path( lead )
57
+
58
+ .relative
59
+ %a.chip{ href: email_contexts_for_lead_path( lead ) }
60
+ \(
61
+ = lead.email_contexts.count
62
+ %i.fa.fa-envelope
63
+ \)
64
+
65
+ .relative
66
+ %i.fa.fa-pencil.expand-next
67
+ %form.form-mini{ style: 'display: none' }
68
+ Editing...
69
+
70
+ .relative
71
+ %i.fa.fa-clock-o.expand-next
72
+ = render 'ish_manager/scheduled_emails/form', scheduled_email: Sch.new({ lead_id: lead.id })
73
+
74
+ .scheduled
75
+ - lead.scheduled_emails.each do |sch|
76
+ .chip
77
+ .interval= sch.interval
78
+ .tmpl= sch.email_template.slug
79
+
80
+
@@ -0,0 +1,33 @@
1
+
2
+ .manager-leadsets-index
3
+ %h5
4
+ = link_to 'Leadsets', leadsets_path
5
+ (#{Leadset.kept.length})
6
+ (trash: #{Leadset.discarded.length})
7
+ = link_to raw("<i class='fa fa-plus-square'></i>"), new_leadset_path
8
+
9
+ .actions
10
+ %label.select-all
11
+ = check_box_tag :select_all
12
+ select all
13
+ %label.n-selected -
14
+ = button_tag 'Delete', method: :delete, class: 'delete-btn'
15
+
16
+ %table.data-table.compact
17
+ %thead
18
+ %tr
19
+ %th &nbsp;
20
+ %th created at
21
+ %th Name
22
+ %th Tag
23
+ %th.company-url Company Url
24
+ %th Location
25
+ %tbody
26
+ - @leadsets.each do |leadset|
27
+ %tr
28
+ %td= check_box_tag 'leadset_ids[]', leadset.id, nil, { class: 'i-sel' }
29
+ %td= leadset.created_at.strftime("%Y-%m-%d %H:%M")
30
+ %td= link_to leadset.name, leadset_path( leadset )
31
+ %td= leadset.tag
32
+ %td= link_to leadset.company_url, leadset.company_url
33
+ %td= leadset.location
@@ -0,0 +1,16 @@
1
+
2
+ .scheduled-actions--form-mini
3
+
4
+ %form
5
+ .field
6
+ %label Every
7
+ = text_field_tag :every_min_days, nil, placeholder: 'min', size: 3, class: 'input-mini'
8
+ %label -
9
+ = text_field_tag :every_max_days, nil, placeholder: 'max', size: 3, class: 'input-mini'
10
+ %label Days
11
+
12
+ .field
13
+ = select_tag :email_template_id, options_for_select( @email_templates_list )
14
+
15
+ .action
16
+ = button_tag 'Schedule'
@@ -0,0 +1,26 @@
1
+
2
+ -#
3
+ -# scheduled_emails / _form
4
+ -#
5
+
6
+ - sch_a = scheduled_email_action
7
+ - url = sch_a.new_record? ? scheduled_email_actions_path : scheduled_email_action_path(sch_a.id)
8
+
9
+
10
+ = form_for scheduled_email_action, url: url, html: { class: "form-mini" } do |f|
11
+ .header
12
+ %h5.title Schedule an email action
13
+
14
+ .field
15
+ %label Lead
16
+ = select_tag :lead_id, options_for_select( @leads_list, selected: sch_a[:lead_id]||params[:lead_id] ), class: 'select2'
17
+ .field
18
+ %label State
19
+ = f.select :state, options_for_select(::Office::ScheduledEmailAction::STATES, selected: sch_a.state ), class: 'select2'
20
+ %br
21
+ .field
22
+ %label Email Action
23
+ = select_tag :email_action_id, options_for_select( @email_actions_list, selected: sch_a[:email_action_id] ), class: 'select2'
24
+
25
+ .actions
26
+ = submit_tag 'Schedule'
@@ -0,0 +1,15 @@
1
+
2
+ .scheduled-emails-index.max-width
3
+ .header
4
+ %h2
5
+ Index
6
+ -# (#{Sch.kept.count})
7
+ (#{Sch.all.count})
8
+ = link_to '[+]', new_scheduled_email_path
9
+
10
+ .items
11
+ - @scheduled_emails.each do |sch|
12
+ .item
13
+ = sch.interval
14
+ = sch.email_template.slug
15
+ = sch.lead.email
@@ -0,0 +1,4 @@
1
+
2
+ .scheduled-email-actions-new.max-width
3
+
4
+ = render 'form', scheduled_email_action: @scheduled_email_action
@@ -22,8 +22,8 @@
22
22
  = javascript_include_tag "//cdn.jsdelivr.net/npm/popper.js@1.14.7/dist/umd/popper.min.js"
23
23
  = javascript_include_tag "//cdn.jsdelivr.net/npm/bootstrap@4.3.1/dist/js/bootstrap.min.js"
24
24
 
25
- = stylesheet_link_tag "//cdn.jsdelivr.net/npm/select2@4.1.0-rc.0/dist/css/select2.min.css"
26
- = javascript_include_tag "//cdn.jsdelivr.net/npm/select2@4.1.0-rc.0/dist/js/select2.min.js"
25
+ = stylesheet_link_tag "//cdn.jsdelivr.net/npm/select2@4.0.0/dist/css/select2.min.css"
26
+ = javascript_include_tag "//cdn.jsdelivr.net/npm/select2@4.0.0/dist/js/select2.min.js"
27
27
 
28
28
  - # @TODO: document? test-drive?
29
29
  - if @include_materialize
@@ -0,0 +1,45 @@
1
+ !!!
2
+ %html
3
+ %head
4
+ %title #{@page_title}| PiousboxCMS
5
+ %link{ :rel => 'icon', :href => "/favicon_#{ENV['RAILS_ENV']}.gif" }
6
+ %meta{ :name => :viewport, :content => 'width=device-width, initial-scale=1, minimum-scale=1, maximum-scale=2' }
7
+ %meta{ :charset => 'UTF-8' }
8
+ %meta{ :description => @page_description }
9
+
10
+ = javascript_include_tag "//code.jquery.com/jquery-3.3.1.min.js"
11
+
12
+ %script{ :src => "//cdn.datatables.net/1.10.16/js/jquery.dataTables.min.js" }
13
+ = stylesheet_link_tag "//cdn.datatables.net/1.10.16/css/jquery.dataTables.min.css"
14
+
15
+ %script{ :src => "//cdnjs.cloudflare.com/ajax/libs/tinymce/4.6.3/jquery.tinymce.min.js" }
16
+ %script{ :src => "//cdnjs.cloudflare.com/ajax/libs/tinymce/4.6.3/tinymce.min.js" }
17
+
18
+ = stylesheet_link_tag "//maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css", :media => 'all'
19
+ = stylesheet_link_tag "//fonts.googleapis.com/icon?family=Material+Icons"
20
+
21
+ = stylesheet_link_tag "//cdn.jsdelivr.net/npm/bootstrap@4.3.1/dist/css/bootstrap.min.css"
22
+ = javascript_include_tag "//cdn.jsdelivr.net/npm/popper.js@1.14.7/dist/umd/popper.min.js"
23
+ = javascript_include_tag "//cdn.jsdelivr.net/npm/bootstrap@4.3.1/dist/js/bootstrap.min.js"
24
+
25
+ = stylesheet_link_tag "//cdn.jsdelivr.net/npm/select2@4.0.0/dist/css/select2.min.css"
26
+ = javascript_include_tag "//cdn.jsdelivr.net/npm/select2@4.0.0/dist/js/select2.min.js"
27
+
28
+ - # @TODO: document? test-drive?
29
+ - if @include_materialize
30
+ = stylesheet_link_tag "//cdnjs.cloudflare.com/ajax/libs/materialize/1.0.0/css/materialize.min.css"
31
+ = javascript_include_tag "//cdnjs.cloudflare.com/ajax/libs/materialize/1.0.0/js/materialize.min.js"
32
+
33
+ = stylesheet_link_tag "ish_manager/application", media: "all"
34
+ = javascript_include_tag "ish_manager/application"
35
+
36
+ = csrf_meta_tags
37
+ %body{ class: [ params[:controller].gsub("ish_manager/",""), "#{params[:controller].gsub("ish_manager/","")}-#{params[:action]}", params[:action], "application-fullwidth" ] }
38
+
39
+ = render :partial => "ish_manager/application/main_header_#{@current_profile.role_name}"
40
+ = render 'alerts_notices'
41
+ = yield
42
+ = render 'ish_manager/application/main_footer'
43
+ = render 'analytics' if Rails.env.production?
44
+
45
+
@@ -0,0 +1,6 @@
1
+ !!!
2
+ %html
3
+ %head
4
+ = stylesheet_link_tag "ish_manager/email_iframe"
5
+ %body
6
+ = yield
data/config/routes.rb CHANGED
@@ -3,6 +3,8 @@ IshManager::Engine.routes.draw do
3
3
 
4
4
  root :to => 'application#home'
5
5
 
6
+ get 'categories', to: 'categories#index'
7
+
6
8
  get 'galleries', :to => 'galleries#index', :defaults => { :render_type => Gallery::RENDER_THUMBS }
7
9
  get 'galleries/index_titles', :to => 'galleries#index', :defaults => { :render_type => Gallery::RENDER_TITLES }
8
10
  get 'galleries/index_thumbs', :to => 'galleries#index', :defaults => { :render_type => Gallery::RENDER_THUMBS }
@@ -49,15 +51,23 @@ IshManager::Engine.routes.draw do
49
51
  # office, below
50
52
  #
51
53
 
52
- resources :office_actions
54
+ resources :email_actions
53
55
 
54
56
  resources :email_campaigns
55
57
  resources :email_campaign_leads, as: :campaign_leads
58
+ resources :email_filters
56
59
 
60
+ get 'email_messages/iframe/:id', to: 'email_messages#show_iframe', as: :email_message_iframe
61
+ get 'email_messages/source/:id', to: 'email_messages#show_source', as: :email_message_source
62
+ get 'email_messages/stripped/:id', to: 'email_messages#show_stripped', as: :email_message_stripped
57
63
  resources :email_messages
58
64
 
65
+ get 'email_conversations', to: 'email_conversations#index'
66
+ get 'email_conversations/:id', to: 'email_conversations#show', as: :email_conversation
67
+
68
+ get 'email_contexts/for_lead/:lead_id', to: 'email_contexts#index', as: :email_contexts_for_lead
59
69
  get 'email_contexts/iframe_src/:id', to: 'email_contexts#iframe_src', as: :email_context_iframe
60
- get 'email_contexts/new_with/:template_slug', to: 'email_contexts#new'
70
+ get 'email_contexts/new_with_template/:template_slug', to: 'email_contexts#new'
61
71
  post 'email_contexts/send/:id', to: 'email_contexts#do_send', as: :email_context_send
62
72
  get 'email_contexts', to: 'email_contexts#index', as: :email_contexts, defaults: { notsent: false }
63
73
  get 'email_contexts/notsent', to: 'email_contexts#index', as: :notsent_email_contexts, defaults: { notsent: true }
@@ -71,6 +81,8 @@ IshManager::Engine.routes.draw do
71
81
 
72
82
  resources :email_unsubscribes
73
83
 
84
+ resources :lead_leadsets
85
+
74
86
  get 'leads', :to => 'leads#index'
75
87
  post 'leads/bulkop', to: 'leads#bulkop'
76
88
  post 'leads/import', to: 'leads#import', as: :leads_import
@@ -78,6 +90,8 @@ IshManager::Engine.routes.draw do
78
90
 
79
91
  resources :leadsets
80
92
 
93
+ resources :leadset_tags
94
+
81
95
 
82
96
  resources :meetings
83
97
 
@@ -88,6 +102,8 @@ IshManager::Engine.routes.draw do
88
102
 
89
103
  resources :reports
90
104
 
105
+ resources :scheduled_email_actions
106
+
91
107
  resources :user_profiles do
92
108
  resources :newsitems
93
109
  end
@@ -13,6 +13,7 @@ module IshManager
13
13
  app.config.assets.precompile << %w( ish_manager/application.js ish_manager/application.css )
14
14
  app.config.assets.precompile << %w( ish_manager/materialize.js ish_manager/materialize.css )
15
15
  app.config.assets.precompile << %w( missing.png )
16
+ app.config.assets.precompile << %w( ish_manager/email_iframe.css )
16
17
  end
17
18
  end
18
19
  end
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.354
4
+ version: 0.1.8.356
5
5
  platform: ruby
6
6
  authors:
7
7
  - piousbox
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2023-02-24 00:00:00.000000000 Z
11
+ date: 2023-03-07 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rails
@@ -234,6 +234,7 @@ files:
234
234
  - app/assets/images/wait.gif
235
235
  - app/assets/javascripts/ish_manager/application.js
236
236
  - app/assets/javascripts/ish_manager/email_contexts.js
237
+ - app/assets/javascripts/ish_manager/email_templates.js
237
238
  - app/assets/javascripts/ish_manager/maps.js
238
239
  - app/assets/javascripts/ish_manager/shared.js
239
240
  - app/assets/javascripts/ish_manager/trash/application_materialize.js
@@ -266,24 +267,35 @@ files:
266
267
  - app/assets/javascripts/ish_manager/vendor/jquery.iframe-transport.js
267
268
  - app/assets/javascripts/ish_manager/vendor/jquery.ui.widget.js
268
269
  - app/assets/stylesheets/ish_manager/application.scss
270
+ - app/assets/stylesheets/ish_manager/email.scss
271
+ - app/assets/stylesheets/ish_manager/email_contexts.scss
272
+ - app/assets/stylesheets/ish_manager/email_conversations.scss
273
+ - app/assets/stylesheets/ish_manager/email_iframe.css
274
+ - app/assets/stylesheets/ish_manager/email_messages.scss
269
275
  - app/assets/stylesheets/ish_manager/email_templates.scss
270
276
  - app/assets/stylesheets/ish_manager/galleries.scss
271
277
  - app/assets/stylesheets/ish_manager/jquery-ui.css
272
- - app/assets/stylesheets/ish_manager/leads.scss
278
+ - app/assets/stylesheets/ish_manager/leads_leadsets.scss
273
279
  - app/assets/stylesheets/ish_manager/maps.scss
274
280
  - app/assets/stylesheets/ish_manager/markers.scss
275
281
  - app/assets/stylesheets/ish_manager/office.scss
276
282
  - app/assets/stylesheets/ish_manager/pagination.scss
277
283
  - app/assets/stylesheets/ish_manager/photos.scss
284
+ - app/assets/stylesheets/ish_manager/scheduled_actions_emails.scss
285
+ - app/assets/stylesheets/ish_manager/tags.scss
278
286
  - app/assets/stylesheets/ish_manager/trash/bootstrap.css
279
287
  - app/assets/stylesheets/ish_manager/trash/materialize.css
280
288
  - app/assets/stylesheets/ish_manager/trash/reset.css
281
289
  - app/assets/stylesheets/ish_manager/user_profiles.scss
282
290
  - app/assets/stylesheets/ish_manager/videos.scss
283
291
  - app/controllers/ish_manager/application_controller.rb
292
+ - app/controllers/ish_manager/categories_controller.rb
293
+ - app/controllers/ish_manager/email_actions_controller.rb
284
294
  - app/controllers/ish_manager/email_campaign_leads_controller.rb
285
295
  - app/controllers/ish_manager/email_campaigns_controller.rb
286
296
  - app/controllers/ish_manager/email_contexts_controller.rb
297
+ - app/controllers/ish_manager/email_conversations_controller.rb
298
+ - app/controllers/ish_manager/email_filters_controller.rb
287
299
  - app/controllers/ish_manager/email_messages_controller.rb
288
300
  - app/controllers/ish_manager/email_templates_controller.rb
289
301
  - app/controllers/ish_manager/email_unsubscribes_controller.rb
@@ -292,15 +304,16 @@ files:
292
304
  - app/controllers/ish_manager/invoices_controller.rb
293
305
  - app/controllers/ish_manager/iro_watches_controller.rb
294
306
  - app/controllers/ish_manager/leads_controller.rb
307
+ - app/controllers/ish_manager/leadset_tags_controller.rb
295
308
  - app/controllers/ish_manager/leadsets_controller.rb
296
309
  - app/controllers/ish_manager/maps_controller.rb
297
310
  - app/controllers/ish_manager/markers_controller.rb
298
311
  - app/controllers/ish_manager/meetings_controller.rb
299
312
  - app/controllers/ish_manager/newsitems_controller.rb
300
- - app/controllers/ish_manager/office_actions_controller.rb
301
313
  - app/controllers/ish_manager/payments_controller.rb
302
314
  - app/controllers/ish_manager/photos_controller.rb
303
315
  - app/controllers/ish_manager/reports_controller.rb
316
+ - app/controllers/ish_manager/scheduled_email_actions_controller.rb
304
317
  - app/controllers/ish_manager/user_profiles_controller.rb
305
318
  - app/controllers/ish_manager/videos_controller.rb
306
319
  - app/helpers/ish_manager/application_helper.rb
@@ -346,6 +359,7 @@ files:
346
359
  - app/views/202212 Mailchimp Templates/202212 theme subtle.html
347
360
  - app/views/202212 Mailchimp Templates/202212 theme ticket.html
348
361
  - app/views/202212 Mailchimp Templates/202212 theme whale.html
362
+ - app/views/ish_manager/application/_alerts_notices.haml
349
363
  - app/views/ish_manager/application/_analytics.html
350
364
  - app/views/ish_manager/application/_debug.haml
351
365
  - app/views/ish_manager/application/_form_errors.haml
@@ -360,16 +374,35 @@ files:
360
374
  - app/views/ish_manager/application/home.haml
361
375
  - app/views/ish_manager/application_mailer/shared_galleries.html.erb
362
376
  - app/views/ish_manager/application_mailer/welcome.html.erb
377
+ - app/views/ish_manager/categories/_subtree.haml
378
+ - app/views/ish_manager/categories/index.haml
379
+ - app/views/ish_manager/email_actions/_form.haml
380
+ - app/views/ish_manager/email_actions/edit.haml
381
+ - app/views/ish_manager/email_actions/index.haml
382
+ - app/views/ish_manager/email_actions/new.haml
363
383
  - app/views/ish_manager/email_campaign_leads/show.haml
364
384
  - app/views/ish_manager/email_contexts/_form.haml
365
385
  - app/views/ish_manager/email_contexts/edit.haml
366
386
  - app/views/ish_manager/email_contexts/index.haml
367
387
  - app/views/ish_manager/email_contexts/new.haml
368
388
  - app/views/ish_manager/email_contexts/show.haml
389
+ - app/views/ish_manager/email_conversations/index.haml
390
+ - app/views/ish_manager/email_conversations/show.haml
391
+ - app/views/ish_manager/email_filters/_form.haml
392
+ - app/views/ish_manager/email_filters/edit.haml
393
+ - app/views/ish_manager/email_filters/index.haml
394
+ - app/views/ish_manager/email_filters/new.haml
395
+ - app/views/ish_manager/email_messages/_show_iframe.haml
369
396
  - app/views/ish_manager/email_messages/index.haml
370
397
  - app/views/ish_manager/email_messages/show.haml
398
+ - app/views/ish_manager/email_messages/show_iframe.haml
399
+ - app/views/ish_manager/email_messages/show_source.haml
400
+ - app/views/ish_manager/email_messages/show_stripped.haml
371
401
  - app/views/ish_manager/email_templates/_form.haml
372
402
  - app/views/ish_manager/email_templates/_form_mini.haml
403
+ - app/views/ish_manager/email_templates/_form_reply_2_mini.haml
404
+ - app/views/ish_manager/email_templates/_form_reply_mini.haml
405
+ - app/views/ish_manager/email_templates/_form_schedule_mini.haml
373
406
  - app/views/ish_manager/email_templates/_index.haml
374
407
  - app/views/ish_manager/email_templates/_m20221201react.html.erb
375
408
  - app/views/ish_manager/email_templates/_m20221222merryxmas.html.erb
@@ -385,9 +418,12 @@ files:
385
418
  - app/views/ish_manager/email_templates/_slug-3.html.erb
386
419
  - app/views/ish_manager/email_templates/_wasyaco_roundborders.html.erb
387
420
  - app/views/ish_manager/email_templates/_wasyaco_social.html.erb
421
+ - app/views/ish_manager/email_templates/done/_form.haml
422
+ - app/views/ish_manager/email_templates/done/_form2.haml
388
423
  - app/views/ish_manager/email_templates/edit.haml
389
424
  - app/views/ish_manager/email_templates/iframe_src.haml
390
425
  - app/views/ish_manager/email_templates/index.haml
426
+ - app/views/ish_manager/email_templates/new.haml
391
427
  - app/views/ish_manager/email_templates/plain.html.erb
392
428
  - app/views/ish_manager/email_templates/show.haml
393
429
  - app/views/ish_manager/email_unsubscribes/new.haml
@@ -426,6 +462,7 @@ files:
426
462
  - app/views/ish_manager/leadsets/_form.haml
427
463
  - app/views/ish_manager/leadsets/edit.haml
428
464
  - app/views/ish_manager/leadsets/index.haml
465
+ - app/views/ish_manager/leadsets/index_dataTables.haml
429
466
  - app/views/ish_manager/leadsets/new.haml
430
467
  - app/views/ish_manager/maps/_form.haml
431
468
  - app/views/ish_manager/maps/_index_item.haml
@@ -451,8 +488,6 @@ files:
451
488
  - app/views/ish_manager/newsitems/edit.haml
452
489
  - app/views/ish_manager/newsitems/index.haml
453
490
  - app/views/ish_manager/newsitems/new.haml
454
- - app/views/ish_manager/office_actions/_form.haml
455
- - app/views/ish_manager/office_actions/index.haml
456
491
  - app/views/ish_manager/office_mailer/morning_reminder.haml
457
492
  - app/views/ish_manager/office_mailer/render
458
493
  - app/views/ish_manager/office_mailer/test_email.html.haml
@@ -473,6 +508,11 @@ files:
473
508
  - app/views/ish_manager/reports/index.haml
474
509
  - app/views/ish_manager/reports/new.haml
475
510
  - app/views/ish_manager/reports/show.haml
511
+ - app/views/ish_manager/scheduled_actions/_form_mini.haml
512
+ - app/views/ish_manager/scheduled_email_actions/_form.haml
513
+ - app/views/ish_manager/scheduled_email_actions/index.haml
514
+ - app/views/ish_manager/scheduled_email_actions/new.haml
515
+ - app/views/ish_manager/scheduled_email_actions/show.haml
476
516
  - app/views/ish_manager/trash/email_campaigns-trash/_form.haml
477
517
  - app/views/ish_manager/trash/email_campaigns-trash/edit.haml
478
518
  - app/views/ish_manager/trash/email_campaigns-trash/index.haml
@@ -502,6 +542,8 @@ files:
502
542
  - app/views/ish_manager/videos/new.haml
503
543
  - app/views/ish_manager/videos/show.haml
504
544
  - app/views/layouts/ish_manager/application.haml
545
+ - app/views/layouts/ish_manager/application_fullwidth.haml
546
+ - app/views/layouts/ish_manager/email_iframe.haml
505
547
  - config/routes.rb
506
548
  - lib/ish_manager.rb
507
549
  - lib/ish_manager/engine.rb
@@ -1,10 +0,0 @@
1
-
2
- .manager-leads-index {
3
- th.company-url {
4
- width: 10px;
5
- }
6
- th.created-at,
7
- td.created-at {
8
- width: 200px;
9
- }
10
- }