wco_models 3.1.0.76 → 3.1.0.78
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: e0f8f4f03a6fe53303a403050d9ca34e5b81caefda6dbeef36ea5b994643ebe9
|
4
|
+
data.tar.gz: b8b19c8349d9783a54ee8da11db8a414506164216a4e87f9b6cd3f4768eb8f9f
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 98de670421120a2e745a6af46cecd4238a9528bc0c001a12135469c54e3de70e69222910f8a63a5de3c051953f272685786f5953dd87cb1d03ca490dcb0581fb
|
7
|
+
data.tar.gz: f775ed1e9c82d7464d837c6325fb1b2308436352743bff39617165ebeea1617424929ef69366249fc83376c0eee287aec69b9268e1ba78c2fe649c14a08a6d6e
|
@@ -33,12 +33,6 @@ class WcoEmail::EmailFilter
|
|
33
33
|
KINDS = [ nil, KIND_AUTORESPOND_TMPL, KIND_AUTORESPOND_EACT, KIND_ADD_TAG, KIND_REMOVE_TAG, KIND_DESTROY_SCHS]
|
34
34
|
field :kind
|
35
35
|
|
36
|
-
STATUS_ACTIVE = 'active'
|
37
|
-
STATUS_INACTIVE = 'inactive'
|
38
|
-
STATUSES = [ STATUS_ACTIVE, STATUS_INACTIVE ]
|
39
|
-
field :status, type: :string, default: STATUS_ACTIVE
|
40
|
-
scope :active, ->{ where( status: STATUS_ACTIVE ) }
|
41
|
-
|
42
36
|
belongs_to :email_template, class_name: 'WcoEmail::EmailTemplate', optional: true
|
43
37
|
belongs_to :email_action_template, class_name: 'WcoEmail::EmailActionTemplate', optional: true
|
44
38
|
|
@@ -77,9 +77,10 @@ class WcoEmail::MessageStub
|
|
77
77
|
end
|
78
78
|
conv = in_reply_to_msg.conversation
|
79
79
|
else
|
80
|
-
conv = WcoEmail::Conversation.find_or_create_by({
|
80
|
+
conv = WcoEmail::Conversation.unscoped.find_or_create_by({
|
81
81
|
subject: subject,
|
82
82
|
})
|
83
|
+
conv.deleted_at = nil
|
83
84
|
end
|
84
85
|
|
85
86
|
|
@@ -177,9 +178,9 @@ class WcoEmail::MessageStub
|
|
177
178
|
|
178
179
|
|
179
180
|
## Actions & Filters
|
180
|
-
email_filters = WcoEmail::EmailFilter.
|
181
|
+
email_filters = WcoEmail::EmailFilter.all
|
181
182
|
email_filters.each do |filter|
|
182
|
-
|
183
|
+
reason = nil
|
183
184
|
if filter.from_regex.present? && @message.from.downcase.match( filter.from_regex )
|
184
185
|
reason = 'from_regex'
|
185
186
|
end
|
@@ -197,7 +198,7 @@ class WcoEmail::MessageStub
|
|
197
198
|
end
|
198
199
|
|
199
200
|
if reason
|
200
|
-
puts! "Applying filter #{filter} to conv #{
|
201
|
+
puts! "Applying filter #{filter} to conv #{@message.conversation} for matching #{reason}" if DEBUG
|
201
202
|
@message.apply_filter( filter )
|
202
203
|
end
|
203
204
|
end
|
@@ -73,13 +73,5 @@
|
|
73
73
|
%ul
|
74
74
|
- @lead.convs.each do |conv|
|
75
75
|
%li
|
76
|
-
= link_to conv.subject, wco_email.
|
77
|
-
|
78
|
-
-# .row
|
79
|
-
-# .col-md-6
|
80
|
-
-# = render 'ish_manager/galleries/index', galleries: @lead.galleries
|
81
|
-
-# .col-md-6
|
82
|
-
-# = render 'ish_manager/videos/index', videos: @lead.videos
|
83
|
-
|
84
|
-
|
76
|
+
= link_to conv.subject, wco_email.conversation_path( conv )
|
85
77
|
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: wco_models
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 3.1.0.
|
4
|
+
version: 3.1.0.78
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Victor Pudeyev
|
@@ -435,7 +435,6 @@ files:
|
|
435
435
|
- app/views/wco/_analytics.erb
|
436
436
|
- app/views/wco/_main_footer.haml
|
437
437
|
- app/views/wco/_main_header.haml
|
438
|
-
- app/views/wco/_main_header.haml-bk
|
439
438
|
- app/views/wco/_paginate.haml
|
440
439
|
- app/views/wco/_search.haml
|
441
440
|
- app/views/wco/application/_auth_widget.haml
|
@@ -1,109 +0,0 @@
|
|
1
|
-
|
2
|
-
.application--main-header.main-header{ class: "#{ENV['RAILS_ENV']} #{ENV['RAILS_ENV'][0...3]=="dev" ? "development" : ''}" }
|
3
|
-
|
4
|
-
%i.fa.fa-compress.collapse-expand#collapseHeaderMain
|
5
|
-
Wco Suite
|
6
|
-
.container
|
7
|
-
|
8
|
-
%i.fa.fa-compress.collapse-expand#collapseHeaderOffice
|
9
|
-
Wco Email & CRM
|
10
|
-
.a
|
11
|
-
%ul
|
12
|
-
%li= link_to 'Tags', tags_path
|
13
|
-
-# %li
|
14
|
-
-# = link_to "#{WpTag::INBOX} (#{Office::EmailConversation.in_emailtag(WpTag::INBOX).length})", email_conversations_in_path(WpTag::INBOX), class: 'chip'
|
15
|
-
-# = link_to '[+]', new_email_context_path
|
16
|
-
%li
|
17
|
-
= link_to "Tmpls (#{WcoEmail::EmailTemplate.all.length})", email_templates_path
|
18
|
-
= link_to '[+]', new_email_template_path
|
19
|
-
%li
|
20
|
-
= link_to "Companies (#{Leadset.kept.length})", leadsets_path
|
21
|
-
.inline-search
|
22
|
-
= form_tag leadsets_path, method: :get do
|
23
|
-
= text_field_tag :q
|
24
|
-
= link_to '[+]', new_leadset_path
|
25
|
-
%li
|
26
|
-
= link_to "EActions", email_actions_path
|
27
|
-
= link_to '[+]', new_email_action_path
|
28
|
-
%ul
|
29
|
-
%li
|
30
|
-
= link_to "Filters (#{Office::EmailFilter.active.length})", email_filters_path
|
31
|
-
= link_to '[+]', new_email_filter_path
|
32
|
-
%li
|
33
|
-
= link_to "Ctxs (#{Ctx.notsent.length})", email_contexts_path({ sent: false })
|
34
|
-
= link_to '[+]', new_email_context_path
|
35
|
-
%br
|
36
|
-
= link_to 'summary', email_contexts_summary_path( format: :html )
|
37
|
-
= link_to '[csv]', email_contexts_summary_path( format: :csv )
|
38
|
-
|
39
|
-
%li
|
40
|
-
= link_to "Leads (#{Lead.kept.length})", leads_path
|
41
|
-
.inline-search
|
42
|
-
= form_tag leads_path, method: :get do
|
43
|
-
= text_field_tag :q
|
44
|
-
= link_to '[+]', new_lead_path
|
45
|
-
%li
|
46
|
-
= link_to "Schs (#{Sch.active.length})", scheduled_email_actions_path
|
47
|
-
= link_to '[+]', new_scheduled_email_action_path
|
48
|
-
|
49
|
-
%ul
|
50
|
-
%li
|
51
|
-
= link_to 'OLATs', lead_action_templates_path
|
52
|
-
= link_to '[+]', new_lead_action_template_path
|
53
|
-
= link_to 'Lead Actions', lead_actions_path
|
54
|
-
|
55
|
-
|
56
|
-
%li
|
57
|
-
= link_to "Campaigns (#{Ish::EmailCampaign.all.length})", email_campaigns_path
|
58
|
-
= link_to '[+]', new_email_campaign_path
|
59
|
-
%li
|
60
|
-
= link_to "OActions (#{Office::Action.all.length})", office_actions_path
|
61
|
-
= link_to '[+]', new_office_action_path
|
62
|
-
%li
|
63
|
-
= link_to 'Unsubs', unsubscribes_path
|
64
|
-
= link_to 'Analytics', analytics_path
|
65
|
-
|
66
|
-
.c
|
67
|
-
|
68
|
-
%i.fa.fa-compress.collapse-expand#collapseHeaderWco
|
69
|
-
Wasya Co Rb
|
70
|
-
.a
|
71
|
-
%ul
|
72
|
-
%li
|
73
|
-
= link_to 'ApplianceTmpl\'s', appliance_tmpls_path
|
74
|
-
%li
|
75
|
-
= link_to 'Appliance\'s', appliances_path
|
76
|
-
%li
|
77
|
-
= link_to 'Serverhost\'s', serverhosts_path
|
78
|
-
%ul
|
79
|
-
%li
|
80
|
-
= link_to 'Products & Prices', products_path
|
81
|
-
%li
|
82
|
-
= link_to 'Subscriptions', subscriptions_path
|
83
|
-
= link_to '[+]', new_wco_subscription_path
|
84
|
-
%li
|
85
|
-
= link_to 'Wco::Leadset\'s', wco_leadsets_path
|
86
|
-
|
87
|
-
|
88
|
-
.c
|
89
|
-
|
90
|
-
|
91
|
-
|
92
|
-
-# %i.fa.fa-compress.collapse-expand#collapseHeaderIro Iro Wor
|
93
|
-
-# .a
|
94
|
-
-# %ul
|
95
|
-
-# %li
|
96
|
-
-# = link_to 'Alerts', iro_alerts_path
|
97
|
-
-# = link_to 'Watchers', iro_watchers_path
|
98
|
-
-# %li
|
99
|
-
-# = link_to 'Plots', 'http://localhost:3000/iron_warbler/NOPE-1', target: '_blank'
|
100
|
-
-# %li
|
101
|
-
-# = link_to 'Purses', iro_purses_path
|
102
|
-
-# - Iro::Purse.all.map do |p|
|
103
|
-
-# = "[#{p.id}"
|
104
|
-
-# = link_to "show", iro_purse_path(p)
|
105
|
-
-# = link_to "gui", iro_purse_path({ id: p.id, kind: 'show_gameui' })
|
106
|
-
-# = "]"
|
107
|
-
-# = link_to '[+]', new_iro_purse_path
|
108
|
-
-# .c
|
109
|
-
|