ish_manager 0.1.8.380 → 0.1.8.382
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/email_conversations.js +27 -0
- data/app/controllers/ish_manager/email_conversations_controller.rb +5 -3
- data/app/views/ish_manager/application/_alerts_notices.haml +1 -1
- data/app/views/ish_manager/application/_main_header_admin.haml +2 -3
- data/app/views/ish_manager/categories/index.haml +10 -9
- data/app/views/ish_manager/email_conversations/index.haml +18 -7
- data/app/views/ish_manager/email_conversations/show.haml +17 -17
- data/app/views/ish_manager/maps/map_editor.haml +1 -1
- data/app/views/ish_manager/maps/new.haml +6 -2
- data/app/views/ish_manager/maps/show.haml +1 -1
- data/app/views/ish_manager/markers/_form.haml +0 -10
- data/app/views/ish_manager/markers/edit.haml +3 -2
- data/app/views/ish_manager/markers/new.haml +4 -2
- data/config/routes.rb +2 -1
- data/lib/tasks/office_tasks.rake +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: b3577db8734f36721f678b56eaafa27a45aaced767e8d348a4eb67f0f51b2b40
|
4
|
+
data.tar.gz: ff1cbed5a6fd1452341c6a96b093d2995e435d2eb7ef164d3a851578368d8361
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: b3be716f9fae264d5b3c28ac69c6f055565e33d09c77d5d0875aa6ba09b31c87074d2ddbcd2911fe8c110da4e83682c6da5c01d69ab7769c7481cf2bded4827a
|
7
|
+
data.tar.gz: ed2dfd2a0878cd1f1cd360edf12bb76dd41cf7a01ac1485722ba6f21bda4d32982a8b90b7634cf8be2f9346a6601cdfc016abbcd1f294904804e8230b8d45e90
|
@@ -16,6 +16,33 @@ $(document).ready(() => {
|
|
16
16
|
|
17
17
|
})
|
18
18
|
|
19
|
+
$(".archive-btn").click(function(e) {
|
20
|
+
const jwt_token = $("#Config").data('jwt-token')
|
21
|
+
const action_path = $(this).data('url')
|
22
|
+
const out = []
|
23
|
+
|
24
|
+
$( $("input[type='checkbox'].i-sel:checked") ).each( idx => {
|
25
|
+
let val = $($("input[type='checkbox'].i-sel:checked")[idx]).val()
|
26
|
+
out.push(val)
|
27
|
+
})
|
28
|
+
|
29
|
+
$.ajax({
|
30
|
+
url: action_path,
|
31
|
+
type: 'POST',
|
32
|
+
data: {
|
33
|
+
ids: out,
|
34
|
+
jwt_token: jwt_token,
|
35
|
+
},
|
36
|
+
success: e => {
|
37
|
+
logg((e||{}).responseText, 'archived Ok')
|
38
|
+
location.reload()
|
39
|
+
},
|
40
|
+
error: e => {
|
41
|
+
logg((e||{}).responseText, 'archived Err')
|
42
|
+
},
|
43
|
+
})
|
44
|
+
|
45
|
+
})
|
19
46
|
|
20
47
|
$(".delete-btn").click(function(e) {
|
21
48
|
const jwt_token = $("#Config").data('jwt-token')
|
@@ -5,11 +5,13 @@ class ::IshManager::EmailConversationsController < IshManager::ApplicationContro
|
|
5
5
|
|
6
6
|
def index
|
7
7
|
authorize! :email_conversations_index, IshManager::Ability
|
8
|
+
@email_conversations = ::Office::EmailConversation.all
|
8
9
|
|
9
10
|
if params[:slug]
|
10
|
-
@email_conversations =
|
11
|
-
|
12
|
-
|
11
|
+
@email_conversations = @email_conversations.in_emailtag( params[:slug] )
|
12
|
+
end
|
13
|
+
if params[:not_slug]
|
14
|
+
@email_conversations = @email_conversations.not_in_emailtag(params[:not_slug])
|
13
15
|
end
|
14
16
|
@email_conversations = @email_conversations.order_by( latest_at: :desc )
|
15
17
|
end
|
@@ -29,7 +29,7 @@
|
|
29
29
|
%li= link_to 'Ish::UserProfiles', user_profiles_path
|
30
30
|
%li= link_to "Ish::ImageAsset's", image_assets_path
|
31
31
|
%li
|
32
|
-
= link_to '
|
32
|
+
= link_to 'Locations (maps)', maps_path
|
33
33
|
.inline-search
|
34
34
|
= form_tag maps_path, method: :get do
|
35
35
|
= text_field_tag :q
|
@@ -41,13 +41,12 @@
|
|
41
41
|
.a
|
42
42
|
%ul
|
43
43
|
%li
|
44
|
-
= link_to "
|
44
|
+
= link_to "#{WpTag::INBOX} (#{Office::EmailConversation.in_emailtag(WpTag::INBOX).length})", email_conversations_in_path(WpTag::INBOX)
|
45
45
|
= link_to '[+]', new_email_context_path
|
46
46
|
%li
|
47
47
|
= link_to "Templates (#{Ish::EmailTemplate.all.count})", email_templates_path
|
48
48
|
= link_to '[+]', new_email_template_path
|
49
49
|
%li
|
50
|
-
-# = link_to 'Contexts', email_contexts_path
|
51
50
|
= link_to 'Contexts', notsent_email_contexts_path
|
52
51
|
= link_to '[+]', new_email_context_path
|
53
52
|
-# %li
|
@@ -1,11 +1,12 @@
|
|
1
1
|
|
2
|
-
.
|
3
|
-
.
|
4
|
-
|
5
|
-
|
2
|
+
.categories-index.max-width
|
3
|
+
.row
|
4
|
+
.col-md-6
|
5
|
+
%h1 Categories
|
6
|
+
= render 'ish_manager/categories/subtree', subtree: @categories_flat, config: { parent_id: nil, parent_ids: @categories_flat.map { |c| c[5] }.uniq }
|
6
7
|
|
7
|
-
|
8
|
-
|
9
|
-
|
10
|
-
|
11
|
-
|
8
|
+
.col-md-6
|
9
|
+
%h1 Tags
|
10
|
+
%ul
|
11
|
+
- @tags.each do |tag|
|
12
|
+
%li= tag[:name]
|
@@ -3,21 +3,32 @@
|
|
3
3
|
|
4
4
|
.second-header
|
5
5
|
%i.material-icons mail
|
6
|
-
= link_to
|
7
|
-
Inbox (#{Office::EmailConversation.
|
8
|
-
= link_to
|
9
|
-
|
10
|
-
= link_to email_conversations_in_emailtag_path(WpTag::EMAILTAG_TRASH) do
|
11
|
-
Trash (#{Office::EmailConversation.in_emailtag(WpTag::EMAILTAG_TRASH).length})
|
6
|
+
= link_to email_conversations_in_path(WpTag::INBOX) do
|
7
|
+
Inbox (#{Office::EmailConversation.in_emailtag(WpTag::INBOX).length})
|
8
|
+
= link_to email_conversations_notin_path(WpTag::INBOX) do
|
9
|
+
Not Inbox (#{Office::EmailConversation.not_in_emailtag(WpTag::INBOX).length})
|
12
10
|
|
13
|
-
|
11
|
+
= link_to email_conversations_in_path(WpTag::TRASH) do
|
12
|
+
Trash (#{Office::EmailConversation.in_emailtag(WpTag::TRASH).length})
|
13
|
+
= link_to email_conversations_notin_path(WpTag::TRASH) do
|
14
|
+
Not Trash (#{Office::EmailConversation.not_in_emailtag(WpTag::TRASH).length})
|
15
|
+
|
16
|
+
- if params[:slug]
|
17
|
+
slug: #{params[:slug]}
|
18
|
+
- if params[:not_slug]
|
19
|
+
not slug: #{params[:not_slug]}
|
14
20
|
|
15
21
|
.actions
|
16
22
|
|
23
|
+
%a.btn.archive-btn{ href: "javascript: void(0)", data: { url: "/api/email_conversations/rmtag/#{WpTag::INBOX}" } }
|
24
|
+
%i.material-icons archive
|
25
|
+
archive
|
17
26
|
%a.btn.delete-btn{ href: "javascript: void(0)", data: { url: '/api/email_conversations' } }
|
18
27
|
%i.material-icons delete
|
28
|
+
delete
|
19
29
|
%a.btn.reload-btn{ href: "javascript: location.reload()" }
|
20
30
|
%i.material-icons refresh
|
31
|
+
refresh
|
21
32
|
|
22
33
|
%table.conversations
|
23
34
|
%tr
|
@@ -17,8 +17,7 @@
|
|
17
17
|
.leads.max-width
|
18
18
|
Leads (#{@email_conversation.leads.length}):
|
19
19
|
= @email_conversation.leads.map(&:id)
|
20
|
-
.leadsC
|
21
|
-
= render 'ish_manager/leads/index_rows', leads: @email_conversation.leads
|
20
|
+
-# .leadsC= render 'ish_manager/leads/index_rows', leads: @email_conversation.leads
|
22
21
|
|
23
22
|
.messages.max-width
|
24
23
|
- @email_messages.each do |msg|
|
@@ -26,21 +25,22 @@
|
|
26
25
|
|
27
26
|
.item
|
28
27
|
.row-1
|
29
|
-
.gray
|
30
|
-
|
31
|
-
|
32
|
-
|
33
|
-
|
34
|
-
|
35
|
-
|
36
|
-
|
37
|
-
|
38
|
-
|
39
|
-
|
40
|
-
|
41
|
-
|
42
|
-
|
43
|
-
|
28
|
+
.gray
|
29
|
+
%ul
|
30
|
+
%li
|
31
|
+
= msg.id
|
32
|
+
<b>To:</b> #{msg.to}
|
33
|
+
%li
|
34
|
+
<b>From:</b> #{msg.from}
|
35
|
+
= lead.email
|
36
|
+
%a.chip{ href: email_contexts_for_lead_path( lead ) }
|
37
|
+
\(
|
38
|
+
= lead.email_contexts.count
|
39
|
+
%i.fa.fa-envelope
|
40
|
+
\)
|
41
|
+
.relative.inline-block
|
42
|
+
%i.fa.fa-clock-o.expand-next
|
43
|
+
.expand-hide= render 'ish_manager/scheduled_email_actions/form', scheduled_email_action: Sch.new({ lead_id: lead.id })
|
44
44
|
|
45
45
|
.datetime
|
46
46
|
.date= msg.date&.strftime('%Y-%m-%d')
|
@@ -68,21 +68,11 @@
|
|
68
68
|
.field
|
69
69
|
= f.label :url, "URL (if any)"
|
70
70
|
= f.text_field :url
|
71
|
-
.row
|
72
|
-
.col-sm-3
|
73
|
-
.col-sm-5
|
74
|
-
.field
|
75
|
-
= f.label :description
|
76
|
-
= f.text_area :description
|
77
71
|
.row
|
78
72
|
.col-sm-4
|
79
73
|
.field
|
80
74
|
= f.label :item_type
|
81
75
|
= f.select :item_type, options_for_select( ::Gameui::Marker::ITEM_TYPES, selected: @marker.item_type )
|
82
|
-
.col-sm-4
|
83
|
-
.field
|
84
|
-
= f.label :ordering
|
85
|
-
= f.text_field :ordering
|
86
76
|
.col-sm-4
|
87
77
|
.field
|
88
78
|
= f.check_box :is_active
|
data/config/routes.rb
CHANGED
@@ -62,7 +62,8 @@ IshManager::Engine.routes.draw do
|
|
62
62
|
resources :email_messages
|
63
63
|
|
64
64
|
get 'email_conversations', to: 'email_conversations#index'
|
65
|
-
get 'email_conversations/
|
65
|
+
get 'email_conversations/in/:slug', to: 'email_conversations#index', as: :email_conversations_in
|
66
|
+
get 'email_conversations/notin/:not_slug', to: 'email_conversations#index', as: :email_conversations_notin
|
66
67
|
get 'email_conversations/show/:id', to: 'email_conversations#show', as: :email_conversation
|
67
68
|
|
68
69
|
get 'email_contexts/for_lead/:lead_id', to: 'email_contexts#index', as: :email_contexts_for_lead
|
data/lib/tasks/office_tasks.rake
CHANGED
@@ -47,7 +47,7 @@ namespace :office do
|
|
47
47
|
task :email_worker => :environment do
|
48
48
|
while true do
|
49
49
|
|
50
|
-
ctxs = ::Ish::EmailContext.
|
50
|
+
ctxs = ::Ish::EmailContext.scheduled.unsent
|
51
51
|
puts! ctxs.count, 'ctxs'
|
52
52
|
ctxs.map do |ctx|
|
53
53
|
IshManager::OfficeMailer.send_context_email( ctx[:id].to_s ).deliver_later
|
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.382
|
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-24 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: rails
|