ish_manager 0.1.8.346 → 0.1.8.348
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/app/assets/stylesheets/ish_manager/email_templates.scss +4 -1
- data/app/controllers/ish_manager/email_contexts_controller.rb +5 -3
- data/app/mailers/ish_manager/office_mailer.rb +1 -1
- data/app/views/202212 Mailchimp Templates/202212 1col fixed-width.html +863 -0
- data/app/views/202212 Mailchimp Templates/202212 1col full-width.html +906 -0
- data/app/views/202212 Mailchimp Templates/202212 2col fixed-width 2.html +1003 -0
- data/app/views/202212 Mailchimp Templates/202212 2col fixed-width.html +1082 -0
- data/app/views/202212 Mailchimp Templates/202212 2col full-width 2.html +1053 -0
- data/app/views/202212 Mailchimp Templates/202212 2col full-width.html +1147 -0
- data/app/views/202212 Mailchimp Templates/202212 3col fixed-width.html +1087 -0
- data/app/views/202212 Mailchimp Templates/202212 3col full-width.html +1136 -0
- data/app/views/202212 Mailchimp Templates/202212 catalog various-colors-1.html +1223 -0
- data/app/views/202212 Mailchimp Templates/202212 educate.html +1080 -0
- data/app/views/202212 Mailchimp Templates/202212 follow up.html +1001 -0
- data/app/views/202212 Mailchimp Templates/202212 make an announcement.html +1048 -0
- data/app/views/202212 Mailchimp Templates/202212 sell-a-product.html +977 -0
- data/app/views/202212 Mailchimp Templates/202212 tell a story.html +1168 -0
- data/app/views/202212 Mailchimp Templates/202212 theme art-newsletter.html +1612 -0
- data/app/views/202212 Mailchimp Templates/202212 theme caribou-xmas.html +856 -0
- data/app/views/202212 Mailchimp Templates/202212 theme colorbox.html +1027 -0
- data/app/views/202212 Mailchimp Templates/202212 theme competition-invitation.html +918 -0
- data/app/views/202212 Mailchimp Templates/202212 theme event-veerle.html +1132 -0
- data/app/views/202212 Mailchimp Templates/202212 theme fall-colors.html +1407 -0
- data/app/views/202212 Mailchimp Templates/202212 theme gift-giving.html +787 -0
- data/app/views/202212 Mailchimp Templates/202212 theme giftgiving-snowmen.html +731 -0
- data/app/views/202212 Mailchimp Templates/202212 theme heart-of-flowers.html +795 -0
- data/app/views/202212 Mailchimp Templates/202212 theme hero-card.html +915 -0
- data/app/views/202212 Mailchimp Templates/202212 theme hero-image.html +1148 -0
- data/app/views/202212 Mailchimp Templates/202212 theme monthly-contest.html +967 -0
- data/app/views/202212 Mailchimp Templates/202212 theme multiple-event.html +1189 -0
- data/app/views/202212 Mailchimp Templates/202212 theme postcard.html +914 -0
- data/app/views/202212 Mailchimp Templates/202212 theme snowy-fields.html +733 -0
- data/app/views/202212 Mailchimp Templates/202212 theme soft.html +849 -0
- data/app/views/202212 Mailchimp Templates/202212 theme sophisticated.html +1079 -0
- data/app/views/202212 Mailchimp Templates/202212 theme subtle.html +1218 -0
- data/app/views/202212 Mailchimp Templates/202212 theme ticket.html +1015 -0
- data/app/views/202212 Mailchimp Templates/202212 theme whale.html +888 -0
- data/app/views/ish_manager/application/_main_footer.haml +5 -3
- data/app/views/ish_manager/email_contexts/_form.haml +3 -1
- data/app/views/ish_manager/email_contexts/show.haml +3 -3
- data/app/views/layouts/ish_manager/application.haml +10 -6
- data/lib/systemd/system/ish_email_worker.service +19 -0
- data/lib/systemd/system/ish_sidekiq.service +20 -0
- data/lib/tasks/office_tasks.rake +27 -0
- metadata +39 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 648c727ded2ae9dd00b45d657e41829101faad32630bcf3b507a9e02b112fb0c
|
4
|
+
data.tar.gz: f0dc033e4ee263189f763314a0e617f388ffd407dec354d886b4a2c70f0a7b18
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 7a8c487c8b012636600135781eed31b2341c816e6aefd53d95cbf5ee1322d11d1bfcdd00eb42b3fac0aba7bb6ae95850b8573a79b87b4637dd45da029a737f04
|
7
|
+
data.tar.gz: a2ae4d306b98b92f08388fd7fce66e1994eed32c0f9997970be5335e03fdca7bd1a8e8db7ca32f0d0d1b547fc6e5011cedbe5a870afe08f7b6e5a141341bf66a
|
@@ -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
|
-
|
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])
|
@@ -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,
|