ish_manager 0.1.8.413 → 0.1.8.415

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ac60f7cd88786021285d1497b25f91540c45f639d1912ef070eb3329f2e1f15e
-  data.tar.gz: 21a8968131ae5f0075c774f3ad27cfdc0fe9d2927c0150f8c3d28f3366e03ef1
+  metadata.gz: 613aa0218db8158e91ee2892cc31c54a8d39d97cd9f9515eaf8fd432d898c62a
+  data.tar.gz: 1b35c0e649fbf0cbc8e6a1884bef677ee6d89565bae9832facb313c89659e49f
 SHA512:
-  metadata.gz: 7b4ea92b7f2208a3c80a2a4d478e29582ea2fd5aa37b99afdae807b6b8003f6fc21e0afef66d4ffb72195e25e4993e5ad2a7311b5be1ac2f6e5fa540235aadb6
-  data.tar.gz: 5195f3b41ac7dd1568878ef9ec5de62dbfde500ca3844ffe75e0f211b3f5433c724d1a9ead3578fd7508e4e3f71037513d9bea3945085539dd6d246b7a4ed0ad
+  metadata.gz: 488a0e826ecc70bb707c8fa021645871387c9d21c5f7560dd077d3fba9c48317186c3b27be923f45f25cbbcfd65d9d0cec8f9da51bc93bcb3a5c8d6eef0b1893
+  data.tar.gz: 8329b75417ae55e85be51d38e69721dd7c8f72c2b1a2d7f661015c2bb5a95868fa793cbb2c84833ae6dd3f4d00b633430b04c1c291ad893614197170052ba977

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

@@ -359,7 +359,7 @@ textarea.large {
     flex-wrap: wrap;
 
     li {
-      margin: 0 0 10px 0;
+      margin: 0 10px 10px 0;
       display: inline-block;
       min-width: 220px;
 

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

@@ -53,3 +53,14 @@
   }
 }
 
+.scheduled-emails-index {
+  .items {
+    display: flex;
+    flex-wrap: wrap;
+
+    .Card {
+      margin: 0 10px 10px 0;
+      padding: 10px;
+    }
+  }
+}

data/app/controllers/ish_manager/application_controller.rb

@@ -81,6 +81,7 @@ class IshManager::ApplicationController < ActionController::Base
     @leadsets_list        = Leadset.list
     @locations_list       = ::Gameui::Map.list
     @maps_list            = ::Gameui::Map.list # @TODO: missing nonpublic!
+    @office_actions_list  = [[nil,nil]] + Office::Action.all.map { |a| [ a.slug, a.id ] }
     @profiles_list        = Ish::UserProfile.list
     @reports_list         = Report.all.list
     @user_profiles_list   = Ish::UserProfile.list

data/app/controllers/ish_manager/email_actions_controller.rb

@@ -42,7 +42,7 @@ class ::IshManager::EmailActionsController < IshManager::ApplicationController
           params[:email_action][:ties_attributes].delete( k )
         end
         if v[:to_delete] == "1"
-          Actie.find( v[:id] ).delete
+          EActie.find( v[:id] ).delete
           params[:email_action][:ties_attributes].delete( k )
         end
       end

data/app/controllers/ish_manager/email_campaigns_controller.rb

@@ -27,18 +27,7 @@ class ::IshManager::EmailCampaignsController < IshManager::ApplicationController
   def do_send
     @campaign = Ish::EmailCampaign.find params[:id]
     authorize! :send, @campaign
-    @campaign.leads.each do |lead|
-      tmpl = @campaign.email_template
-
-      ctx = Ctx.create!({
-        email_template: tmpl,
-        send_at: Time.now,
-        lead_id: lead.id,
-        from_email: tmpl.from_email,
-        subject: tmpl.subject,
-      })
-    end
-
+    @campaign.do_send
   end
 
   def show

data/app/controllers/ish_manager/email_templates_controller.rb

@@ -33,8 +33,26 @@ class ::IshManager::EmailTemplatesController < ::IshManager::ApplicationControll
   def iframe_src
     @tmpl = @email_template = Ish::EmailTemplate.where({ id: params[:id] }).first ||
       Ish::EmailTemplate.find_by({ slug: params[:id] })
-    @ctx = Ctx.new({ email_template: @tmpl })
     authorize! :iframe_src, @email_template
+
+    @ctx = Ctx.new({ email_template: @tmpl, lead_id: 999 })
+
+    @utm_tracking_str = {
+      # 'v'   => 1,
+      # 'tid' => 'UA-53077236-2',
+      'cid' => @ctx.lead_id,
+      # 'uid' => @ctx.lead_id,
+      # 't'   => 'event',
+      # 'ec'  => 'email',
+      # 'ea'  => 'open',
+      # 'cn'  => @campaign.slug,
+      # 'ci'  => @campaign.slug,
+      # 'cm'  => 'email',
+      # 'utm_source'   => @campaign.slug,
+      'utm_medium'   => 'email',
+      'utm_campaign' => 'campaign-1', # @campaign.slug,
+    }.map { |k, v| "#{k}=#{v}" }.join("&")
+
     render layout: false
   end
 

data/app/controllers/ish_manager/office_actions_controller.rb

@@ -0,0 +1,85 @@
+
+class ::IshManager::OfficeActionsController < IshManager::ApplicationController
+
+  before_action :set_lists
+
+  ## Alphabetized : )
+
+  def create
+    @new_office_action = Office::Action.new params[:office_action].permit!
+    authorize! :create, @new_office_action
+    flag = @new_office_action.save
+    if flag
+      flash[:notice] = "Created OAction."
+      redirect_to action: 'index'
+    else
+      flash[:alert] = "Cannot create OAction: #{@new_office_action.errors.full_messages.join(', ')}."
+      render action: 'new'
+    end
+  end
+
+  def edit
+    @act = @office_action = Office::Action.find( params[:id] )
+    @act.ties.push Office::ActionTie.new( next_office_action_id: nil )
+    authorize! :edit, @act
+  end
+
+  def index
+    @office_actions = Office::Action.all
+
+    authorize! :index, @new_office_action
+  end
+
+  def new
+    authorize! :new, @new_office_action
+  end
+
+  def show
+    @act = @office_action = Office::Action.find( params[:id] )
+    authorize! :show, @act
+  end
+
+  ## def create; update; end
+  ## def upsert; update; end
+  def update
+    if params[:id]
+      @act = @office_action = Office::Action.find( params[:id] )
+    else
+      @act = @office_action = Office::Action.new
+    end
+    authorize! :upsert, @act
+
+    if params[:office_action][:ties_attributes]
+      params[:office_action][:ties_attributes].each do |k, v|
+        if !v[:next_office_action_id].present?
+          params[:office_action][:ties_attributes].delete( k )
+        end
+        if v[:to_delete] == "1"
+          EActie.find( v[:id] ).delete
+          params[:office_action][:ties_attributes].delete( k )
+        end
+      end
+    end
+
+    flag = @act.update_attributes( params[:office_action].permit! )
+    if flag
+      flash[:notice] = 'Success'
+      redirect_to action: 'index'
+    else
+      flash[:alert] = "No luck: #{@act.errors.full_messages.join(', ')}. #{@act.ties.map { |t| t.errors.full_messages.join(', ') }.join(' | ') }"
+      render action: 'edit'
+    end
+
+  end
+
+  ##
+  ## private
+  ##
+  private
+
+  def set_lists
+    @new_office_action = Office::Action.new
+    super
+  end
+
+end

data/app/mailers/ish_manager/office_mailer.rb

@@ -57,8 +57,16 @@ class IshManager::OfficeMailer < IshManager::ApplicationMailer
   ## 2023-04-02 _vp_ Continue.
   def send_context_email ctx_id
     @ctx = Ctx.find ctx_id
+
+    @utm_tracking_str = {
+      'cid'          => @ctx.lead_id,
+      'utm_medium'   => 'email',
+      'utm_campaign' => @ctx.tmpl.slug,
+    }.map { |k, v| "#{k}=#{v}" }.join("&")
+
     ac   = ActionController::Base.new
     ac.instance_variable_set( :@ctx, @ctx )
+    ac.instance_variable_set( :@utm_tracking_str, @utm_tracking_str )
 
     rendered_str = ac.render_to_string("ish_manager/email_templates/_#{@ctx.tmpl.layout}")
     @ctx.update({

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

@@ -56,24 +56,24 @@
             = link_to "#{WpTag::INBOX} (#{Office::EmailConversation.in_emailtag(WpTag::INBOX).length})", email_conversations_in_path(WpTag::INBOX)
           = link_to '[+]', new_email_context_path
         %li
-          = link_to "Templates (#{Ish::EmailTemplate.all.count})", email_templates_path
+          = link_to "Tmpls (#{Ish::EmailTemplate.all.count})", email_templates_path
           = link_to '[+]', new_email_template_path
         %li
-          = link_to "Companies (#{Leadset.kept.length})", leadsets_path
+          = link_to "Co's (#{Leadset.kept.length})", leadsets_path
           = link_to '[+]', new_leadset_path
 
 
         %li
-          = link_to "Email Actions (#{Office::EmailAction.all.length})", email_actions_path
+          = link_to "EActions (#{Office::EmailAction.count})", email_actions_path
           = link_to '[+]', new_email_action_path
       %ul
         %li
           = link_to "Filters (#{Office::EmailFilter.active.length})", email_filters_path
           = link_to '[+]', new_email_filter_path
         %li
-          = link_to "Contexts (#{Ctx.notsent.length})", notsent_email_contexts_path
+          = link_to "Ctxs (#{Ctx.notsent.length})", notsent_email_contexts_path
           = link_to '[+]', new_email_context_path
-          = link_to 'summary', email_contexts_summary_path( format: :csv )
+          = link_to '[csv]', email_contexts_summary_path( format: :csv )
 
         %li
           = link_to "Leads (#{Lead.kept.length})", leads_path
@@ -81,13 +81,16 @@
         %li
           = link_to "Schs (#{Sch.active.length})", scheduled_email_actions_path
           = link_to '[+]', new_scheduled_email_action_path
+
       %ul
         %li  
         %li  
         %li
-          = link_to 'Campaigns', email_campaigns_path
+          = link_to "Campaigns (#{Ish::EmailCampaign.count})", email_campaigns_path
           = link_to '[+]', new_email_campaign_path
-        %li  
+        %li
+          = link_to "OActions (#{Office::Action.count})", office_actions_path
+          = link_to '[+]', new_office_action_path
 
     .c
 

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

@@ -1,6 +1,6 @@
 
-- act = email_action
-- url = email_action.new_record? ? email_actions_path : email_action_path( email_action )
+- eact = email_action
+- url  = email_action.new_record? ? email_actions_path : email_action_path( email_action )
 
 .email-actions--form
 
@@ -19,7 +19,7 @@
         -#   = f.text_area :descr
         .field.flex-row
           %label Template
-          = f.select :email_template_id, options_for_select( @email_templates_list, selected: act.email_template_id ), {}, class: 'select2'
+          = f.select :email_template_id, options_for_select( @email_templates_list, selected: eact.email_template_id ), {}, class: 'select2'
 
       .col-md-6
         .field

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

@@ -11,22 +11,22 @@
       %th= check_box_tag 'abba'
       %th
       %th slug
-      %th descr
       %th next actions
-    - @email_actions.each do |act|
+    - @email_actions.each do |eact|
       %tr
         %td= check_box_tag 'abba'
-        %td= link_to '[~]', edit_email_action_path( act )
-        %td= link_to act.slug, email_action_path( act )
-        %td= act.descr
-        -# %td= act.lead&.email
+        %td= link_to '[~]', edit_email_action_path( eact )
+        %td
+          -# = link_to eact.slug, email_action_path( eact )
+          = eact.slug
+          .em.small= eact.descr
         %td
           %ul
-            - act.ties.map do |next_a|
+            - eact.ties.map do |next_a|
               %li
                 .a= next_a.next_at_exe
                 .a
-                  - if next_a.next_email_action.slug == act.slug
+                  - if next_a.next_email_action.slug == eact.slug
                     (same)
                   = next_a.next_email_action.slug
-              -# %li= link_to next_a.next_email_action.slug, edit_email_action_path( next_a.next_email_action )
+

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

@@ -21,7 +21,7 @@
 
     .field
       = f.label "From"
-      = f.select :from_email, options_for_select(Ish::EmailContext.from_email_list, selected: campaign.from_email)
+      = f.select :from_email, options_for_select(Ish::EmailContext.from_email_list, selected: campaign.from_email), {}, class: 'select2'
 
     .actions
       = f.submit 'Submit'

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

@@ -5,6 +5,9 @@
       Email Campaigns (#{@campaigns.length})
       = link_to '[+]', new_email_campaign_path
 
-  - @campaigns.each do |c|
-    = link_to c.slug, email_campaign_path(c)
+  %ul
+    - @campaigns.each do |c|
+      %li
+        = link_to c.slug, email_campaign_path(c)
+        = link_to '[~]', edit_email_campaign_path(c)
 

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

@@ -9,9 +9,9 @@
           = f.label :slug
           = f.text_field :slug
       .col-md-4
-        .field
+        .flex-row
           = f.label :layout
-          = f.select :layout, options_for_select(Ish::EmailTemplate::LAYOUTS, selected: email_template.layout)
+          = f.select :layout, options_for_select(Ish::EmailTemplate::LAYOUTS, selected: email_template.layout), {}, class: 'select2'
       .col-md-4
         .field
           = f.label "From"