ish_manager 0.1.8.480 → 0.1.8.481
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/app/assets/stylesheets/ish_manager/application.scss +8 -0
- data/app/assets/stylesheets/ish_manager/email_contexts.scss +6 -0
- data/app/assets/stylesheets/ish_manager/email_conversations.scss +0 -7
- data/app/controllers/ish_manager/email_contexts_controller.rb +3 -1
- data/app/helpers/ish_manager/application_helper.rb +5 -1
- data/app/views/ish_manager/application/_main_footer.haml +5 -3
- data/app/views/ish_manager/email_contexts/index.haml +6 -4
- data/app/views/ish_manager/email_conversations/index.haml +4 -3
- 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: acc807d1aa7e5d4d60cf5ef25018b4511a6bce0c0e137421f79d292dce82c11b
|
|
4
|
+
data.tar.gz: c4c52895d3f55008a7e93aa0ad8c6e657f5b0402d88b90487e1ddba8389a27b1
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 574313b67f7b1a79d2529732cf986d7939094636b2886e0261f9b40cedcaf8b8649575af22d5caa68c0ca67849f50ae364f57f1a14a6bd35f0e888bc9d086443
|
|
7
|
+
data.tar.gz: d2b36ac20385d5bfaed08a30123e4d7244d972b124a92475668b20ab2594a511f86b962364e1ef9fc2380bbbbdb35fcfcda1815f6daff8f9a2318582e18c58ed
|
|
@@ -56,7 +56,9 @@ class ::IshManager::EmailContextsController < ::IshManager::ApplicationControlle
|
|
|
56
56
|
|
|
57
57
|
def index
|
|
58
58
|
authorize! :index, ::Ish::EmailContext
|
|
59
|
-
@ctxs = ::Ish::EmailContext.all.
|
|
59
|
+
@ctxs = ::Ish::EmailContext.all.order_by( sent_at: :desc, send_at: :desc
|
|
60
|
+
).page( params[:ctxs_page]
|
|
61
|
+
).per( current_profile.per_page )
|
|
60
62
|
|
|
61
63
|
if params[:lead_id]
|
|
62
64
|
@lead = Lead.find params[:lead_id]
|
|
@@ -71,11 +71,15 @@ module IshManager
|
|
|
71
71
|
date&.strftime('%Y-%m-%d')
|
|
72
72
|
end
|
|
73
73
|
def pp_date a; pretty_date a; end
|
|
74
|
+
|
|
74
75
|
def pp_datetime date
|
|
75
76
|
date&.strftime('%Y-%m-%d %l:%M%P %z')
|
|
76
77
|
end
|
|
78
|
+
|
|
77
79
|
def pp_time date
|
|
78
|
-
date
|
|
80
|
+
return nil if !date
|
|
81
|
+
# return date.strftime('%l:%M%P %z')
|
|
82
|
+
return date.in_time_zone( Rails.application.config.time_zone ).strftime('%l:%M%P')
|
|
79
83
|
end
|
|
80
84
|
|
|
81
85
|
def pp_amount a
|
|
@@ -18,9 +18,11 @@
|
|
|
18
18
|
|
|
19
19
|
.col-sm-4
|
|
20
20
|
%ul
|
|
21
|
-
%li
|
|
22
|
-
%li=
|
|
23
|
-
%li
|
|
21
|
+
%li ~__^ v#{@version}
|
|
22
|
+
-# %li= Time.now.in_time_zone.to_s
|
|
23
|
+
%li
|
|
24
|
+
= pp_date Time.now
|
|
25
|
+
= pp_time Time.now
|
|
24
26
|
-# <pre>#{@changelog}</pre>
|
|
25
27
|
|
|
26
28
|
.col-sm-4
|
|
@@ -47,10 +47,12 @@
|
|
|
47
47
|
= link_to email_context_path(ctx) do
|
|
48
48
|
= ctx.subject ? ctx.subject : "t| #{ctx.tmpl.subject}"
|
|
49
49
|
%td= ctx.email_template.slug
|
|
50
|
-
%td.send_at
|
|
51
|
-
.
|
|
52
|
-
|
|
53
|
-
|
|
50
|
+
%td.send_at.padded
|
|
51
|
+
.datetime
|
|
52
|
+
.date= pp_date ctx.send_at
|
|
53
|
+
.time= pp_time ctx.send_at
|
|
54
|
+
%td
|
|
55
|
+
.datetime.padded= pp_date ctx.sent_at
|
|
54
56
|
|
|
55
57
|
|
|
56
58
|
= render 'paginate', resource: @ctxs, param_name: :ctxs_page, views_prefix: :ish_manager
|
|
@@ -61,9 +61,10 @@
|
|
|
61
61
|
%td.subject
|
|
62
62
|
= link_to conv.subject, email_conversation_path( conv )
|
|
63
63
|
|
|
64
|
-
%td
|
|
65
|
-
.
|
|
66
|
-
|
|
64
|
+
%td
|
|
65
|
+
.datetime
|
|
66
|
+
.date= pp_date conv.latest_at
|
|
67
|
+
.time= pp_time conv.latest_at
|
|
67
68
|
|
|
68
69
|
%td
|
|
69
70
|
.tags
|