ish_manager 0.1.8.401 → 0.1.8.402
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/application.scss +10 -5
- data/app/controllers/ish_manager/email_contexts_controller.rb +2 -0
- data/app/views/ish_manager/application/_main_footer.haml +1 -1
- data/app/views/ish_manager/application/_main_header_admin.haml +1 -1
- data/app/views/ish_manager/email_contexts/index.haml +12 -2
- data/app/views/ish_manager/email_contexts/show.haml +1 -1
- data/config/routes.rb +3 -2
- data/lib/tasks/office_tasks.rake +4 -6
- metadata +1 -1
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 99464fcd8fa7b0f58cb5d7eb6b62dec9e62fb6b5d8da4500bb7b11362a5042a0
|
4
|
+
data.tar.gz: 71fdb74c90c9d4d7ead1b5d410e2516f29dc51e2bc1a67aaf0d712189527a3e8
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 4123acb840e9676a335b2d8664182e6b81ab7f353ddd0627eea8ee637402269120c419bae5142ca62f5d2709da8f540bb083c5ac5cb5c2bc5bf76d7526fb19e9
|
7
|
+
data.tar.gz: 155d66ae258ed66afb40f01fa9083d422875e0a40e0f3b1249b34f23610626305bdf04c7b66071397197591c2dcb89acbdde98d634cc3d10b5573d3a008a5639
|
@@ -42,10 +42,20 @@ a[target='_blank'] {
|
|
42
42
|
}
|
43
43
|
html {
|
44
44
|
height: 100%;
|
45
|
+
width: 100%;
|
46
|
+
// display: flex;
|
47
|
+
background: url('//d15g8hc4183yn4.cloudfront.net/wp-content/uploads/2022/10/05192823/weather-bg.png');
|
45
48
|
}
|
46
49
|
body {
|
47
50
|
background: #dedede;
|
48
51
|
font-size: 20px;
|
52
|
+
width: 100%;
|
53
|
+
}
|
54
|
+
|
55
|
+
body.application-fullwidth {
|
56
|
+
// height: 100%;
|
57
|
+
// display: flex;
|
58
|
+
// flex-direction: column;
|
49
59
|
}
|
50
60
|
hr {
|
51
61
|
background: red;
|
@@ -95,11 +105,6 @@ ul:not(.browser-default).bullets, {
|
|
95
105
|
width: 100vwh;
|
96
106
|
overflow-x: auto;
|
97
107
|
}
|
98
|
-
body.application-fullwidth {
|
99
|
-
height: 100%;
|
100
|
-
display: flex;
|
101
|
-
flex-direction: column;
|
102
|
-
}
|
103
108
|
.application-home {
|
104
109
|
.bordered-card {
|
105
110
|
max-width: 400px;
|
@@ -58,7 +58,7 @@
|
|
58
58
|
= link_to "Templates (#{Ish::EmailTemplate.all.count})", email_templates_path
|
59
59
|
= link_to '[+]', new_email_template_path
|
60
60
|
%li
|
61
|
-
= link_to
|
61
|
+
= link_to "Contexts (#{Ctx.notsent.length})", notsent_email_contexts_path
|
62
62
|
= link_to '[+]', new_email_context_path
|
63
63
|
-# %li
|
64
64
|
-# = link_to 'Campaigns', email_campaigns_path
|
@@ -3,16 +3,22 @@
|
|
3
3
|
|
4
4
|
.header.collapse-expand-trash#emailContextsIndex
|
5
5
|
%h2.title
|
6
|
+
- if params[:notsent]
|
7
|
+
<u>notsent</u>
|
8
|
+
= link_to '[sent]', sent_email_contexts_path
|
9
|
+
- else
|
10
|
+
= link_to '[notsent]', notsent_email_contexts_path
|
11
|
+
<u>sent</u>
|
6
12
|
Email Contexts (#{@ctxs.length})
|
7
13
|
- if @lead
|
8
14
|
For lead `#{@lead.name}`
|
9
15
|
= link_to '[+]', new_email_context_path
|
10
|
-
|
16
|
+
|
11
17
|
|
12
18
|
.W0
|
13
19
|
= render 'paginate', resource: @ctxs, param_name: :email_contexts_page, views_prefix: :ish_manager
|
14
20
|
|
15
|
-
%table.bordered
|
21
|
+
%table.bordered
|
16
22
|
%thead
|
17
23
|
%tr
|
18
24
|
%th.actions
|
@@ -20,6 +26,8 @@
|
|
20
26
|
%th.to To
|
21
27
|
%th.subject Subject
|
22
28
|
%th.template Template
|
29
|
+
%th.send_at Send at
|
30
|
+
%th.sent_at Sent at
|
23
31
|
%tbody
|
24
32
|
- @ctxs.each do |ctx|
|
25
33
|
%tr
|
@@ -36,6 +44,8 @@
|
|
36
44
|
= link_to email_context_path(ctx) do
|
37
45
|
= ctx.subject ? ctx.subject : "t| #{ctx.tmpl.subject}"
|
38
46
|
%td= ctx.email_template.slug
|
47
|
+
%td= pp_date ctx.send_at
|
48
|
+
%td= pp_date ctx.sent_at
|
39
49
|
|
40
50
|
|
41
51
|
= render 'paginate', resource: @ctxs, param_name: :email_contexts_page, views_prefix: :ish_manager
|
@@ -20,7 +20,7 @@
|
|
20
20
|
%li <b>Send at:</b> #{@ctx.send_at&.strftime('%Y-%m-%d %l:%M%P')}
|
21
21
|
%li <b>Sent at:</b> #{@ctx.sent_at&.strftime('%Y-%m-%d %l:%M%P')}
|
22
22
|
%li
|
23
|
-
= button_to 'Send',
|
23
|
+
= button_to 'Send', send_email_context_path(@ctx), form_class: 'inline', :data => { :confirm => 'Are you sure?' }
|
24
24
|
= link_to '[~]', edit_email_context_path(@ctx)
|
25
25
|
|
26
26
|
.max-width
|
data/config/routes.rb
CHANGED
@@ -73,9 +73,10 @@ IshManager::Engine.routes.draw do
|
|
73
73
|
get 'email_contexts/for_lead/:lead_id', to: 'email_contexts#index', as: :email_contexts_for_lead
|
74
74
|
get 'email_contexts/iframe_src/:id', to: 'email_contexts#iframe_src', as: :email_context_iframe
|
75
75
|
get 'email_contexts/new_with_template/:template_slug', to: 'email_contexts#new'
|
76
|
-
post 'email_contexts/send/:id', to: 'email_contexts#do_send', as: :
|
77
|
-
get 'email_contexts', to: 'email_contexts#index', as: :email_contexts, defaults: { notsent:
|
76
|
+
post 'email_contexts/send/:id', to: 'email_contexts#do_send', as: :send_email_context
|
77
|
+
get 'email_contexts', to: 'email_contexts#index', as: :email_contexts, defaults: { notsent: true }
|
78
78
|
get 'email_contexts/notsent', to: 'email_contexts#index', as: :notsent_email_contexts, defaults: { notsent: true }
|
79
|
+
get 'email_contexts/sent', to: 'email_contexts#index', as: :sent_email_contexts, defaults: { notsent: false }
|
79
80
|
resources :email_contexts
|
80
81
|
|
81
82
|
get 'email_templates/iframe_src/:id', to: 'email_templates#iframe_src', as: :email_template_iframe
|
data/lib/tasks/office_tasks.rake
CHANGED
@@ -51,16 +51,14 @@ namespace :office do
|
|
51
51
|
task email_worker: :environment do
|
52
52
|
while true do
|
53
53
|
|
54
|
-
ctxs = ::Ish::EmailContext.scheduled.
|
55
|
-
puts! ctxs.count, 'ctxs'
|
54
|
+
ctxs = ::Ish::EmailContext.scheduled.notsent
|
56
55
|
ctxs.map do |ctx|
|
57
56
|
IshManager::OfficeMailer.send_context_email( ctx[:id].to_s ).deliver_later
|
58
|
-
print '
|
57
|
+
print '^'
|
59
58
|
end
|
60
59
|
|
61
|
-
#
|
62
|
-
|
63
|
-
print '^'
|
60
|
+
sleep 60 # seconds
|
61
|
+
print '.'
|
64
62
|
end
|
65
63
|
end
|
66
64
|
|