ish_manager 0.1.8.425 → 0.1.8.427
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/app/controllers/ish_manager/email_campaigns_controller.rb +14 -14
- data/app/controllers/ish_manager/email_contexts_controller.rb +1 -3
- data/app/controllers/ish_manager/email_templates_controller.rb +1 -1
- data/app/controllers/ish_manager/image_assets_controller.rb +4 -1
- data/app/controllers/ish_manager/leads_controller.rb +5 -1
- data/app/controllers/ish_manager/leadsets_controller.rb +1 -1
- data/app/controllers/ish_manager/user_profiles_controller.rb +32 -32
- data/app/views/ish_manager/application/_analytics.html +14 -7
- data/app/views/ish_manager/application/_main_header_admin.haml +3 -0
- data/app/views/ish_manager/application/_search.haml +2 -0
- data/app/views/ish_manager/email_templates/_index.haml +20 -17
- data/app/views/ish_manager/email_templates/_m20221222merryxmas.html.erb +3 -1
- data/app/views/ish_manager/email_templates/_marketing_react_3.html.erb +2 -2
- data/app/views/ish_manager/email_templates/_marketing_ror_2.html.erb +4 -2
- data/app/views/ish_manager/leads/index.haml +4 -3
- data/app/views/ish_manager/leadsets/index.haml +2 -1
- metadata +2 -3
- data/app/views/ish_manager/galleries/index_ajax.haml-trash +0 -9
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: '02538b7db4c131f456474b688ba92ae8de961ad3c2256eea3b06075d13ac2352'
|
4
|
+
data.tar.gz: 72615354fe52eef9bccb16e256e0cedcf19aaf241315433ef14b457e388b7356
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 90add5ac708ee81f2af050e9f4bc349ca0b1d71c6cb7e2e49bd0aac56c3c37bebc7bdd3f9f88b0e3a28d8941a39100f7b2debaef545cf461efb0d756c4c3513b
|
7
|
+
data.tar.gz: 2a7071698626767453ad592e4ae14de260ded882b633c50ad8eaedd0df4dd09625eb2085a201429704016b46b37042d057190d1e5172c307ea4816865afed8b7
|
@@ -3,16 +3,6 @@ class ::IshManager::EmailCampaignsController < IshManager::ApplicationController
|
|
3
3
|
|
4
4
|
before_action :set_lists
|
5
5
|
|
6
|
-
def index
|
7
|
-
authorize! :index, Ish::EmailCampaign
|
8
|
-
@campaigns = Ish::EmailCampaign.all
|
9
|
-
end
|
10
|
-
|
11
|
-
def new
|
12
|
-
@campaign = Ish::EmailCampaign.new
|
13
|
-
authorize! :new, @campaign
|
14
|
-
end
|
15
|
-
|
16
6
|
def create
|
17
7
|
@campaign = Ish::EmailCampaign.new params[:campaign].permit!
|
18
8
|
authorize! :create, @campaign
|
@@ -30,14 +20,24 @@ class ::IshManager::EmailCampaignsController < IshManager::ApplicationController
|
|
30
20
|
@campaign.do_send
|
31
21
|
end
|
32
22
|
|
33
|
-
def
|
23
|
+
def edit
|
34
24
|
@campaign = Ish::EmailCampaign.find params[:id]
|
35
|
-
authorize! :
|
25
|
+
authorize! :edit, @campaign
|
36
26
|
end
|
37
27
|
|
38
|
-
def
|
28
|
+
def index
|
29
|
+
authorize! :index, Ish::EmailCampaign
|
30
|
+
@campaigns = Ish::EmailCampaign.all
|
31
|
+
end
|
32
|
+
|
33
|
+
def new
|
34
|
+
@campaign = Ish::EmailCampaign.new
|
35
|
+
authorize! :new, @campaign
|
36
|
+
end
|
37
|
+
|
38
|
+
def show
|
39
39
|
@campaign = Ish::EmailCampaign.find params[:id]
|
40
|
-
authorize! :
|
40
|
+
authorize! :show, @campaign
|
41
41
|
end
|
42
42
|
|
43
43
|
def update
|
@@ -67,8 +67,7 @@ class ::IshManager::EmailContextsController < ::IshManager::ApplicationControlle
|
|
67
67
|
|
68
68
|
def index
|
69
69
|
authorize! :index, ::Ish::EmailContext
|
70
|
-
@ctxs = ::Ish::EmailContext.all.page( params[:ctxs_page] ).per(
|
71
|
-
|
70
|
+
@ctxs = ::Ish::EmailContext.all.page( params[:ctxs_page] ).per( current_profile.per_page )
|
72
71
|
|
73
72
|
if my_truthy? params[:sent]
|
74
73
|
@ctxs = @ctxs.where( :sent_at.ne => nil )
|
@@ -109,7 +108,6 @@ class ::IshManager::EmailContextsController < ::IshManager::ApplicationControlle
|
|
109
108
|
render layout: false
|
110
109
|
end
|
111
110
|
end
|
112
|
-
|
113
111
|
end
|
114
112
|
|
115
113
|
def update
|
@@ -49,7 +49,7 @@ class ::IshManager::EmailTemplatesController < ::IshManager::ApplicationControll
|
|
49
49
|
|
50
50
|
def index
|
51
51
|
authorize! :index, Ish::EmailTemplate
|
52
|
-
@templates = Ish::EmailTemplate.all.order_by( slug: :asc ).page( params[:templates_page] )
|
52
|
+
@templates = Ish::EmailTemplate.all.order_by( slug: :asc ).page( params[:templates_page] ).per( current_profile.per_page )
|
53
53
|
end
|
54
54
|
|
55
55
|
def new
|
@@ -1,9 +1,12 @@
|
|
1
1
|
|
2
|
+
##
|
3
|
+
## trash?! _vp_ 2023-05-10
|
4
|
+
##
|
2
5
|
class IshManager::ImageAssetsController < IshManager::ApplicationController
|
3
6
|
|
4
7
|
def index
|
5
8
|
authorize! :index, Ish::ImageAsset
|
6
|
-
@image_assets = Ish::ImageAsset.all.order_by( created_at: :desc )
|
9
|
+
@image_assets = Ish::ImageAsset.all.order_by( created_at: :desc )
|
7
10
|
end
|
8
11
|
|
9
12
|
end
|
@@ -64,7 +64,11 @@ class ::IshManager::LeadsController < IshManager::ApplicationController
|
|
64
64
|
|
65
65
|
def index
|
66
66
|
authorize! :index, ::Lead
|
67
|
-
@leads = ::Lead.kept.includes( :company )
|
67
|
+
@leads = ::Lead.kept.includes( :company )
|
68
|
+
if params[:q].present?
|
69
|
+
@leads = @leads.where(" email LIKE ? ", "%#{params[:q]}%" )
|
70
|
+
end
|
71
|
+
@leads = @leads.page( params[:leads_page ] ).per( current_profile.per_page )
|
68
72
|
|
69
73
|
@email_contexts = {}
|
70
74
|
# lead_emails = @leads.map( &:email ).compact.reject(&:empty?)
|
@@ -33,7 +33,7 @@ class ::IshManager::LeadsetsController < IshManager::ApplicationController
|
|
33
33
|
|
34
34
|
def index
|
35
35
|
authorize! :index, Leadset
|
36
|
-
@leadsets = Leadset.all.kept
|
36
|
+
@leadsets = Leadset.all.kept.page( params[:leadsets_page] ).per( current_profile.per_page )
|
37
37
|
end
|
38
38
|
|
39
39
|
def new
|
@@ -3,6 +3,33 @@ class IshManager::UserProfilesController < IshManager::ApplicationController
|
|
3
3
|
|
4
4
|
before_action :set_lists
|
5
5
|
|
6
|
+
def create
|
7
|
+
@user = User.find_or_create_by( :email => params[:profile][:email] )
|
8
|
+
@user.password ||= (0...12).map { rand(100) }.join
|
9
|
+
@user_profile = Ish::UserProfile.new params[:profile].permit!
|
10
|
+
authorize! :create, @user_profile
|
11
|
+
|
12
|
+
if params[:photo]
|
13
|
+
photo = Photo.new :photo => params[:photo]
|
14
|
+
@user_profile.profile_photo = photo
|
15
|
+
end
|
16
|
+
|
17
|
+
if !@user.save
|
18
|
+
raise "cannot save profile.user: #{@user.errors.full_messages} profile errors: #{@user_profile.errors.full_messages}"
|
19
|
+
end
|
20
|
+
if @user_profile.save
|
21
|
+
flash[:notice] = "Created profile"
|
22
|
+
else
|
23
|
+
flash[:alert] = "Cannot create profile: #{@user_profile.errors.messages}"
|
24
|
+
end
|
25
|
+
redirect_to :action => :index
|
26
|
+
end
|
27
|
+
|
28
|
+
def edit
|
29
|
+
@profile = Ish::UserProfile.find params[:id]
|
30
|
+
authorize! :edit, @profile
|
31
|
+
end
|
32
|
+
|
6
33
|
def index
|
7
34
|
@user_profiles = Ish::UserProfile.all
|
8
35
|
authorize! :index, Ish::UserProfile
|
@@ -11,14 +38,14 @@ class IshManager::UserProfilesController < IshManager::ApplicationController
|
|
11
38
|
end
|
12
39
|
end
|
13
40
|
|
14
|
-
def
|
15
|
-
@profile = Ish::UserProfile.
|
16
|
-
authorize! :
|
41
|
+
def new
|
42
|
+
@profile = Ish::UserProfile.new
|
43
|
+
authorize! :new, @profile
|
17
44
|
end
|
18
45
|
|
19
|
-
def
|
46
|
+
def show
|
20
47
|
@profile = Ish::UserProfile.find params[:id]
|
21
|
-
authorize! :
|
48
|
+
authorize! :show, @profile
|
22
49
|
end
|
23
50
|
|
24
51
|
def update
|
@@ -44,32 +71,5 @@ class IshManager::UserProfilesController < IshManager::ApplicationController
|
|
44
71
|
end
|
45
72
|
end
|
46
73
|
|
47
|
-
def new
|
48
|
-
@profile = Ish::UserProfile.new
|
49
|
-
authorize! :new, @profile
|
50
|
-
end
|
51
|
-
|
52
|
-
def create
|
53
|
-
@user = User.find_or_create_by( :email => params[:profile][:email] )
|
54
|
-
@user.password ||= (0...12).map { rand(100) }.join
|
55
|
-
@user_profile = Ish::UserProfile.new params[:profile].permit!
|
56
|
-
authorize! :create, @user_profile
|
57
|
-
|
58
|
-
if params[:photo]
|
59
|
-
photo = Photo.new :photo => params[:photo]
|
60
|
-
@user_profile.profile_photo = photo
|
61
|
-
end
|
62
|
-
|
63
|
-
if !@user.save
|
64
|
-
raise "cannot save profile.user: #{@user.errors.full_messages} profile errors: #{@user_profile.errors.full_messages}"
|
65
|
-
end
|
66
|
-
if @user_profile.save
|
67
|
-
flash[:notice] = "Created profile"
|
68
|
-
else
|
69
|
-
flash[:alert] = "Cannot create profile: #{@user_profile.errors.messages}"
|
70
|
-
end
|
71
|
-
redirect_to :action => :index
|
72
|
-
end
|
73
|
-
|
74
74
|
end
|
75
75
|
|
@@ -1,9 +1,16 @@
|
|
1
|
-
<!-- Global site tag (gtag.js) - Google Analytics -->
|
2
|
-
<script async src="https://www.googletagmanager.com/gtag/js?id=UA-53077236-7"></script>
|
3
|
-
<script>
|
4
|
-
window.dataLayer = window.dataLayer || [];
|
5
|
-
function gtag(){dataLayer.push(arguments);}
|
6
|
-
gtag('js', new Date());
|
7
1
|
|
8
|
-
|
2
|
+
<!-- Matomo -->
|
3
|
+
<script>
|
4
|
+
var _paq = window._paq = window._paq || [];
|
5
|
+
/* tracker methods like "setCustomDimension" should be called before "trackPageView" */
|
6
|
+
_paq.push(['trackPageView']);
|
7
|
+
_paq.push(['enableLinkTracking']);
|
8
|
+
(function() {
|
9
|
+
var u="//analytics.wasya.co/";
|
10
|
+
_paq.push(['setTrackerUrl', u+'matomo.php']);
|
11
|
+
_paq.push(['setSiteId', '4']);
|
12
|
+
var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
|
13
|
+
g.async=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
|
14
|
+
})();
|
9
15
|
</script>
|
16
|
+
<!-- End Matomo Code -->
|
@@ -79,6 +79,9 @@
|
|
79
79
|
|
80
80
|
%li
|
81
81
|
= link_to "Leads (#{Lead.kept.length})", leads_path
|
82
|
+
.inline-search
|
83
|
+
= form_tag leads_path, method: :get do
|
84
|
+
= text_field_tag :q
|
82
85
|
= link_to '[+]', new_lead_path
|
83
86
|
%li
|
84
87
|
= link_to "Schs (#{Sch.active.length})", scheduled_email_actions_path
|
@@ -1,22 +1,25 @@
|
|
1
1
|
|
2
|
-
|
3
|
-
Email Templates (#{Ish::EmailTemplate.all.count})
|
2
|
+
.email-templates--index.max-width
|
4
3
|
|
5
|
-
.
|
6
|
-
|
7
|
-
%tr
|
8
|
-
%th
|
9
|
-
%th Slug
|
10
|
-
%th Created
|
11
|
-
%th Updated
|
4
|
+
%h3.center.collapse-expand#emailTemplatesIndex
|
5
|
+
Email Templates (#{Ish::EmailTemplate.all.count})
|
12
6
|
|
13
|
-
|
7
|
+
= paginate @templates, :param_name => :templates_page, :views_prefix => 'ish_manager'
|
8
|
+
.email-templates-index.max-width
|
9
|
+
%table.bordered
|
14
10
|
%tr
|
15
|
-
%
|
16
|
-
|
17
|
-
|
18
|
-
|
19
|
-
%td= link_to tmpl.slug, email_template_path({ id: tmpl })
|
20
|
-
%td= pp_date tmpl.created_at
|
21
|
-
%td= pp_date tmpl.updated_at
|
11
|
+
%th
|
12
|
+
%th Slug
|
13
|
+
%th Created
|
14
|
+
%th Updated
|
22
15
|
|
16
|
+
- @templates.each do |tmpl|
|
17
|
+
%tr
|
18
|
+
%td
|
19
|
+
= link_to '[use]', new_email_context_path({ email_template_id: tmpl.id })
|
20
|
+
= link_to '[~]', edit_email_template_path({ id: tmpl })
|
21
|
+
= button_to '[x]', email_template_path({ id: tmpl }), method: :delete, :data => { :confirm => 'Are you sure?' }, form_class: 'inline'
|
22
|
+
%td= link_to tmpl.slug, email_template_path({ id: tmpl })
|
23
|
+
%td= pp_date tmpl.created_at
|
24
|
+
%td= pp_date tmpl.updated_at
|
25
|
+
= paginate @templates, :param_name => :templates_page, :views_prefix => 'ish_manager'
|
@@ -760,5 +760,7 @@
|
|
760
760
|
</tr>
|
761
761
|
</table>
|
762
762
|
</center>
|
763
|
-
|
763
|
+
<!-- Matomo Image Tracker-->
|
764
|
+
<img referrerpolicy="no-referrer-when-downgrade" src="https://analytics.wasya.co/matomo.php?idsite=2&rec=1" style="border:0" alt="" />
|
765
|
+
<!-- End Matomo -->
|
764
766
|
</html>
|
@@ -663,9 +663,9 @@
|
|
663
663
|
<td width="100" > </td>
|
664
664
|
<td align="center" style="padding-left: 50px; padding-right: 9px; ">
|
665
665
|
|
666
|
-
<h3><a href="https://wasya.co/our-services-2?<%= @utm_tracking_str %>" style="color: #00c8cc;" target="_blank" >
|
666
|
+
<h3><a href="https://wasya.co/our-services-2?<%= @utm_tracking_str %>" style="color: #00c8cc;" target="_blank" >Our Services</a></h3>
|
667
667
|
<br />
|
668
|
-
<h3><a href="https://wasya.co/contact-us-2?<%= @utm_tracking_str %>" style="color: #00c8cc;" target="_blank" >
|
668
|
+
<h3><a href="https://wasya.co/contact-us-2?<%= @utm_tracking_str %>" style="color: #00c8cc;" target="_blank" >Contact Us</a></h3>
|
669
669
|
|
670
670
|
</td>
|
671
671
|
</tr>
|
@@ -1,5 +1,7 @@
|
|
1
1
|
|
2
|
-
|
2
|
+
<!-- Matomo Image Tracker-->
|
3
|
+
<img referrerpolicy="no-referrer-when-downgrade" src="https://analytics.wasya.co/matomo.php?idsite=2&rec=1" style="border:0" alt="" />
|
4
|
+
<!-- End Matomo -->
|
3
5
|
|
4
6
|
<table align="center" border="0" cellpadding="0" cellspacing="0" height="100%" width="100%"
|
5
7
|
style="border-collapse: collapse; height: 100%; margin: 0px; padding: 0px; width: 100%;">
|
@@ -555,7 +557,7 @@
|
|
555
557
|
>
|
556
558
|
<a
|
557
559
|
title="Chat with Us!"
|
558
|
-
href="https://wasya.co/contact-us
|
560
|
+
href="https://wasya.co/contact-us?<%= @utm_tracking_str %>"
|
559
561
|
style="font-weight: bold; letter-spacing: 1px; line-height: 100%; text-align: center; text-decoration: none; color: rgb(238, 238, 238); display: block;"
|
560
562
|
target="_blank"
|
561
563
|
> Chat with Us! </a>
|
@@ -5,13 +5,14 @@
|
|
5
5
|
#{link_to 'Kept Leads', leads_path} (#{::Lead.kept.count}, #{::Lead.all.count})
|
6
6
|
= link_to raw("<i class='fa fa-plus-square'></i>"), new_lead_path
|
7
7
|
|
8
|
-
=
|
8
|
+
= render 'search', resource: ::Lead
|
9
9
|
= form_tag leads_bulkop_path do
|
10
10
|
= label_tag 'Act on Selected:'
|
11
11
|
= select_tag :op, options_for_select( [[nil,nil]] + Lead::OPS )
|
12
12
|
= select_tag :email_campaign_id, options_for_select( @email_campaigns_list )
|
13
13
|
= submit_tag 'Go'
|
14
14
|
|
15
|
+
= paginate @leads, param_name: :leads_page
|
15
16
|
%table.bordered
|
16
17
|
%thead
|
17
18
|
%tr
|
@@ -48,8 +49,8 @@
|
|
48
49
|
-# %li
|
49
50
|
-# = link_to sch_a.email_action.slug, edit_scheduled_email_action_path( sch_a )
|
50
51
|
-# [x]
|
51
|
-
|
52
|
-
|
52
|
+
|
53
|
+
= paginate @leads, param_name: :leads_page
|
53
54
|
|
54
55
|
|
55
56
|
|
@@ -13,6 +13,7 @@
|
|
13
13
|
.n-selected -
|
14
14
|
= button_tag 'Delete', method: :delete, class: 'delete-btn'
|
15
15
|
|
16
|
+
= paginate @leadsets, :param_name => :leadsets_page, :views_prefix => 'ish_manager'
|
16
17
|
%table
|
17
18
|
%thead
|
18
19
|
%tr
|
@@ -76,5 +77,5 @@
|
|
76
77
|
.chip
|
77
78
|
.interval= sch.interval
|
78
79
|
.tmpl= sch.email_template.slug
|
79
|
-
|
80
|
+
= paginate @leadsets, :param_name => :leadsets_page, :views_prefix => 'ish_manager'
|
80
81
|
|
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.427
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- piousbox
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2023-
|
11
|
+
date: 2023-05-10 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: rails
|
@@ -618,7 +618,6 @@ files:
|
|
618
618
|
- app/views/ish_manager/galleries/_thumbs.haml
|
619
619
|
- app/views/ish_manager/galleries/_title.haml
|
620
620
|
- app/views/ish_manager/galleries/edit.haml
|
621
|
-
- app/views/ish_manager/galleries/index_ajax.haml-trash
|
622
621
|
- app/views/ish_manager/galleries/index_thumbs.haml
|
623
622
|
- app/views/ish_manager/galleries/index_titles.haml
|
624
623
|
- app/views/ish_manager/galleries/new.haml
|