wco_email 0.1.1.31 → 0.1.1.33
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 +1 -1
- data/app/views/layouts/wco_email/application.haml +1 -1
- data/app/views/wco_email/_sidebar.haml +1 -0
- data/app/views/wco_email/conversations/_actions.haml +11 -9
- data/app/views/wco_email/conversations/index.haml +1 -0
- data/config/routes.rb +1 -1
- data/lib/tasks/wco_email_tasks.rake +4 -4
- 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: 78fb2701aceae49be8e71f766e2230de18fdae793ee34d281e8d0f654de7547c
|
|
4
|
+
data.tar.gz: 6818673a5cadaef98218df37c829f4f1fb9e0ca93d04381ea7ca9519548fd170
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 725603d48b9c7fefbc9e9d4b2d42c4643e203d0cc2cde8356c4b79e3c6fc3d94e6f99ac12632d6bcdb401827d7607dff930f1921a9eaeffab1585ea85cfc1069
|
|
7
|
+
data.tar.gz: dfb45143933acb188bcc45f5d80831a2a0f4d07087d340d0b1596f87793d0976dd78b1193f63b8f1d22d8ef51ad369d30905dce96873376160240b1efef2a4b0
|
|
@@ -44,7 +44,7 @@ class WcoEmail::ConversationsController < WcoEmail::ApplicationController
|
|
|
44
44
|
end
|
|
45
45
|
|
|
46
46
|
@conversations = @conversations.order_by( latest_at: :desc
|
|
47
|
-
).includes( :leads
|
|
47
|
+
).includes( :leads, :messages
|
|
48
48
|
).page( params[:conv_page]
|
|
49
49
|
).per( current_profile.per_page
|
|
50
50
|
)
|
|
@@ -1,14 +1,16 @@
|
|
|
1
1
|
|
|
2
2
|
.conversations--actions.bordered.d-flex
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
3
|
+
|
|
4
|
+
-# %a.btn.archive-btn{ href: "javascript: void(0)", data: { url: conversations_rmtag_path(Wco::Tag::INBOX) } }
|
|
5
|
+
-# %i.material-icons archive
|
|
6
|
+
-# archive
|
|
7
|
+
-# %a.btn.delete-btn{ href: "javascript: void(0)", data: { url: conversations_path } }
|
|
8
|
+
-# %i.material-icons delete
|
|
9
|
+
-# delete
|
|
10
|
+
-# %a.btn.reload-btn{ href: "javascript: location.reload()" }
|
|
11
|
+
-# %i.material-icons refresh
|
|
12
|
+
-# refresh
|
|
13
|
+
|
|
12
14
|
.bordered.inline-block
|
|
13
15
|
.d-inline-block
|
|
14
16
|
= select_tag :emailtag, options_for_select(@tags_list), class: 'select2'
|
data/config/routes.rb
CHANGED
|
@@ -8,7 +8,7 @@ WcoEmail::Engine.routes.draw do
|
|
|
8
8
|
|
|
9
9
|
# get 'conversations', to: '/wco_email/conversations#index', as: :email_conversations
|
|
10
10
|
get 'conversations/in/:tagname', to: '/wco_email/conversations#index', as: :email_conversations_in
|
|
11
|
-
get 'conversations/not-in/:tagname_not', to: '/wco_email/conversations#index', as: :
|
|
11
|
+
get 'conversations/not-in/:tagname_not', to: '/wco_email/conversations#index', as: :email_conversations_not_in
|
|
12
12
|
get 'conversations/:id', to: '/wco_email/conversations#show', as: :email_conversation
|
|
13
13
|
post 'conversations/:id1/merge/:id2', to: '/wco_email/conversations#merge', as: :merge_email_conversations
|
|
14
14
|
post 'conversations/addtag', to: 'conversations#addtag'
|
|
@@ -149,8 +149,8 @@ namespace :wco_email do
|
|
|
149
149
|
|
|
150
150
|
sch.send_and_roll
|
|
151
151
|
|
|
152
|
-
print
|
|
153
|
-
sleep
|
|
152
|
+
print "[#{sch.id}]^"
|
|
153
|
+
sleep 15
|
|
154
154
|
end
|
|
155
155
|
|
|
156
156
|
print '.'
|
|
@@ -188,8 +188,8 @@ namespace :wco_email do
|
|
|
188
188
|
Rails.env.production? ? out.deliver_later : out.deliver_now
|
|
189
189
|
end
|
|
190
190
|
|
|
191
|
-
print "#{ctx.id}^"
|
|
192
|
-
sleep
|
|
191
|
+
print "[#{ctx.id}]^"
|
|
192
|
+
sleep 15
|
|
193
193
|
end
|
|
194
194
|
|
|
195
195
|
print '.'
|