wco_email 0.1.1.82 → 0.1.1.83
Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 719582a97ebd0fd983baed326967e48df5c08662ab874f95ec29bb3c54f8e336
|
|
4
|
+
data.tar.gz: 49e79e9b494639ebe800d3fc23913d0d3d8629972b7a5e5bffd1ef18400b1849
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: ce5caa2b693a76232ba3da967722e32bbfbc7ec974365dc813d3e0bf3ce200cf4f55788c637fc3c702515f34fe0d72ef76a9528a86acc8d22375525e529f0676
|
|
7
|
+
data.tar.gz: af953710ceb0829f19d0d2200ae33f717405ab997e082bf04b97ec503d026d0ee80a3f79ffe88d8721262e07e77360577c34a869b66ba7e0db96cc84c6a97bee
|
|
@@ -46,23 +46,24 @@ class WcoEmail::ContextsController < WcoEmail::ApplicationController
|
|
|
46
46
|
|
|
47
47
|
def index
|
|
48
48
|
authorize! :index, WcoEmail::Context
|
|
49
|
-
@ctxs = WcoEmail::Context.
|
|
50
|
-
:send_at.ne => nil,
|
|
51
|
-
sent_at: nil,
|
|
52
|
-
).order_by( sent_at: :desc, send_at: :desc
|
|
53
|
-
).page( params[:ctxs_page]
|
|
54
|
-
).per( current_profile.per_page )
|
|
55
|
-
|
|
49
|
+
@ctxs = WcoEmail::Context.all
|
|
56
50
|
if params[:lead_id]
|
|
57
51
|
@lead = Lead.find params[:lead_id]
|
|
58
52
|
@ctxs = @ctxs.where( lead_id: @lead.id )
|
|
53
|
+
end
|
|
54
|
+
|
|
55
|
+
if 'true' == params[:sent]
|
|
56
|
+
@ctxs = @ctxs.where( :sent_at.ne => nil )
|
|
57
|
+
elsif 'false' == params[:sent]
|
|
58
|
+
@ctxs = @ctxs.where( sent_at: nil )
|
|
59
59
|
else
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
else
|
|
63
|
-
@ctxs = @ctxs.where( sent_at: nil, unsubscribed_at: nil )
|
|
64
|
-
end
|
|
60
|
+
## default, show notsent.
|
|
61
|
+
@ctxs = @ctxs.where( :sent_at.ne => nil )
|
|
65
62
|
end
|
|
63
|
+
|
|
64
|
+
@ctxs = @ctxs.order_by( sent_at: :desc, send_at: :desc
|
|
65
|
+
).page( params[:ctxs_page]
|
|
66
|
+
).per( current_profile.per_page )
|
|
66
67
|
end
|
|
67
68
|
|
|
68
69
|
def new
|
|
@@ -2,16 +2,11 @@
|
|
|
2
2
|
- ctxs = @ctxs || WcoEmail::Context.all
|
|
3
3
|
|
|
4
4
|
.a
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
= link_to '[notsent]', contexts_path({ sent: false })
|
|
11
|
-
<b>sent</b>
|
|
12
|
-
- else
|
|
13
|
-
<b>notsent</b>
|
|
14
|
-
= link_to '[sent]', contexts_path({ sent: true })
|
|
5
|
+
Email Contexts (#{ctxs.length})
|
|
6
|
+
- if @lead
|
|
7
|
+
For lead #{@lead.email}
|
|
8
|
+
= link_to '[notsent]', contexts_path({ sent: false }), class: "#{'false' == params[:sent] ? 'active' : ''}"
|
|
9
|
+
= link_to '[sent]', contexts_path({ sent: true }), class: "#{'true' == params[:sent] ? 'active' : ''}"
|
|
15
10
|
= form_tag contexts_path, method: :get do
|
|
16
11
|
= text_field_tag :q
|
|
17
12
|
= link_to '[+]', new_context_path
|
|
@@ -7,7 +7,7 @@
|
|
|
7
7
|
.W0
|
|
8
8
|
= render 'wco/paginate', resource: @ctxs, param_name: :ctxs_page, views_prefix: :wco
|
|
9
9
|
|
|
10
|
-
%table.bordered
|
|
10
|
+
%table.bordered
|
|
11
11
|
%thead
|
|
12
12
|
%tr
|
|
13
13
|
%th.actions
|
|
@@ -39,11 +39,13 @@
|
|
|
39
39
|
= ctx.subject ? ctx.subject : "t| #{ctx.tmpl.subject}"
|
|
40
40
|
%td= ctx.email_template.slug
|
|
41
41
|
%td.send_at.padded
|
|
42
|
-
.datetime
|
|
42
|
+
.datetime.p-1
|
|
43
43
|
.date= pp_date ctx.send_at
|
|
44
44
|
.time= pp_time ctx.send_at
|
|
45
45
|
%td
|
|
46
|
-
.datetime.
|
|
46
|
+
.datetime.p-1
|
|
47
|
+
.date= pp_date ctx.sent_at
|
|
48
|
+
.time= pp_time ctx.sent_at
|
|
47
49
|
%td
|
|
48
50
|
.datetime.padded= pp_date ctx.unsubscribed_at
|
|
49
51
|
|
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.83
|
|
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-09-
|
|
11
|
+
date: 2024-09-17 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: aws-sdk-s3
|