wco_email 0.1.1.49 → 0.1.1.51
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/app/controllers/wco_email/conversations_controller.rb +4 -0
- data/app/views/layouts/wco_email/application.haml +1 -1
- data/app/views/wco_email/conversations/_search.haml +2 -0
- data/app/views/wco_email/conversations/show.haml +4 -0
- data/app/views/wco_email/email_templates/_form.haml +6 -3
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: d903910322abeff65d3382c3035b76f1d4b261fda57bc4b3e1b0257c7e02c961
|
|
4
|
+
data.tar.gz: 9d3dd99d6dd1c1a5aa9431979a3d2ffa383a5e7238422fedfdf3308140b9d7b4
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: ae1b169da0417816eec828e41e9cddc66a1219b653feab1876740f44a7cbff8a6ecee6fa4c221d7cc1def49f6f4b1ad82e832a2b98b0ae83e4d160236d742fb8
|
|
7
|
+
data.tar.gz: 690a27bffb447a80e5f844295dc64e6ac4a8d8ae783e7cbe76def125b7648e1b0ebf36afec4736c92fc8ecf94586e498d6e4686d2af57cb15e27533c37a369ef
|
|
@@ -48,6 +48,10 @@ class WcoEmail::ConversationsController < WcoEmail::ApplicationController
|
|
|
48
48
|
@conversations = @conversations.where({ from_emails: /.*#{params[:from_email]}.*/i })
|
|
49
49
|
end
|
|
50
50
|
|
|
51
|
+
if params[:lead_id].present?
|
|
52
|
+
@conversations = @conversations.where( lead_ids: params[:lead_id] )
|
|
53
|
+
end
|
|
54
|
+
|
|
51
55
|
@conversations = @conversations.order_by( latest_at: :desc
|
|
52
56
|
).includes( :leads, :messages
|
|
53
57
|
).page( params[:conv_page]
|
|
@@ -20,7 +20,7 @@
|
|
|
20
20
|
= javascript_include_tag "//cdn.jsdelivr.net/npm/bootstrap@4.3.1/dist/js/bootstrap.min.js"
|
|
21
21
|
|
|
22
22
|
= stylesheet_link_tag "//cdn.jsdelivr.net/npm/select2@4.0.0/dist/css/select2.min.css"
|
|
23
|
-
= javascript_include_tag "//cdn.jsdelivr.net/npm/select2@4.0.0/dist/js/select2.min.js"
|
|
23
|
+
= javascript_include_tag "//cdn.jsdelivr.net/npm/select2@4.0.0/dist/js/select2.min.js", defer: 'defer'
|
|
24
24
|
|
|
25
25
|
= stylesheet_link_tag "//cdn.jsdelivr.net/npm/summernote@0.8.18/dist/summernote.min.css"
|
|
26
26
|
= javascript_include_tag "//cdn.jsdelivr.net/npm/summernote@0.8.18/dist/summernote.min.js"
|
|
@@ -8,6 +8,10 @@
|
|
|
8
8
|
<b>(#{@conversation.messages.length})</b>
|
|
9
9
|
= link_to '[~]', edit_conversation_path(@conversation)
|
|
10
10
|
%span.gray.mini= @conversation.id
|
|
11
|
+
.leads
|
|
12
|
+
.d-inline <b>Leads:</b>
|
|
13
|
+
- @conversation.leads.each do |lead|
|
|
14
|
+
.Chip= link_to lead.email, wco.lead_path( lead )
|
|
11
15
|
|
|
12
16
|
|
|
13
17
|
- if @other_convs.present?
|
|
@@ -28,12 +28,15 @@
|
|
|
28
28
|
.label-save-preview= f.submit 'Save & Preview'
|
|
29
29
|
.tabs
|
|
30
30
|
.tab-raw
|
|
31
|
-
-## No class tinymce, cannot have tinymce mess with my own templating.
|
|
32
|
-
|
|
31
|
+
-## 2024-01-xx No class tinymce, cannot have tinymce mess with my own templating.
|
|
32
|
+
-## 2024-02-05 re-addedd tinymce
|
|
33
|
+
= f.text_area :body, class: 'tinymce'
|
|
34
|
+
|
|
33
35
|
.tab-preview
|
|
34
36
|
- if email_template.persisted?
|
|
35
37
|
%iframe{ src: email_template_iframe_path(email_template), width: '100%', height: '100%' }
|
|
36
|
-
|
|
38
|
+
- if email_template.persisted?
|
|
39
|
+
.gray.mini= link_to email_template_iframe_path(email_template), email_template_iframe_path(email_template), target: :_blank
|
|
37
40
|
|
|
38
41
|
.row
|
|
39
42
|
.col-md-6
|
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.51
|
|
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-02-
|
|
11
|
+
date: 2024-02-05 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: aws-sdk-s3
|