ish_manager 0.1.8.327 → 0.1.8.329

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f4352bd842e1cdc92ad63259bde55833704e7366d06728a19cb40c8f3ba37e81
-  data.tar.gz: 16b80cef890656d55899269d7f0501a963e250d504132c4c60cb49c6279a5507
+  metadata.gz: 168e3b80f936578509b925a3724a24455bded5f8ec0a340a9db76a02b827a11e
+  data.tar.gz: fafe8c1ae99e9677a8b3066410e263d8bfd762fdbf982e2216c83d652eee22cf
 SHA512:
-  metadata.gz: 18d9fa469444b421b46d8a7f7a8fac0a48e3e7880f87c18f51b36e33ce8000b9f60301ef0f53491d7713cad2d432e3424bddca4a92614686e7d136df805790bd
-  data.tar.gz: 1564a872717ec4fdd6076eb7697a0ed6882f566abecec082bf5e8b322fb1cf11688ed79dc590470cef1cf096db62ad6d4dce11c6e28e175cdb12cc4aaf2a0d53
+  metadata.gz: df33c3dc00fc249314ffeaf0c52ed075e3011ef2b0b939221f9820de50a588c5459c1fe4e3b22c4add4d8078e8ea636e010f5bffe4123e9a0411fdadf57725e1
+  data.tar.gz: f59723fe434089ae4e777f546514000c3b6b4fa9730710c535ff4979fe2dbbdb9c65cd6fa54314e67fc5f91959c5f4028fcfa3be42e375c73f425e5a8cd4a45d

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

@@ -17,7 +17,9 @@
 //= require ish_manager/vendor/jquery.fileupload
 //= require ish_manager/vendor/jquery-ui.min
 //= require ish_manager/shared
+//
 //= require ish_manager/maps
+//= require ish_manager/email_contexts
 
 $(function () {
 

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

@@ -0,0 +1,32 @@
+
+AppRouter = {
+  new_email_context_with: (slug) => `/manager/email_contexts/new_with/${slug}`
+}
+
+$(document).ready(() => {
+
+  if ($(".email-contexts--form").length) {
+    $("#ish_email_context_email_template_id").on('change', (ev) => {
+      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/assets/stylesheets/ish_manager/email_templates.scss

@@ -35,7 +35,7 @@
 }
 
 
-.email-templates--form {
+.email-templates--form-mini {
   border: 1px solid red;
   padding: 1em;
 
@@ -48,3 +48,26 @@
   }
 
 }
+
+.email-contexts--form,
+.email-templates--form {
+
+  .field-subject {
+    display: flex;
+    width: calc( 100% - 20px );
+
+    input[name='ish_email_context[subject]'],
+    input[name='ish_email_template[subject]'] {
+      margin-left: 5px;
+      flex-grow: 1;
+    }
+  }
+
+
+
+  .body {
+    border: 1px solid red;
+    padding: 10px;
+    margin: 10px;
+  }
+}

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

@@ -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! :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
+    end
+
     redirect_to action: 'index'
   end
 
@@ -47,7 +55,16 @@ class ::IshManager::EmailContextsController < ::IshManager::ApplicationControlle
     @email_ctx = EmailContext.find params[:id]
     authorize! :iframe_src, @email_ctx
     @email_template = @email_ctx.email_template
-    render 'ish_manager/email_templates/iframe_src', layout: false
+    case @email_template.type
+    when 'partial'
+      render 'ish_manager/email_templates/iframe_src', layout: false
+      return
+    when 'plain'
+      @body = @email_template.body
+      @body.gsub!('{name}', @email_ctx.tmpl_name)
+      render 'ish_manager/email_templates/plain', layout: false
+      return
+    end
   end
 
   def index
@@ -61,7 +78,13 @@ class ::IshManager::EmailContextsController < ::IshManager::ApplicationControlle
 
   def new
     authorize! :new, ::Ish::EmailContext
-    @email_ctx = ::Ish::EmailContext.new email_template: @template
+    @template = Ish::EmailTemplate.where( slug: params[:template_slug] ).first
+    @template ||= Ish::EmailTemplate.where( id: params[:template_slug] ).first
+    attrs = {}
+    if @template
+      attrs = @template.attributes.slice( :subject, :body, :from_email )
+    end
+    @email_ctx = ::Ish::EmailContext.new( { email_template: @template }.merge(attrs) )
   end
 
   def show

data/app/controllers/ish_manager/email_templates_controller.rb

@@ -23,6 +23,11 @@ class ::IshManager::EmailTemplatesController < ::IshManager::ApplicationControll
     redirect_to action: :index
   end
 
+  def edit
+    @template = Ish::EmailTemplate.where({ id: params[:id] }).first
+    authorize! :edit, @template
+  end
+
   def iframe_src
     authorize! :iframe_src, Ish::EmailTemplate
     @email_template = Ish::EmailTemplate.where({ id: params[:id] }).first ||
@@ -45,5 +50,17 @@ class ::IshManager::EmailTemplatesController < ::IshManager::ApplicationControll
     @email_ctx = EmailContext.new({ body: Ish::LoremIpsum.html })
   end
 
+  def update
+    @template = Ish::EmailTemplate.where({ id: params[:id] }).first
+    authorize! :update, @template
+    flag = @template.update_attributes( params[:ish_email_template].permit! )
+    if flag
+      flash[:notice] = 'Success.'
+      redirect_to action: 'index'
+    else
+      flash[:alert] = "No luck. #{@template.errors.full_messages.join(', ')}"
+      render :edit
+    end
+  end
 
 end

data/app/mailers/ish_manager/office_mailer.rb

@@ -1,22 +1,97 @@
 
 class IshManager::OfficeMailer < IshManager::ApplicationMailer
-  default from: 'piousbox@gmail.com'
-  # layout 'mailer'
+
+  def send_campaign campaign_id
+    @ctx = ::Ish::EmailContext.find campaign_id
+    actl = ActionController::Base.new
+    actl.instance_variable_set( :@ctx, @ctx )
+
+    if @ctx.email_template.type != 'partial'
+      raise "only `partial` template type is supported for campaigns."
+    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
+  end
 
   def send_context_email ctx_id
     @email_ctx = ::Ish::EmailContext.find ctx_id
-    template = "render/_#{@email_ctx.email_template.slug}"
-
     ac = ActionController::Base.new
     ac.instance_variable_set( :@email_ctx, @email_ctx )
-    rendered_str = ac.render_to_string("ish_manager/email_templates/_#{@email_ctx.email_template.slug}")
+
+    case @email_ctx.email_template.type
+    when 'partial'
+      template = "render/_#{@email_ctx.email_template.slug}"
+      rendered_str = ac.render_to_string("ish_manager/email_templates/_#{@email_ctx.email_template.slug}")
+    when 'plain'
+      @body = @email_ctx.email_template.body
+      @body.gsub!('{name}', @email_ctx.name)
+      template = "render/plain"
+      rendered_str = ac.render_to_string("ish_manager/email_templates/plain")
+    end
+
     @email_ctx.update( rendered_str: rendered_str, sent_at: Time.now )
 
-    mail( to: @email_ctx.to_email,
+    mail( from: @email_ctx.from_email,
+          to: @email_ctx.to_email,
           bcc: 'piousbox@gmail.com',
           subject: @email_ctx.subject,
           template_name: template )
-
   end
 
 end
+
+
+## 2022-11-10 backup
+# def send_context_email ctx_id
+#   @email_ctx = ::Ish::EmailContext.find ctx_id
+#   template = "render/_#{@email_ctx.email_template.slug}"
+#   ac = ActionController::Base.new
+#   ac.instance_variable_set( :@email_ctx, @email_ctx )
+#   rendered_str = ac.render_to_string("ish_manager/email_templates/_#{@email_ctx.email_template.slug}")
+#   @email_ctx.update( rendered_str: rendered_str, sent_at: Time.now )
+#   mail( to: @email_ctx.to_email,
+#         bcc: 'piousbox@gmail.com',
+#         subject: @email_ctx.subject,
+#         template_name: template )
+# end

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

@@ -53,7 +53,7 @@
       Office
     .namespace
       %ul
-        %li= link_to 'Leads', leads_path
+        %li= link_to 'Leads', '/admin/leads'
         %li
           = link_to 'Meetings', meetings_path
           = link_to '[+]', new_meeting_path
@@ -62,7 +62,6 @@
           = 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 'Email Campaigns', email_campaigns_path
   %hr
 

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

@@ -2,23 +2,48 @@
 .email-contexts--form
   %h2
     New Email Context
-    -# with template `#{email_ctx.email_template&.slug}`
+    - if email_ctx.email_template
+      with template `#{email_ctx.email_template.slug}` type:#{email_ctx.email_template.type}.
 
   - url = %w| index new create |.include?( params[:action] ) ? email_contexts_path : email_context_path(email_ctx)
   = form_for email_ctx, url: url do |f|
-    .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 )
+    .row
 
-    .field
-      = f.label :to_email
-      = f.text_field :to_email
-    .field
+      .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)
+
+      .col.s6
+        .field
+          = 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
-    .field
-      = f.label :body
-      = f.text_area :body, class: 'tinymce'
+    - if 'plain' == email_ctx.email_template&.type
+      .body
+        = raw email_ctx.email_template.body
+    - else
+      .field
+        = f.label :body
+        = f.text_area :body, class: 'tinymce'
     .actions
       .left
         = f.submit 'Preview'

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

@@ -19,7 +19,10 @@
             = 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
 
-          To #{ctx.to_email}: #{ctx.subject}
+          [ <b>tmpl:</b> #{ctx.email_template.slug} ]
+          [ <b>To:</b> #{ctx.to_email} ]
+          <u>#{ctx.subject}</u>

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

@@ -2,9 +2,20 @@
 .email-contexts-show
 
   %ul
-    %li <b>To:</b> #{@email_ctx.to_email}
-    %li <b>Subject:</b> #{@email_ctx.subject}
+
+    %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(", ") }
+
     - if @email_ctx.sent_at
       %li <b>Sent at:</b> #{@email_ctx.sent_at.strftime('%Y-%m-%d %l:%M%P')}
     - else
@@ -13,6 +24,6 @@
         = link_to '[~]', edit_email_context_path(@email_ctx)
 
   - if @email_ctx.sent_at
-    =raw @email_ctx.rendered_str
+    = raw @email_ctx.rendered_str
   - else
     %iframe{ src: email_context_iframe_path(@email_ctx), width: '100%', height: '100%' }

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

@@ -3,9 +3,20 @@
 
 .email-templates--form
   = form_for email_template, url: url do |f|
-    %h3 New Email Template
+    .field
+      = f.label :type
+      = f.select :type, options_for_select(Ish::EmailTemplate.type_list, selected: email_template.type)
     .field
       = f.label :slug
       = f.text_field :slug
+    .field
+      = f.label :from_email
+      = f.select :from_email, options_for_select(Ish::EmailContext.from_email_list, selected: email_template.from_email)
+    .field.field-subject
+      = f.label :subject
+      = f.text_field :subject
+    .field
+      = f.label :body
+      = f.text_area :body, class: 'tinymce'
     .actions
       = f.submit 'Submit'

data/app/views/ish_manager/email_templates/_form_mini.haml

@@ -0,0 +1,9 @@
+
+.email-templates--form-mini
+  = form_for ::Ish::EmailTemplate.new, url: email_templates_path do |f|
+    %h3 New Email Template
+    .field
+      = f.label :slug
+      = f.text_field :slug
+    .actions
+      = f.submit 'Create'

data/app/views/ish_manager/email_templates/_index.haml

@@ -3,11 +3,12 @@
   Email Templates
 .email-templates-index
 
-  = render 'ish_manager/email_templates/form', email_template: ::Ish::EmailTemplate.new
+  = render 'ish_manager/email_templates/form_mini'
   %ul
     - @templates.each do |tmpl|
       %li
         = link_to 'Use', new_email_context_path({ email_template_id: tmpl.id })
+        = link_to 'Edit', edit_email_template_path({ id: tmpl })
         = link_to 'View', email_template_path({ id: tmpl })
         = link_to 'iFrame', email_template_iframe_path({ id: tmpl }), target: :_blank
         = tmpl.slug