wco_email 0.1.1.8 → 0.1.1.9
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/app/assets/javascript/wco_email/application.js +12 -5
- data/app/assets/javascript/wco_email/contexts.js +2 -1
- data/app/assets/stylesheets/wco_email/contexts.scss +5 -1
- data/app/controllers/wco_email/api_controller.rb +2 -2
- data/app/controllers/wco_email/application_controller.rb +3 -3
- data/app/controllers/wco_email/contexts_controller.rb +2 -3
- data/app/controllers/wco_email/email_templates_controller.rb +0 -2
- data/app/jobs/wco_email/message_intake_job.rb +0 -3
- data/app/views/layouts/wco_email/application.haml +1 -1
- data/app/views/wco_email/contexts/_form.haml +4 -10
- metadata +3 -3
- /data/config/{credentials.yml.enc → trash/credentials.yml.enc} +0 -0
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: e57ecd1bf1d0b46720dcccaa03f2d64dd5f2cdad1f388deb3c8911dd0aa6d356
|
4
|
+
data.tar.gz: 13b0c8d1e091583953a55c4df15649ad013941d2edf55490daa291e1b2a6b705
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 95cea1283f602b863a91c45fa6a8d0fe0ac1ed4a719a4b4acbe6466b7553efdff646e4f990b2653d6cd692e9c7181dceab79004440cd147e1ec8f5e7e4b751fb
|
7
|
+
data.tar.gz: e549dec48e17c1aa283ed2163c6bf52937bca3a5bf14b5d6a4c1b261fab888a45bff52f97cd5590e73940b6eda76ddff10c1278e5d4676cc27bf423c6b67bf87
|
@@ -1,9 +1,16 @@
|
|
1
1
|
//
|
2
|
-
// require rails-ujs
|
2
|
+
// trash: require rails-ujs
|
3
3
|
//
|
4
|
-
|
5
|
-
|
6
|
-
// require ./conversations
|
4
|
+
//= require ./contexts
|
5
|
+
//= require ./conversations
|
7
6
|
//
|
8
7
|
|
9
|
-
|
8
|
+
$(function () {
|
9
|
+
|
10
|
+
if ($(".tinymce").length > 0) {
|
11
|
+
$(".tinymce").summernote()
|
12
|
+
}
|
13
|
+
|
14
|
+
logg('loaded wco_email/application.js')
|
15
|
+
}) // END
|
16
|
+
|
@@ -7,7 +7,8 @@
|
|
7
7
|
.email-templates--form {
|
8
8
|
form {
|
9
9
|
> .actions {
|
10
|
-
|
10
|
+
display: flex;
|
11
|
+
justify-content: space-between;
|
11
12
|
}
|
12
13
|
|
13
14
|
.tab-labels {
|
@@ -31,6 +32,9 @@
|
|
31
32
|
|
32
33
|
}
|
33
34
|
.tabs {
|
35
|
+
> div {
|
36
|
+
border: 2px dotted gray;
|
37
|
+
}
|
34
38
|
.tab-raw {
|
35
39
|
display: none;
|
36
40
|
}
|
@@ -5,7 +5,7 @@ class WcoEmail::ApiController < ActionController::Base
|
|
5
5
|
skip_before_action :verify_authenticity_token
|
6
6
|
|
7
7
|
def create_email_message
|
8
|
-
|
8
|
+
puts! params, 'params'
|
9
9
|
|
10
10
|
stub = WcoEmail::MessageStub.create!({
|
11
11
|
bucket: params[:bucket],
|
@@ -23,7 +23,7 @@ class WcoEmail::ApiController < ActionController::Base
|
|
23
23
|
|
24
24
|
def check_credentials
|
25
25
|
if params[:secret] != AWS_SES_LAMBDA_SECRET
|
26
|
-
render status: 400, json: { status: 400 }
|
26
|
+
render status: 400, json: { status: 400, message: "#check_credentials says unauthorized." }
|
27
27
|
return
|
28
28
|
end
|
29
29
|
end
|
@@ -78,7 +78,7 @@ class WcoEmail::ContextsController < WcoEmail::ApplicationController
|
|
78
78
|
authorize! :new, WcoEmail::Context
|
79
79
|
@tmpl = @email_template = WcoEmail::EmailTemplate.where( slug: params[:template_slug] ).first ||
|
80
80
|
WcoEmail::EmailTemplate.where( id: params[:template_slug] ).first ||
|
81
|
-
WcoEmail::EmailTemplate.
|
81
|
+
WcoEmail::EmailTemplate.where({ slug: 'blank' }).last
|
82
82
|
attrs = {}
|
83
83
|
if @tmpl
|
84
84
|
attrs = @tmpl.attributes.slice( :subject, :body, :from_email )
|
@@ -146,10 +146,9 @@ class WcoEmail::ContextsController < WcoEmail::ApplicationController
|
|
146
146
|
private
|
147
147
|
|
148
148
|
def set_lists
|
149
|
-
super
|
150
149
|
@email_layouts_list = WcoEmail::EmailTemplate::LAYOUTS
|
151
150
|
@email_templates_list = [ [nil, nil] ] + WcoEmail::EmailTemplate.all.map { |tmpl| [ tmpl.slug, tmpl.id ] }
|
152
|
-
@leads_list
|
151
|
+
@leads_list = Wco::Lead.list
|
153
152
|
end
|
154
153
|
|
155
154
|
end
|
@@ -9,7 +9,7 @@
|
|
9
9
|
|
10
10
|
= javascript_include_tag "//code.jquery.com/jquery-3.3.1.min.js"
|
11
11
|
|
12
|
-
|
12
|
+
= javascript_include_tag "//cdn.datatables.net/1.10.16/js/jquery.dataTables.min.js"
|
13
13
|
= stylesheet_link_tag "//cdn.datatables.net/1.10.16/css/jquery.dataTables.min.css"
|
14
14
|
|
15
15
|
= stylesheet_link_tag "//maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css", :media => 'all'
|
@@ -1,30 +1,23 @@
|
|
1
1
|
|
2
|
-
-# =
|
2
|
+
-# - blank_tmpl_id = WcoEmail::EmailTemplate.where({ slug: 'blank' }).first&.id
|
3
3
|
|
4
4
|
.email-contexts--form
|
5
|
-
-# - url = ctx.new_record? ? contexts_path : context_path(ctx)
|
6
5
|
= form_for ctx, as: :context do |f|
|
7
6
|
|
8
7
|
.flex-row
|
9
|
-
= f.label
|
10
|
-
= f.select :email_template_id, options_for_select(@email_templates_list, selected: params[:email_template_id] || ctx.email_template_id ), {}, { class: 'select2' }
|
8
|
+
= f.label :email_template_id
|
9
|
+
= f.select :email_template_id, options_for_select(@email_templates_list, selected: params[:email_template_id] || ctx.email_template_id || blank_tmpl_id ), {}, { class: 'select2', required: true }
|
11
10
|
- if ctx.email_template_id
|
12
11
|
= link_to '[view]', email_template_path( ctx.email_template_id ), target: :_blank, class: [ 'action-view' ]
|
13
12
|
= link_to '[~]', edit_email_template_path( ctx.email_template_id ), target: :_blank, class: [ 'action-view' ]
|
14
13
|
<b>Layout:</b>
|
15
14
|
= ctx.email_template.layout
|
16
15
|
|
17
|
-
-# .field
|
18
|
-
-# %label Layout
|
19
|
-
-# = f.select :layout, options_for_select( @layouts_list, selected: ctx.layout_id )
|
20
|
-
|
21
16
|
.flex-row
|
22
17
|
%label From
|
23
18
|
= f.select :from_email, options_for_select(WcoEmail::EmailTemplate.from_emails_list, selected: ctx.from_email), {}, { class: 'select2' }
|
24
|
-
|
25
19
|
%label To lead
|
26
20
|
= f.select :lead_id, options_for_select( @leads_list, selected: ctx.lead_id ), {}, { class: 'select2' }
|
27
|
-
|
28
21
|
%label cc
|
29
22
|
= f.text_field :cc, class: 'w-100'
|
30
23
|
|
@@ -36,6 +29,7 @@
|
|
36
29
|
= f.label :reply_to_message
|
37
30
|
= f.select :reply_to_message_id, options_for_select([[ ctx.reply_to_message, ctx.reply_to_message_id ]], selected: ctx.reply_to_message_id), {}, class: 'w-100'
|
38
31
|
|
32
|
+
|
39
33
|
.tab-labels.flex-row
|
40
34
|
%a.label-raw{ href: "javascript: void(0)", data: { ref: '.tab-raw' } } Raw
|
41
35
|
%a.label-preview.active{ href: "javascript: void(0)", data: { ref: '.tab-preview' } } Preview
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: wco_email
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.1.1.
|
4
|
+
version: 0.1.1.9
|
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-12 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: aws-sdk-s3
|
@@ -448,9 +448,9 @@ files:
|
|
448
448
|
- app/views/wco_email/sessions/new.html.erb
|
449
449
|
- app/views/wco_email/unsubscribes/_header.haml
|
450
450
|
- app/views/wco_email/unsubscribes/_table.haml
|
451
|
-
- config/credentials.yml.enc
|
452
451
|
- config/initializers/assets.rb
|
453
452
|
- config/routes.rb
|
453
|
+
- config/trash/credentials.yml.enc
|
454
454
|
- lib/systemd/system/wco_email_sidekiq.service
|
455
455
|
- lib/tasks/bjjcollective/sitemap.rb
|
456
456
|
- lib/tasks/db_tasks.rake
|
File without changes
|