ish_manager 0.1.8.354 → 0.1.8.356

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
@@ -15,6 +17,18 @@ class ::IshManager::LeadsetsController < IshManager::ApplicationController
     redirect_to :action => 'index'
   end
 
+  def destroy
+    puts! params, 'params'
+
+    leadsets = Leadset.find( params[:leadset_ids] )
+    @results = []
+    leadsets.each do |leadset|
+      @results.push leadset.discard
+    end
+    flash[:notice] = "Discard outcome: #{@results.inspect}."
+    redirect_to action: 'index'
+  end
+
   def edit
     @leadset = Leadset.find params[:id]
     authorize! :edit, @leadset
@@ -22,12 +36,14 @@ class ::IshManager::LeadsetsController < IshManager::ApplicationController
 
   def index
     authorize! :index, Leadset
-    @leadsets = Leadset.all # where( :profile => @current_profile, :is_trash => false )
+    @leadsets = Leadset.all.kept # 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
+
+    render layout: 'ish_manager/application_fullwidth'
   end
 
   def new
@@ -51,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

data/app/controllers/ish_manager/scheduled_email_actions_controller.rb

@@ -0,0 +1,38 @@
+
+class IshManager::ScheduledEmailActionsController < IshManager::ApplicationController
+
+  before_action :set_lists
+
+  layout 'ish_manager/application_fullwidth'
+
+  def create
+    puts! params, 'params'
+
+    authorize! :scheduled_emails_create, ::IshManager
+
+    @scheduled = Office::ScheduledEmailAction .new({
+      lead_id: params[:lead_id],
+      email_action_id: params[:email_action_id],
+    })
+
+    flag = @scheduled.save
+    if flag
+      flash[:notice] = 'Success'
+    else
+      flash[:alert] = "No luck: #{@scheduled.errors.full_messages.join(', ')}"
+    end
+    redirect_to request.referrer ? request.referrer : leadsets_path
+  end
+
+  def index
+    authorize! :scheduled_emails_index, ::IshManager
+    @scheduled_email_actions = ::Office::ScheduledEmailAction.all
+  end
+
+  def new
+    @scheduled_email_action = ::Office::ScheduledEmailAction.new
+    authorize! :scheduled_emails_new, @scheduled_email_action
+  end
+
+end
+

data/app/helpers/ish_manager/application_helper.rb

@@ -1,6 +1,19 @@
 module IshManager
   module ApplicationHelper
 
+
+    #
+    # api paths
+    #
+    def api_map_path map
+      "/api/maps/view/#{map.slug}"
+    end
+
+    def api_marker_path marker
+      "/api/markers/view/#{marker.id}"
+    end
+
+
     def current_layout
       layout = controller.class.send(:_layout)
       if layout.nil?
@@ -13,6 +26,10 @@ module IshManager
       end
     end
 
+    # def email_contexts_for_lead_path lead
+    #   "/manager/email_contexts/for_lead/#{lead.id.to_s}"
+    # end
+
     def pretty_date input
       return input.strftime("%Y-%m-%d")
     end
@@ -40,16 +57,5 @@ module IshManager
       "$ #{'%.2f' % a}"
     end
 
-    #
-    # api paths
-    #
-    def api_map_path map
-      "/api/maps/view/#{map.slug}"
-    end
-
-    def api_marker_path marker
-      "/api/markers/view/#{marker.id}"
-    end
-
   end
 end

data/app/mailers/ish_manager/office_mailer.rb

@@ -59,15 +59,16 @@ class IshManager::OfficeMailer < IshManager::ApplicationMailer
     ac = ActionController::Base.new
     ac.instance_variable_set( :@email_ctx, @email_ctx )
 
-    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.body_templated
-      template = "render/plain"
-      rendered_str = ac.render_to_string("ish_manager/email_templates/plain")
-    end
+    raise '@TODO: re-implement. _vp_ 2023-03-04'
+    # 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.body_templated
+    #   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.to_s )
 

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

@@ -0,0 +1,18 @@
+
+- if notice || alert
+  .row
+    .col-sm-12
+      - if notice
+        - if notice.class == Array
+          %ul.notice
+            - notice.map do |n|
+              %li= n
+        - else
+          %p.notice= notice
+      - if alert
+        - if alert.class == Array
+          %ul.alert
+            - alert.map do |n|
+              %li= n
+        - else
+          %p.alert= alert

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

@@ -1,9 +1,10 @@
 
 %i.fa.fa-compress.collapse-expand#debug
+  Debug
 .application--debug
   %ul.browser-default
     %li= params.inspect
-    %li= "Cached?: #{Rails.application.config.action_controller.perform_caching}"
-    %li Cache key: #{@cache_key.inspect}
-    %li Layout: #{current_layout}
-    %li= "Env: #{Rails.env}"
+    %li Cached? #{Rails.application.config.action_controller.perform_caching} :: Cache key: #{@cache_key.inspect}
+    -# %li Layout: #{current_layout}
+    %li= "Env: #{Rails.env}"
+    %li JWT: #{@jwt_token}

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

@@ -3,6 +3,7 @@
   .container
 
     %i.fa.fa-compress.collapse-expand#mainFooter
+      Account & Session
     .a
       .row
         .col-sm-6

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

@@ -1,75 +1,48 @@
 
 
 .application--main-header-admin.main-header{ class: "#{ENV['RAILS_ENV']} #{ENV['RAILS_ENV'][0...3]=="dev" ? "development" : ''}" }
+  %i.fa.fa-compress.collapse-expand#collapseHeaderMain
+    Piousbox Suite
   .container
 
     %i.fa.fa-compress.collapse-expand#collapseHeaderPiCMS
       PiousboxCMS
-    %ul
-      %li
-        = link_to 'Photos', photos_path
-        = link_to '[+]', new_photo_path
-      %li
-        = render 'ish_manager/galleries/menu'
-      %li
-        = link_to 'Reports',   reports_path
-        .inline-search
-          = form_tag reports_path, method: :get do
-            = text_field_tag :q
-        = link_to '[+]', new_report_path
-      %li
-        = link_to 'Videos',    videos_path
-        .inline-search
-          = form_tag videos_path, method: :get do
-            = text_field_tag :q
-        = link_to '[+]', new_video_path
-    .c
-
-    %i.fa.fa-compress.collapse-expand#collapseHeaderIsh
-      Gameui
-    .content
+    .a
       %ul
         %li
-          = link_to 'Maps', maps_path
+          = render 'ish_manager/galleries/menu'
+        %li
+          = link_to 'Reports',   reports_path
           .inline-search
-            = form_tag maps_path, method: :get do
+            = form_tag reports_path, method: :get do
               = text_field_tag :q
-          = link_to '[+]', new_map_path
-
-        -# %li
-        -#   = link_to 'Tags',      tags_path
-
+          = link_to '[+]', new_report_path
+        %li
+          = link_to 'Videos',    videos_path
+          .inline-search
+            = form_tag videos_path, method: :get do
+              = text_field_tag :q
+          = link_to '[+]', new_video_path
+        %li= link_to 'Categories & Tags', categories_path
       %ul
         %li= link_to '+Newsitem', new_newsitem_path
-        -# %li{ :class => params[:controller] == 'ish_manager/stock_watches' ? 'active' : '' }= link_to 'Stock Watches (old m3)', stock_watches_path
-        -# %li= link_to 'Stock Watches', '/iron_warbler/stock_watches'
-        -# %li= link_to 'Users',  users_path
         %li= link_to 'Ish::UserProfiles',  user_profiles_path
+        %li= link_to "Ish::ImageAsset's", image_assets_path
         %li
-          = link_to "Ish::ImageAsset's", image_assets_path
+          = link_to 'Maps', maps_path
+          .inline-search
+            = form_tag maps_path, method: :get do
+              = text_field_tag :q
+          = link_to '[+]', new_map_path
     .c
 
     %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 'Meetings', meetings_path
-          = link_to '[+]', new_meeting_path
-        %li
-          = link_to 'EmailMessages', email_messages_path
+      PiousboxCRM
+    .a
       %ul
         %li
-          = link_to 'Leads', leads_path
-          = link_to '[+]', new_lead_path
-        %li
-          = link_to 'Leadsets', leadsets_path
-          = link_to '[+]', new_leadset_path
-        %li= link_to 'Email Templates', email_templates_path
+          = link_to "Inbox (#{Office::EmailConversation.count})", email_conversations_path
+          = link_to '[+]', new_email_context_path
         %li
           = link_to 'Contexts', email_contexts_path
           = link_to '[+]', new_email_context_path
@@ -77,19 +50,35 @@
         %li
           = link_to 'Campaigns', email_campaigns_path
           = link_to '[+]', new_email_campaign_path
-        %li
-          = link_to 'Actions', office_actions_path
-          = link_to '[+]', new_office_action_path
 
+        %li
+          = link_to 'Scheduled Emails', scheduled_email_actions_path
+          = link_to '[+]', new_scheduled_email_action_path
+      %ul
+        %li
+          = link_to "Templates (#{Ish::EmailTemplate.all.count})", email_templates_path
+          = link_to '[+]', new_email_template_path
+        %li
+          = link_to "Leadsets (#{Leadset.kept.length})", leadsets_path
+          = link_to '[+]', new_leadset_path
+        %li
+          = link_to "Leads (#{Lead.kept.length})", leads_path
+          = link_to '[+]', new_lead_path
+        %li
+          = link_to "Email Actions (#{Office::EmailAction.all.length})", email_actions_path
+          = link_to '[+]', new_email_action_path
+        %li
+          = link_to "Filters (#{Office::EmailFilter.active.length})", email_filters_path
+          = link_to '[+]', new_email_filter_path
     .c
+
     %i.fa.fa-compress.collapse-expand#collapseHeaderIro
-      Iro
-    .content
+      Iro Wor
+    .a
       %ul
         %li
           = link_to 'Watches', iro_watches_path
         %li
           = link_to 'Plots', 'http://localhost:3000/iron_warbler/NOPE-1', target: '_blank'
-
-  %hr
+    .c
 

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

@@ -1,5 +1,5 @@
 
-.application-home
+.application-home.max-width
   Welcome home
 
   .bordered-card

data/app/views/ish_manager/categories/_subtree.haml

@@ -0,0 +1,12 @@
+
+-## provides local vars: subtree, config
+
+- puts! config, 'config'
+- puts! subtree, 'subtree'
+
+%ul
+  - subtree.select { |c| c[5] == config[:parent_id] }.each do |c|
+    %li
+      = c[1]
+      - if config[:parent_ids].include?( c[0] )
+        = render 'ish_manager/categories/subtree', subtree: subtree, config: { parent_id: c[0], parent_ids: config[:parent_ids] }

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

@@ -0,0 +1,11 @@
+
+.row
+  .col-md-6
+    %h1 Categories
+    = render 'ish_manager/categories/subtree', subtree: @categories_flat, config: { parent_id: nil, parent_ids: @categories_flat.map { |c| c[5] }.uniq }
+
+  .col-md-6
+    %h1 Tags
+    %ul
+      - @tags.each do |tag|
+        %li= tag[:name]

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

@@ -0,0 +1,42 @@
+
+- act = email_action
+- url = email_action.new_record? ? email_actions_path : email_action_path( email_action )
+
+.email-actions--form
+
+  = form_for email_action, url: url, as: :email_action, :html => { :multipart => true } do |f|
+    .row
+      .col-sm-6
+        = f.submit :submit
+
+    .row
+      .col-md-6
+        .field
+          %label Slug
+          = f.text_field :slug
+        -# .field
+        -#   %label Lead
+        -#   = f.select :lead_id, options_for_select( @leads_list, selected: act.lead_id ), {}, class: 'select2'
+        .field
+          %label Template
+          = f.select :email_template_id, options_for_select( @email_templates_list, selected: act.email_template_id ), {}, class: 'select2'
+        -# .field
+        -#   %label State
+        -#   = f.select :state, options_for_select( ::Office::EmailAction::STATES, selected: act.state )
+
+      .col-md-6
+        .field
+          %label Next in Days
+          .eg eg: rand(1..5)
+          = f.text_field :next_in_days
+        .field
+          %label Next at Time
+          .eg eg: rand(8..16).hours + rand(1..59).minutes
+          = f.text_field :next_at_time
+        .field
+          %label Next Email Actions
+          = f.select :next_email_actions, options_for_select( @email_actions_list, selected: act.next_email_actions.map(&:id) ), { }, { class: 'select2', multiple: true }
+
+    .row
+      .col-sm-6
+        = f.submit :submit

data/app/views/ish_manager/email_actions/edit.haml

@@ -0,0 +1,7 @@
+
+.email-actions-edit
+  .header
+    %h2.title Edit Email Action
+
+  = render 'form', email_action: @act
+

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

@@ -0,0 +1,24 @@
+
+.email-actions-index
+
+  .header
+    %h2.title
+      Email Actions
+      = link_to '[+]', new_email_action_path
+
+  %table.bordered
+    %tr
+      %th  
+      %th actions
+      %th slug
+      %th next actions
+    - @email_actions.each do |act|
+      %tr
+        %td [_]
+        %td= link_to '[~]', edit_email_action_path( act )
+        %td= act.slug
+        -# %td= act.lead&.email
+        %td
+          %ul
+            - act.next_email_actions.map do |next_a|
+              %li= link_to next_a.slug, edit_email_action_path( next_a )

data/app/views/ish_manager/email_actions/new.haml

@@ -0,0 +1,7 @@
+
+.email-actions-new
+  .header
+    %h2.title
+      New Email Action
+
+  = render 'form', email_action: @new_email_action

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

@@ -1,43 +1,45 @@
 
 .email-contexts--form
-  %h2
-    New Email Context
-    - if email_ctx.email_template
-      with template `#{email_ctx.email_template.slug}` type:#{email_ctx.email_template.type}.
+  .header
+    %h2.title Email Context
 
-  - url = %w| index new create |.include?( params[:action] ) ? email_contexts_path : email_context_path(email_ctx)
-  = form_for email_ctx, url: url do |f|
+  - url = ctx.new_record? ? email_contexts_path : email_context_path(ctx)
+  = form_for ctx, url: url do |f|
     .row
+      = f.submit 'Save'
+    .row
+      .col-md-6
+        .field.field-template
+          = f.label "Template"
+          = f.select :email_template_id, options_for_select(@email_templates_list, selected: params[:email_template_id] || ctx.email_template_id ), {}, { class: 'select2' }
+          = link_to 'view', email_template_path( ctx.email_template_id ), target: :_blank, class: [ 'action-view' ]
+          = link_to '~', edit_email_template_path( ctx.email_template_id ), target: :_blank, class: [ 'action-view' ]
+        -# .field
+        -#   = f.label :slug
+        -#   = f.text_field :slug
 
-      .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 :slug
-          = f.text_field :slug
+          = f.label "From"
+          = f.select :from_email, options_for_select(Ish::EmailContext.from_email_list, selected: ctx.from_email)
 
+      -# .col-md-6
+      -#   %h5 Context
+      -#   %div Commonly: name, companyName
+      -#   .field
+      -#     = f.text_area :tmpl, value: JSON.pretty_generate( ctx.tmpl )
+    .row
+      .col-md-4
         .field
-          = f.label :from_email
-          = f.select :from_email, options_for_select(Ish::EmailContext.from_email_list, selected: email_ctx.from_email)
-
-      .col.s6
-        -# @TODO: clean this up. _vp_ 2023-02-13
-        .TYPE_SINGLE
-          .field
-            = f.label :to_email
-            = f.text_field :to_email
-          %h5 Templating
-          %div Commonly: name, companyName
-          .field
-            = f.text_area :tmpl, value: JSON.pretty_generate( email_ctx.tmpl )
+          = f.label "To lead"
+          = f.select :lead_id, options_for_select( @leads_list ), {}, { class: 'select2' }
+      .col-md-8
+        .field.field-subject
+          = f.label :subject
+          = f.text_field :subject
 
-    .field.field-subject
-      = f.label :subject
-      = f.text_field :subject
-    - if 'plain' == email_ctx.email_template&.type
+    - if 'plain' == ctx.email_template&.layout
       .body
-        = raw email_ctx.email_template.body
+        = raw ctx.email_template.body
     - else
       .field
         = f.label :body