ish_manager 0.1.8.329 → 0.1.8.330

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 168e3b80f936578509b925a3724a24455bded5f8ec0a340a9db76a02b827a11e
-  data.tar.gz: fafe8c1ae99e9677a8b3066410e263d8bfd762fdbf982e2216c83d652eee22cf
+  metadata.gz: fb8837f836ee7037d6459fed6da788325b1ab61e84f50382a5c688b1f33bd6df
+  data.tar.gz: b3b559b2a51bc73c84c49f2307806f56af9aa54e0e39d149f0dad37a7ecbe1b7
 SHA512:
-  metadata.gz: df33c3dc00fc249314ffeaf0c52ed075e3011ef2b0b939221f9820de50a588c5459c1fe4e3b22c4add4d8078e8ea636e010f5bffe4123e9a0411fdadf57725e1
-  data.tar.gz: f59723fe434089ae4e777f546514000c3b6b4fa9730710c535ff4979fe2dbbdb9c65cd6fa54314e67fc5f91959c5f4028fcfa3be42e375c73f425e5a8cd4a45d
+  metadata.gz: 45013f135fbbde395b067d95ab84d9ac6e061edcfca0d6b52d30b1e339c5b822eba55365d28843da1b0d99d7fd592c9f62fe912f486cf789e989d52531069b3e
+  data.tar.gz: eb63ccc14ff4a8a5739b958d47aae5b2e047dcbfe9c1c4131160ed3a2cbe05bc680d9c64cb386d43c48728dc9dbe504f55371aaf41247494078c6cc188478149

data/app/controllers/ish_manager/application_controller.rb

@@ -26,16 +26,6 @@ module IshManager
       @current_ability ||= ::IshManager::Ability.new( @current_profile )
     end
 
-    # @TODO: obsolete, remove _vp_ 2022-10-15
-    def set_lists
-      # alphabetized! : )
-      @galleries_list = Gallery.all.list
-      @maps_list = ::Gameui::Map.list # @TODO: missing nonpublic!
-      @reports_list = Report.all.list
-      @user_profiles_list = Ish::UserProfile.list
-      @videos_list = Video.all.list
-    end
-
     def access_denied exception
       store_location_for :user, request.path
       redirect_to user_signed_in? ? root_path : Rails.application.routes.url_helpers.new_user_session_path, :alert => exception.message

data/app/controllers/ish_manager/email_campaign_leads_controller.rb

@@ -0,0 +1,75 @@
+
+class ::IshManager::EmailCampaignLeadsController < IshManager::ApplicationController
+
+  # before_action :set_lists
+
+  ## alphabetized : )
+
+  # def bulkop
+  #   authorize! :bulkop, ::Lead
+  #   case params[:a]
+  #   when 'add_to_campaign'
+  #     c = EmailCampaign.find params[:email_campaign_id]
+  #     params[:lead_ids].each do |lead_id|
+  #       c_lead = EmailCampaignLead.new( lead_id: lead_id, email_campaign_id: c.id )
+  #       flag = c_lead.save
+  #       if !flag
+  #         puts! c_lead.errors.full_messages.join(", ")
+  #       end
+  #     end
+  #     flash[:notice] = 'Done acted; See logs.'
+  #     redirect_to action: :index
+  #   end
+  # end
+
+  # def create
+  #   @lead = ::Lead.new params[:lead].permit!
+  #   authorize! :create, @lead
+  #   if @lead.save
+  #     flash[:notice] = "created lead"
+  #   else
+  #     flash[:alert] = "Cannot create lead: #{@lead.errors.messages}"
+  #   end
+  #   redirect_to :action => 'index'
+  # end
+
+  # def edit
+  #   @lead = ::Lead.find params[:id]
+  #   authorize! :edit, @lead
+  # end
+
+  # def index
+  #   authorize! :index, ::Lead
+  #   @leads = ::Lead.all.includes( :leadset )
+  # end
+
+  # def new
+  #   @new_lead = ::Lead.new
+  #   authorize! :new, @new_lead
+  # end
+
+  def show
+    @c_lead = ::EmailCampaignLead.find params[:id]
+    authorize! :show, @c_lead
+
+  end
+
+  # def update
+  #   @lead = ::Lead.find params[:id]
+  #   authorize! :update, @lead
+  #   if @lead.update_attributes params[:lead].permit!
+  #     flash[:notice] = 'Successfully updated lead.'
+  #   else
+  #     flash[:alert] = "Cannot update lead: #{@lead.errors.messages}"
+  #   end
+  #   redirect_to :action => 'index'
+  # end
+
+  private
+
+  # def set_lists
+  #   @leadsets_list = [ [nil,nil] ] + ::Leadset.all.map { |k| [ k.name, k.id ] }
+  #   @email_campaigns_list = [ [nil,nil] ] + Ish::EmailContext.all_campaigns.map { |k| [ k.slug, k.id ] }
+  # end
+
+end

data/app/controllers/ish_manager/email_contexts_controller.rb

@@ -20,7 +20,7 @@ class ::IshManager::EmailContextsController < ::IshManager::ApplicationControlle
   end
 
   def destroy
-    @email_ctx = EmailContext.find params[:id]
+    @email_ctx = Ish::EmailContext.find params[:id]
     authorize! :destroy, @email_ctx
     flag = @email_ctx.destroy
     if flag
@@ -33,14 +33,14 @@ class ::IshManager::EmailContextsController < ::IshManager::ApplicationControlle
 
   def do_send
     @ctx = ::Ish::EmailContext.find params[:id]
-    authorize! :send, @ctx
+    authorize! :do_send, @ctx
     case @ctx.type
     when ::Ish::EmailContext::TYPE_SINGLE
       flash[:notice] = 'Scheduled a single send'
       IshManager::OfficeMailer.send_context_email(params[:id]).deliver_later
     when ::Ish::EmailContext::TYPE_CAMPAIGN
       flash[:notice] = 'Scheduled campaign send'
-      IshManager::OfficeMailer.send_campaign(params[:id]).deliver_later
+      IshManager::EmailCampaignJob.perform_later(params[:id])
     end
 
     redirect_to action: 'index'
@@ -52,7 +52,7 @@ class ::IshManager::EmailContextsController < ::IshManager::ApplicationControlle
   end
 
   def iframe_src
-    @email_ctx = EmailContext.find params[:id]
+    @email_ctx = Ish::EmailContext.find params[:id]
     authorize! :iframe_src, @email_ctx
     @email_template = @email_ctx.email_template
     case @email_template.type

data/app/controllers/ish_manager/leads_controller.rb

@@ -1,11 +1,29 @@
 
 class ::IshManager::LeadsController < IshManager::ApplicationController
 
+  before_action :set_lists
+
   ## alphabetized : )
 
+  def bulkop
+    authorize! :bulkop, ::Lead
+    case params[:a]
+    when 'add_to_campaign'
+      c = EmailCampaign.find params[:email_campaign_id]
+      params[:lead_ids].each do |lead_id|
+        c_lead = EmailCampaignLead.new( lead_id: lead_id, email_campaign_id: c.id )
+        flag = c_lead.save
+        if !flag
+          puts! c_lead.errors.full_messages.join(", ")
+        end
+      end
+      flash[:notice] = 'Done acted; See logs.'
+      redirect_to action: :index
+    end
+  end
+
   def create
-    @lead = Ish::Lead.new params[:lead].permit!
-    @lead.profile = @current_profile
+    @lead = ::Lead.new params[:lead].permit!
     authorize! :create, @lead
     if @lead.save
       flash[:notice] = "created lead"
@@ -16,22 +34,17 @@ class ::IshManager::LeadsController < IshManager::ApplicationController
   end
 
   def edit
-    @lead = Ish::Lead.find params[:id]
+    @lead = ::Lead.find params[:id]
     authorize! :edit, @lead
   end
 
   def index
-    authorize! :index, Ish::Lead
-    @leads = Ish::Lead.all # where( :profile => @current_profile, :is_trash => false )
-    if params[:is_done]
-      @leads = @leads.where( :is_done => true )
-    else
-      @leads = @leads.where( :is_done => false )
-    end
+    authorize! :index, ::Lead
+    @leads = ::Lead.all.includes( :leadset )
   end
 
   def new
-    @new_lead = Ish::Lead.new
+    @new_lead = ::Lead.new
     authorize! :new, @new_lead
   end
 
@@ -41,7 +54,7 @@ class ::IshManager::LeadsController < IshManager::ApplicationController
   end
 
   def update
-    @lead = Ish::Lead.find params[:id]
+    @lead = ::Lead.find params[:id]
     authorize! :update, @lead
     if @lead.update_attributes params[:lead].permit!
       flash[:notice] = 'Successfully updated lead.'
@@ -51,4 +64,11 @@ class ::IshManager::LeadsController < IshManager::ApplicationController
     redirect_to :action => 'index'
   end
 
+  private
+
+  def set_lists
+    @leadsets_list = [ [nil,nil] ] + ::Leadset.all.map { |k| [ k.name, k.id ] }
+    @email_campaigns_list = [ [nil,nil] ] + Ish::EmailContext.all_campaigns.map { |k| [ k.slug, k.id ] }
+  end
+
 end

data/app/controllers/ish_manager/leadsets_controller.rb

@@ -0,0 +1,54 @@
+
+class ::IshManager::LeadsetsController < IshManager::ApplicationController
+
+  ## alphabetized : )
+
+  def create
+    @leadset = Leadset.new params[:leadset].permit!
+    @leadset.profile = @current_profile
+    authorize! :create, @leadset
+    if @leadset.save
+      flash[:notice] = "created leadset"
+    else
+      flash[:alert] = "Cannot create leadset: #{@leadset.errors.messages}"
+    end
+    redirect_to :action => 'index'
+  end
+
+  def edit
+    @leadset = Leadset.find params[:id]
+    authorize! :edit, @leadset
+  end
+
+  def index
+    authorize! :index, Leadset
+    @leadsets = Leadset.all # where( :profile => @current_profile, :is_trash => false )
+    # if params[:is_done]
+    #   @leadsets = @leadsets.where( :is_done => true )
+    # else
+    #   @leadsets = @leadsets.where( :is_done => false )
+    # end
+  end
+
+  def new
+    @new_leadset = Leadset.new
+    authorize! :new, @new_leadset
+  end
+
+  def show
+    authorize! :redirect, IshManager::Ability
+    redirect_to :action => :edit, :id => params[:id]
+  end
+
+  def update
+    @leadset = Leadset.find params[:id]
+    authorize! :update, @leadset
+    if @leadset.update_attributes params[:leadset].permit!
+      flash[:notice] = 'Successfully updated leadset.'
+    else
+      flash[:alert] = "Cannot update leadset: #{@leadset.errors.messages}"
+    end
+    redirect_to :action => 'index'
+  end
+
+end

data/app/jobs/ish_manager/application_job.rb

@@ -1,4 +1,7 @@
-module IshManager
-  class ApplicationJob < ActiveJob::Base
-  end
+
+class IshManager::ApplicationJob < ActiveJob::Base
+
+  include Sidekiq::Job
+
 end
+

data/app/jobs/ish_manager/email_campaign_job.rb

@@ -0,0 +1,30 @@
+
+##
+## EmailContext is mongoid
+##
+class IshManager::EmailCampaignJob < ApplicationJob
+  queue_as :mailers
+
+  def perform campaign_id
+    @ctx = @campaign = ::Ish::EmailContext.find campaign_id
+    print "Sending #{@campaign.slug}:"
+
+    if @ctx.email_template.type != 'partial'
+      raise "only `partial` template type is supported for campaigns."
+    end
+
+    if @ctx.sent_at
+      raise 'This campaign has already been sent!'
+    end
+
+    @ctx.campaign_leads.each do |campaign_lead|
+      IshManager::OfficeMailer.send_campaign_email( campaign_id, campaign_lead.id ).deliver_later
+      print '.'
+    end
+
+    @campaign.update_attributes({ sent_at: Time.now })
+
+    puts 'ok'
+  end
+
+end

data/app/mailers/ish_manager/office_mailer.rb

@@ -1,57 +1,52 @@
 
 class IshManager::OfficeMailer < IshManager::ApplicationMailer
 
-  def send_campaign campaign_id
-    @ctx = ::Ish::EmailContext.find campaign_id
-    actl = ActionController::Base.new
-    actl.instance_variable_set( :@ctx, @ctx )
+  def send_campaign_email campaign_id, c_lead_id
+    @ctx = @campaign = ::Ish::EmailContext.find campaign_id
+    @lead = EmailCampaignLead.find c_lead_id
 
-    if @ctx.email_template.type != 'partial'
-      raise "only `partial` template type is supported for campaigns."
+    if @lead.sent_at
+      raise "This campaign_lead #{@lead.id} has already been sent."
     end
 
-    puts! @ctx.leads, '@ctx.leads'
-
-    @ctx.leads.each do |clead| # a campaign lead
-      @lead = clead
-
-      @pixel_tracking = {
-        'v'   => 1,
-        'tid' => 'UA-53077236-2',
-        'cid' => @lead[:cid],
-        't'   => 'event',
-        'ec'  => 'email',
-        'ea'  => 'open',
-        'utm_source'   => 'eror1',
-        'utm_medium'   => 'email',
-        'utm_campaign' => 'eror1',
-      }.map { |k, v| "#{k}=#{v}" }.join("&")
-      actl.instance_variable_set( :@pixel_tracking, @pixel_tracking )
-
-      @click_tracking = {
-        'cid' => @lead[:cid],
-        't'   => 'event',
-        'ec'  => 'email',
-        'ea'  => 'clk-ctct', # clicked contact us
-        'utm_source'   => 'eror1',
-        'utm_medium'   => 'email',
-        'utm_campaign' => 'eror1',
-      }.map { |k, v| "#{k}=#{v}" }.join("&")
-      actl.instance_variable_set( :@click_tracking, @click_tracking )
-
-
-      actl.instance_variable_set( :@lead, @lead )
-
-      template = "render/_#{@ctx.email_template.slug}"
-      # rendered_str = actl.render_to_string("ish_manager/email_templates/_#{@ctx.email_template.slug}")
-      # @lead.update( rendered_str: rendered_str, sent_at: Time.now )
-
-      mail( from: @ctx.from_email,
-        to: @lead.email,
-        bcc: 'piousbox@gmail.com',
-        subject: @ctx.subject,
-        template_name: template )
-    end
+    actl = ActionController::Base.new
+    actl.instance_variable_set( :@ctx, @ctx )
+
+    @pixel_tracking = {
+      'v'   => 1,
+      'tid' => 'UA-53077236-2',
+      'cid' => @lead.cid,
+      't'   => 'event',
+      'ec'  => 'email',
+      'ea'  => 'open',
+      'utm_source'   => @campaign.slug,
+      'utm_medium'   => 'email',
+      'utm_campaign' => @campaign.slug,
+    }.map { |k, v| "#{k}=#{v}" }.join("&")
+    actl.instance_variable_set( :@pixel_tracking, @pixel_tracking )
+
+    @click_tracking = {
+      'cid' => @lead.cid,
+      't'   => 'event',
+      'ec'  => 'email',
+      'ea'  => 'clk-ctct', # clicked contact us
+      'utm_source'   => 'eror1',
+      'utm_medium'   => 'email',
+      'utm_campaign' => 'eror1',
+    }.map { |k, v| "#{k}=#{v}" }.join("&")
+    actl.instance_variable_set( :@click_tracking, @click_tracking )
+
+    actl.instance_variable_set( :@lead, @lead )
+
+    template = "render/_#{@ctx.email_template.slug}"
+    rendered_str = actl.render_to_string("ish_manager/email_templates/_#{@ctx.email_template.slug}")
+    @lead.update( rendered_str: rendered_str, sent_at: Time.now )
+
+    mail( from: @ctx.from_email,
+      to: @lead.email,
+      bcc: 'piousbox@gmail.com', # @TODO: change _vp_ 2022-11-21
+      subject: @ctx.subject,
+      template_name: template )
   end
 
   def send_context_email ctx_id

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

@@ -52,16 +52,18 @@
     %i.fa.fa-compress.collapse-expand#collapseHeaderOffice
       Office
     .namespace
+      -# %ul
+      -#   %li= link_to 'Admin', '/admin'
+      -#   %li= link_to 'A/Leads', '/admin/leads'
+      -#   %li= link_to 'A/CampaignLeads', '/admin/email_campaign_leads'
       %ul
-        %li= link_to 'Leads', '/admin/leads'
         %li
           = link_to 'Meetings', meetings_path
           = link_to '[+]', new_meeting_path
       %ul
-        %li
-          = link_to 'Email Templates', email_templates_path
-        %li
-          = link_to 'Email Contexts', email_contexts_path
-        -# %li= link_to 'Email Campaigns', email_campaigns_path
+        %li= link_to 'Leads', leads_path
+        %li= link_to 'Leadsets', leadsets_path
+        %li= link_to 'Email Templates', email_templates_path
+        %li= link_to 'Contexts/Campaigns', email_contexts_path
   %hr
 

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

@@ -0,0 +1,4 @@
+
+= @c_lead.inspect
+
+= raw @c_lead.rendered_str

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

@@ -2,28 +2,39 @@
 .email-contexts-show
 
   %ul
-
     %li <b>Type:</b> #{@email_ctx.type}
     %li <b>Title:</b> #{@email_ctx.title}
     %li <b>Template:</b> #{@email_ctx.email_template.slug}
     %li <b>From:</b> #{@email_ctx.from_email}
-
     %li <b>Subject:</b> #{@email_ctx.subject}
-
     - if @email_ctx.type == Ish::EmailContext::TYPE_SINGLE
       %li <b>To:</b> #{@email_ctx.to_email}
       %li <b>Template:</b> #{@email_ctx.email_template.slug} <b>Type:</b> #{@email_ctx.email_template.type}
-    - if @email_ctx.type == Ish::EmailContext::TYPE_CAMPAIGN
-      %li <b>Leads (#{@email_ctx.leads.length}):</b> #{@email_ctx.leads.map { |p| p&.email }.join(", ") }
 
+    -#
+    -# Yes sent
+    -#
     - if @email_ctx.sent_at
+      - if @email_ctx.type == Ish::EmailContext::TYPE_CAMPAIGN
+        %li
+          <b>C_Leads (#{@email_ctx.campaign_leads.length}):</b>
+          - @email_ctx.campaign_leads&.each do |c_lead|
+            = c_lead.lead.email
+            = link_to '[view]', campaign_lead_path( c_lead )
+            ,
+
       %li <b>Sent at:</b> #{@email_ctx.sent_at.strftime('%Y-%m-%d %l:%M%P')}
-    - else
+
+    - else # Draft
+      - if @email_ctx.type == Ish::EmailContext::TYPE_CAMPAIGN
+        %li <b>Leads (#{@email_ctx.leads.length}):</b> #{@email_ctx.leads.map { |p| p&.email }.join(", ") }
+
       %li
         = button_to 'Send', email_context_send_path(@email_ctx), form_class: 'inline', :data => { :confirm => 'Are you sure?' }
         = link_to '[~]', edit_email_context_path(@email_ctx)
 
   - if @email_ctx.sent_at
     = raw @email_ctx.rendered_str
+
   - else
     %iframe{ src: email_context_iframe_path(@email_ctx), width: '100%', height: '100%' }

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

@@ -2,41 +2,18 @@
 - url = lead.persisted? ? lead_path( lead.id ) : leads_path
 
 = form_for lead, :as => :lead, :url => url do |f|
-  .input-field
+  .field
+    = f.label :name
+    = f.text_field :name
+  .field
     = f.label :email
     = f.text_field :email
-    
-  .input-field
-    = f.label :job_url
-    = f.text_field :job_url
-  .input-field
-    = f.label :company_url
-    = f.text_field :company_url
-  .input-field
-    = f.label :yelp_url
-    = f.text_field :yelp_url
-    
-  .input-field
+  .field
     = f.label :company
-    = f.text_field :company
-  .input-field
+    = f.select :m3_leadset_id, options_for_select(@leadsets_list, selected: lead.m3_leadset_id), { include_blank: true }, {class: 'select2' }
+  .field
     = f.label :tag
     = f.text_field :tag
-  .input-field
-    = f.label :location
-    = f.text_field :location
-  .input-field
-    = f.label :description
-    = f.text_area :description
-  .input-field
-    = f.label :address
-    = f.text_area :address
-  .field
-    = f.check_box :is_done
-    = f.label :is_done
-  .field
-    = f.check_box :is_trash
-    = f.label :is_trash
-  .actions{ :style => "margin-top: 1em;" }
+  .actions
     = f.submit
-  
+

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

@@ -1,43 +1,33 @@
 
 .manager-leads-index
   %h5
-    = link_to 'Leads', leads_path
-    (#{Ish::Lead.all.count})
+    SQL #{link_to 'Leads', leads_path} (#{::Lead.all.count})
     = link_to raw("<i class='fa fa-plus-square'></i>"), new_lead_path
-    = link_to '[done]', done_leads_path
 
-  %table#dataTable.display.compact
-    %thead
-      %tr
-        %th &nbsp;
-        %th.created-at Created At
-        %th Company
-        %th Tag
-        %th Phone
-        %th Email
-        %th Job Url
-        %th.company-url Company Url
-        %th.yelp-url Yelp Url
-        %th Location
-        %th Description
-        %th Address
-    %tbody
-      - @leads.each do |lead|
+  = form_tag leads_bulkop_path do
+    = label_tag 'Act on Selected:'
+    = select_tag :a, options_for_select( %w| delete add_to_campaign | )
+    = select_tag :email_campaign_id, options_for_select( @email_campaigns_list )
+    = submit_tag 'Go'
+
+    %table#dataTable.display.compact
+      %thead
         %tr
-          %td= link_to raw('<i class="fa fa-play"></i>'), lead_path( lead )
-          %td.created-at= pretty_date lead.created_at
-          %td= lead.company
-          %td= lead.tag
-          %td= lead.phone
-          %td
-            = link_to raw('<i class="fa fa-envelope"></i>'), "mailto:#{lead.email}" if lead.email.present?
-          %td
-            = link_to raw('<i class="fa fa-user-md"></i>'), lead.job_url, :target => '_blank' if lead.job_url.present?
-          %td
-            = link_to 'B', lead.company_url if lead.company_url.present?
-          %td
-            = link_to raw('<i class="fa fa-user-md"></i>'), lead.yelp_url if lead.yelp_url.present?
-          %td= lead.location
-          %td= lead.description
-          %td
-            = 'Y' if lead.address.present?
+          %th &nbsp;
+          %th Name
+          %th Company
+          %th Email
+          %th Tag
+
+      %tbody
+        - @leads.each do |lead|
+          %tr
+            %td= check_box_tag 'lead_ids[]', lead.id
+            %td= link_to lead.name, lead_path( lead )
+            %td= lead.leadset&.name
+            %td= lead.email
+            -# %td= link_to raw('<i class="fa fa-envelope"></i>'), "mailto:#{lead.email}" if lead.email.present?
+
+
+            %td= lead.tag
+

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

@@ -0,0 +1,42 @@
+
+- url = leadset.persisted? ? leadset_path( leadset.id ) : leadsets_path
+
+= form_for leadset, :as => :leadset, :url => url do |f|
+  .input-field
+    = f.label :email
+    = f.text_field :email
+
+  .input-field
+    = f.label :job_url
+    = f.text_field :job_url
+  .input-field
+    = f.label :company_url
+    = f.text_field :company_url
+  .input-field
+    = f.label :yelp_url
+    = f.text_field :yelp_url
+
+  .input-field
+    = f.label :company
+    = f.text_field :company
+  .input-field
+    = f.label :tag
+    = f.text_field :tag
+  .input-field
+    = f.label :location
+    = f.text_field :location
+  .input-field
+    = f.label :description
+    = f.text_area :description
+  .input-field
+    = f.label :address
+    = f.text_area :address
+  .field
+    = f.check_box :is_done
+    = f.label :is_done
+  .field
+    = f.check_box :is_trash
+    = f.label :is_trash
+  .actions{ :style => "margin-top: 1em;" }
+    = f.submit
+

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

@@ -0,0 +1,3 @@
+
+%h1 Edit leadset
+= render 'form', :leadset => @leadset

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

@@ -0,0 +1,26 @@
+
+.manager-leadsets-index
+  %h5
+    SQL
+    = link_to 'Leadsets', leadsets_path
+    (#{Leadset.all.count})
+    = link_to raw("<i class='fa fa-plus-square'></i>"), new_leadset_path
+
+  %table#dataTable.display.compact
+    %thead
+      %tr
+        %th &nbsp;
+
+        %th Name
+        %th Tag
+        %th.company-url Company Url
+        %th Location
+    %tbody
+      - @leadsets.each do |leadset|
+        %tr
+          %td= check_box_tag leadset.id
+
+          %td= link_to leadset.name, leadset_path( leadset )
+          %td= leadset.tag
+          %td= link_to 'B', leadset.company_url if leadset.company_url.present?
+          %td= leadset.location

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

@@ -0,0 +1,5 @@
+
+.row
+  .col.s6.col-sm-offset-3
+    %h5 New Leadset
+    = render 'form', :leadset => @new_leadset

data/config/routes.rb

@@ -62,10 +62,14 @@ IshManager::Engine.routes.draw do
 
   resources :email_unsubscribes
 
-  get 'leads',      :to => 'leads#index', :defaults => { :is_done => false }, as: :leads
-  get 'leads/done', :to => 'leads#index', :defaults => { :is_done => true }, :as => :done_leads
+  get 'leads',      :to => 'leads#index'
+  post 'leads/bulkop', to: 'leads#bulkop'
   resources :leads
 
+  resources :leadsets
+
+  resources :email_campaign_leads, as: :campaign_leads
+
   resources :meetings
 
   resources :newsitems

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ish_manager
 version: !ruby/object:Gem::Version
-  version: 0.1.8.329
+  version: 0.1.8.330
 platform: ruby
 authors:
 - piousbox
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-11-20 00:00:00.000000000 Z
+date: 2022-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -266,6 +266,7 @@ files:
 - app/assets/stylesheets/ish_manager/user_profiles.scss
 - app/assets/stylesheets/ish_manager/videos.scss
 - app/controllers/ish_manager/application_controller.rb
+- app/controllers/ish_manager/email_campaign_leads_controller.rb
 - app/controllers/ish_manager/email_campaigns_controller.rb
 - app/controllers/ish_manager/email_contexts_controller.rb
 - app/controllers/ish_manager/email_templates_controller.rb
@@ -274,6 +275,7 @@ files:
 - app/controllers/ish_manager/image_assets_controller.rb
 - app/controllers/ish_manager/invoices_controller.rb
 - app/controllers/ish_manager/leads_controller.rb
+- app/controllers/ish_manager/leadsets_controller.rb
 - app/controllers/ish_manager/maps_controller.rb
 - app/controllers/ish_manager/markers_controller.rb
 - app/controllers/ish_manager/meetings_controller.rb
@@ -286,6 +288,7 @@ files:
 - app/helpers/ish_manager/application_helper.rb
 - app/helpers/ish_manager/images_helper.rb
 - app/jobs/ish_manager/application_job.rb
+- app/jobs/ish_manager/email_campaign_job.rb
 - app/jobs/ish_manager/test_email_job.rb
 - app/mailers/ish_manager/application_mailer.rb
 - app/mailers/ish_manager/meeting_mailer.rb
@@ -307,6 +310,7 @@ files:
 - app/views/ish_manager/application/trash/_main_header_manager.haml
 - app/views/ish_manager/application_mailer/shared_galleries.html.erb
 - app/views/ish_manager/application_mailer/welcome.html.erb
+- app/views/ish_manager/email_campaign_leads/show.haml
 - app/views/ish_manager/email_contexts/_form.haml
 - app/views/ish_manager/email_contexts/edit.haml
 - app/views/ish_manager/email_contexts/index.haml
@@ -359,6 +363,10 @@ files:
 - app/views/ish_manager/leads/edit.haml
 - app/views/ish_manager/leads/index.haml
 - app/views/ish_manager/leads/new.haml
+- app/views/ish_manager/leadsets/_form.haml
+- app/views/ish_manager/leadsets/edit.haml
+- app/views/ish_manager/leadsets/index.haml
+- app/views/ish_manager/leadsets/new.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