ish_manager 0.1.8.422 → 0.1.8.423

Sign up to get free protection for your applications and to get access to all the features.
Files changed (18) hide show
  1. checksums.yaml +4 -4
  2. data/app/assets/stylesheets/ish_manager/application.scss +0 -1
  3. data/app/assets/stylesheets/ish_manager/pagination.scss +42 -49
  4. data/app/assets/stylesheets/ish_manager/trash/pagination.scss +54 -0
  5. data/app/controllers/ish_manager/application_controller.rb +4 -0
  6. data/app/controllers/ish_manager/email_contexts_controller.rb +5 -4
  7. data/app/controllers/ish_manager/reports_controller.rb +2 -2
  8. data/app/helpers/ish_manager/application_helper.rb +4 -0
  9. data/app/views/ish_manager/application/_main_header_admin.haml +1 -1
  10. data/app/views/ish_manager/application/_paginate.haml +3 -1
  11. data/app/views/ish_manager/email_contexts/index.haml +7 -7
  12. data/app/views/ish_manager/leads/_form.haml +4 -0
  13. data/app/views/ish_manager/leads/index.haml +4 -2
  14. data/app/views/ish_manager/leads/show.haml +2 -0
  15. data/app/views/ish_manager/reports/new.haml +4 -5
  16. data/config/routes.rb +1 -3
  17. metadata +3 -3
  18. data/app/assets/stylesheets/ish_manager/kaminari_pagination.scss +0 -40
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: c4aeaab136e6bac44369c359fe48d2e52a045c690bff6d06ceac1149f5781ce2
4
- data.tar.gz: dedd191f53be49f6f734313ab211e3953f8cdaaaba36c35422d1cc17edf5f049
3
+ metadata.gz: 69cc57e0ef9e184e82c26bbad059d9a552a6194020d141200053e7ab25e43380
4
+ data.tar.gz: e28795a162ba67e30cfa844223b7229bebc24123c3bd0e94a5f6b1b4bad09a2a
5
5
  SHA512:
6
- metadata.gz: be2736d3d77c617967a6fbca389e00427a9d0ab24899323fdef09b3a7a8868138ee3ed16c708464e0a687270bdeaef2a0ab9ecb092102abb9ec802b2357f34c9
7
- data.tar.gz: 1f6da260270b60edce61a0d8a5089a61f3f565227a7d8a06891869d282e34c9c53d9d880d5b219b3002d73376e851dcec71267d55e60f420288cf51d7e6a4bf1
6
+ metadata.gz: 7afb754d5ea53b3b2bcf61d790c415de7ebe0aeed33f2ca69f2c2411b6ae9b5eeb6db97f9bb1d3811f123712ea631e77bec7b5cd4d534fe3f17b6eda5d30cb4e
7
+ data.tar.gz: 9cded4d845df17577950fa7622dca332449d20a57c443b905d0492a0392e5724f4e1fe824b5f9dcb62dbd6fb91bdc2d8f0d3b1423ca4520ebfec0d65a16b578a
data/app/assets/stylesheets/ish_manager/application.scss CHANGED
@@ -5,7 +5,6 @@
5
5
  * require ish_manager/vendor/summernote-bs4.min
6
6
  *
7
7
  *= require_self
8
- *= require ish_manager/kaminari_pagination
9
8
  *= require ish_manager/email_contexts
10
9
  *= require ish_manager/email_conversations
11
10
  *= require ish_manager/email_messages
data/app/assets/stylesheets/ish_manager/pagination.scss CHANGED
@@ -1,54 +1,47 @@
1
1
 
2
-
3
- .pagination li {
4
- display: inline-block;
5
- border-radius: 2px;
6
- text-align: center;
7
- vertical-align: top;
8
- height: 30px;
9
- }
10
-
11
- .pagination li a {
12
- color: #444;
13
- display: inline-block;
14
- font-size: 1.2rem;
15
- padding: 0 10px;
16
- line-height: 30px;
17
- }
18
-
19
- .pagination li.active a {
20
- color: #fff;
21
- }
22
-
23
- .pagination li.active {
24
- background-color: #ee6e73;
25
- }
26
-
27
- .pagination li.disabled a {
28
- cursor: default;
29
- color: #999;
30
- }
31
-
32
- .pagination li i {
33
- font-size: 2rem;
34
- }
35
-
36
- .pagination li.pages ul li {
37
- display: inline-block;
38
- float: none;
39
- }
40
-
41
- @media only screen and (max-width: 992px) {
42
- .pagination {
43
- width: 100%;
2
+ .pagination a,
3
+ .pagination span.current,
4
+ .pagination span.gap {
5
+ float: left;
6
+ padding: 0 14px;
7
+ line-height: 38px;
8
+ text-decoration: none;
9
+ background-color: white;
10
+ border: 1px solid #DDD;
11
+ border-left-width: 0;
12
+ }
13
+
14
+ .pagination {
15
+ border-left: 1px solid #ddd;
16
+
17
+ li.active a {
18
+ background-color: #ee6e73;
19
+ color: white;
44
20
  }
45
- .pagination li.prev,
46
- .pagination li.next {
47
- width: 10%;
21
+ .first{
22
+ padding : 0;
23
+ float: none;
24
+ border: none;
48
25
  }
49
- .pagination li.pages {
50
- width: 80%;
51
- overflow: hidden;
52
- white-space: nowrap;
26
+ .prev {
27
+ padding : 0;
28
+ float: none;
29
+ border: none;
30
+ }
31
+ .page{
32
+ padding : 0;
33
+ float: none;
34
+ border: none;
35
+ }
36
+ .next{
37
+ padding : 0;
38
+ float: none;
39
+ border: none;
40
+ }
41
+ .last{
42
+ padding : 0;
43
+ float: none;
44
+ border: none;
53
45
  }
54
46
  }
47
+
data/app/assets/stylesheets/ish_manager/trash/pagination.scss ADDED
@@ -0,0 +1,54 @@
1
+
2
+
3
+ .pagination li {
4
+ display: inline-block;
5
+ border-radius: 2px;
6
+ text-align: center;
7
+ vertical-align: top;
8
+ height: 30px;
9
+ }
10
+
11
+ .pagination li a {
12
+ color: #444;
13
+ display: inline-block;
14
+ font-size: 1.2rem;
15
+ padding: 0 10px;
16
+ line-height: 30px;
17
+ }
18
+
19
+ .pagination li.active a {
20
+ color: #fff;
21
+ }
22
+
23
+ .pagination li.active {
24
+ background-color: #ee6e73;
25
+ }
26
+
27
+ .pagination li.disabled a {
28
+ cursor: default;
29
+ color: #999;
30
+ }
31
+
32
+ .pagination li i {
33
+ font-size: 2rem;
34
+ }
35
+
36
+ .pagination li.pages ul li {
37
+ display: inline-block;
38
+ float: none;
39
+ }
40
+
41
+ @media only screen and (max-width: 992px) {
42
+ .pagination {
43
+ width: 100%;
44
+ }
45
+ .pagination li.prev,
46
+ .pagination li.next {
47
+ width: 10%;
48
+ }
49
+ .pagination li.pages {
50
+ width: 80%;
51
+ overflow: hidden;
52
+ white-space: nowrap;
53
+ }
54
+ }
data/app/controllers/ish_manager/application_controller.rb CHANGED
@@ -45,6 +45,10 @@ class IshManager::ApplicationController < ActionController::Base
45
45
  JWT.encode(payload, Rails.application.secrets.secret_key_base.to_s)
46
46
  end
47
47
 
48
+ def my_truthy? which
49
+ ["1", "t", "T", "true"].include?( which )
50
+ end
51
+
48
52
  def pp_errors err
49
53
  err
50
54
  end
data/app/controllers/ish_manager/email_contexts_controller.rb CHANGED
@@ -67,12 +67,13 @@ class ::IshManager::EmailContextsController < ::IshManager::ApplicationControlle
67
67
 
68
68
  def index
69
69
  authorize! :index, ::Ish::EmailContext
70
- @ctxs = ::Ish::EmailContext.all
70
+ @ctxs = ::Ish::EmailContext.all.page( params[:ctxs_page] ).per( 100 )
71
71
 
72
- if params[:notsent]
73
- @ctxs = @ctxs.where( sent_at: nil )
74
- else
72
+
73
+ if my_truthy? params[:sent]
75
74
  @ctxs = @ctxs.where( :sent_at.ne => nil )
75
+ else
76
+ @ctxs = @ctxs.where( sent_at: nil )
76
77
  end
77
78
 
78
79
  if params[:lead_id]
data/app/controllers/ish_manager/reports_controller.rb CHANGED
@@ -31,7 +31,7 @@ class IshManager::ReportsController < IshManager::ApplicationController
31
31
  else
32
32
  format.html do
33
33
  flash[:alert] = @report.errors.full_messages
34
- @tags_list = Tag.all.list
34
+ @tags_list = [] # ::WpTag.all.list
35
35
 
36
36
  render :action => "new"
37
37
  end
@@ -70,7 +70,7 @@ class IshManager::ReportsController < IshManager::ApplicationController
70
70
  def new
71
71
  @report = Report.new
72
72
  authorize! :new, @report
73
- @tags_list = Tag.all.where( :is_public => true ).list
73
+ @tags_list = [] # ::WpTag.all.where( :is_public => true ).list
74
74
 
75
75
  respond_to do |format|
76
76
  format.html do
data/app/helpers/ish_manager/application_helper.rb CHANGED
@@ -26,6 +26,10 @@ module IshManager
26
26
  end
27
27
  end
28
28
 
29
+ def my_truthy? which
30
+ ["1", "t", "T", "true"].include?( which )
31
+ end
32
+
29
33
  # def email_contexts_for_lead_path lead
30
34
  # "/manager/email_contexts/for_lead/#{lead.id.to_s}"
31
35
  # end
data/app/views/ish_manager/application/_main_header_admin.haml CHANGED
@@ -71,7 +71,7 @@
71
71
  = link_to "Filters (#{Office::EmailFilter.active.length})", email_filters_path
72
72
  = link_to '[+]', new_email_filter_path
73
73
  %li
74
- = link_to "Ctxs (#{Ctx.notsent.length})", notsent_email_contexts_path
74
+ = link_to "Ctxs (#{Ctx.notsent.length})", email_contexts_path({ sent: false })
75
75
  = link_to '[+]', new_email_context_path
76
76
  %br
77
77
  = link_to 'summary', email_contexts_summary_path( format: :html )
data/app/views/ish_manager/application/_paginate.haml CHANGED
@@ -1,7 +1,9 @@
1
1
 
2
2
  -# Used only in email_contexts#index right now. _vp_ 2022-10-06
3
3
 
4
+ - param_name ||= resource.klass::PAGE_PARAM_NAME
5
+
4
6
  - if resource.respond_to? :total_pages
5
- = paginate resource, param_name: resource.klass::PAGE_PARAM_NAME, views_prefix: 'ish_manager'
7
+ = paginate resource, param_name: param_name, views_prefix: 'ish_manager'
6
8
  - else
7
9
  -# %label Not paginated.
data/app/views/ish_manager/email_contexts/index.haml CHANGED
@@ -3,12 +3,12 @@
3
3
 
4
4
  .header.collapse-expand-trash#emailContextsIndex
5
5
  %h2.title
6
- - if params[:notsent]
7
- <u>notsent</u>
8
- = link_to '[sent]', sent_email_contexts_path
9
- - else
10
- = link_to '[notsent]', notsent_email_contexts_path
6
+ - if my_truthy? params[:sent]
7
+ = link_to '[notsent]', email_contexts_path({ sent: false })
11
8
  <u>sent</u>
9
+ - else
10
+ <u>notsent</u>
11
+ = link_to '[sent]', email_contexts_path({ sent: true })
12
12
  Email Contexts (#{@ctxs.length})
13
13
  - if @lead
14
14
  For lead `#{@lead.name}`
@@ -16,7 +16,7 @@
16
16
 
17
17
 
18
18
  .W0
19
- = render 'paginate', resource: @ctxs, param_name: :email_contexts_page, views_prefix: :ish_manager
19
+ = render 'paginate', resource: @ctxs, param_name: :ctxs_page, views_prefix: :ish_manager
20
20
 
21
21
  %table.bordered
22
22
  %thead
@@ -50,4 +50,4 @@
50
50
  %td= pp_date ctx.sent_at
51
51
 
52
52
 
53
- = render 'paginate', resource: @ctxs, param_name: :email_contexts_page, views_prefix: :ish_manager
53
+ = render 'paginate', resource: @ctxs, param_name: :ctxs_page, views_prefix: :ish_manager
data/app/views/ish_manager/leads/_form.haml CHANGED
@@ -15,6 +15,10 @@
15
15
  = f.label :phone
16
16
  = f.text_field :phone
17
17
 
18
+ .field
19
+ = f.label :address
20
+ = f.text_field :address
21
+
18
22
  .field
19
23
  = f.label "Leadset (company)"
20
24
  = f.select :m3_leadset_id, options_for_select(@leadsets_list, selected: lead.m3_leadset_id), { include_blank: true }, { class: 'select2' }
data/app/views/ish_manager/leads/index.haml CHANGED
@@ -18,7 +18,7 @@
18
18
  %th &nbsp;
19
19
  %th Name/Email
20
20
  %th.company Company
21
- %th Phone
21
+ %th Phone, address
22
22
  %th Tag
23
23
  %th created_at
24
24
  %th Ctx
@@ -33,7 +33,9 @@
33
33
  = lead.company.company_url
34
34
  - if lead.company.name.present?
35
35
  <br /><b>#{lead.company.name}</b>
36
- %td= lead.phone
36
+ %td
37
+ .a= lead.phone if lead.phone.present?
38
+ .a= lead.address if lead.address.present?
37
39
  %td= lead.wp_tags.map(&:name).join(", ")
38
40
  %td= lead.created_at.to_s[0..10]
39
41
  %td.ctx
data/app/views/ish_manager/leads/show.haml CHANGED
@@ -9,6 +9,8 @@
9
9
  %ul
10
10
  %li Name: #{@lead.name}
11
11
  %li Email: #{@lead.email}
12
+ %li Phone: #{@lead.phone}
13
+ %li Address: #{@lead.address}
12
14
 
13
15
  .row
14
16
  .col-md-6.ctxs
data/app/views/ish_manager/reports/new.haml CHANGED
@@ -1,6 +1,5 @@
1
1
 
2
- .row
3
- .col.s12
4
- %h1
5
- %strong New Report
6
- = render 'ish_manager/reports/form', :report => @report
2
+ .reports-new.max-width
3
+ .header
4
+ %h3.title New Report
5
+ = render 'ish_manager/reports/form', :report => @report
data/config/routes.rb CHANGED
@@ -81,9 +81,7 @@ IshManager::Engine.routes.draw do
81
81
  get 'email_contexts/iframe_src/:id', to: 'email_contexts#iframe_src', as: :email_context_iframe
82
82
  get 'email_contexts/new_with_template/:template_slug', to: 'email_contexts#new'
83
83
  post 'email_contexts/send/:id', to: 'email_contexts#do_send', as: :send_email_context
84
- get 'email_contexts', to: 'email_contexts#index', as: :email_contexts, defaults: { notsent: true }
85
- get 'email_contexts/notsent', to: 'email_contexts#index', as: :notsent_email_contexts, defaults: { notsent: true }
86
- get 'email_contexts/sent', to: 'email_contexts#index', as: :sent_email_contexts, defaults: { notsent: false }
84
+ get 'email_contexts', to: 'email_contexts#index', as: :email_contexts
87
85
  resources :email_contexts
88
86
 
89
87
  get 'email_templates/iframe_src/:id', to: 'email_templates#iframe_src', as: :email_template_iframe
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.422
4
+ version: 0.1.8.423
5
5
  platform: ruby
6
6
  authors:
7
7
  - piousbox
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2023-04-14 00:00:00.000000000 Z
11
+ date: 2023-04-15 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rails
@@ -431,7 +431,6 @@ files:
431
431
  - app/assets/stylesheets/ish_manager/email_templates.scss
432
432
  - app/assets/stylesheets/ish_manager/galleries.scss
433
433
  - app/assets/stylesheets/ish_manager/iro.scss
434
- - app/assets/stylesheets/ish_manager/kaminari_pagination.scss
435
434
  - app/assets/stylesheets/ish_manager/leads_leadsets.scss
436
435
  - app/assets/stylesheets/ish_manager/maps.scss
437
436
  - app/assets/stylesheets/ish_manager/markers.scss
@@ -440,6 +439,7 @@ files:
440
439
  - app/assets/stylesheets/ish_manager/photos.scss
441
440
  - app/assets/stylesheets/ish_manager/scheduled_email_actions.scss
442
441
  - app/assets/stylesheets/ish_manager/tags.scss
442
+ - app/assets/stylesheets/ish_manager/trash/pagination.scss
443
443
  - app/assets/stylesheets/ish_manager/user_profiles.scss
444
444
  - app/assets/stylesheets/ish_manager/vendor/jquery-ui.css
445
445
  - app/assets/stylesheets/ish_manager/vendor/summernote-bs4.min.css
data/app/assets/stylesheets/ish_manager/kaminari_pagination.scss DELETED
@@ -1,40 +0,0 @@
1
-
2
- .pagination a, .pagination span.current, .pagination span.gap {
3
- float: left;
4
- padding: 0 14px;
5
- line-height: 38px;
6
- text-decoration: none;
7
- background-color: white;
8
- border: 1px solid #DDD;
9
- border-left-width: 0;
10
- }
11
-
12
- .pagination {
13
- border-left: 1px solid #ddd;
14
- .first{
15
- padding : 0;
16
- float: none;
17
- border: none;
18
- }
19
- .prev {
20
- padding : 0;
21
- float: none;
22
- border: none;
23
- }
24
- .page{
25
- padding : 0;
26
- float: none;
27
- border: none;
28
- }
29
- .next{
30
- padding : 0;
31
- float: none;
32
- border: none;
33
- }
34
- .last{
35
- padding : 0;
36
- float: none;
37
- border: none;
38
- }
39
- }
40
-