ish_manager 0.1.8.355 → 0.1.8.357

data/app/controllers/ish_manager/galleries_controller.rb

@@ -1,7 +1,7 @@
 class IshManager::GalleriesController < IshManager::ApplicationController
 
   before_action :set_lists
-  before_action :set_gallery, only: %w|destroy edit j_show show update|
+  before_action :set_gallery, only: %w|destroy edit j_show show update update_ordering|
 
   # alphabetized! : )
 
@@ -86,22 +86,37 @@ class IshManager::GalleriesController < IshManager::ApplicationController
 
   def show
     authorize! :show, @gallery
-    @photos = @gallery.photos.unscoped.where({ :is_trash => false })
-    @deleted_photos = @gallery.photos.unscoped.where({ :is_trash => true })
+    @photos = @gallery.photos.unscoped.where({ :is_trash => false }).order_by( ordering: :asc )
+    @deleted_photos = @gallery.photos.unscoped.where({ :is_trash => true }).order_by( ordering: :asc )
+  end
+
+  def update_ordering
+    authorize! :update, @gallery
+    out = []
+    params[:gallery][:sorted_photo_ids].each_with_index do |id, idx|
+      out.push Photo.find( id ).update_attribute( :ordering, idx )
+    end
+    flash[:notice] = "Outcomes: #{out}."
+    redirect_to action: 'show', id: @gallery.id
   end
 
   def update
     old_shared_profile_ids = @gallery.shared_profiles.map(&:id)
     authorize! :update, @gallery
 
-    params[:gallery][:shared_profiles].delete('')
+    if params[:gallery][:shared_profiles].present?
+      params[:gallery][:shared_profiles].delete('')
+    end
     params[:gallery][:shared_profile_ids] = params[:gallery][:shared_profiles]
     params[:gallery].delete :shared_profiles
 
-    if @gallery.update_attributes( params[:gallery].permit! )
-      new_shared_profiles = Ish::UserProfile.find( params[:gallery][:shared_profile_ids]
-        ).select { |p| !old_shared_profile_ids.include?( p.id ) }
-      ::IshManager::ApplicationMailer.shared_galleries( new_shared_profiles, @gallery ).deliver
+    flag = @gallery.update_attributes( params[:gallery].permit! )
+    if flag
+      if params[:gallery][:shared_profile_ids].present?
+        new_shared_profiles = Ish::UserProfile.find( params[:gallery][:shared_profile_ids]
+          ).select { |p| !old_shared_profile_ids.include?( p.id ) }
+        ::IshManager::ApplicationMailer.shared_galleries( new_shared_profiles, @gallery ).deliver
+      end
       flash[:notice] = 'Success.'
       redirect_to edit_gallery_path(@gallery)
     else

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

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

@@ -26,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

data/app/mailers/ish_manager/application_mailer.rb

@@ -1,7 +1,7 @@
 
 module IshManager
   class ApplicationMailer < ActionMailer::Base
-    default from: '314658@gmail.com'
+    default from: 'WasyaCo Consulting <no-reply@wasya.co>'
     layout 'mailer'
 
     def shared_galleries profiles, gallery

data/app/mailers/ish_manager/meeting_mailer.rb

@@ -1,6 +1,7 @@
 
 class IshManager::MeetingMailer < IshManager::ApplicationMailer
-  default from: 'piousbox@gmail.com'
+  default from: 'WasyaCo Consulting <no-reply@wasya.co>'
+
   # layout 'mailer'
 
   def morning_reminder meeting_id:

data/app/mailers/ish_manager/office_mailer.rb

@@ -1,5 +1,6 @@
 
 class IshManager::OfficeMailer < IshManager::ApplicationMailer
+  default from: 'WasyaCo Consulting <no-reply@wasya.co>'
 
   def send_campaign_email campaign_id, c_lead_id
     @ctx = @campaign = ::Ish::EmailContext.find campaign_id
@@ -59,15 +60,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 )
 
@@ -81,7 +83,7 @@ class IshManager::OfficeMailer < IshManager::ApplicationMailer
 end
 
 
-## 2022-11-10 backup
+## 2022-11-10 _vp_ backup
 # def send_context_email ctx_id
 #   @email_ctx = ::Ish::EmailContext.find ctx_id
 #   template = "render/_#{@email_ctx.email_template.slug}"

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

@@ -6,4 +6,5 @@
     %li= params.inspect
     %li Cached? #{Rails.application.config.action_controller.perform_caching} :: Cache key: #{@cache_key.inspect}
     -# %li Layout: #{current_layout}
-    %li= "Env: #{Rails.env}"
+    %li= "Env: #{Rails.env}"
+    %li JWT: #{@jwt_token}

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

@@ -1,79 +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
-      %li
-        = link_to 'Categories & Tags', categories_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'
+      PiousboxCRM
+    .a
       %ul
         %li
-          = link_to 'Meetings', meetings_path
-          = link_to '[+]', new_meeting_path
-        %li
-          -## superceded by conversations, below _vp_ 2023-02-26
-          -# = link_to "Email Messages (#{Office::EmailMessage.count})", email_messages_path
-          = link_to "Email Conv's (#{Office::EmailConversation.count})", email_conversations_path
-      %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
@@ -81,17 +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 Wor
-    .content
+    .a
       %ul
         %li
           = link_to 'Watches', iro_watches_path
         %li
           = link_to 'Plots', 'http://localhost:3000/iron_warbler/NOPE-1', target: '_blank'
+    .c
 

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

@@ -0,0 +1,52 @@
+
+- 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 Descr
+          = f.text_area :descr
+        .field
+          %label Template
+          = f.select :email_template_id, options_for_select( @email_templates_list, selected: act.email_template_id ), {}, class: 'select2'
+
+      .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
+
+
+
+
+
+
+
+        -# .field
+        -#   %label State
+        -#   = f.select :state, options_for_select( ::Office::EmailAction::STATES, selected: act.state )
+        -# .field
+        -#   %label Lead
+        -#   = f.select :lead_id, options_for_select( @leads_list, selected: act.lead_id ), {}, class: 'select2'

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,26 @@
+
+.email-actions-index
+
+  .header
+    %h2.title
+      Email Actions
+      = link_to '[+]', new_email_action_path
+
+  %table.bordered
+    %tr
+      %th= check_box_tag 'abba'
+      %th actions
+      %th slug
+      %th descr
+      %th next actions
+    - @email_actions.each do |act|
+      %tr
+        %td= check_box_tag 'abba'
+        %td= link_to '[~]', edit_email_action_path( act )
+        %td= act.slug
+        %td= act.descr
+        -# %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

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

@@ -1,3 +1,3 @@
 
 .email-contexts-edit
-  = render 'ish_manager/email_contexts/form', template: @template, email_ctx: @email_ctx
+  = render 'ish_manager/email_contexts/form', ctx: @ctx, tmpl: @tmpl

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

@@ -1,31 +1,36 @@
 
-.email-contexts-index
+.email-contexts-index.padded
 
   .collapse-expand#emailContextsIndex
     %h2.header
-      Paginated Email Contexts (aka emails)
+      Paginated Email Contexts (#{@ctxs.length})
+      - if @lead
+        For lead `#{@lead.name}`
       = link_to '+', new_email_context_path
-      = link_to 'to-send', notsent_email_contexts_path
-
-    %ul.meta
-      %li= params[:type]
+      = link_to 'unsent', notsent_email_contexts_path
 
   .W0
-    = render 'paginate', resource: @email_ctxs, param_name: :email_contexts_page, views_prefix: :ish_manager
+    = render 'paginate', resource: @ctxs, param_name: :email_contexts_page, views_prefix: :ish_manager
+
+    %table.bordered
+      %tr
+        %th.actions Actions
+        %th.to To
+        %th.subject Subject
+        %th.template Template
+      - @ctxs.each do |ctx|
+        %tr
+          %td
+            - if ctx.sent_at
+              [~]
+            - else
+              = link_to '[~]', edit_email_context_path(ctx)
+            = button_to '[x]', email_context_path(ctx), method: :delete, form_class: :inline, data: { confirm: 'Are you sure?' }
+          %td= ctx.to_email
+          %td
+            = link_to ctx.subject, email_context_path(ctx)
+            -# = link_to 'iframe', email_context_iframe_path(ctx), target: :_blank do
+          %td= ctx.email_template.slug
 
-    %ul.main
-      - @email_ctxs.each do |ctx|
-        %li
-          - if ctx.sent_at
-            \----
-          - else
-            = 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
 
-          [ <b>tmpl:</b> #{ctx.email_template.slug} ]
-          [ <b>To:</b> #{ctx.to_email} ]
-          <u>#{ctx.subject}</u>
+    = render 'paginate', resource: @ctxs, param_name: :email_contexts_page, views_prefix: :ish_manager