ish_manager 0.1.8.328 → 0.1.8.330

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6d4a0f293f7775d1cb692bd13e478037207e95d50cb0175b54f872d4c6f20ab6
-  data.tar.gz: 68b17421aff68e4fc2bef3d1e2e3aba4d5d0ad8120b48e6b201700689433b198
+  metadata.gz: fb8837f836ee7037d6459fed6da788325b1ab61e84f50382a5c688b1f33bd6df
+  data.tar.gz: b3b559b2a51bc73c84c49f2307806f56af9aa54e0e39d149f0dad37a7ecbe1b7
 SHA512:
-  metadata.gz: a236d6ad5f3ea044628697590553d5752ed21343582f32ef7e9b1a94f8639c8e2d7b0ffca016867567bc9a9dfd3b1e9612e2dc6275d6805fdafe1d433a6529d3
-  data.tar.gz: d333a3a14fcb5ff46e3c5c16e3549572e76145ab72233adab06e4a268b0cfe32eb3136d16b771bcd521ab337d26b1084e9118e6b52c93c2535374030be928187
+  metadata.gz: 45013f135fbbde395b067d95ab84d9ac6e061edcfca0d6b52d30b1e339c5b822eba55365d28843da1b0d99d7fd592c9f62fe912f486cf789e989d52531069b3e
+  data.tar.gz: eb63ccc14ff4a8a5739b958d47aae5b2e047dcbfe9c1c4131160ed3a2cbe05bc680d9c64cb386d43c48728dc9dbe504f55371aaf41247494078c6cc188478149

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

@@ -10,6 +10,22 @@ $(document).ready(() => {
       const val = ev.target.value
       window.location.href = AppRouter.new_email_context_with(val)
     })
+
+    $("#ish_email_context_type").on('change', (ev) => {
+      const val = ev.target.value
+      if (val == 'TYPE_CAMPAIGN') {
+        $(".email-contexts--form .TYPE_SINGLE").css('display', 'none')
+      } else {
+        $(".email-contexts--form .TYPE_SINGLE").css('display', 'block')
+      }
+    })
+    // on page load:
+    if ($("#ish_email_context_type").val() == 'TYPE_CAMPAIGN') {
+      $(".email-contexts--form .TYPE_SINGLE").css('display', 'none')
+    } else {
+      $(".email-contexts--form .TYPE_SINGLE").css('display', 'block')
+    }
+
   }
 
 })

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_campaigns_controller.rb

@@ -2,8 +2,8 @@
 class ::IshManager::EmailCampaignsController < IshManager::ApplicationController
 
   def index
-    authorize! :index, Ish::Campaign
-    @campaigns = Ish::Campaign.where( :profile => @current_profile, :is_trash => false )
+    authorize! :index, Ish::EmailCampaign
+    @campaigns = Ish::EmailCampaign.where( :profile => @current_profile, :is_trash => false )
     if params[:is_done]
       @campaigns = @campaigns.where( :is_done => true )
     else
@@ -12,12 +12,12 @@ class ::IshManager::EmailCampaignsController < IshManager::ApplicationController
   end
 
   def new
-    @new_campaign = Ish::Campaign.new
+    @new_campaign = Ish::EmailCampaign.new
     authorize! :new, @new_campaign
   end
 
   def create
-    @campaign = Ish::Campaign.new params[:campaign].permit!
+    @campaign = Ish::EmailCampaign.new params[:campaign].permit!
     @campaign.profile = @current_profile
     authorize! :create, @campaign
     if @campaign.save
@@ -34,12 +34,12 @@ class ::IshManager::EmailCampaignsController < IshManager::ApplicationController
   end
 
   def edit
-    @campaign = Ish::Campaign.find params[:id]
+    @campaign = Ish::EmailCampaign.find params[:id]
     authorize! :edit, @campaign
   end
 
   def update
-    @campaign = Ish::Campaign.find params[:id]
+    @campaign = Ish::EmailCampaign.find params[:id]
     authorize! :update, @campaign
     if @campaign.update_attributes params[:campaign].permit!
       flash[:notice] = 'Successfully updated campaign.'

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
@@ -32,9 +32,17 @@ class ::IshManager::EmailContextsController < ::IshManager::ApplicationControlle
   end
 
   def do_send
-    authorize! :send, ::Ish::EmailContext
-    IshManager::OfficeMailer.send_context_email(params[:id]).deliver_later
-    flash[:notice] = 'Scheduled send'
+    @ctx = ::Ish::EmailContext.find params[:id]
+    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::EmailCampaignJob.perform_later(params[:id])
+    end
+
     redirect_to action: 'index'
   end
 
@@ -44,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
@@ -53,7 +61,7 @@ class ::IshManager::EmailContextsController < ::IshManager::ApplicationControlle
       return
     when 'plain'
       @body = @email_template.body
-      @body.gsub!('{name}', @email_ctx.name)
+      @body.gsub!('{name}', @email_ctx.tmpl_name)
       render 'ish_manager/email_templates/plain', layout: false
       return
     end

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,6 +1,54 @@
 
 class IshManager::OfficeMailer < IshManager::ApplicationMailer
 
+  def send_campaign_email campaign_id, c_lead_id
+    @ctx = @campaign = ::Ish::EmailContext.find campaign_id
+    @lead = EmailCampaignLead.find c_lead_id
+
+    if @lead.sent_at
+      raise "This campaign_lead #{@lead.id} has already been sent."
+    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
     @email_ctx = ::Ish::EmailContext.find ctx_id
     ac = ActionController::Base.new

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

@@ -52,17 +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', leads_path
         %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/_form.haml

@@ -8,23 +8,32 @@
   - url = %w| index new create |.include?( params[:action] ) ? email_contexts_path : email_context_path(email_ctx)
   = form_for email_ctx, url: url do |f|
     .row
+
       .col.s6
         .field
           = f.label :email_template_id
           = f.select :email_template_id, options_for_select(@email_templates_list, selected: params[:email_template_id] || email_ctx.email_template&.id )
+        .field
+          = f.label :title
+          = f.text_field :title
 
         .field
           = f.label :from_email
           = f.select :from_email, options_for_select(Ish::EmailContext.from_email_list, selected: email_ctx.from_email)
-        .field
-          = f.label :to_email
-          = f.text_field :to_email
 
       .col.s6
-        %h5 Templating
         .field
-          = f.label :name
-          = f.text_field :name
+          = f.label :type
+          = f.select :type, options_for_select(Ish::EmailContext.types_list, selected: email_ctx.type)
+        .TYPE_SINGLE
+          .field
+            = f.label :to_email
+            = f.text_field :to_email
+          %h5 Templating
+          .field
+            = f.label :tmpl_name
+            = f.text_field :tmpl_name
+
     .field.field-subject
       = f.label :subject
       = f.text_field :subject

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

@@ -19,6 +19,7 @@
             = link_to '~', edit_email_context_path(ctx)
           = link_to email_context_path(ctx) do
             view
+          = ctx.title
           = button_to '[x]', email_context_path(ctx), method: :delete, form_class: :inline, data: { confirm: 'Are you sure?' }
           -# = link_to 'iframe', email_context_iframe_path(ctx), target: :_blank do
 

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

@@ -2,18 +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>To:</b> #{@email_ctx.to_email}
     %li <b>Subject:</b> #{@email_ctx.subject}
-    %li <b>Template:</b> #{@email_ctx.email_template.slug} <b>Type:</b> #{@email_ctx.email_template.type}
+    - 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}
+
+    -#
+    -# 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%' }