ish_manager 0.1.8.327 → 0.1.8.329

Sign up to get free protection for your applications and to get access to all the features.
Files changed (28) hide show
  1. checksums.yaml +4 -4
  2. data/app/assets/javascripts/ish_manager/application.js +2 -0
  3. data/app/assets/javascripts/ish_manager/email_contexts.js +32 -0
  4. data/app/assets/javascripts/ish_manager/{application_materialize.js → trash/application_materialize.js} +0 -0
  5. data/app/assets/javascripts/ish_manager/{materialize.js → trash/materialize.js} +0 -0
  6. data/app/assets/stylesheets/ish_manager/email_templates.scss +24 -1
  7. data/app/controllers/ish_manager/email_campaigns_controller.rb +6 -6
  8. data/app/controllers/ish_manager/email_contexts_controller.rb +28 -5
  9. data/app/controllers/ish_manager/email_templates_controller.rb +17 -0
  10. data/app/mailers/ish_manager/office_mailer.rb +82 -7
  11. data/app/views/ish_manager/application/_main_header_admin.haml +2 -3
  12. data/app/views/ish_manager/email_contexts/_form.haml +36 -11
  13. data/app/views/ish_manager/email_contexts/index.haml +4 -1
  14. data/app/views/ish_manager/email_contexts/show.haml +14 -3
  15. data/app/views/ish_manager/email_templates/_form.haml +12 -1
  16. data/app/views/ish_manager/email_templates/_form_mini.haml +9 -0
  17. data/app/views/ish_manager/email_templates/_index.haml +2 -1
  18. data/app/views/ish_manager/email_templates/{_marketing_ror_2.html → _marketing_react_1.html} +0 -0
  19. data/app/views/ish_manager/email_templates/_marketing_ror_2.html.erb +753 -0
  20. data/app/views/ish_manager/email_templates/edit.haml +2 -0
  21. data/app/views/ish_manager/email_templates/plain.html.erb +4 -0
  22. data/app/views/ish_manager/trash/email_campaigns-trash/_form.haml +46 -0
  23. data/app/views/ish_manager/trash/email_campaigns-trash/edit.haml +0 -0
  24. data/app/views/ish_manager/trash/email_campaigns-trash/index.haml +4 -0
  25. data/app/views/ish_manager/trash/email_campaigns-trash/new.haml +2 -0
  26. data/config/routes.rb +10 -8
  27. metadata +14 -6
  28. data/app/views/ish_manager/email_campaigns/index.haml +0 -2
@@ -0,0 +1,2 @@
1
+
2
+ = render 'form', email_template: @template
@@ -0,0 +1,4 @@
1
+
2
+
3
+ <%= raw @body %>
4
+
@@ -0,0 +1,46 @@
1
+
2
+ .email-campaigns--form
3
+ %h2
4
+ Email Campaign
5
+ - if email_campaign.email_template
6
+ with template `#{email_campaign.email_template.slug}` type:#{email_campaign.email_template.type}.
7
+
8
+ - url = %w| index new create |.include?( params[:action] ) ? email_contexts_path : email_context_path(email_campaign)
9
+ = form_for email_campaign, url: url do |f|
10
+ .row
11
+ .col.s6
12
+ .field
13
+ = f.label :title
14
+ = f.text_field :title
15
+
16
+ .field
17
+ = f.label :email_template_id
18
+ = f.select :email_template_id, options_for_select(@email_templates_list, selected: params[:email_template_id] || email_campaign.email_template&.id )
19
+
20
+ .field
21
+ = f.label :from_email
22
+ = f.select :from_email, options_for_select(Ish::EmailContext.from_email_list, selected: email_campaign.from_email)
23
+ .field
24
+ = f.label :to_email
25
+ = f.text_field :to_email
26
+
27
+ .col.s6
28
+ %h5 Templating
29
+ .field
30
+ = f.label :name
31
+ = f.text_field :name
32
+ .field.field-subject
33
+ = f.label :subject
34
+ = f.text_field :subject
35
+ - if 'plain' == email_campaign.email_template&.type
36
+ .body
37
+ = raw email_campaign.email_template.body
38
+ - else
39
+ .field
40
+ = f.label :body
41
+ = f.text_area :body, class: 'tinymce'
42
+ .actions
43
+ .left
44
+ = f.submit 'Preview'
45
+ .right
46
+ -# = f.submit 'Schedule/Send'
@@ -0,0 +1,4 @@
1
+
2
+ %h2
3
+ Email Campaigns
4
+ = link_to '[+]', new_email_campaign_path
@@ -0,0 +1,2 @@
1
+
2
+ = render 'form'
data/config/routes.rb CHANGED
@@ -47,17 +47,19 @@ IshManager::Engine.routes.draw do
47
47
 
48
48
  resources :email_campaigns, as: :email_campaigns
49
49
 
50
- get 'email_contexts/iframe_src/:id', to: 'email_contexts#iframe_src', as: :email_context_iframe
51
- get 'email_contexts/new_with/:template_slug', to: 'email_contexts#new'
52
- post 'email_contexts/send/:id', to: 'email_contexts#do_send', as: :email_context_send
53
- get 'email_contexts', to: 'email_contexts#index', defaults: { notsent: false }, as: :email_contexts
54
- get 'email_contexts/notsent', to: 'email_contexts#index', defaults: { notsent: true }, as: :notsent_email_contexts
50
+ get 'email_contexts/iframe_src/:id', to: 'email_contexts#iframe_src', as: :email_context_iframe
51
+ get 'email_contexts/new_with/:template_slug', to: 'email_contexts#new'
52
+ post 'email_contexts/send/:id', to: 'email_contexts#do_send', as: :email_context_send
53
+ get 'email_contexts', to: 'email_contexts#index', as: :email_contexts, defaults: { notsent: false }
54
+ get 'email_contexts/notsent', to: 'email_contexts#index', as: :notsent_email_contexts, defaults: { notsent: true }
55
55
  resources :email_contexts
56
56
 
57
- get 'email_templates/iframe_src/:id', to: 'email_templates#iframe_src', as: :email_template_iframe
58
- get 'email_templates/show/:id', to: 'email_templates#show', as: :email_template
59
- delete 'email_templates/show/:id', to: 'email_templates#destroy'
57
+ get 'email_templates/iframe_src/:id', to: 'email_templates#iframe_src', as: :email_template_iframe
58
+ get 'email_templates/show/:id', to: 'email_templates#show', as: :email_template
59
+ patch 'email_templates/show/:id', to: 'email_templates#update'
60
+ delete 'email_templates/show/:id', to: 'email_templates#destroy'
60
61
  resources :email_templates
62
+
61
63
  resources :email_unsubscribes
62
64
 
63
65
  get 'leads', :to => 'leads#index', :defaults => { :is_done => false }, as: :leads
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.327
4
+ version: 0.1.8.329
5
5
  platform: ruby
6
6
  authors:
7
7
  - piousbox
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2022-11-10 00:00:00.000000000 Z
11
+ date: 2022-11-20 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rails
@@ -219,10 +219,10 @@ files:
219
219
  - app/assets/images/ui-icons_ffffff_256x240.png
220
220
  - app/assets/images/wait.gif
221
221
  - app/assets/javascripts/ish_manager/application.js
222
- - app/assets/javascripts/ish_manager/application_materialize.js
222
+ - app/assets/javascripts/ish_manager/email_contexts.js
223
223
  - app/assets/javascripts/ish_manager/maps.js
224
- - app/assets/javascripts/ish_manager/materialize.js
225
224
  - app/assets/javascripts/ish_manager/shared.js
225
+ - app/assets/javascripts/ish_manager/trash/application_materialize.js
226
226
  - app/assets/javascripts/ish_manager/trash/jquery-ui-1.12.1.zip
227
227
  - app/assets/javascripts/ish_manager/trash/jquery-ui-1.12.1/AUTHORS.txt
228
228
  - app/assets/javascripts/ish_manager/trash/jquery-ui-1.12.1/LICENSE.txt
@@ -243,6 +243,7 @@ files:
243
243
  - app/assets/javascripts/ish_manager/trash/jquery-ui-1.12.1/jquery-ui.theme.css
244
244
  - app/assets/javascripts/ish_manager/trash/jquery-ui-1.12.1/jquery-ui.theme.min.css
245
245
  - app/assets/javascripts/ish_manager/trash/jquery-ui-1.12.1/package.json
246
+ - app/assets/javascripts/ish_manager/trash/materialize.js
246
247
  - app/assets/javascripts/ish_manager/vendor/bootstrap.min.js
247
248
  - app/assets/javascripts/ish_manager/vendor/jquery-3.2.1.min.js
248
249
  - app/assets/javascripts/ish_manager/vendor/jquery-3.6.0.min.js
@@ -306,22 +307,25 @@ files:
306
307
  - app/views/ish_manager/application/trash/_main_header_manager.haml
307
308
  - app/views/ish_manager/application_mailer/shared_galleries.html.erb
308
309
  - app/views/ish_manager/application_mailer/welcome.html.erb
309
- - app/views/ish_manager/email_campaigns/index.haml
310
310
  - app/views/ish_manager/email_contexts/_form.haml
311
311
  - app/views/ish_manager/email_contexts/edit.haml
312
312
  - app/views/ish_manager/email_contexts/index.haml
313
313
  - app/views/ish_manager/email_contexts/new.haml
314
314
  - app/views/ish_manager/email_contexts/show.haml
315
315
  - app/views/ish_manager/email_templates/_form.haml
316
+ - app/views/ish_manager/email_templates/_form_mini.haml
316
317
  - app/views/ish_manager/email_templates/_index.haml
318
+ - app/views/ish_manager/email_templates/_marketing_react_1.html
317
319
  - app/views/ish_manager/email_templates/_marketing_ror_1.html
318
- - app/views/ish_manager/email_templates/_marketing_ror_2.html
320
+ - app/views/ish_manager/email_templates/_marketing_ror_2.html.erb
319
321
  - app/views/ish_manager/email_templates/_marketing_wordpress_1.html
320
322
  - app/views/ish_manager/email_templates/_marketing_wordpress_2.html
321
323
  - app/views/ish_manager/email_templates/_piousbox_roundborders.html.erb
322
324
  - app/views/ish_manager/email_templates/_social.html.erb
325
+ - app/views/ish_manager/email_templates/edit.haml
323
326
  - app/views/ish_manager/email_templates/iframe_src.haml
324
327
  - app/views/ish_manager/email_templates/index.haml
328
+ - app/views/ish_manager/email_templates/plain.html.erb
325
329
  - app/views/ish_manager/email_templates/show.haml
326
330
  - app/views/ish_manager/email_unsubscribes/new.haml
327
331
  - app/views/ish_manager/galleries/_form.haml
@@ -399,6 +403,10 @@ files:
399
403
  - app/views/ish_manager/reports/index.haml
400
404
  - app/views/ish_manager/reports/new.haml
401
405
  - app/views/ish_manager/reports/show.haml
406
+ - app/views/ish_manager/trash/email_campaigns-trash/_form.haml
407
+ - app/views/ish_manager/trash/email_campaigns-trash/edit.haml
408
+ - app/views/ish_manager/trash/email_campaigns-trash/index.haml
409
+ - app/views/ish_manager/trash/email_campaigns-trash/new.haml
402
410
  - app/views/ish_manager/user_profiles/_form.haml
403
411
  - app/views/ish_manager/user_profiles/_show.haml
404
412
  - app/views/ish_manager/user_profiles/edit.haml
@@ -1,2 +0,0 @@
1
-
2
- %h2 Email Campaigns