ish_manager 0.1.8.428 → 0.1.8.430

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b9f691435726734a9202b8266f28b7fb9c62b8090f9f75ea1ba7c706c474a68c
-  data.tar.gz: 873c4604a16c7612130fe758882aa97e6485fcbe74c391399a6ea10f39fb1b3a
+  metadata.gz: 7e6abbf238a452811df0495561ea410cf0a569b39065ad1067e829ee09d0091d
+  data.tar.gz: fe6580a8254170fcfc39b0feef97976bdd30e5b8272e57a8d85275d198e2a9bc
 SHA512:
-  metadata.gz: afb5335ab24acfccd4dab998bd8c56e0418376208687ca06f93fc04d4842e385814c4b73c36bf261eff750687df4709fba794fc1bf36995db5761e103865dc27
-  data.tar.gz: 23fe9362978d688d0fb6576b6fde208155dd48748889b9f2bb437ab10976ca47ce4f9822bea5511f51cd0817139b472ab1acbcf4373193a058f04c272c1b2b41
+  metadata.gz: b671d0e4eabdcd2e351d9fb0fa51661c6c8e6b52cd05d19af5f79a58cd67ea703f9159bcf882330ad4e0fec1d3c16c1e32d7d01123a38427b4bc52ef39733e2e
+  data.tar.gz: '008e15ce28bfdd511fdd4186081368a7989bfae05e8d424b04ef5408248233f070e35b81f356312284636581c940ae1ca4c19fb64ccd730184e2753ae50252d3'

data/app/assets/javascripts/ish_manager/application.js

@@ -3,6 +3,7 @@
 //= require ish_manager/vendor/jquery.ui.widget
 //= require ish_manager/vendor/jquery.fileupload
 //= require ish_manager/vendor/jquery-ui.min
+//
 // require ish_manager/vendor/summernote-bs4.min
 //
 //= require ish_manager/shared
@@ -13,6 +14,7 @@
 //= require ish_manager/email_templates
 //= require ish_manager/galleries
 //= require ish_manager/iro
+//= require ish_manager/leads
 //
 
 const AppRouter = {

data/app/assets/javascripts/ish_manager/leads.js

@@ -0,0 +1,13 @@
+
+
+$(document).ready(() => {
+
+  $("input[type='checkbox']#selectAll").change(function () {
+    logg(this, 'clicked')
+
+    const checked = $(this).prop('checked')
+    $(this).closest('table').find("tbody input[type='checkbox']").prop('checked', checked)
+  })
+
+})
+

data/app/assets/stylesheets/ish_manager/email.scss

@@ -12,8 +12,10 @@
 .emails-ns, // emails namespace
 .iro-purses-my,
 .leads-edit,
+.leads--index,
 .leads-index,
 .leads-show,
+.leadsets-show,
 .scheduled-email-actions--form,
 .scheduled-emails-index {
   .header {
@@ -21,7 +23,9 @@
     justify-content: center;
   }
 }
-
+.ctxs {
+  text-align: center;
+}
 .email-actions--form {
   .select2-container {
     flex-grow: 1;

data/app/controllers/ish_manager/categories_controller.rb

@@ -14,6 +14,12 @@ class ::IshManager::CategoriesController < IshManager::ApplicationController
     @category = WpTag.find params[:id]
     authorize! :show, @category
 
+    ## same as in leads#index
+    @leads = @category.leads
+    if params[:q].present?
+      @leads = @leads.where(" email LIKE ? ", "%#{params[:q]}%" )
+    end
+    @leads = @leads.page( params[:leads_page] ).per( current_profile.per_page )
   end
 
 end

data/app/controllers/ish_manager/email_campaigns_controller.rb

@@ -38,6 +38,11 @@ class ::IshManager::EmailCampaignsController < IshManager::ApplicationController
   def show
     @campaign = Ish::EmailCampaign.find params[:id]
     authorize! :show, @campaign
+    @leads = @campaign.leads
+    if params[:q].present?
+      @leads = @leads.where(" email LIKE ? ", "%#{params[:q]}%" )
+    end
+    @leads = @leads.page( params[:leads_page ] ).per( current_profile.per_page )
   end
 
   def update

data/app/controllers/ish_manager/leads_controller.rb

@@ -71,27 +71,27 @@ class ::IshManager::LeadsController < IshManager::ApplicationController
     @leads = @leads.page( params[:leads_page ] ).per( current_profile.per_page )
 
     @email_contexts = {}
-    # lead_emails = @leads.map( &:email ).compact.reject(&:empty?)
-    # map = %Q{
-    #   function() {
-    #     emit(this.to_email, {count: 1})
-    #   }
-    # }
-    # reduce = %Q{
-    #   function(key, values) {
-    #     var result = {count: 0};
-    #     values.forEach(function(value) {
-    #       result.count += value.count;
-    #     });
-    #     return result;
-    #   }
-    # }
-    # tmp_contexts = Ish::EmailContext.all.where( :to_email.in => lead_emails
-    #   ).map_reduce( map, reduce
-    #   ).out( inline: 1 ## From: https://www.mongodb.com/docs/mongoid/current/reference/map-reduce/
-    #   ).to_a
-    # tmp_contexts.map { |x| @email_contexts[x[:_id]] = x[:value][:count].to_i }
-    # puts! @email_contexts, '@email_contexts'
+    lead_emails = @leads.map( &:email ).compact.reject(&:empty?)
+    map = %Q{
+      function() {
+        emit(this.to_email, {count: 1})
+      }
+    }
+    reduce = %Q{
+      function(key, values) {
+        var result = {count: 0};
+        values.forEach(function(value) {
+          result.count += value.count;
+        });
+        return result;
+      }
+    }
+    tmp_contexts = Ish::EmailContext.all.where( :to_email.in => lead_emails
+      ).map_reduce( map, reduce
+      ).out( inline: 1 ## From: https://www.mongodb.com/docs/mongoid/current/reference/map-reduce/
+      ).to_a
+    tmp_contexts.map { |x| @email_contexts[x[:_id]] = x[:value][:count].to_i }
+    puts! @email_contexts, '@email_contexts'
 
   end
 

data/app/controllers/ish_manager/leadsets_controller.rb

@@ -33,7 +33,11 @@ class ::IshManager::LeadsetsController < IshManager::ApplicationController
 
   def index
     authorize! :index, Leadset
-    @leadsets = Leadset.all.kept.page( params[:leadsets_page] ).per( current_profile.per_page )
+    @leadsets = Leadset.all.kept.includes(:leads)
+    if params[:q].present?
+      @leadsets = @leadsets.where(" company_url LIKE ? ", "%#{params[:q]}%" )
+    end
+    @leadsets = @leadsets.page( params[:leadsets_page] ).per( current_profile.per_page )
   end
 
   def new
@@ -42,8 +46,12 @@ class ::IshManager::LeadsetsController < IshManager::ApplicationController
   end
 
   def show
-    authorize! :redirect, IshManager::Ability
-    redirect_to :action => :edit, :id => params[:id]
+    @leadset = Leadset.find params[:id]
+    authorize! :show, @leadset
+    @email_contexts = {}
+    @leadset.employees.each do |lead|
+      @email_contexts[lead.email] = lead.email_contexts
+    end
   end
 
   def update

data/app/controllers/ish_manager/user_profiles_controller.rb

@@ -67,7 +67,7 @@ class IshManager::UserProfilesController < IshManager::ApplicationController
     if params[:redirect_to]
       redirect_to params[:redirect_to]
     else
-      redirect_to :action => :index
+      redirect_to request.referrer
     end
   end
 

data/app/views/ish_manager/application/_main_header_admin.haml

@@ -59,7 +59,7 @@
           = link_to "Tmpls (#{Ish::EmailTemplate.all.count})", email_templates_path
           = link_to '[+]', new_email_template_path
         %li
-          = link_to "Co's (#{Leadset.kept.length})", leadsets_path
+          = link_to "Companies (#{Leadset.kept.length})", leadsets_path
           = link_to '[+]', new_leadset_path
 
 

data/app/views/ish_manager/categories/show.haml

@@ -3,8 +3,5 @@
   .header
     %h2.title Category/Tag `#{@category.slug}`
 
-  .leads
-    %h3 Leads (#{@category.leads.length})
-    %ol
-      - @category.leads.each do |lead|
-        %li= link_to lead.email, lead_path(lead)
+  = render 'ish_manager/leads/index', leads: @leads, email_contexts: {}, search_path: category_path(@category)
+

data/app/views/ish_manager/email_campaigns/index.haml

@@ -9,5 +9,6 @@
     - @campaigns.each do |c|
       %li
         = link_to c.slug, email_campaign_path(c)
+        (#{c.leads.length})
         = link_to '[~]', edit_email_campaign_path(c)
 

data/app/views/ish_manager/email_campaigns/show.haml

@@ -14,10 +14,4 @@
     -# %li Send At: #{@campaign.send_at}
 
   .collapse-expand#campaignLeads Email Campaign leads (#{@campaign.campaign_leads.length})
-  %ul.email-campaign-leads.items.browser-default
-    - @campaign.campaign_leads.each do |clead|
-      %li.item
-        .inline-block= button_to '[x]', email_campaign_lead_path(clead), method: :delete, :data => { :confirm => 'Are you sure?' }
-        = link_to clead.lead.email, lead_path(clead.lead.id)
-        (#{clead.lead.email_contexts.length} ctxs)
-
+  = render 'ish_manager/leads/index', leads: @leads, search_path: email_campaign_path(@campaign), email_contexts: {}

data/app/views/ish_manager/email_contexts/index.haml

@@ -31,15 +31,15 @@
       %tbody
         - @ctxs.each do |ctx|
           %tr
-            %td
+            %td.actions
               - if ctx.sent_at
                 [~]
               - else
                 = link_to '[~]', edit_email_context_path(ctx)
               = button_to '[x]', email_context_path(ctx), method: :delete, form_class: :inline, data: { confirm: 'Are you sure?' }
-            %td
+            %td.from
               = ctx.from_email ? ctx.from_email : "t| #{ctx.tmpl.from_email}"
-            %td= ctx.to_email
+            %td.to= link_to ctx.lead.email, lead_path(ctx.lead)
             %td
               = link_to email_context_path(ctx) do
                 = ctx.subject ? ctx.subject : "t| #{ctx.tmpl.subject}"

data/app/views/ish_manager/leads/_index.haml

@@ -0,0 +1,69 @@
+
+-#
+-# receives locals: leads , email_contexts , search_path
+-#
+- email_contexts ||= {}
+
+.leads--index.padded
+  .header
+    %h2.title
+      Leads
+      - if !defined?( skip_pagination ) || !skip_pagination
+        (#{leads.total_count})
+      - else
+        (#{leads.length})
+      = link_to raw("<i class='fa fa-plus-square'></i>"), new_lead_path
+
+  - if defined?( search_path )
+    .float-right= render 'search', path: search_path
+  = form_tag leads_bulkop_path do
+    = label_tag 'Act on Selected:'
+    = select_tag :op, options_for_select( [[nil,nil]] + Lead::OPS )
+    = select_tag :email_campaign_id, options_for_select( @email_campaigns_list )
+    = submit_tag 'Go'
+
+    - if !defined?( skip_pagination ) || !skip_pagination
+      = paginate leads, param_name: :leads_page
+    %table.bordered
+      %thead
+        %tr
+          %th= check_box_tag :selectAll
+          %th Name/Email
+          %th.company Company
+          %th Phone, address
+          %th Tag
+          %th created_at
+          %th.ctxs Ctxs
+          %th Sch
+
+      %tbody
+        - leads.each do |lead|
+          %tr
+            %td= check_box_tag 'lead_ids[]', lead.id
+            %td= link_to "#{lead.name} <#{lead.email}>", lead_path( lead )
+            %td.company
+              = lead.company.company_url
+              - if lead.company.name.present?
+                <br /><b>#{lead.company.name}</b>
+            %td
+              .a= lead.phone   if lead.phone.present?
+              .a= lead.address if lead.address.present?
+            %td= lead.wp_tags.map(&:name).join(", ")
+            %td= lead.created_at.to_s[0..10]
+            %td.ctxs
+              = email_contexts[lead.email].length || '-'
+            %td.sch
+              = lead.scheduled_email_actions.length
+              = link_to '[+]', new_scheduled_email_action_path( lead_id: lead.id )
+              -# %ul
+              -#   - lead.scheduled_email_actions.map do |sch_a|
+              -#     %li
+              -#       = link_to sch_a.email_action.slug, edit_scheduled_email_action_path( sch_a )
+              -#       [x]
+
+    - if !defined?( skip_pagination ) || !skip_pagination
+      = paginate leads, param_name: :leads_page
+
+
+
+

data/app/views/ish_manager/leads/index.haml

@@ -1,57 +1,2 @@
 
-.leads-index.padded
-  .header
-    %h2.title
-      #{link_to 'Kept Leads', leads_path} (#{::Lead.kept.count}, #{::Lead.all.count})
-      = link_to raw("<i class='fa fa-plus-square'></i>"), new_lead_path
-
-  = render 'search', resource: ::Lead
-  = form_tag leads_bulkop_path do
-    = label_tag 'Act on Selected:'
-    = select_tag :op, options_for_select( [[nil,nil]] + Lead::OPS )
-    = select_tag :email_campaign_id, options_for_select( @email_campaigns_list )
-    = submit_tag 'Go'
-
-    = paginate @leads, param_name: :leads_page
-    %table.bordered
-      %thead
-        %tr
-          %th &nbsp;
-          %th Name/Email
-          %th.company Company
-          %th Phone, address
-          %th Tag
-          %th created_at
-          %th Ctx
-          %th Sch
-
-      %tbody
-        - @leads.each do |lead|
-          %tr
-            %td= check_box_tag 'lead_ids[]', lead.id
-            %td= link_to "#{lead.name} <#{lead.email}>", lead_path( lead )
-            %td.company
-              = lead.company.company_url
-              - if lead.company.name.present?
-                <br /><b>#{lead.company.name}</b>
-            %td
-              .a= lead.phone   if lead.phone.present?
-              .a= lead.address if lead.address.present?
-            %td= lead.wp_tags.map(&:name).join(", ")
-            %td= lead.created_at.to_s[0..10]
-            %td.ctx
-              = @email_contexts[lead.email] || '-'
-            %td.sch
-              = lead.scheduled_email_actions.length
-              = link_to '[+]', new_scheduled_email_action_path( lead_id: lead.id )
-              -# %ul
-              -#   - lead.scheduled_email_actions.map do |sch_a|
-              -#     %li
-              -#       = link_to sch_a.email_action.slug, edit_scheduled_email_action_path( sch_a )
-              -#       [x]
-
-    = paginate @leads, param_name: :leads_page
-
-
-
-
+= render 'index', leads: @leads, email_contexts: @email_contexts, search_path: leads_path

data/app/views/ish_manager/leads/show.haml

@@ -9,6 +9,7 @@
   %ul
     %li Name: #{@lead.name}
     %li Email: #{@lead.email}
+    %li Company: #{ link_to @lead.company.company_url, leadset_path(@lead.company) }
     %li Phone: #{@lead.phone}
     %li Address: #{@lead.address}
 

data/app/views/ish_manager/leadsets/index.haml

@@ -13,26 +13,24 @@
       .n-selected -
     = button_tag 'Delete', method: :delete, class: 'delete-btn'
 
+  .float-right= render 'search', path: leadsets_path
   = paginate @leadsets, :param_name => :leadsets_page, :views_prefix => 'ish_manager'
-  %table
+  %table.bordered
     %thead
       %tr
         %th  
-        -# %th created at
-        -# %th Name
         %th.company-url Company Url
         %th Tags
         %th +
+        %th.employees Employees
         %th.leads Leads
     %tbody
       - @leadsets.each_with_index do |leadset, idx1|
         %tr
           %td= check_box_tag 'leadset_ids[]', leadset.id, nil, { class: 'i-sel' }
-          -# %td= leadset.created_at.strftime("%Y-%m-%d %H:%M%P")
-          -# %td= link_to leadset.name, leadset_path( leadset )
-          %td= link_to leadset.company_url, leadset.company_url
-          %td.tags
+          %td= link_to leadset.company_url, leadset_path(leadset)
 
+          %td.tags
             - leadset.wp_tags.each_with_index do |tag, idx2|
               .chip
                 = tag.name
@@ -47,35 +45,36 @@
               .actions
                 = submit_tag 'Add'
 
-          %td.leads
-            -# = leadset.leads.count
-            - leadset.leads.each do |lead|
-              .item
+          %td.employees
+            = leadset.employees.length
+            -# - leadset.employees.each do |lead|
+            -#   .item
+
+            -#     .chip
+            -#       -# = lead.email
+            -#       = link_to lead.name, lead_path( lead )
 
-                .chip
-                  -# = lead.email
-                  = link_to lead.name, lead_path( lead )
+            -#     .relative
+            -#       %a.chip{ href: email_contexts_for_lead_path( lead ) }
+            -#         \(
+            -#         = lead.email_contexts.count
+            -#         %i.fa.fa-envelope
+            -#         \)
 
-                .relative
-                  %a.chip{ href: email_contexts_for_lead_path( lead ) }
-                    \(
-                    = lead.email_contexts.count
-                    %i.fa.fa-envelope
-                    \)
+            -#     .relative
+            -#       %i.fa.fa-pencil.expand-next
+            -#       %form.form-mini{ style: 'display: none' }
+            -#         Editing...
 
-                .relative
-                  %i.fa.fa-pencil.expand-next
-                  %form.form-mini{ style: 'display: none' }
-                    Editing...
+            -#     .relative
+            -#       %i.fa.fa-clock-o.expand-next
+            -#       .expand-hide= render 'ish_manager/scheduled_email_actions/form', scheduled_email_action: Sch.new({ lead_id: lead.id })
 
-                .relative
-                  %i.fa.fa-clock-o.expand-next
-                  = render 'ish_manager/scheduled_email_actions/form', scheduled_email_action: Sch.new({ lead_id: lead.id })
+            -#     -# .scheduled
+            -#     -#   - lead.scheduled_emails.each do |sch|
+            -#     -#     .chip
+            -#     -#       -# .interval= sch.interval
+            -#     -#       -# .tmpl= sch.email_template.slug
 
-                .scheduled
-                  - lead.scheduled_emails.each do |sch|
-                    .chip
-                      .interval= sch.interval
-                      .tmpl= sch.email_template.slug
   = paginate @leadsets, :param_name => :leadsets_page, :views_prefix => 'ish_manager'
 

data/app/views/ish_manager/leadsets/show.haml

@@ -0,0 +1,5 @@
+
+.leadsets-show.max-width
+  .header
+    %h2.title Leadset #{@leadset.company_url}
+  = render 'ish_manager/leads/index', leads: @leadset.employees, skip_pagination: true, email_contexts: @email_contexts

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ish_manager
 version: !ruby/object:Gem::Version
-  version: 0.1.8.428
+  version: 0.1.8.430
 platform: ruby
 authors:
 - piousbox
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-05-10 00:00:00.000000000 Z
+date: 2023-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -252,6 +252,7 @@ files:
 - app/assets/javascripts/ish_manager/email_templates.js
 - app/assets/javascripts/ish_manager/galleries.js
 - app/assets/javascripts/ish_manager/iro.js
+- app/assets/javascripts/ish_manager/leads.js
 - app/assets/javascripts/ish_manager/maps.js
 - app/assets/javascripts/ish_manager/shared.js
 - app/assets/javascripts/ish_manager/vendor/jquery-ui.min.js
@@ -654,6 +655,7 @@ files:
 - app/views/ish_manager/kaminari/_prev_page.html.erb
 - app/views/ish_manager/leads/_form.haml
 - app/views/ish_manager/leads/_form_import.haml
+- app/views/ish_manager/leads/_index.haml
 - app/views/ish_manager/leads/_index_rows.haml
 - app/views/ish_manager/leads/edit.haml
 - app/views/ish_manager/leads/index.haml
@@ -664,6 +666,7 @@ files:
 - app/views/ish_manager/leadsets/index.haml
 - app/views/ish_manager/leadsets/index_dataTables.haml
 - app/views/ish_manager/leadsets/new.haml
+- app/views/ish_manager/leadsets/show.haml
 - app/views/ish_manager/maps/_form.haml
 - app/views/ish_manager/maps/_index_item.haml
 - app/views/ish_manager/maps/_map_meta_row.haml