wco_models 3.1.0.63 → 3.1.0.65
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/app/assets/javascripts/wco/alerts-notices.js +8 -0
- data/app/assets/javascripts/wco/application.js +1 -1
- data/app/assets/stylesheets/wco/alerts_notices.scss +14 -0
- data/app/assets/stylesheets/wco/application.css +2 -11
- data/app/helpers/wco/application_helper.rb +1 -1
- data/app/mailers/wco_email/application_mailer.rb +2 -10
- data/app/models/wco_email/context.rb +1 -2
- data/app/models/wco_email/message.rb +2 -2
- data/app/views/wco/_alerts_notices.haml +1 -1
- data/app/views/wco/_main_footer.haml +4 -9
- metadata +4 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 02fdc8bebae14b0be3eac4cb615b79dad76bc8744cb99562a186ada61d971e92
|
4
|
+
data.tar.gz: fb55583510689139a5a6b6edcb67cd6b329650d6fc0e3e64e1363fb442456e9f
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 5385f595a664d61d27ea8a99d13baa2af3fa7d7adab2c0cd77e80d24daaae35627e9893ce6ec93d1324fe9857a4a3d4287319d244f43cb71cddf88422cdac3a8
|
7
|
+
data.tar.gz: 45f1d42555b82d076e8e1a9c8d485bf96eef7ab05a3940eedebd1fc0a99d5a9a979640d329aeea81c1ee118472b29d40961d09715ab7a9c77b4bb2fdbd002291
|
@@ -5,25 +5,16 @@
|
|
5
5
|
*= require_tree .
|
6
6
|
**/
|
7
7
|
|
8
|
-
/* body {
|
9
|
-
color: red !important;
|
10
|
-
} */
|
11
|
-
|
12
8
|
.select2 {
|
13
9
|
min-width: 200px;
|
14
|
-
/* width: 100%; */
|
15
|
-
}
|
16
|
-
|
17
|
-
.wco--alerts-notices {
|
18
|
-
border-bottom: 1px solid red;
|
19
10
|
}
|
20
11
|
|
21
12
|
.main-footer {
|
22
|
-
border-top:
|
13
|
+
border-top: 2px solid #6395b9;
|
23
14
|
}
|
24
15
|
|
25
16
|
.main-header {
|
26
|
-
|
17
|
+
border-bottom: 2px solid #6395b9;
|
27
18
|
|
28
19
|
li {
|
29
20
|
display: flex;
|
@@ -26,7 +26,7 @@ module Wco::ApplicationHelper
|
|
26
26
|
def pp_time date
|
27
27
|
return nil if !date
|
28
28
|
# return date.strftime('%l:%M%P %z')
|
29
|
-
return date.in_time_zone( Rails.application.config.time_zone ).strftime('%l:%M%P')
|
29
|
+
return date.in_time_zone( Rails.application.config.time_zone ).strftime('%l:%M%P %Z')
|
30
30
|
end
|
31
31
|
|
32
32
|
def pp_amount a
|
@@ -58,18 +58,12 @@ class WcoEmail::ApplicationMailer < ActionMailer::Base
|
|
58
58
|
'utm_source' => @ctx.tmpl.slug,
|
59
59
|
}.map { |k, v| "#{k}=#{v}" }.join("&")
|
60
60
|
|
61
|
-
# @origin = "https://#{Rails.application.config.action_mailer.default_url_options[:host]}"
|
62
|
-
|
63
61
|
@unsubscribe_url = WcoEmail::Engine.routes.url_helpers.unsubscribes_url({
|
64
62
|
template_id: @ctx.tmpl.id,
|
65
63
|
lead_id: @lead.id,
|
66
64
|
token: @lead.unsubscribe_token,
|
67
65
|
host: Rails.application.routes.default_url_options[:host],
|
68
66
|
})
|
69
|
-
# renderer = Tmp6Ctl.new
|
70
|
-
# renderer = IshManager::ApplicationController.new
|
71
|
-
# renderer.send( :include, ::IshManager::ApplicationHelper )
|
72
|
-
# renderer.send( :request, { host: 'test-host' } )
|
73
67
|
renderer = WcoEmail::ApplicationMailer.new
|
74
68
|
|
75
69
|
renderer.instance_variable_set( :@ctx, @ctx )
|
@@ -78,12 +72,10 @@ class WcoEmail::ApplicationMailer < ActionMailer::Base
|
|
78
72
|
renderer.instance_variable_set( :@unsubscribe_url, @unsubscribe_url )
|
79
73
|
renderer.instance_variable_set( :@tmpl_config, @tmpl_config )
|
80
74
|
|
81
|
-
# eval( @ctx.tmpl.config_exe )
|
82
|
-
|
83
75
|
rendered_str = renderer.render_to_string("/wco_email/email_templates/_#{@ctx.tmpl.layout}")
|
84
|
-
@ctx.update({
|
76
|
+
@ctx.update!({
|
85
77
|
rendered_str: rendered_str,
|
86
|
-
sent_at:
|
78
|
+
sent_at: Time.now.to_s,
|
87
79
|
})
|
88
80
|
|
89
81
|
mail( from: @ctx.from_email,
|
@@ -100,7 +100,7 @@ class WcoEmail::Message
|
|
100
100
|
WcoEmail::Context.create({
|
101
101
|
email_template: filter.email_template,
|
102
102
|
lead_id: lead.id,
|
103
|
-
send_at: Time.now
|
103
|
+
send_at: Time.now,
|
104
104
|
})
|
105
105
|
|
106
106
|
when WcoEmail::EmailFilter::KIND_AUTORESPOND_EACT
|
@@ -108,7 +108,7 @@ class WcoEmail::Message
|
|
108
108
|
email_action: filter.email_action,
|
109
109
|
state: ::Sch::STATE_ACTIVE,
|
110
110
|
lead_id: lead.id,
|
111
|
-
perform_at: Time.now
|
111
|
+
perform_at: Time.now,
|
112
112
|
})
|
113
113
|
|
114
114
|
else
|
@@ -12,26 +12,21 @@
|
|
12
12
|
.row
|
13
13
|
.col-sm-4
|
14
14
|
%ul
|
15
|
-
%li
|
15
|
+
%li
|
16
|
+
<b>Email:</b> #{@current_profile.email}
|
17
|
+
= button_to 'Logout', main_app.destroy_user_session_path, :method => :delete, data: { confirm: 'Are you sure?' }
|
16
18
|
%li= link_to 'sidekiq', '/sidekiq', target: :_blank
|
17
19
|
%li= link_to 'Iron Warbler', '/iron_warbler'
|
18
20
|
|
21
|
+
|
19
22
|
.col-sm-4
|
20
23
|
%ul
|
21
24
|
%li ~__^ v#{@version}
|
22
|
-
-# %li= Time.now.in_time_zone.to_s
|
23
25
|
%li
|
24
26
|
= pp_date Time.now
|
25
27
|
= pp_time Time.now
|
26
|
-
-# <pre>#{@changelog}</pre>
|
27
28
|
|
28
29
|
.col-sm-4
|
29
|
-
= button_to 'Logout', main_app.destroy_user_session_path, :method => :delete, data: { confirm: 'Are you sure?' }
|
30
|
-
|
31
|
-
-# .set-jwt-token
|
32
|
-
-# = button_tag 'Set JWT', class: 'set-jwt-token'
|
33
|
-
-# .jwt-token
|
34
|
-
|
35
30
|
= form_for @current_profile, url: wco.profile_path(@current_profile), as: :profile do |f|
|
36
31
|
.flex-row
|
37
32
|
= f.label :per_page
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: wco_models
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 3.1.0.
|
4
|
+
version: 3.1.0.65
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Victor Pudeyev
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2024-01-
|
11
|
+
date: 2024-01-14 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: aws-sdk-s3
|
@@ -355,11 +355,13 @@ files:
|
|
355
355
|
- app/assets/javascripts/vendor/jquery.ui.widget.js
|
356
356
|
- app/assets/javascripts/vendor/popper-1.14.0.min.js
|
357
357
|
- app/assets/javascripts/vendor/summernote-bs4.min.js
|
358
|
+
- app/assets/javascripts/wco/alerts-notices.js
|
358
359
|
- app/assets/javascripts/wco/application.js
|
359
360
|
- app/assets/javascripts/wco/collapse-expand.js
|
360
361
|
- app/assets/javascripts/wco/file_upload.js
|
361
362
|
- app/assets/javascripts/wco/shared.js
|
362
363
|
- app/assets/stylesheets/vendor/bootstrap-4.6.2.min.css
|
364
|
+
- app/assets/stylesheets/wco/alerts_notices.scss
|
363
365
|
- app/assets/stylesheets/wco/application.css
|
364
366
|
- app/assets/stylesheets/wco/pagination.scss
|
365
367
|
- app/assets/stylesheets/wco/utils.scss
|