ish_models 0.0.33.236 → 0.0.33.238
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/ish/email_context.rb +5 -2
- data/lib/ish/email_template.rb +1 -1
- 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: e1c960b6372f0929c516cc3482738977e2d4b1d8c5ef5c63d27d257c12bfe422
|
|
4
|
+
data.tar.gz: 79971a45405a9c29abb69e8d266dca223a29b4a82a87704b17d548e3123af1eb
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 4f6e88e54a2ee9b656f7e90b5234359c44a4b20a433444090305169810dba8ef919941987430098e5dff11250e0e69f62adeaef40f38f986378bbab752643fc5
|
|
7
|
+
data.tar.gz: a606173a1f1337dcda0efd7a0cf3bfa7a7c171edceaa344b9950a8cba52c215e016c0147aab2ecfe9d7ca359936f48a5beb57197c8037051753dc6014d52bf45
|
data/lib/ish/email_context.rb
CHANGED
|
@@ -33,7 +33,9 @@ class ::Ish::EmailContext
|
|
|
33
33
|
# validates_presence_of :from_email
|
|
34
34
|
|
|
35
35
|
field :subject
|
|
36
|
-
|
|
36
|
+
def subject
|
|
37
|
+
self[:subject].presence || tmpl.subject
|
|
38
|
+
end
|
|
37
39
|
|
|
38
40
|
belongs_to :email_template
|
|
39
41
|
def tmpl; email_template; end
|
|
@@ -85,7 +87,8 @@ class ::Ish::EmailContext
|
|
|
85
87
|
pipeline = [
|
|
86
88
|
{ '$group' => {
|
|
87
89
|
'_id' => { '$dateToString' => { 'format' => "%Y-%m-%d", 'date' => "$sent_at" } }, 'total' => { '$sum' => 1 }
|
|
88
|
-
} }
|
|
90
|
+
} },
|
|
91
|
+
{ '$sort' => { '_id': -1 } },
|
|
89
92
|
]
|
|
90
93
|
outs = Ish::EmailContext.collection.aggregate( pipeline )
|
|
91
94
|
outs.to_a
|
data/lib/ish/email_template.rb
CHANGED
|
@@ -12,7 +12,7 @@ class ::Ish::EmailTemplate
|
|
|
12
12
|
field :layout, type: :string, default: 'plain'
|
|
13
13
|
LAYOUTS = %w| plain
|
|
14
14
|
m20221201react m20221222merryxmas
|
|
15
|
-
marketing_react_1
|
|
15
|
+
marketing_react_1 marketing_react_2
|
|
16
16
|
marketing_ror_1 marketing_ror_2
|
|
17
17
|
marketing_wordpres_1 marketing_wordpress_2
|
|
18
18
|
piousbox_roundborders
|