ish_manager 0.1.8.355 → 0.1.8.357

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 (80) hide show
  1. checksums.yaml +4 -4
  2. data/app/assets/javascripts/ish_manager/application.js +68 -15
  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/javascripts/ish_manager/galleries.js +78 -0
  6. data/app/assets/stylesheets/ish_manager/application.scss +48 -9
  7. data/app/assets/stylesheets/ish_manager/email.scss +44 -0
  8. data/app/assets/stylesheets/ish_manager/{email_contexts_templates.scss → email_contexts.scss} +29 -49
  9. data/app/assets/stylesheets/ish_manager/email_conversations.scss +99 -21
  10. data/app/assets/stylesheets/ish_manager/email_templates.scss +59 -0
  11. data/app/assets/stylesheets/ish_manager/galleries.scss +10 -0
  12. data/app/assets/stylesheets/ish_manager/leads_leadsets.scss +96 -3
  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 +15 -0
  16. data/app/controllers/ish_manager/email_actions_controller.rb +80 -0
  17. data/app/controllers/ish_manager/email_campaigns_controller.rb +13 -0
  18. data/app/controllers/ish_manager/email_contexts_controller.rb +41 -48
  19. data/app/controllers/ish_manager/email_conversations_controller.rb +6 -2
  20. data/app/controllers/ish_manager/email_filters_controller.rb +47 -0
  21. data/app/controllers/ish_manager/email_messages_controller.rb +1 -1
  22. data/app/controllers/ish_manager/email_templates_controller.rb +23 -10
  23. data/app/controllers/ish_manager/galleries_controller.rb +23 -8
  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 +13 -0
  27. data/app/controllers/ish_manager/scheduled_email_actions_controller.rb +38 -0
  28. data/app/helpers/ish_manager/application_helper.rb +4 -0
  29. data/app/mailers/ish_manager/application_mailer.rb +1 -1
  30. data/app/mailers/ish_manager/meeting_mailer.rb +2 -1
  31. data/app/mailers/ish_manager/office_mailer.rb +12 -10
  32. data/app/views/ish_manager/application/_debug.haml +2 -1
  33. data/app/views/ish_manager/application/_main_header_admin.haml +47 -60
  34. data/app/views/ish_manager/email_actions/_form.haml +52 -0
  35. data/app/views/ish_manager/email_actions/edit.haml +7 -0
  36. data/app/views/ish_manager/email_actions/index.haml +26 -0
  37. data/app/views/ish_manager/email_actions/new.haml +7 -0
  38. data/app/views/ish_manager/email_contexts/_form.haml +32 -30
  39. data/app/views/ish_manager/email_contexts/edit.haml +1 -1
  40. data/app/views/ish_manager/email_contexts/index.haml +27 -22
  41. data/app/views/ish_manager/email_contexts/show.haml +26 -15
  42. data/app/views/ish_manager/email_conversations/index.haml +46 -9
  43. data/app/views/ish_manager/email_conversations/show.haml +56 -21
  44. data/app/views/ish_manager/email_filters/_form.haml +12 -0
  45. data/app/views/ish_manager/email_filters/edit.haml +5 -0
  46. data/app/views/ish_manager/email_filters/index.haml +24 -0
  47. data/app/views/ish_manager/email_filters/new.haml +5 -0
  48. data/app/views/ish_manager/email_templates/_form.haml +32 -13
  49. data/app/views/ish_manager/email_templates/_form_reply_2_mini.haml +15 -0
  50. data/app/views/ish_manager/email_templates/_form_reply_mini.haml +1 -1
  51. data/app/views/ish_manager/email_templates/_index.haml +24 -11
  52. data/app/views/ish_manager/email_templates/_piousbox_roundborders.html.erb +4 -1
  53. data/app/views/ish_manager/email_templates/_wasyaco_roundborders.html.erb +5 -6
  54. data/app/views/ish_manager/email_templates/done/_form.haml +22 -0
  55. data/app/views/ish_manager/email_templates/done/_form2.haml +26 -0
  56. data/app/views/ish_manager/email_templates/edit.haml +2 -1
  57. data/app/views/ish_manager/email_templates/iframe_src.haml +4 -3
  58. data/app/views/ish_manager/email_templates/new.haml +5 -0
  59. data/app/views/ish_manager/email_templates/show.haml +9 -3
  60. data/app/views/ish_manager/galleries/show.haml +10 -1
  61. data/app/views/ish_manager/leads/_form.haml +11 -6
  62. data/app/views/ish_manager/leads/_form_import.haml +3 -3
  63. data/app/views/ish_manager/leads/edit.haml +19 -16
  64. data/app/views/ish_manager/leads/index.haml +25 -16
  65. data/app/views/ish_manager/leads/new.haml +8 -7
  66. data/app/views/ish_manager/leadsets/index.haml +60 -12
  67. data/app/views/ish_manager/leadsets/index_dataTables.haml +33 -0
  68. data/app/views/ish_manager/photos/_index_thumbs.haml +1 -1
  69. data/app/views/ish_manager/scheduled_actions/_form_mini.haml +16 -0
  70. data/app/views/ish_manager/scheduled_email_actions/_form.haml +26 -0
  71. data/app/views/ish_manager/scheduled_email_actions/index.haml +15 -0
  72. data/app/views/ish_manager/scheduled_email_actions/new.haml +4 -0
  73. data/app/views/ish_manager/scheduled_email_actions/show.haml +0 -0
  74. data/app/views/layouts/ish_manager/application.haml +2 -2
  75. data/app/views/layouts/ish_manager/application_fullwidth.haml +2 -2
  76. data/config/routes.rb +11 -2
  77. metadata +31 -6
  78. data/app/controllers/ish_manager/office_actions_controller.rb +0 -59
  79. data/app/views/ish_manager/office_actions/_form.haml +0 -83
  80. data/app/views/ish_manager/office_actions/index.haml +0 -9
@@ -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'
@@ -2,31 +2,79 @@
2
2
  .manager-leadsets-index
3
3
  %h5
4
4
  = link_to 'Leadsets', leadsets_path
5
- (#{Leadset.all.count})
5
+ (#{Leadset.kept.length})
6
+ (trash: #{Leadset.discarded.length})
6
7
  = link_to raw("<i class='fa fa-plus-square'></i>"), new_leadset_path
7
8
 
8
9
  .actions
9
10
  %label.select-all
10
11
  = check_box_tag :select_all
11
12
  select all
12
- %label.n-selected -
13
+ .n-selected -
13
14
  = button_tag 'Delete', method: :delete, class: 'delete-btn'
14
15
 
15
- %table.data-table.compact
16
+ %table
16
17
  %thead
17
18
  %tr
18
19
  %th &nbsp;
19
- %th created at
20
- %th Name
21
- %th Tag
20
+ -# %th created at
21
+ -# %th Name
22
22
  %th.company-url Company Url
23
- %th Location
23
+ %th Tags
24
+ %th +
25
+ %th.leads Leads
24
26
  %tbody
25
- - @leadsets.each do |leadset|
27
+ - @leadsets.each_with_index do |leadset, idx1|
26
28
  %tr
27
29
  %td= check_box_tag 'leadset_ids[]', leadset.id, nil, { class: 'i-sel' }
28
- %td= leadset.created_at.strftime("%Y-%m-%d %H:%M")
29
- %td= link_to leadset.name, leadset_path( leadset )
30
- %td= leadset.tag
30
+ -# %td= leadset.created_at.strftime("%Y-%m-%d %H:%M%P")
31
+ -# %td= link_to leadset.name, leadset_path( leadset )
31
32
  %td= link_to leadset.company_url, leadset.company_url
32
- %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
@@ -1,6 +1,6 @@
1
1
 
2
2
  .photos--index-thumbs
3
- .flex-row
3
+ .flex-row.items
4
4
  - photos.each do |photo|
5
5
  .item
6
6
  = render 'ish_manager/photos/meta_manager', photo: photo
@@ -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
@@ -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
data/config/routes.rb CHANGED
@@ -5,6 +5,7 @@ IshManager::Engine.routes.draw do
5
5
 
6
6
  get 'categories', to: 'categories#index'
7
7
 
8
+ patch 'galleries/:id/update_ordering', to: 'galleries#update_ordering'
8
9
  get 'galleries', :to => 'galleries#index', :defaults => { :render_type => Gallery::RENDER_THUMBS }
9
10
  get 'galleries/index_titles', :to => 'galleries#index', :defaults => { :render_type => Gallery::RENDER_TITLES }
10
11
  get 'galleries/index_thumbs', :to => 'galleries#index', :defaults => { :render_type => Gallery::RENDER_THUMBS }
@@ -51,10 +52,11 @@ IshManager::Engine.routes.draw do
51
52
  # office, below
52
53
  #
53
54
 
54
- resources :office_actions
55
+ resources :email_actions
55
56
 
56
57
  resources :email_campaigns
57
58
  resources :email_campaign_leads, as: :campaign_leads
59
+ resources :email_filters
58
60
 
59
61
  get 'email_messages/iframe/:id', to: 'email_messages#show_iframe', as: :email_message_iframe
60
62
  get 'email_messages/source/:id', to: 'email_messages#show_source', as: :email_message_source
@@ -64,8 +66,9 @@ IshManager::Engine.routes.draw do
64
66
  get 'email_conversations', to: 'email_conversations#index'
65
67
  get 'email_conversations/:id', to: 'email_conversations#show', as: :email_conversation
66
68
 
69
+ get 'email_contexts/for_lead/:lead_id', to: 'email_contexts#index', as: :email_contexts_for_lead
67
70
  get 'email_contexts/iframe_src/:id', to: 'email_contexts#iframe_src', as: :email_context_iframe
68
- get 'email_contexts/new_with/:template_slug', to: 'email_contexts#new'
71
+ get 'email_contexts/new_with_template/:template_slug', to: 'email_contexts#new'
69
72
  post 'email_contexts/send/:id', to: 'email_contexts#do_send', as: :email_context_send
70
73
  get 'email_contexts', to: 'email_contexts#index', as: :email_contexts, defaults: { notsent: false }
71
74
  get 'email_contexts/notsent', to: 'email_contexts#index', as: :notsent_email_contexts, defaults: { notsent: true }
@@ -79,6 +82,8 @@ IshManager::Engine.routes.draw do
79
82
 
80
83
  resources :email_unsubscribes
81
84
 
85
+ resources :lead_leadsets
86
+
82
87
  get 'leads', :to => 'leads#index'
83
88
  post 'leads/bulkop', to: 'leads#bulkop'
84
89
  post 'leads/import', to: 'leads#import', as: :leads_import
@@ -86,6 +91,8 @@ IshManager::Engine.routes.draw do
86
91
 
87
92
  resources :leadsets
88
93
 
94
+ resources :leadset_tags
95
+
89
96
 
90
97
  resources :meetings
91
98
 
@@ -96,6 +103,8 @@ IshManager::Engine.routes.draw do
96
103
 
97
104
  resources :reports
98
105
 
106
+ resources :scheduled_email_actions
107
+
99
108
  resources :user_profiles do
100
109
  resources :newsitems
101
110
  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.355
4
+ version: 0.1.8.357
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-28 00:00:00.000000000 Z
11
+ date: 2023-03-10 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rails
@@ -234,6 +234,8 @@ 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
238
+ - app/assets/javascripts/ish_manager/galleries.js
237
239
  - app/assets/javascripts/ish_manager/maps.js
238
240
  - app/assets/javascripts/ish_manager/shared.js
239
241
  - app/assets/javascripts/ish_manager/trash/application_materialize.js
@@ -266,10 +268,12 @@ files:
266
268
  - app/assets/javascripts/ish_manager/vendor/jquery.iframe-transport.js
267
269
  - app/assets/javascripts/ish_manager/vendor/jquery.ui.widget.js
268
270
  - app/assets/stylesheets/ish_manager/application.scss
269
- - app/assets/stylesheets/ish_manager/email_contexts_templates.scss
271
+ - app/assets/stylesheets/ish_manager/email.scss
272
+ - app/assets/stylesheets/ish_manager/email_contexts.scss
270
273
  - app/assets/stylesheets/ish_manager/email_conversations.scss
271
274
  - app/assets/stylesheets/ish_manager/email_iframe.css
272
275
  - app/assets/stylesheets/ish_manager/email_messages.scss
276
+ - app/assets/stylesheets/ish_manager/email_templates.scss
273
277
  - app/assets/stylesheets/ish_manager/galleries.scss
274
278
  - app/assets/stylesheets/ish_manager/jquery-ui.css
275
279
  - app/assets/stylesheets/ish_manager/leads_leadsets.scss
@@ -278,6 +282,8 @@ files:
278
282
  - app/assets/stylesheets/ish_manager/office.scss
279
283
  - app/assets/stylesheets/ish_manager/pagination.scss
280
284
  - app/assets/stylesheets/ish_manager/photos.scss
285
+ - app/assets/stylesheets/ish_manager/scheduled_actions_emails.scss
286
+ - app/assets/stylesheets/ish_manager/tags.scss
281
287
  - app/assets/stylesheets/ish_manager/trash/bootstrap.css
282
288
  - app/assets/stylesheets/ish_manager/trash/materialize.css
283
289
  - app/assets/stylesheets/ish_manager/trash/reset.css
@@ -285,10 +291,12 @@ files:
285
291
  - app/assets/stylesheets/ish_manager/videos.scss
286
292
  - app/controllers/ish_manager/application_controller.rb
287
293
  - app/controllers/ish_manager/categories_controller.rb
294
+ - app/controllers/ish_manager/email_actions_controller.rb
288
295
  - app/controllers/ish_manager/email_campaign_leads_controller.rb
289
296
  - app/controllers/ish_manager/email_campaigns_controller.rb
290
297
  - app/controllers/ish_manager/email_contexts_controller.rb
291
298
  - app/controllers/ish_manager/email_conversations_controller.rb
299
+ - app/controllers/ish_manager/email_filters_controller.rb
292
300
  - app/controllers/ish_manager/email_messages_controller.rb
293
301
  - app/controllers/ish_manager/email_templates_controller.rb
294
302
  - app/controllers/ish_manager/email_unsubscribes_controller.rb
@@ -297,15 +305,16 @@ files:
297
305
  - app/controllers/ish_manager/invoices_controller.rb
298
306
  - app/controllers/ish_manager/iro_watches_controller.rb
299
307
  - app/controllers/ish_manager/leads_controller.rb
308
+ - app/controllers/ish_manager/leadset_tags_controller.rb
300
309
  - app/controllers/ish_manager/leadsets_controller.rb
301
310
  - app/controllers/ish_manager/maps_controller.rb
302
311
  - app/controllers/ish_manager/markers_controller.rb
303
312
  - app/controllers/ish_manager/meetings_controller.rb
304
313
  - app/controllers/ish_manager/newsitems_controller.rb
305
- - app/controllers/ish_manager/office_actions_controller.rb
306
314
  - app/controllers/ish_manager/payments_controller.rb
307
315
  - app/controllers/ish_manager/photos_controller.rb
308
316
  - app/controllers/ish_manager/reports_controller.rb
317
+ - app/controllers/ish_manager/scheduled_email_actions_controller.rb
309
318
  - app/controllers/ish_manager/user_profiles_controller.rb
310
319
  - app/controllers/ish_manager/videos_controller.rb
311
320
  - app/helpers/ish_manager/application_helper.rb
@@ -368,6 +377,10 @@ files:
368
377
  - app/views/ish_manager/application_mailer/welcome.html.erb
369
378
  - app/views/ish_manager/categories/_subtree.haml
370
379
  - app/views/ish_manager/categories/index.haml
380
+ - app/views/ish_manager/email_actions/_form.haml
381
+ - app/views/ish_manager/email_actions/edit.haml
382
+ - app/views/ish_manager/email_actions/index.haml
383
+ - app/views/ish_manager/email_actions/new.haml
371
384
  - app/views/ish_manager/email_campaign_leads/show.haml
372
385
  - app/views/ish_manager/email_contexts/_form.haml
373
386
  - app/views/ish_manager/email_contexts/edit.haml
@@ -376,6 +389,10 @@ files:
376
389
  - app/views/ish_manager/email_contexts/show.haml
377
390
  - app/views/ish_manager/email_conversations/index.haml
378
391
  - app/views/ish_manager/email_conversations/show.haml
392
+ - app/views/ish_manager/email_filters/_form.haml
393
+ - app/views/ish_manager/email_filters/edit.haml
394
+ - app/views/ish_manager/email_filters/index.haml
395
+ - app/views/ish_manager/email_filters/new.haml
379
396
  - app/views/ish_manager/email_messages/_show_iframe.haml
380
397
  - app/views/ish_manager/email_messages/index.haml
381
398
  - app/views/ish_manager/email_messages/show.haml
@@ -384,6 +401,7 @@ files:
384
401
  - app/views/ish_manager/email_messages/show_stripped.haml
385
402
  - app/views/ish_manager/email_templates/_form.haml
386
403
  - app/views/ish_manager/email_templates/_form_mini.haml
404
+ - app/views/ish_manager/email_templates/_form_reply_2_mini.haml
387
405
  - app/views/ish_manager/email_templates/_form_reply_mini.haml
388
406
  - app/views/ish_manager/email_templates/_form_schedule_mini.haml
389
407
  - app/views/ish_manager/email_templates/_index.haml
@@ -401,9 +419,12 @@ files:
401
419
  - app/views/ish_manager/email_templates/_slug-3.html.erb
402
420
  - app/views/ish_manager/email_templates/_wasyaco_roundborders.html.erb
403
421
  - app/views/ish_manager/email_templates/_wasyaco_social.html.erb
422
+ - app/views/ish_manager/email_templates/done/_form.haml
423
+ - app/views/ish_manager/email_templates/done/_form2.haml
404
424
  - app/views/ish_manager/email_templates/edit.haml
405
425
  - app/views/ish_manager/email_templates/iframe_src.haml
406
426
  - app/views/ish_manager/email_templates/index.haml
427
+ - app/views/ish_manager/email_templates/new.haml
407
428
  - app/views/ish_manager/email_templates/plain.html.erb
408
429
  - app/views/ish_manager/email_templates/show.haml
409
430
  - app/views/ish_manager/email_unsubscribes/new.haml
@@ -442,6 +463,7 @@ files:
442
463
  - app/views/ish_manager/leadsets/_form.haml
443
464
  - app/views/ish_manager/leadsets/edit.haml
444
465
  - app/views/ish_manager/leadsets/index.haml
466
+ - app/views/ish_manager/leadsets/index_dataTables.haml
445
467
  - app/views/ish_manager/leadsets/new.haml
446
468
  - app/views/ish_manager/maps/_form.haml
447
469
  - app/views/ish_manager/maps/_index_item.haml
@@ -467,8 +489,6 @@ files:
467
489
  - app/views/ish_manager/newsitems/edit.haml
468
490
  - app/views/ish_manager/newsitems/index.haml
469
491
  - app/views/ish_manager/newsitems/new.haml
470
- - app/views/ish_manager/office_actions/_form.haml
471
- - app/views/ish_manager/office_actions/index.haml
472
492
  - app/views/ish_manager/office_mailer/morning_reminder.haml
473
493
  - app/views/ish_manager/office_mailer/render
474
494
  - app/views/ish_manager/office_mailer/test_email.html.haml
@@ -489,6 +509,11 @@ files:
489
509
  - app/views/ish_manager/reports/index.haml
490
510
  - app/views/ish_manager/reports/new.haml
491
511
  - app/views/ish_manager/reports/show.haml
512
+ - app/views/ish_manager/scheduled_actions/_form_mini.haml
513
+ - app/views/ish_manager/scheduled_email_actions/_form.haml
514
+ - app/views/ish_manager/scheduled_email_actions/index.haml
515
+ - app/views/ish_manager/scheduled_email_actions/new.haml
516
+ - app/views/ish_manager/scheduled_email_actions/show.haml
492
517
  - app/views/ish_manager/trash/email_campaigns-trash/_form.haml
493
518
  - app/views/ish_manager/trash/email_campaigns-trash/edit.haml
494
519
  - app/views/ish_manager/trash/email_campaigns-trash/index.haml
@@ -1,59 +0,0 @@
1
-
2
- class ::IshManager::OfficeActionsController < IshManager::ApplicationController
3
-
4
- before_action :set_lists
5
-
6
- ## alphabetized : )
7
-
8
- def create
9
- # @lead = ::Lead.new params[:lead].permit!
10
- # authorize! :create, @lead
11
- # if @lead.save
12
- # flash[:notice] = "created lead"
13
- # else
14
- # flash[:alert] = "Cannot create lead: #{@lead.errors.messages}"
15
- # end
16
- # redirect_to :action => 'index'
17
- end
18
-
19
- def edit
20
- # @lead = ::Lead.find params[:id]
21
- # authorize! :edit, @lead
22
- end
23
-
24
- def index
25
- @actions = Office::Action.active
26
- @new_office_action = Office::Action.new
27
- authorize! :index, @new_office_action
28
- end
29
-
30
- def new
31
- # @new_lead = ::Lead.new
32
- # authorize! :new, @new_lead
33
- end
34
-
35
- def show
36
- # authorize! :redirect, IshManager::Ability
37
- # redirect_to :action => :edit, :id => params[:id]
38
- end
39
-
40
- def update
41
- # @lead = ::Lead.find params[:id]
42
- # authorize! :update, @lead
43
- # if @lead.update_attributes params[:lead].permit!
44
- # flash[:notice] = 'Successfully updated lead.'
45
- # else
46
- # flash[:alert] = "Cannot update lead: #{@lead.errors.messages}"
47
- # end
48
- # redirect_to :action => 'index'
49
- end
50
-
51
- private
52
-
53
- def set_lists
54
- super
55
- @leadsets_list = [ [nil,nil] ] + ::Leadset.all.map { |k| [ k.name, k.id ] }
56
- @email_campaigns_list = [ [nil,nil] ] + Ish::EmailContext.unsent_campaigns.map { |k| [ k.slug, k.id ] }
57
- end
58
-
59
- end
@@ -1,83 +0,0 @@
1
- -#
2
- -# ish_manager / office_actions / _form
3
- -#
4
-
5
- = form_for office_action, :html => { :multipart => true, class: 'office-actions--form' } do |f|
6
- .row
7
- .col-sm-6
8
- .field
9
- -# = f.label :map
10
- -# = f.select :map_id, options_for_select( @maps_list, selected:( newsitem[:map_id] || params[:map_id] ) ), {}, class: 'select2'
11
- .col-sm-6
12
- = f.submit :submit
13
-
14
- .row
15
- .col-sm-12
16
- An
17
- .bordered-field
18
- = f.label :status do
19
- = f.check_box :status
20
- %span Active
21
-
22
- .input-field.input-outlined.inline
23
- = f.select :channel, options_for_select(['email', 'email'])
24
- -# = f.label :channel
25
-
26
- action
27
- .input-field.input-outlined.inline
28
- = f.text_field :match_from, value: 'sync.com'
29
- = f.label "From", for: :match_from
30
-
31
-
32
- Triggers
33
- <br />
34
-
35
- .input-field.input-outlined.inline
36
- = f.select :channel, options_for_select(['email', 'email'])
37
-
38
- w/ config
39
- .input-field.input-outlined.inline
40
- = f.text_area :channel, value: '{ "template": "20230207-autoresponse" }'
41
-
42
- <br />
43
-
44
- .input-field.input-outlined.inline
45
- = f.select :channel, options_for_select(['create_lead', 'email'])
46
-
47
- w/ config
48
- .input-field.input-outlined.inline
49
- = f.text_area :channel, value: ''
50
-
51
- .row
52
- .col-sm-6
53
- .field
54
-
55
- -# .field
56
- -# = label_tag :photo
57
- -# = file_field_tag :photo
58
- -# .field
59
- -# = f.label :subhead
60
- -# = f.text_area :subhead
61
- -# .field
62
- -# = f.label :descr
63
- -# = f.text_area :descr, :class => :tinymce
64
-
65
- -# .col-sm-6
66
- -# .field
67
- -# = f.label :video
68
- -# = f.select :video_id, options_for_select( @videos_list, :selected => @newsitem.video_id ), {}, class: 'select2'
69
- -# .field
70
- -# = f.label :gallery
71
- -# = f.select :gallery_id, options_for_select( @galleries_list, :selected => @newsitem.gallery_id ), {}, class: 'select2'
72
- -# .field
73
- -# = f.label :report
74
- -# = f.select :report_id, options_for_select( @reports_list, :selected => @newsitem.report_id ), {}, class: 'select2'
75
-
76
-
77
- .row
78
- .col-sm-6
79
- .field
80
- -# = f.label :map
81
- -# = f.select :map_id, options_for_select( @maps_list, selected:( newsitem[:map_id] || params[:map_id] ) ), {}, class: 'select2'
82
- .col-sm-6
83
- = f.submit :submit
@@ -1,9 +0,0 @@
1
-
2
- = render 'ish_manager/office_actions/form', office_action: @new_office_action
3
-
4
- .title
5
- %h1
6
- Office Actions
7
- = link_to '[+]', new_office_action_path
8
-
9
- = @actions.to_a