ish_manager 0.1.8.361 → 0.1.8.363
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/app/assets/javascripts/ish_manager/application.js +1 -31
- data/app/assets/javascripts/ish_manager/email_conversations.js +33 -0
- data/app/controllers/ish_manager/email_contexts_controller.rb +1 -2
- data/app/controllers/ish_manager/email_conversations_controller.rb +1 -1
- data/app/views/ish_manager/application/_alerts_notices.haml +16 -17
- data/app/views/ish_manager/application/_debug.haml +0 -2
- data/app/views/ish_manager/application/_main_footer.haml +2 -0
- data/app/views/ish_manager/email_contexts/_form.haml +3 -2
- data/app/views/ish_manager/email_contexts/new.haml +1 -1
- data/app/views/ish_manager/email_conversations/show.haml +1 -1
- data/app/views/ish_manager/leadsets/index.haml +1 -1
- data/app/views/layouts/ish_manager/application.haml +2 -17
- data/app/views/layouts/ish_manager/application_fullwidth.haml +1 -1
- metadata +3 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 373d942eedac08f101ace0d4fdf2ceeef4d192667ec8d89f20231468468cf534
|
4
|
+
data.tar.gz: 25e6af32445e2515ff734cd05e150a17fed1b0da2b6b38160fca594c28cbe9be
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 298335ad3aa05e7f72fd0cfe80d2326a82b6fe5423c5ea3c1000beded4dae63f66374db271d5b3cf19882d20ec49316614dd9ceb9d9b748c9aa142902ded11e5
|
7
|
+
data.tar.gz: 30786e197d6b80c49616f024b92458527c677e647c6a9314129bc8b00fd8bf83838246ad13f03ea094b035ced5ad500c2bf3ca48103998cfea9108cf5dfa01de
|
@@ -22,6 +22,7 @@
|
|
22
22
|
//= require_self
|
23
23
|
//= require ish_manager/maps
|
24
24
|
//= require ish_manager/email_contexts
|
25
|
+
//= require ish_manager/email_conversations
|
25
26
|
//= require ish_manager/email_templates
|
26
27
|
//= require ish_manager/galleries
|
27
28
|
|
@@ -171,37 +172,6 @@ $(function () {
|
|
171
172
|
$( $(".n-selected")[0] ).html( $("input[type='checkbox'].i-sel:checked").length )
|
172
173
|
})
|
173
174
|
|
174
|
-
//
|
175
|
-
// email conversations
|
176
|
-
//
|
177
|
-
$("body.email_conversations-show a.preview").click(function(e) {
|
178
|
-
// logg(e, 'clicked')
|
179
|
-
|
180
|
-
if ($(this).data('expanded')) {
|
181
|
-
$(this).parent().find(".expand").html('')
|
182
|
-
$(this).parent().find(".my-actions").addClass('hide')
|
183
|
-
$(this).data('expanded', false)
|
184
|
-
return
|
185
|
-
}
|
186
|
-
|
187
|
-
const action_path = "/api/email_messages/" + $(this).data('id')
|
188
|
-
|
189
|
-
$.ajax({
|
190
|
-
url: action_path,
|
191
|
-
type: 'GET',
|
192
|
-
data: {
|
193
|
-
jwt_token: localStorage.getItem('jwt_token'),
|
194
|
-
},
|
195
|
-
success: e => {
|
196
|
-
$(this).parent().find(".expand").html(e.item.part_html)
|
197
|
-
$(this).parent().find(".my-actions").removeClass('hide')
|
198
|
-
$(this).data('expanded', true)
|
199
|
-
},
|
200
|
-
error: e => {
|
201
|
-
logg((e||{}).responseText, 'cannot get email_message')
|
202
|
-
},
|
203
|
-
})
|
204
|
-
})
|
205
175
|
|
206
176
|
});
|
207
177
|
|
@@ -0,0 +1,33 @@
|
|
1
|
+
|
2
|
+
$(document).ready(() => {
|
3
|
+
|
4
|
+
$("body.email_conversations-show a.preview").click(function(e) {
|
5
|
+
// logg(e, 'clicked')
|
6
|
+
|
7
|
+
if ($(this).data('expanded')) {
|
8
|
+
$(this).parent().find(".expand").html('')
|
9
|
+
$(this).parent().find(".my-actions").addClass('hide')
|
10
|
+
$(this).data('expanded', false)
|
11
|
+
return
|
12
|
+
}
|
13
|
+
|
14
|
+
const action_path = "/api/email_messages/" + $(this).data('id')
|
15
|
+
|
16
|
+
$.ajax({
|
17
|
+
url: action_path,
|
18
|
+
type: 'GET',
|
19
|
+
data: {
|
20
|
+
jwt_token: $( $("#Config")[0] ).data('jwt-token'),
|
21
|
+
},
|
22
|
+
success: e => {
|
23
|
+
$(this).parent().find(".expand").html(e.item.part_html)
|
24
|
+
$(this).parent().find(".my-actions").removeClass('hide')
|
25
|
+
$(this).data('expanded', true)
|
26
|
+
},
|
27
|
+
error: e => {
|
28
|
+
logg((e||{}).responseText, 'cannot get email_message')
|
29
|
+
},
|
30
|
+
})
|
31
|
+
})
|
32
|
+
|
33
|
+
})
|
@@ -79,8 +79,7 @@ class ::IshManager::EmailContextsController < ::IshManager::ApplicationControlle
|
|
79
79
|
|
80
80
|
def new
|
81
81
|
authorize! :new, ::Ish::EmailContext
|
82
|
-
@
|
83
|
-
@template ||= Ish::EmailTemplate.where( id: params[:template_slug] ).first
|
82
|
+
@tmpl = @email_template = Ish::EmailTemplate.where( slug: params[:template_slug] ).first || Ish::EmailTemplate.where( id: params[:template_slug] ).first
|
84
83
|
attrs = {}
|
85
84
|
if @template
|
86
85
|
attrs = @template.attributes.slice( :subject, :body, :from_email )
|
@@ -7,7 +7,7 @@ class ::IshManager::EmailConversationsController < IshManager::ApplicationContro
|
|
7
7
|
|
8
8
|
def index
|
9
9
|
authorize! :email_conversations_index, IshManager::Ability
|
10
|
-
@email_conversations = ::Office::EmailConversation.all.order_by(
|
10
|
+
@email_conversations = ::Office::EmailConversation.all.order_by( latest_at: :desc )
|
11
11
|
end
|
12
12
|
|
13
13
|
def show
|
@@ -1,18 +1,17 @@
|
|
1
1
|
|
2
|
-
|
3
|
-
.
|
4
|
-
|
5
|
-
- if notice
|
6
|
-
|
7
|
-
|
8
|
-
|
9
|
-
|
10
|
-
|
11
|
-
|
12
|
-
- if alert
|
13
|
-
|
14
|
-
|
15
|
-
|
16
|
-
|
17
|
-
|
18
|
-
%p.alert= alert
|
2
|
+
.row
|
3
|
+
.col-sm-12
|
4
|
+
- if notice
|
5
|
+
- if notice.class == Array
|
6
|
+
%ul.notice
|
7
|
+
- notice.map do |n|
|
8
|
+
%li= n
|
9
|
+
- else
|
10
|
+
%p.notice= notice
|
11
|
+
- if alert
|
12
|
+
- if alert.class == Array
|
13
|
+
%ul.alert
|
14
|
+
- alert.map do |n|
|
15
|
+
%li= n
|
16
|
+
- else
|
17
|
+
%p.alert= alert
|
@@ -12,8 +12,9 @@
|
|
12
12
|
.field.field-template
|
13
13
|
= f.label "Template"
|
14
14
|
= f.select :email_template_id, options_for_select(@email_templates_list, selected: params[:email_template_id] || ctx.email_template_id ), {}, { class: 'select2' }
|
15
|
-
|
16
|
-
|
15
|
+
- if ctx.email_template_id
|
16
|
+
= link_to 'view', email_template_path( ctx.email_template_id ), target: :_blank, class: [ 'action-view' ]
|
17
|
+
= link_to '~', edit_email_template_path( ctx.email_template_id ), target: :_blank, class: [ 'action-view' ]
|
17
18
|
-# .field
|
18
19
|
-# = f.label :slug
|
19
20
|
-# = f.text_field :slug
|
@@ -49,7 +49,7 @@
|
|
49
49
|
.time= m.date&.strftime('%l:%M%P')
|
50
50
|
|
51
51
|
.row-2
|
52
|
-
%a.preview{ href:
|
52
|
+
%a.preview{ href: 'javascript:void(0)', data: { id: m.id.to_s } }
|
53
53
|
= (ActionView::Base.full_sanitizer.sanitize( m.part_html )||'<no-info>')[0..300]
|
54
54
|
.expand
|
55
55
|
|
@@ -69,7 +69,7 @@
|
|
69
69
|
|
70
70
|
.relative
|
71
71
|
%i.fa.fa-clock-o.expand-next
|
72
|
-
= render 'ish_manager/scheduled_email_actions/form',
|
72
|
+
= render 'ish_manager/scheduled_email_actions/form', scheduled_email_action: Sch.new({ lead_id: lead.id })
|
73
73
|
|
74
74
|
.scheduled
|
75
75
|
- lead.scheduled_emails.each do |sch|
|
@@ -38,24 +38,9 @@
|
|
38
38
|
.bg-white
|
39
39
|
= render :partial => "ish_manager/application/main_header_#{@current_profile.role_name}"
|
40
40
|
.container.W0
|
41
|
-
|
42
|
-
.row
|
43
|
-
.col-sm-12
|
44
|
-
- if notice
|
45
|
-
- if notice.class == Array
|
46
|
-
%ul.notice
|
47
|
-
- notice.map do |n|
|
48
|
-
%li= n
|
49
|
-
- else
|
50
|
-
%p.notice= notice
|
51
|
-
- if alert
|
52
|
-
- if alert.class == Array
|
53
|
-
%ul.alert
|
54
|
-
- alert.map do |n|
|
55
|
-
%li= n
|
56
|
-
- else
|
57
|
-
%p.alert= alert
|
41
|
+
= render 'alerts_notices' if notice || alert
|
58
42
|
= yield
|
43
|
+
|
59
44
|
= render 'ish_manager/application/main_footer'
|
60
45
|
= render 'analytics' if Rails.env.production?
|
61
46
|
|
@@ -37,7 +37,7 @@
|
|
37
37
|
%body{ class: [ params[:controller].gsub("ish_manager/",""), "#{params[:controller].gsub("ish_manager/","")}-#{params[:action]}", params[:action], "application-fullwidth" ] }
|
38
38
|
|
39
39
|
= render :partial => "ish_manager/application/main_header_#{@current_profile.role_name}"
|
40
|
-
= render 'alerts_notices'
|
40
|
+
= render 'alerts_notices' if notice || alert
|
41
41
|
= yield
|
42
42
|
= render 'ish_manager/application/main_footer'
|
43
43
|
= render 'analytics' if Rails.env.production?
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: ish_manager
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.1.8.
|
4
|
+
version: 0.1.8.363
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- piousbox
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2023-03-
|
11
|
+
date: 2023-03-15 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: rails
|
@@ -234,6 +234,7 @@ files:
|
|
234
234
|
- app/assets/images/wait.gif
|
235
235
|
- app/assets/javascripts/ish_manager/application.js
|
236
236
|
- app/assets/javascripts/ish_manager/email_contexts.js
|
237
|
+
- app/assets/javascripts/ish_manager/email_conversations.js
|
237
238
|
- app/assets/javascripts/ish_manager/email_templates.js
|
238
239
|
- app/assets/javascripts/ish_manager/galleries.js
|
239
240
|
- app/assets/javascripts/ish_manager/maps.js
|