ish_manager 0.1.8.340 → 0.1.8.342

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9b4184b0ea29ec3dfaba9dcdc6ed2dee035b6232a18902bbaaadfdfa4b19a99b
-  data.tar.gz: c686465e885ba4bb5c96a53d8c85306691db5a3eb52fcdb66a4a5fffa2e5f3fa
+  metadata.gz: 31dc721f8085acc082c40407f49b1d43d5e2fdea662ec65baab7518d05e59bc6
+  data.tar.gz: 92623cdaabf812aa4949bb91f8316fd9173cc6553df79cb04f5027c4d46da49b
 SHA512:
-  metadata.gz: 30b9137f89b5d97a384638c126f0b20f83f0cf75031a9bc8f55712f8d72f76031ad711614843664de0d64eaf07e6d066a40cc15e2a6cb67be6be792a863f1553
-  data.tar.gz: fd5f044e36f07fb45c5e232ff678518ec487461de77c6f6e6723c1b5a1d8b3570e49ccad3bbf4e4f08457cbb41df479362ac15f72aeeab9dd2af8e9a808a4126
+  metadata.gz: 747bafb898ed79e8d7a8fd09a381221745733082b69214a1512d100d4ce5997daef0d4f9261d0311991d93d02483c4f8917648be5241915217d1b09188d7e438
+  data.tar.gz: 31e72f77b079430987187711798a1b0744739cd3d73958757c2c393277aae95ae85f569fff846b0213d2b5c94f13db0bf37e248537edd022c17fd32bbe67bdbd

data/app/controllers/ish_manager/email_contexts_controller.rb

@@ -71,9 +71,15 @@ class ::IshManager::EmailContextsController < ::IshManager::ApplicationControlle
   def index
     authorize! :index, ::Ish::EmailContext
     @email_ctxs = ::Ish::EmailContext.all
+
     if params[:notsent]
       @email_ctxs = @email_ctxs.where( sent_at: nil )
     end
+
+    if params[:type]
+      @email_ctxs = @email_ctxs.where( type: params[:type] )
+    end
+
     @email_ctxs = @email_ctxs.page( params[Ish::EmailContext::PAGE_PARAM_NAME] )
   end
 

data/app/controllers/ish_manager/leads_controller.rb

@@ -38,9 +38,62 @@ class ::IshManager::LeadsController < IshManager::ApplicationController
     authorize! :edit, @lead
   end
 
+  ##          0     1     2      3            4           5      6         7        8
+  ## fields: id, date, name, email, company url, source tag, phone, linkedin, comment
+  def import
+    authorize! :import, ::Lead
+    file = params[:csv_file]
+    flags = []
+    errors = []
+    CSV.read(file.path, headers: true).each do |row|
+      company_url = row[4].presence
+      company_url ||= "https://#{row[3].split('@')[1]}"
+      company = ::Leadset.find_or_create_by({ company_url: company_url })
+      lead = ::Lead.new({
+        name: row[2] || 'there',
+        full_name: row[2] || 'there',
+        email: row[3],
+        m3_leadset_id: company.id,
+        phone: row[6],
+      })
+      flag = lead.save
+      flags << flag
+      if !flag
+        errors << lead.errors.full_messages.join(", ")
+      end
+    end
+    flash[:notice] = "Result: #{flags.inspect} ."
+    flash[:alert] = errors
+    redirect_to action: 'new'
+  end
+
   def index
     authorize! :index, ::Lead
-    @leads = ::Lead.all.includes( :leadset )
+    @leads = ::Lead.all.includes( :leadset, :email_campaign_leads )
+    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;
+      }
+    }
+    @email_contexts = {}
+    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
 
   def new
@@ -67,8 +120,9 @@ class ::IshManager::LeadsController < IshManager::ApplicationController
   private
 
   def set_lists
+    super
     @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 ] }
+    @email_campaigns_list = [ [nil,nil] ] + Ish::EmailContext.unsent_campaigns.map { |k| [ k.slug, k.id ] }
   end
 
 end

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

@@ -61,11 +61,14 @@
           = link_to 'Meetings', meetings_path
           = link_to '[+]', new_meeting_path
       %ul
-        %li= link_to 'Leads', leads_path
+        %li
+          = link_to 'Leads', leads_path
+          = link_to '[+]', new_lead_path
         %li= link_to 'Leadsets', leadsets_path
         %li= link_to 'Email Templates', email_templates_path
         %li
-          = link_to 'Contexts/Campaigns', email_contexts_path
+          = link_to 'Contexts', email_contexts_path
+          = link_to 'Campaigns', email_campaigns_path
           = link_to '[+]', new_email_context_path
           = link_to '[to-send]', notsent_email_contexts_path
   %hr

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

@@ -7,6 +7,9 @@
       = link_to '+', new_email_context_path
       = link_to 'to-send', notsent_email_contexts_path
 
+    %ul.meta
+      %li= params[:type]
+
   .W0
     = render 'paginate', resource: @email_ctxs, param_name: :email_contexts_page, views_prefix: :ish_manager
 

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

@@ -0,0 +1,19 @@
+
+= form_tag leads_import_path, multipart: true do
+  .doc
+    %ul
+      %li v1 fields: id, date, name, email, company url, source tag, phone, linkedin, comment
+  .field
+    %label File
+    = file_field_tag :csv_file
+
+  -# .field
+  -#   %label Leadset
+  -#   = select_tag :leadset_id, options_for_select(@leadsets_list), class: 'select2'
+
+  .field
+    %label Campaign
+    = select_tag :email_campaign_id, options_for_select(@email_campaigns_list), class: 'select2'
+
+  .actions
+    = submit_tag 'Submit'

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

@@ -1,3 +1,19 @@
 
 %h1 Edit lead
 = render 'form', :lead => @lead
+
+%hr
+%h1 Email Campaigns:
+%ul
+  - @lead.email_campaign_leads.each do |x|
+    %li
+      <b>Sent on ::</b> #{x.sent_at.to_s[0..10]}
+      <b>Slug ::</b> #{x.email_campaign.slug}
+
+%hr
+%h1 Single Emails:
+%ul
+  - @lead.email_contexts.each do |x|
+    %li
+      <b>Sent at ::</b> #{x.sent_at.to_s[0..10]}
+      <b>Subject ::</b> #{x.subject}

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

@@ -18,16 +18,20 @@
           %th Company
           %th Email
           %th Tag
+          %th created_at
+          %th n campaign sends
+          %th n single sends
 
       %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.leadset&.id
             %td= lead.email
-            -# %td= link_to raw('<i class="fa fa-envelope"></i>'), "mailto:#{lead.email}" if lead.email.present?
-
-
             %td= lead.tag
+            %td= lead.created_at.to_s[0..10]
+            %td= lead.email_campaign_leads.count
+            %td= @email_contexts[lead.email] || '-'
+
 

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

@@ -1,5 +1,8 @@
 
 .row
-  .col.s6.col-sm-offset-3
-    %h5 New Lead
+  .col-sm-12.col-md-6
+    %h1 New Lead
     = render 'form', :lead => @new_lead
+  .col-sm-12.col-md-6
+    %h1 Import Leads
+    = render 'form_import'

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

@@ -2,41 +2,19 @@
 - 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
+    = f.label :name
+    = f.text_field :name
   .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/index.haml

@@ -10,7 +10,7 @@
     %thead
       %tr
         %th  
-
+        %th created at
         %th Name
         %th Tag
         %th.company-url Company Url
@@ -19,8 +19,8 @@
       - @leadsets.each do |leadset|
         %tr
           %td= check_box_tag leadset.id
-
+          %td= leadset.created_at.strftime("%Y-%m-%d %H:%M")
           %td= link_to leadset.name, leadset_path( leadset )
           %td= leadset.tag
-          %td= link_to 'B', leadset.company_url if leadset.company_url.present?
+          %td= link_to leadset.company_url, leadset.company_url
           %td= leadset.location

data/config/routes.rb

@@ -45,12 +45,13 @@ IshManager::Engine.routes.draw do
   # office, below
   #
 
-  resources :email_campaigns, as: :email_campaigns
+  # resources :email_campaigns, as: :email_campaigns
 
   get  'email_contexts/iframe_src/:id',          to: 'email_contexts#iframe_src', as: :email_context_iframe
   get  'email_contexts/new_with/:template_slug', to: 'email_contexts#new'
   post 'email_contexts/send/:id',                to: 'email_contexts#do_send',    as: :email_context_send
-  get  'email_contexts',                         to: 'email_contexts#index',      as: :email_contexts,         defaults: { notsent: false }
+  get  'email_contexts',                         to: 'email_contexts#index',      as: :email_contexts,         defaults: { notsent: false, type: Ish::EmailContext::TYPE_SINGLE   }
+  get  'email_contexts/campaigns',               to: 'email_contexts#index',      as: :email_campaigns,        defaults: { notsent: false, type: Ish::EmailContext::TYPE_CAMPAIGN }
   get  'email_contexts/notsent',                 to: 'email_contexts#index',      as: :notsent_email_contexts, defaults: { notsent: true }
   resources :email_contexts
 
@@ -64,6 +65,7 @@ IshManager::Engine.routes.draw do
 
   get 'leads',      :to => 'leads#index'
   post 'leads/bulkop', to: 'leads#bulkop'
+  post 'leads/import', to: 'leads#import', as: :leads_import
   resources :leads
 
   resources :leadsets

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ish_manager
 version: !ruby/object:Gem::Version
-  version: 0.1.8.340
+  version: 0.1.8.342
 platform: ruby
 authors:
 - piousbox
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-11-25 00:00:00.000000000 Z
+date: 2022-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -374,6 +374,7 @@ files:
 - app/views/ish_manager/kaminari/_paginator.html.erb
 - 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/edit.haml
 - app/views/ish_manager/leads/index.haml
 - app/views/ish_manager/leads/new.haml