ish_manager 0.1.8.346 → 0.1.8.347

Sign up to get free protection for your applications and to get access to all the features.
Files changed (44) hide show
  1. checksums.yaml +4 -4
  2. data/app/assets/stylesheets/ish_manager/email_templates.scss +4 -1
  3. data/app/controllers/ish_manager/email_contexts_controller.rb +5 -3
  4. data/app/mailers/ish_manager/office_mailer.rb +1 -1
  5. data/app/views/202212 Mailchimp Templates/202212 1col fixed-width.html +863 -0
  6. data/app/views/202212 Mailchimp Templates/202212 1col full-width.html +906 -0
  7. data/app/views/202212 Mailchimp Templates/202212 2col fixed-width 2.html +1003 -0
  8. data/app/views/202212 Mailchimp Templates/202212 2col fixed-width.html +1082 -0
  9. data/app/views/202212 Mailchimp Templates/202212 2col full-width 2.html +1053 -0
  10. data/app/views/202212 Mailchimp Templates/202212 2col full-width.html +1147 -0
  11. data/app/views/202212 Mailchimp Templates/202212 3col fixed-width.html +1087 -0
  12. data/app/views/202212 Mailchimp Templates/202212 3col full-width.html +1136 -0
  13. data/app/views/202212 Mailchimp Templates/202212 catalog various-colors-1.html +1223 -0
  14. data/app/views/202212 Mailchimp Templates/202212 educate.html +1080 -0
  15. data/app/views/202212 Mailchimp Templates/202212 follow up.html +1001 -0
  16. data/app/views/202212 Mailchimp Templates/202212 make an announcement.html +1048 -0
  17. data/app/views/202212 Mailchimp Templates/202212 sell-a-product.html +977 -0
  18. data/app/views/202212 Mailchimp Templates/202212 tell a story.html +1168 -0
  19. data/app/views/202212 Mailchimp Templates/202212 theme art-newsletter.html +1612 -0
  20. data/app/views/202212 Mailchimp Templates/202212 theme caribou-xmas.html +856 -0
  21. data/app/views/202212 Mailchimp Templates/202212 theme colorbox.html +1027 -0
  22. data/app/views/202212 Mailchimp Templates/202212 theme competition-invitation.html +918 -0
  23. data/app/views/202212 Mailchimp Templates/202212 theme event-veerle.html +1132 -0
  24. data/app/views/202212 Mailchimp Templates/202212 theme fall-colors.html +1407 -0
  25. data/app/views/202212 Mailchimp Templates/202212 theme gift-giving.html +787 -0
  26. data/app/views/202212 Mailchimp Templates/202212 theme giftgiving-snowmen.html +731 -0
  27. data/app/views/202212 Mailchimp Templates/202212 theme heart-of-flowers.html +795 -0
  28. data/app/views/202212 Mailchimp Templates/202212 theme hero-card.html +915 -0
  29. data/app/views/202212 Mailchimp Templates/202212 theme hero-image.html +1148 -0
  30. data/app/views/202212 Mailchimp Templates/202212 theme monthly-contest.html +967 -0
  31. data/app/views/202212 Mailchimp Templates/202212 theme multiple-event.html +1189 -0
  32. data/app/views/202212 Mailchimp Templates/202212 theme postcard.html +914 -0
  33. data/app/views/202212 Mailchimp Templates/202212 theme snowy-fields.html +733 -0
  34. data/app/views/202212 Mailchimp Templates/202212 theme soft.html +849 -0
  35. data/app/views/202212 Mailchimp Templates/202212 theme sophisticated.html +1079 -0
  36. data/app/views/202212 Mailchimp Templates/202212 theme subtle.html +1218 -0
  37. data/app/views/202212 Mailchimp Templates/202212 theme ticket.html +1015 -0
  38. data/app/views/202212 Mailchimp Templates/202212 theme whale.html +888 -0
  39. data/app/views/ish_manager/application/_main_footer.haml +5 -3
  40. data/app/views/ish_manager/email_contexts/_form.haml +3 -1
  41. data/app/views/ish_manager/email_contexts/show.haml +3 -3
  42. data/app/views/layouts/ish_manager/application.haml +10 -6
  43. data/lib/tasks/office_tasks.rake +27 -0
  44. metadata +37 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: '09fb9aa071250abfb6c6b6b112a5b9cf4713d6bbf9b8f1d4f54f1e4df4aa42a9'
4
- data.tar.gz: f3dfdec908abcf40c418ce33abbf876dd3ffc43fd4bb579901675cba7e4901af
3
+ metadata.gz: 1e2fddc1d3c422db421f3a2b2fbf7744614acc45149c8e703de1def817f02063
4
+ data.tar.gz: c187f60ca2a6fd5e4c137e65444ae2870c01a447f8918d3bb0c11e17d6071089
5
5
  SHA512:
6
- metadata.gz: 2a8c93d5b09bf8b7de79f2bf6ec2c68dea1210dbc541a82ae94171475c5fe6eff058ad1ba5349225a054749f04efa21d48221e819c9255da43b0bcee080e19f9
7
- data.tar.gz: e47f9940f8cfcc61a87d6aeea63d4e4abd26408cb6d7440cedc52e31a2da2601dd18311eb87dcaf4980eb6e27867acd178b379db43645509024d6053b3632bce
6
+ metadata.gz: 67f229406a971c6ada4d8a235ae5a594a4986f4197ec564a0b9e6c838034b4d8b3248c7672372bb9c46857e34525a40068045087fb50e34e673eca58ceeb124a
7
+ data.tar.gz: 4abfe9f4e0a32277d52e4b774aebea6a6e9857763e71b8a18bacfbe19f7083c082b7ee84d73bb0b60e700e6fe2911ea251982ec9701842b93a3a69ea0b718881
data/app/assets/stylesheets/ish_manager/email_templates.scss CHANGED
@@ -1,7 +1,10 @@
1
1
 
2
2
 
3
- .email-contexts-new {
3
+ .email-contexts-new,
4
+ .email-contexts-edit {
4
5
  .actions {
6
+ margin-top: 10px;
7
+ margin-bottom: 50px;
5
8
  display: flex;
6
9
  justify-content: space-between;
7
10
  }
data/app/controllers/ish_manager/email_contexts_controller.rb CHANGED
@@ -15,7 +15,8 @@ class ::IshManager::EmailContextsController < ::IshManager::ApplicationControlle
15
15
  redirect_to action: 'show', id: @email_ctx.id
16
16
  return
17
17
  else
18
- flash[:alert] = "Could not save: #{@email_ctx.errors.full_messages.join(', ')}"
18
+ # flash[:alert] = "Could not save: #{@email_ctx.errors.full_messages.join(', ')}"
19
+ flash[:alert] = ['Could not save:'] + @email_ctx.errors.full_messages
19
20
  render action: :new
20
21
  return
21
22
  end
@@ -38,8 +39,9 @@ class ::IshManager::EmailContextsController < ::IshManager::ApplicationControlle
38
39
  authorize! :do_send, @ctx
39
40
  case @ctx.type
40
41
  when ::Ish::EmailContext::TYPE_SINGLE
41
- flash[:notice] = 'Scheduled a single send'
42
- IshManager::OfficeMailer.send_context_email(params[:id]).deliver_later
42
+ flash[:notice] = 'Scheduled a single send - v2'
43
+ @ctx.send_at = Time.now
44
+ @ctx.save
43
45
  when ::Ish::EmailContext::TYPE_CAMPAIGN
44
46
  flash[:notice] = 'Scheduled campaign send'
45
47
  IshManager::EmailCampaignJob.new.perform(params[:id])
data/app/mailers/ish_manager/office_mailer.rb CHANGED
@@ -69,7 +69,7 @@ class IshManager::OfficeMailer < IshManager::ApplicationMailer
69
69
  rendered_str = ac.render_to_string("ish_manager/email_templates/plain")
70
70
  end
71
71
 
72
- @email_ctx.update( rendered_str: rendered_str, sent_at: Time.now )
72
+ @email_ctx.update( rendered_str: rendered_str, sent_at: Time.now.to_s )
73
73
 
74
74
  mail( from: @email_ctx.from_email,
75
75
  to: @email_ctx.to_email,