ish_manager 0.1.8.355 → 0.1.8.356

data/app/assets/stylesheets/ish_manager/leads_leadsets.scss

@@ -12,10 +12,103 @@
 .manager-leadsets-index {
   padding: 1em;
 
-  .actions label {
-    border: 1px solid gold;
+  > .actions label {
+    border: 1px solid #fff;
     padding: 0.5em;
     border-radius: 0.5em;
-    background: #999900;
+    background: #eee;
+
+    > * {
+      display: inline;
+    }
+  }
+
+  tr {
+    border-bottom: 1px solid yellow;
+
+    // :hover {
+    //   background: #eee;
+    // }
+  }
+
+  th.leads {
+    margin-left: 1em;
+  }
+  td.leads {
+    margin-left: 1em;
+    vertical-align: top;
+
+    .item {
+      display: flex;
+      align-items: flex-start;
+
+      .actions {
+        display: flex;
+      }
+    }
+  }
+
+  form.form-mini {
+    border: 1px solid red;
+    border-radius: .5em;
+    padding: 1em;
+    background: white;
+
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+
+    position: absolute;
+    top: 0;
+    width: 300px;
+    right: -300px;
+
+    z-index: 2;
+
+    .field {
+      display: flex;
+    }
+
+    .actions {
+      margin-top: .5em;
+      width: 100%;
+      text-align: right;
+    }
   }
+
+  .scheduled {
+    position: relative;
+    display: flex;
+
+    .chip {
+      border: 2px solid cyan;
+      display: flex;
+      flex-direction: column;
+    }
+  }
+
+  .tags {
+    // background: #eee;
+
+    display: flex;
+    flex-wrap: wrap;
+
+    max-width: 400px;
+  }
+
+  .tags-add {
+    position: relative;
+    vertical-align: top;
+  }
+
+  .chip {
+    display: inline;
+
+    border: 1px solid #eee;
+    border-radius: 0.5em;
+    padding: 0.1em .3em;
+    background: #fff;
+  }
+
 }
+

data/app/assets/stylesheets/ish_manager/scheduled_actions_emails.scss

@@ -0,0 +1,25 @@
+
+.scheduled-emails-new {
+
+
+  border: 1px solid red;
+  border-radius: .5em;
+  padding: .5em;
+  background: white;
+
+  form {
+    display: flex;
+    align-items: flex-end;
+  }
+
+}
+
+.scheduled-actions--form-mini {
+  display: inline-block;
+
+  form {
+    border: 1px solid blue;
+
+    display: flex;
+  }
+}

data/app/assets/stylesheets/ish_manager/tags.scss

@@ -0,0 +1,5 @@
+
+form.tags--form-mini {
+  display: flex;
+}
+

data/app/controllers/ish_manager/application_controller.rb

@@ -5,6 +5,7 @@ module IshManager
     before_action :set_current_ability
     before_action :set_changelog
     before_action :set_title
+    before_action :set_jwt
     check_authorization
     rescue_from ::CanCan::AccessDenied, :with => :access_denied
 
@@ -44,6 +45,15 @@ module IshManager
       @current_ability ||= ::IshManager::Ability.new( @current_profile )
     end
 
+    def set_jwt
+      @jwt_token = encode(user_profile_id: @current_user.profile.id.to_s)
+    end
+
+    def encode(payload, exp = 48.hours.from_now) # @TODO: definitely change, right now I expire once in 2 days.
+      payload[:exp] = exp.to_i
+      JWT.encode(payload, Rails.application.secrets.secret_key_base.to_s)
+    end
+
     def set_lists
       @galleries_list = Gallery.all.list
       @locations_list = ::Gameui::Map.list
@@ -51,6 +61,11 @@ module IshManager
       @reports_list = Report.all.list
       @user_profiles_list = Ish::UserProfile.list
       @videos_list = Video.all.list
+
+      @leads_list = Lead.list
+      @leadsets_list = Leadset.list
+      @email_actions_list = ::Office::EmailAction.all.map { |a| [ a.slug, a.id ] }
+      @email_templates_list = Ish::EmailTemplate.all.map { |t| [ t.slug, t.id ] }
     end
 
     def set_title

data/app/controllers/ish_manager/email_actions_controller.rb

@@ -0,0 +1,80 @@
+
+class ::IshManager::EmailActionsController < IshManager::ApplicationController
+
+  before_action :set_lists
+
+  ## Alphabetized : )
+
+  def create
+    @act = @email_action = Office::EmailAction.new
+    authorize! :create, @act
+
+    next_ids = params[:email_action].delete(:next_email_actions)
+    next_ids.delete("")
+    Office::EmailAction.where(prev_email_action_id: params[:id] ).update_all(prev_email_action_id: nil)
+    next_ids.each do |next_id|
+      next_action = ::Office::EmailAction.find next_id
+      next_action.update_attribute( :prev_email_action_id, params[:id] )
+    end
+
+    flag = @act.update_attributes( params[:email_action].permit! )
+    if flag
+      flash[:notice] = 'Success'
+    else
+      flash[:alert] = "No luck: #{@act.errors.full_messages.join(', ')}"
+    end
+
+    redirect_to action: 'index'
+  end
+
+  def edit
+    @act = @email_action = Office::EmailAction.find( params[:id] )
+    authorize! :edit, @act
+  end
+
+  def index
+    @email_actions = Office::EmailAction.all
+
+    authorize! :index, @new_email_action
+  end
+
+  def new
+    authorize! :new, @new_email_action
+  end
+
+  def show
+  end
+
+  def update
+    @act = @email_action = Office::EmailAction.find( params[:id] )
+    authorize! :update, @act
+
+    next_ids = params[:email_action].delete(:next_email_actions)
+    next_ids.delete("")
+    Office::EmailAction.where(prev_email_action_id: params[:id] ).update_all(prev_email_action_id: nil)
+    next_ids.each do |next_id|
+      next_action = ::Office::EmailAction.find next_id
+      next_action.update_attribute( :prev_email_action_id, params[:id] )
+    end
+
+    flag = @act.update_attributes( params[:email_action].permit! )
+    if flag
+      flash[:notice] = 'Success'
+    else
+      flash[:alert] = "No luck: #{@act.errors.full_messages.join(', ')}"
+    end
+
+    redirect_to action: 'index'
+  end
+
+  ##
+  ## private
+  ##
+  private
+
+  def set_lists
+    @new_email_action = Office::EmailAction.new
+    super
+  end
+
+end

data/app/controllers/ish_manager/email_campaigns_controller.rb

@@ -1,6 +1,19 @@
 
 class ::IshManager::EmailCampaignsController < IshManager::ApplicationController
 
+  def do_send
+
+    # case @ctx.type
+    # when ::Ish::EmailContext::TYPE_SINGLE
+    #   flash[:notice] = 'Scheduled a single send - v2'
+    #   @ctx.send_at = Time.now
+    #   @ctx.save
+    # when ::Ish::EmailContext::TYPE_CAMPAIGN
+    #   flash[:notice] = 'Scheduled campaign send'
+    #   IshManager::EmailCampaignJob.new.perform(params[:id])
+    # end
+  end
+
   def index
     authorize! :index, Ish::EmailCampaign
     @campaigns = Ish::EmailCampaign.where( :profile => @current_profile, :is_trash => false )

data/app/controllers/ish_manager/email_contexts_controller.rb

@@ -9,23 +9,23 @@ class ::IshManager::EmailContextsController < ::IshManager::ApplicationControlle
     authorize! :create, ::Ish::EmailContext
     pparams = params[:ish_email_context].permit!
     pparams[:tmpl] = JSON.parse(pparams[:tmpl])
-    @email_ctx = ::Ish::EmailContext.new pparams
-    if @email_ctx.save
+    @ctx = ::Ish::EmailContext.new pparams
+    if @ctx.save
       flash[:notice] = 'Saved.'
-      redirect_to action: 'show', id: @email_ctx.id
+      redirect_to action: 'show', id: @ctx.id
       return
     else
-      # flash[:alert] = "Could not save: #{@email_ctx.errors.full_messages.join(', ')}"
-      flash[:alert] = ['Could not save:'] + @email_ctx.errors.full_messages
+      # flash[:alert] = "Could not save: #{@ctx.errors.full_messages.join(', ')}"
+      flash[:alert] = ['Could not save:'] + @ctx.errors.full_messages
       render action: :new
       return
     end
   end
 
   def destroy
-    @email_ctx = Ish::EmailContext.find params[:id]
-    authorize! :destroy, @email_ctx
-    flag = @email_ctx.destroy
+    @ctx = Ish::EmailContext.find params[:id]
+    authorize! :destroy, @ctx
+    flag = @ctx.destroy
     if flag
       flash[:notice] = 'Destroyed the email context'
     else
@@ -37,52 +37,44 @@ class ::IshManager::EmailContextsController < ::IshManager::ApplicationControlle
   def do_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 - v2'
-      @ctx.send_at = Time.now
-      @ctx.save
-    when ::Ish::EmailContext::TYPE_CAMPAIGN
-      flash[:notice] = 'Scheduled campaign send'
-      IshManager::EmailCampaignJob.new.perform(params[:id])
-    end
+
+    flash[:notice] = 'Scheduled a single send - v2'
+    @ctx.send_at = Time.now
+    @ctx.save
 
     redirect_to action: 'index'
   end
 
   def edit
-    @email_ctx = ::Ish::EmailContext.find params[:id]
-    authorize! :edit, @email_ctx
+    @ctx = ::Ish::EmailContext.find params[:id]
+    authorize! :edit, @ctx
   end
 
   def iframe_src
-    @email_ctx = Ish::EmailContext.find params[:id]
-    authorize! :iframe_src, @email_ctx
-    @email_template = @email_ctx.email_template
-    case @email_template.type
-    when 'partial'
-      render 'ish_manager/email_templates/iframe_src', layout: false
-      return
-    when 'plain'
-      @body = @email_ctx.body_templated
-      render 'ish_manager/email_templates/plain', layout: false
-      return
-    end
+    @ctx = @email_context = Ish::EmailContext.find params[:id]
+    authorize! :iframe_src, @ctx
+    @tmpl = @email_template = @ctx.email_template
+    @lead = @ctx.lead
+    # @body = @ctx.body_templated
+    render "ish_manager/email_templates/_#{@tmpl.layout}", layout: false
   end
 
   def index
     authorize! :index, ::Ish::EmailContext
-    @email_ctxs = ::Ish::EmailContext.all
+    @ctxs = ::Ish::EmailContext.all
 
     if params[:notsent]
-      @email_ctxs = @email_ctxs.where( sent_at: nil )
+      @ctxs = @ctxs.where( sent_at: nil )
     end
 
-    if params[:type]
-      @email_ctxs = @email_ctxs.where( type: params[:type] )
+    if params[:lead_id]
+      @lead = Lead.find params[:lead_id]
+      @ctxs = @ctxs.where( to_email: @lead.email )
     end
 
-    @email_ctxs = @email_ctxs.page( params[Ish::EmailContext::PAGE_PARAM_NAME] )
+    @ctxs = @ctxs.page( params[Ish::EmailContext::PAGE_PARAM_NAME] )
+
+    render layout: 'ish_manager/application_fullwidth'
   end
 
   def new
@@ -93,37 +85,38 @@ class ::IshManager::EmailContextsController < ::IshManager::ApplicationControlle
     if @template
       attrs = @template.attributes.slice( :subject, :body, :from_email )
     end
-    @email_ctx = ::Ish::EmailContext.new( { email_template: @template }.merge(attrs) )
+    @ctx = ::Ish::EmailContext.new( { email_template: @template }.merge(attrs) )
   end
 
   def show
-    @email_ctx = ::Ish::EmailContext.find( params[:id] )
-    authorize! :show, @email_ctx
+    @ctx = @email_context = ::Ish::EmailContext.find( params[:id] )
+    authorize! :show, @ctx
   end
 
   def update
-    @email_ctx = ::Ish::EmailContext.find params[:id]
-    authorize! :update, @email_ctx
+    @ctx = ::Ish::EmailContext.find params[:id]
+    authorize! :update, @ctx
     pparams = params[:ish_email_context].permit!
-    pparams[:tmpl] = JSON.parse(pparams[:tmpl])
-    if @email_ctx.update_attributes pparams
+
+    if @ctx.update_attributes pparams
       flash[:notice] = 'Saved.'
-      redirect_to action: 'show', id: @email_ctx.id
+      redirect_to action: 'show', id: @ctx.id
       return
     else
-      flash[:alert] = "Could not save: #{@email_ctx.errors.full_messages.join(', ')}"
+      flash[:alert] = "Could not save: #{@ctx.errors.full_messages.join(', ')}"
       render action: :edit
       return
     end
   end
 
-  #
-  # private
-  #
+  ##
+  ## Private
+  ##
   private
 
   def set_lists
     @email_templates_list = [ [nil, nil] ] + ::Ish::EmailTemplate.all.map { |tmpl| [ tmpl.slug, tmpl.id ] }
+    @leads_list = Lead.list
   end
 
 end

data/app/controllers/ish_manager/email_conversations_controller.rb

@@ -1,16 +1,20 @@
 
 class ::IshManager::EmailConversationsController < IshManager::ApplicationController
 
+  layout 'ish_manager/application_fullwidth'
+
+  before_action :set_lists
+
   def index
     authorize! :email_conversations_index, IshManager::Ability
     @email_conversations = ::Office::EmailConversation.all.order_by( latest_date: :desc )
-
   end
 
   def show
     authorize! :email_conversations_show, IshManager::Ability
     @email_conversation = ::Office::EmailConversation.find( params[:id] )
-    @email_messages = @email_conversation.email_messages.order_by( date: :desc )
+    @email_messages = @email_conversation.email_messages.order_by( date: :asc )
+    @email_conversation.update_attributes({ state: Conv::STATE_READ })
   end
 
 end

data/app/controllers/ish_manager/email_filters_controller.rb

@@ -0,0 +1,47 @@
+
+class ::IshManager::EmailFiltersController < ::IshManager::ApplicationController
+
+  # before_action :set_lists
+
+  # alphabetized : )
+
+  def create
+    authorize! :create, Office::EmailFilter
+    @email_filter = Office::EmailFilter.create params[:email_filter].permit!
+    if @email_filter.persisted?
+      flash[:notice] = 'Success'
+    else
+      flash[:alert] = "No luck: #{@email_filter.errors.full_messages.join(', ')}."
+    end
+    redirect_to action: 'index'
+  end
+
+  def edit
+    @email_filter = Office::EmailFilter.find params[:id]
+    authorize! :edit, @email_filter
+  end
+
+  def index
+    authorize! :index, Office::EmailFilter.new
+    @email_filters = Office::EmailFilter.active
+  end
+
+  def new
+    @email_filter = Office::EmailFilter.new
+    authorize! :new, @email_filter
+  end
+
+  def update
+    @email_filter = Office::EmailFilter.find params[:id]
+    authorize! :update, @email_filter
+    @email_filter.update_attributes( params[:email_filter].permit! )
+    if @email_filter.persisted?
+      flash[:notice] = 'Success'
+    else
+      flash[:alert] = "No luck: #{@email_filter.errors.full_messages.join(', ')}."
+    end
+    redirect_to action: 'index'
+  end
+
+end
+

data/app/controllers/ish_manager/email_messages_controller.rb

@@ -3,7 +3,7 @@ class ::IshManager::EmailMessagesController < IshManager::ApplicationController
 
   def index
     authorize! :email_messages_index, IshManager::Ability
-    @email_messages = Office::EmailMessage.all
+    @email_messages = Office::EmailMessage.all.order_by( date: :desc )
   end
 
   def show

data/app/controllers/ish_manager/email_templates_controller.rb

@@ -1,6 +1,8 @@
 
 class ::IshManager::EmailTemplatesController < ::IshManager::ApplicationController
 
+  # before_action :set_lists, only: %i| new |
+
   def create
     authorize! :create, ::Ish::EmailTemplate
     template = ::Ish::EmailTemplate.create params[:ish_email_template].permit!
@@ -24,30 +26,37 @@ class ::IshManager::EmailTemplatesController < ::IshManager::ApplicationControll
   end
 
   def edit
-    @template = Ish::EmailTemplate.where({ id: params[:id] }).first
-    authorize! :edit, @template
+    @tmpl = @email_template = Ish::EmailTemplate.where({ id: params[:id] }).first
+    authorize! :edit, @tmpl
+
+    # @ctx = @email_context = Ish::EmailContext.new
+    render layout: 'ish_manager/application_fullwidth'
   end
 
   def iframe_src
-    authorize! :iframe_src, Ish::EmailTemplate
-    @email_template = Ish::EmailTemplate.where({ id: params[:id] }).first ||
+    @tmpl = @email_template = Ish::EmailTemplate.where({ id: params[:id] }).first ||
       Ish::EmailTemplate.find_by({ slug: params[:id] })
-    @email_ctx = Ish::EmailContext.new({ body: Ish::LoremIpsum.html })
+    authorize! :iframe_src, @email_template
     render layout: false
   end
 
   def index
     authorize! :index, Ish::EmailTemplate
-    @templates = Ish::EmailTemplate.all.page( params[:templates_page] )
+    @templates = Ish::EmailTemplate.all.order_by( slug: :asc ).page( params[:templates_page] )
+  end
+
+  def new
+    @new_email_template = Ish::EmailTemplate.new
+    authorize! :new, Ish::EmailTemplate
   end
 
   def show
     authorize! :show, Ish::EmailTemplate
     @templates = Ish::EmailTemplate.all.page( params[:templates_page] )
 
-    @email_template = Ish::EmailTemplate.where({ id: params[:id] }).first ||
+    @tmpl = @email_template = Ish::EmailTemplate.where({ id: params[:id] }).first ||
       Ish::EmailTemplate.find_by({ slug: params[:id] })
-    @email_ctx = ::Ish::EmailContext.new({ body: Ish::LoremIpsum.html })
+    @ctx = @email_context = ::Ish::EmailContext.new({ body: Ish::LoremIpsum.html })
   end
 
   def update
@@ -56,11 +65,15 @@ class ::IshManager::EmailTemplatesController < ::IshManager::ApplicationControll
     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
+    redirect_to action: :edit
   end
 
+  ##
+  ## private
+  ##
+  private
+
 end

data/app/controllers/ish_manager/leads_controller.rb

@@ -3,6 +3,8 @@ class ::IshManager::LeadsController < IshManager::ApplicationController
 
   before_action :set_lists
 
+  layout 'ish_manager/application_fullwidth'
+
   ## alphabetized : )
 
   def bulkop
@@ -69,7 +71,7 @@ class ::IshManager::LeadsController < IshManager::ApplicationController
 
   def index
     authorize! :index, ::Lead
-    @leads = ::Lead.all.includes( :leadset, :email_campaign_leads )
+    @leads = ::Lead.all # .includes( :leadset, :email_campaign_leads )
     lead_emails = @leads.map( &:email ).compact.reject(&:empty?)
 
     map = %Q{
@@ -117,12 +119,4 @@ class ::IshManager::LeadsController < IshManager::ApplicationController
     redirect_to :action => 'index'
   end
 
-  private
-
-  def set_lists
-    super
-    @leadsets_list = [ [nil,nil] ] + ::Leadset.all.map { |k| [ k.name, k.id ] }
-    @email_campaigns_list = [ [nil,nil] ] # + Ish::EmailContext.unsent_campaigns.map { |k| [ k.slug, k.id ] }
-  end
-
 end

data/app/controllers/ish_manager/leadset_tags_controller.rb

@@ -0,0 +1,18 @@
+
+class IshManager::LeadsetTagsController < IshManager::ApplicationController
+
+  ## params[ :leadset_id, :term_id, ]
+  def create
+    authorize! :leadset_tags_create, ::IshManager
+
+    lt = LeadsetTag.new( leadset_id: params[:leadset_id], term_id: params[:term_id] )
+    flag = lt.save
+    if flag
+      flash[:notice] = 'Success'
+    else
+      flash[:alert] = "No luck: #{lt.errors.full_messages.join(', ')}"
+    end
+    redirect_to request.referrer ? request.referrer : leadsets_path
+  end
+
+end

data/app/controllers/ish_manager/leadsets_controller.rb

@@ -1,6 +1,8 @@
 
 class ::IshManager::LeadsetsController < IshManager::ApplicationController
 
+  before_action :set_lists
+
   ## alphabetized : )
 
   def create
@@ -65,4 +67,15 @@ class ::IshManager::LeadsetsController < IshManager::ApplicationController
     redirect_to :action => 'index'
   end
 
+  ##
+  ## private
+  ##
+  private
+
+  def set_lists
+    @tags_list = WpTag.all.map { |t| [ t.name, t.id ] }
+    @leads_list = Lead.all.map { |lead| [ lead.email, lead.id ] }
+    @templates_list = Ish::EmailTemplate.all.map { |t| [ t.slug, t.id ] }
+  end
+
 end