ish_manager 0.1.8.358 → 0.1.8.360

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 193a0f1a8f02445f2d98166fe6bfe614268fbc2f9e45204961c45898bd0005d3
-  data.tar.gz: 8d9d4d82f78782390b28463c11c825ab8e1e56fa054a3351869bd6699e264869
+  metadata.gz: 211e20f4c15dfe93f4b66d0fe4e75be2409651310f4603d3c51da3f8b31e5f34
+  data.tar.gz: 3d407d3048a28347545d1912678ec1107596b1ab95fc902cdadbc38f9085b71b
 SHA512:
-  metadata.gz: c4ab1c3fa4bb6e624b7c3c2b90759eb2d4c1823c053a0cd0c0fbfca8ef96fb67c819ef1f15cdae669a50676973f79b42d129c3688a9c88114c5632cb1225ae28
-  data.tar.gz: 409f2c967e02c2f92110feb667f997dad6b5bbf6b5736d085ea0c86cd6e3f46a37de98d2d34124b131331ecace55116a0436fea3ce6b2dd31964d9ef83d1ca7e
+  metadata.gz: 686449e01136c9fbfaefe4e4a1eb890cae44365ea28a9535d61499b56942ca67f8925f8fbf26472104ef91ba0a8b65ec38d14240d66d9c577567b77672725cde
+  data.tar.gz: 75e6666c2a18069b36dbe8bb14ca0d62fb77f3d9845cf59adf4b37f908ef6e6dd25fcc73c10df0bfc6fd31dc4ad9142155e7d0cac84ae826a5c2c8255cf70fd0

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

@@ -19,11 +19,17 @@
 //= require ish_manager/vendor/jquery-ui.min
 //= require ish_manager/shared
 //
+//= require_self
 //= require ish_manager/maps
 //= require ish_manager/email_contexts
 //= require ish_manager/email_templates
 //= require ish_manager/galleries
 
+const AppRouter = {
+  gallery_update_ordering_path: ({ id, slug }) => `/manager/galleries/${slug || id}/update_ordering`,
+  new_email_context_with_template_path: (slug) => `/manager/email_contexts/new_with_template/${slug}`,
+}
+
 $(function () {
 
   $('#fileupload').fileupload({

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

@@ -1,7 +1,4 @@
 
-const AppRouter = {
-  new_email_context_with_template_path: (slug) => `/manager/email_contexts/new_with_template/${slug}`
-}
 
 $(document).ready(() => {
 

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

@@ -1,7 +1,4 @@
 
-const AppRouter = {
-  gallery_update_ordering_path: ({ id, slug }) => `/manager/galleries/${slug || id}/update_ordering`,
-}
 $(document).ready(function () {
 
   if ( $(".orderable-items").length ) {

data/app/controllers/ish_manager/leads_controller.rb

@@ -9,8 +9,8 @@ class ::IshManager::LeadsController < IshManager::ApplicationController
 
   def bulkop
     authorize! :bulkop, ::Lead
-    case params[:a]
-    when 'add_to_campaign'
+    case params[:op]
+    when Lead::OP_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 )
@@ -21,6 +21,19 @@ class ::IshManager::LeadsController < IshManager::ApplicationController
       end
       flash[:notice] = 'Done acted; See logs.'
       redirect_to action: :index
+
+    when Lead::OP_DELETE
+      outs = []
+      params[:lead_ids].each do |lead_id|
+        lead = Lead.find( lead_id )
+        outs.push lead.discard
+      end
+      flash[:notice] = "Outcomes: #{outs.inspect}."
+      redirect_to action: :index
+
+    else
+      throw "Unknown op: #{params[:op]}."
+
     end
   end
 
@@ -40,38 +53,48 @@ 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
+  ##          0     1     2      3    4      5         6        7
+  ## Fields: id, date, name, email, tag, phone, linkedin, comment
   def import
     authorize! :import, ::Lead
-    file = params[:csv_file]
-    flags = []
+    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 })
+
+      leadset = ::Leadset.find_or_create_by({ company_url: row[3].split('@')[1] })
       lead = ::Lead.new({
-        name: row[2] || 'there',
-        full_name: row[2] || 'there',
+        name: row[2].presence || row[3].split('@')[0],
+        full_name: row[2].presence || row[3].split('@')[0],
         email: row[3],
-        m3_leadset_id: company.id,
-        phone: row[6],
+        m3_leadset_id: leadset.id,
+        phone: row[5],
       })
       flag = lead.save
       flags << flag
       if !flag
         errors << lead.errors.full_messages.join(", ")
       end
+
+      if row[4].present?
+        tags = row[4].split(",").map do |tag_name|
+          WpTag.my_find_or_create({ name: tag_name })
+        end
+        puts! tags, 'tags'
+        tags.each do |tag|
+          LeadTag.create({ wp_tag: tag, lead: lead })
+        end
+      end
+
     end
-    flash[:notice] = "Result: #{flags.inspect} ."
+    flash[:notice] = "Result: #{flags.inspect}."
     flash[:alert] = errors
     redirect_to action: 'new'
   end
 
   def index
     authorize! :index, ::Lead
-    @leads = ::Lead.all # .includes( :leadset, :email_campaign_leads )
+    @leads = ::Lead.kept.includes( :company )
     lead_emails = @leads.map( &:email ).compact.reject(&:empty?)
 
     map = %Q{

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

@@ -2,18 +2,10 @@
 = form_tag leads_import_path, multipart: true do
   .doc
     %ul
-      %li v1 fields: id, date, name, email, company url, source tag, phone, linkedin, comment
+      %li Fields: id, date, name, email, 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/index.haml

@@ -2,12 +2,12 @@
 .leads-index
   .header
     %h2.title
-      #{link_to 'Leads', leads_path} (#{::Lead.all.count})
+      #{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
 
   = form_tag leads_bulkop_path do
     = label_tag 'Act on Selected:'
-    = select_tag :a, options_for_select( %w| delete add_to_campaign | )
+    = select_tag :op, options_for_select( [[nil,nil]] + Lead::OPS )
     -# = select_tag :email_campaign_id, options_for_select( @email_campaigns_list )
     = submit_tag 'Go'
 
@@ -27,7 +27,7 @@
           %tr
             %td= check_box_tag 'lead_ids[]', lead.id
             %td= link_to "#{lead.name} <#{lead.email}>", lead_path( lead )
-            %td= lead.leadsets.first&.name
+            %td= lead.company.company_url
             %td= lead.wp_tags.map(&:name).join(", ")
             %td= lead.created_at.to_s[0..10]
             %td #{lead.email_campaign_leads.count || '-'}, #{@email_contexts[lead.email] || '-'}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ish_manager
 version: !ruby/object:Gem::Version
-  version: 0.1.8.358
+  version: 0.1.8.360
 platform: ruby
 authors:
 - piousbox