ish_manager 0.1.8.328 → 0.1.8.330

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/app/views/ish_manager/trash/email_campaigns-trash/_form.haml

@@ -0,0 +1,46 @@
+
+.email-campaigns--form
+  %h2
+    Email Campaign
+    - if email_campaign.email_template
+      with template `#{email_campaign.email_template.slug}` type:#{email_campaign.email_template.type}.
+
+  - url = %w| index new create |.include?( params[:action] ) ? email_contexts_path : email_context_path(email_campaign)
+  = form_for email_campaign, url: url do |f|
+    .row
+      .col.s6
+        .field
+          = f.label :title
+          = f.text_field :title
+
+        .field
+          = f.label :email_template_id
+          = f.select :email_template_id, options_for_select(@email_templates_list, selected: params[:email_template_id] || email_campaign.email_template&.id )
+
+        .field
+          = f.label :from_email
+          = f.select :from_email, options_for_select(Ish::EmailContext.from_email_list, selected: email_campaign.from_email)
+        .field
+          = f.label :to_email
+          = f.text_field :to_email
+
+      .col.s6
+        %h5 Templating
+        .field
+          = f.label :name
+          = f.text_field :name
+    .field.field-subject
+      = f.label :subject
+      = f.text_field :subject
+    - if 'plain' == email_campaign.email_template&.type
+      .body
+        = raw email_campaign.email_template.body
+    - else
+      .field
+        = f.label :body
+        = f.text_area :body, class: 'tinymce'
+    .actions
+      .left
+        = f.submit 'Preview'
+      .right
+        -# = f.submit 'Schedule/Send'

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

@@ -0,0 +1,4 @@
+
+%h2
+  Email Campaigns
+  = link_to '[+]', new_email_campaign_path

data/app/views/ish_manager/trash/email_campaigns-trash/new.haml

@@ -0,0 +1,2 @@
+
+= render 'form'

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.328
+  version: 0.1.8.330
 platform: ruby
 authors:
 - piousbox
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-11-10 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,7 +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_campaigns/index.haml
+- 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
@@ -318,7 +321,7 @@ files:
 - app/views/ish_manager/email_templates/_index.haml
 - app/views/ish_manager/email_templates/_marketing_react_1.html
 - app/views/ish_manager/email_templates/_marketing_ror_1.html
-- app/views/ish_manager/email_templates/_marketing_ror_2.html
+- app/views/ish_manager/email_templates/_marketing_ror_2.html.erb
 - app/views/ish_manager/email_templates/_marketing_wordpress_1.html
 - app/views/ish_manager/email_templates/_marketing_wordpress_2.html
 - app/views/ish_manager/email_templates/_piousbox_roundborders.html.erb
@@ -360,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
@@ -404,6 +411,10 @@ files:
 - app/views/ish_manager/reports/index.haml
 - app/views/ish_manager/reports/new.haml
 - app/views/ish_manager/reports/show.haml
+- app/views/ish_manager/trash/email_campaigns-trash/_form.haml
+- app/views/ish_manager/trash/email_campaigns-trash/edit.haml
+- app/views/ish_manager/trash/email_campaigns-trash/index.haml
+- app/views/ish_manager/trash/email_campaigns-trash/new.haml
 - app/views/ish_manager/user_profiles/_form.haml
 - app/views/ish_manager/user_profiles/_show.haml
 - app/views/ish_manager/user_profiles/edit.haml

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

@@ -1,2 +0,0 @@
-
-%h2 Email Campaigns