ish_manager 0.1.8.374 → 0.1.8.377

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 39b64d928f290a56cb8566d6e3e41883fbdffa45342900d55cc86d2ac650b01f
-  data.tar.gz: f6c64a2bf55a68bfe3ececa0d03ae3b89761db23b29fcb0ebcf1a5fc445b4eec
+  metadata.gz: 5421ad5b4dc558f6e168566d8bacc5db35ab266e1701abf9cfc5e7fefe605fd1
+  data.tar.gz: fdd493de49a5ace572f87d31f3c61d607bf205c793998f9136ec77a08ae1c7c8
 SHA512:
-  metadata.gz: 1b871f0b6e1c35d5dae63efbd7c92f940bfb4cca42e0d0fa132448276db4789594d8644d94ac92f09a4f9d75001c34eac080de100eebf0147a15880df9f29214
-  data.tar.gz: 726aded514ecd4998a7be06d37488afa6688020fe4f28d1b3feb5dfcaa3f31ae7e00f1580225ccbb404123f7e16d909dc422a6148b1e32fca6c0c69a6d3fe5cc
+  metadata.gz: 1ebe7d90b2bca5b0f029dd7e462ca72c338a61fd513f120ec2e645cd589c17572cdf9650c84a6404be263a74fe74e672fbfc2d7aa412813d6ef3f57fab6fc61d
+  data.tar.gz: 896955dcb964096acd99ddf8ef71e019ba213bf917b5291378d07584b203966dad014c30ea798e73fbd16c650b8c5d9a7916a9faa28125ed0ddbb2a7d874a261

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

@@ -106,7 +106,6 @@ $(function () {
       pageLength: 10,
       lengthMenu: [[10, 25, 100, -1], [10, 25, 100, 'All']],
       lengthChange: true,
-      "aLengthMenu": [[5, 10, 25, 50, -1], [5, 10, 25, 50, "All"]]
     }
     $('#dataTable').DataTable(_props)
     $('.data-table').DataTable(_props)

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

@@ -25,11 +25,15 @@
 **/
 
 a[target='_blank'] {
+  display: flex;
+
   &::before {
-    content: '[ '
+    content: '[ ';
+    display: inline;
   }
   &::after {
     content: ' ^]';
+    display: inline;
     // content: ' ^]' !important;
     // font-size: .5em;
   }
@@ -74,6 +78,10 @@ ul:not(.browser-default).bullets, {
   // border: 1px solid red !important;
   // display: none !important;
 }
+.expand-hide {
+  display: none;
+  position: absolute;
+}
 
 .alert {
   border: 1px solid red;
@@ -162,8 +170,8 @@ table.bordered {
 /* D */
 
 table.dataTable {
-  border: 1px solid red;
-  padding: 1em;
+  // border: 1px solid red;
+  // padding: 1em;
   border-radius: 5px;
   box-sizing: border-box;
   background: white;
@@ -179,6 +187,14 @@ table.dataTable {
 
 
 /* E */
+.eg {
+  font-size: 0.8em;
+
+  &:before {
+    content: "e.g. ";
+  }
+}
+
 .error_explanation {
   border: 1px solid red;
   padding: .8em;
@@ -217,10 +233,6 @@ table.dataTable {
 .hide, .hidden {
   display: none !important;
 }
-.hide-expand {
-  display: none;
-  position: absolute;
-}
 
 /* I */
 img.img-400 {

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

@@ -4,12 +4,15 @@
 .email-actions-index,
 .email-filters-index,
 .email-templates-edit,
+.email-templates-new,
 .email-templates-show,
 .email-contexts-edit,
 .email-contexts-show,
 .emails-ns, // emails namespace
 .leads-edit,
-.leads-index {
+.leads-index,
+.leads-show,
+.scheduled-emails-index {
   .header {
     display: flex;
     justify-content: center;
@@ -24,7 +27,7 @@
   // display: flex;
   // flex-direction: column;
 
-  max-width: 400px;
+  // max-width: 400px; // @TODO: where is this used?!
 
   margin-left: 20px;
 

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

@@ -56,20 +56,21 @@
 
 .email-contexts-index {
 
-  > .collapse-expand {
+  > .header {
     display: flex;
     justify-content: center;
 
-    .header {
-      a {
-        &:before {
-          content: '[';
-        }
-        &:after {
-          content: ']';
-        }
-      }
-    }
+    // .title {
+    //   a {
+    //     &:before {
+    //       content: '[';
+    //     }
+    //     &:after {
+    //       content: ']';
+    //     }
+    //   }
+    // }
+
   }
 
 

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

@@ -65,6 +65,13 @@
     }
   }
 
+  .leads {
+    .item {
+      border: 1px solid green;
+      // background: cyan;
+    }
+  }
+
   // these are inside a conversation. _vp_ 2023-02-28
   .messages {
     // border: 1px solid red;
@@ -149,6 +156,11 @@
     border: 1px solid cyan;
   }
 
+  .subject {
+    margin: 0 1em;
+    font-weight: bold;
+  }
+
   .tags {
     display: flex;
     flex-direction: column;

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

@@ -1,9 +1,9 @@
 
-.scheduled-email-actions--form {
-  display: none;
-  position: absolute;
-  min-width: 250px;
-}
+// .scheduled-email-actions--form {
+//   display: none;
+//   position: absolute;
+//   min-width: 250px;
+// }
 
 .scheduled-emails-new {
 
@@ -22,6 +22,7 @@
 
 .scheduled-actions--form-mini {
   display: inline-block;
+  background: #ccc;
 
   form {
     border: 1px solid blue;

data/app/controllers/ish_manager/application_controller.rb

@@ -11,7 +11,7 @@ module IshManager
 
     def home
       authorize! :home, IshManager::Ability
-      render 'home', layout: 'ish_manager/application_fullwidth'
+      render 'home'
     end
 
     #

data/app/controllers/ish_manager/email_contexts_controller.rb

@@ -1,15 +1,19 @@
 
 class ::IshManager::EmailContextsController < ::IshManager::ApplicationController
 
-  # alphabetized : )
+  # Alphabetized : )
 
   before_action :set_lists
 
   def create
-    authorize! :create, ::Ish::EmailContext
     pparams = params[:ish_email_context].permit!
-    pparams[:tmpl] = JSON.parse(pparams[:tmpl])
-    @ctx = ::Ish::EmailContext.new pparams
+    @ctx    = ::Ish::EmailContext.new pparams
+    @tmpl   = ::Ish::EmailTemplate.find @ctx.email_template_id
+
+    @ctx.from_email ||= @tmpl.from_email
+    @ctx.subject    ||= @tmpl.subject
+
+    authorize! :create, @ctx
     if @ctx.save
       flash[:notice] = 'Saved.'
       redirect_to action: 'show', id: @ctx.id
@@ -55,7 +59,6 @@ class ::IshManager::EmailContextsController < ::IshManager::ApplicationControlle
     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
 
@@ -71,10 +74,6 @@ class ::IshManager::EmailContextsController < ::IshManager::ApplicationControlle
       @lead = Lead.find params[:lead_id]
       @ctxs = @ctxs.where( to_email: @lead.email )
     end
-
-    @ctxs = @ctxs.page( params[Ish::EmailContext::PAGE_PARAM_NAME] )
-
-    render layout: 'ish_manager/application_fullwidth'
   end
 
   def new

data/app/controllers/ish_manager/email_conversations_controller.rb

@@ -1,8 +1,6 @@
 
 class ::IshManager::EmailConversationsController < IshManager::ApplicationController
 
-  layout 'ish_manager/application_fullwidth'
-
   before_action :set_lists
 
   def index

data/app/controllers/ish_manager/email_templates_controller.rb

@@ -28,9 +28,6 @@ class ::IshManager::EmailTemplatesController < ::IshManager::ApplicationControll
   def edit
     @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

data/app/controllers/ish_manager/leads_controller.rb

@@ -3,8 +3,6 @@ class ::IshManager::LeadsController < IshManager::ApplicationController
 
   before_action :set_lists
 
-  layout 'ish_manager/application_fullwidth'
-
   ## alphabetized : )
 
   def bulkop
@@ -127,8 +125,11 @@ class ::IshManager::LeadsController < IshManager::ApplicationController
   end
 
   def show
-    authorize! :redirect, IshManager::Ability
-    redirect_to :action => :edit, :id => params[:id]
+    @lead = Lead.find params[:id]
+    authorize! :show, @lead
+    @schs = Sch.where( lead_id: @lead.id )
+    @ctxs = Ctx.where( lead_id: @lead.id )
+    @msgs = Msg.where( from: @lead.email )
   end
 
   def update

data/app/controllers/ish_manager/leadsets_controller.rb

@@ -42,8 +42,6 @@ class ::IshManager::LeadsetsController < IshManager::ApplicationController
     # else
     #   @leadsets = @leadsets.where( :is_done => false )
     # end
-
-    render layout: 'ish_manager/application_fullwidth'
   end
 
   def new

data/app/controllers/ish_manager/scheduled_email_actions_controller.rb

@@ -3,8 +3,6 @@ class IshManager::ScheduledEmailActionsController < IshManager::ApplicationContr
 
   before_action :set_lists
 
-  layout 'ish_manager/application_fullwidth'
-
   def create
     puts! params, 'params'
 
@@ -24,6 +22,11 @@ class IshManager::ScheduledEmailActionsController < IshManager::ApplicationContr
     redirect_to request.referrer ? request.referrer : leadsets_path
   end
 
+  def edit
+    @sch = Sch.find params[:id]
+    authorize! :edit, @sch
+  end
+
   def index
     authorize! :scheduled_emails_index, ::IshManager
     @scheduled_email_actions = ::Office::ScheduledEmailAction.all
@@ -34,5 +37,23 @@ class IshManager::ScheduledEmailActionsController < IshManager::ApplicationContr
     authorize! :scheduled_emails_new, @scheduled_email_action
   end
 
+  def show
+    @sch = Sch.find params[:id]
+    authorize! :show, @sch
+    redirect_to action: 'edit'
+  end
+
+  def update
+    @sch = Sch.find params[:id]
+    authorize! :update, @sch
+    flag = @sch.update_attributes( params[:sch].permit! )
+    if flag
+      flash[:notice] = "Success."
+    else
+      flash[:alert] = "No luck: #{@sch.errors.full_messages.join(',')}."
+    end
+    render action: 'edit'
+  end
+
 end
 

data/app/helpers/ish_manager/application_helper.rb

@@ -49,7 +49,8 @@ module IshManager
     end
 
     def pretty_date date
-      date.to_s[0, 10]
+      # date.to_s[0, 10]
+      date&.strftime('%Y-%m-%d')
     end
     def pp_date a; pretty_date a; end
 

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

@@ -44,29 +44,31 @@
           = link_to "Inbox (#{Office::EmailConversation.in_inbox.length})", email_conversations_path
           = link_to '[+]', new_email_context_path
         %li
-          = link_to 'Contexts', email_contexts_path
-          = link_to '[+]', new_email_context_path
-          = link_to 'unsent', notsent_email_contexts_path
+          = link_to "Templates (#{Ish::EmailTemplate.all.count})", email_templates_path
+          = link_to '[+]', new_email_template_path
         %li
-          = link_to 'Campaigns', email_campaigns_path
-          = link_to '[+]', new_email_campaign_path
+          -# = link_to 'Contexts', email_contexts_path
+          = link_to 'Contexts', notsent_email_contexts_path
+          = link_to '[+]', new_email_context_path
+        -# %li
+        -#   = link_to 'Campaigns', email_campaigns_path
+        -#   = link_to '[+]', new_email_campaign_path
 
         %li
-          = link_to 'Scheduled Emails', scheduled_email_actions_path
+          = link_to "Sch (#{Sch.active.length})", scheduled_email_actions_path
           = link_to '[+]', new_scheduled_email_action_path
+          = link_to "Email Actions (#{Office::EmailAction.all.length})", email_actions_path
+          = link_to '[+]', new_email_action_path
       %ul
+        %li  
+
         %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 "Co's (#{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

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

@@ -1,4 +1,7 @@
 
 -# Used only in email_contexts#index right now. _vp_ 2022-10-06
 
-= paginate resource, param_name: resource.klass::PAGE_PARAM_NAME, views_prefix: 'ish_manager'
+- if resource.respond_to? :total_pages
+  = paginate resource, param_name: resource.klass::PAGE_PARAM_NAME, views_prefix: 'ish_manager'
+- else
+  -# %label Not paginated.

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

@@ -23,13 +23,17 @@
 
       .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
+          %label Next At Exe
+          .eg rand(1..5).business_days.from_now.to_date + rand(8..16).hours + rand(1..59).minutes
+          = f.text_field :next_at_exe
+        -# .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 }

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

@@ -1,5 +1,5 @@
 
-.email-actions-index
+.email-actions-index.max-width
 
   .header
     %h2.title
@@ -9,7 +9,7 @@
   %table.bordered
     %tr
       %th= check_box_tag 'abba'
-      %th actions
+      %th
       %th slug
       %th descr
       %th next actions

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

@@ -1,5 +1,5 @@
 
-.email-actions-new
+.email-actions-new.max-width
   .header
     %h2.title
       New Email Action

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

@@ -0,0 +1,17 @@
+
+.email-contexts--form-reply.form-mini
+  = form_for ::Ish::EmailContext.new, url: email_contexts_path do |f|
+    = hidden_field_tag 'ish_email_context[lead_id]', lead.id
+    To: #{lead.email}
+    .field
+      -# = f.label :template
+      = f.select :email_template_id, options_for_select( @email_templates_list )
+    .action
+      = f.submit 'Reply'
+
+    .field.send-at
+      -# = f.label :send_at
+      = f.text_field :send_at, placeholder: 'YYYY-MM-DD', value: 1.business_day.after(Time.now).strftime('%Y-%m-%d'), size: 10, class: 'input-date'
+
+    .action
+      = f.submit 'Schedule'

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

@@ -1,36 +1,45 @@
 
 .email-contexts-index.padded
 
-  .collapse-expand#emailContextsIndex
-    %h2.header
-      Paginated Email Contexts (#{@ctxs.length})
+  .header.collapse-expand-trash#emailContextsIndex
+    %h2.title
+      Email Contexts (#{@ctxs.length})
       - if @lead
         For lead `#{@lead.name}`
-      = link_to '+', new_email_context_path
-      = link_to 'unsent', notsent_email_contexts_path
+      = link_to '[+]', new_email_context_path
+      = link_to '[unsent]', notsent_email_contexts_path
 
   .W0
     = 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|
+    %table.bordered.data-table
+      %thead
         %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
+          %th.actions
+          %th.from From
+          %th.to To
+          %th.subject Subject
+          %th.template Template
+          %th.created_at Created at
+          %th.updated_at Updated at
+      %tbody
+        - @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.from_email ? ctx.from_email : "t| #{ctx.tmpl.from_email}"
+            %td= ctx.to_email
+            %td
+              = link_to email_context_path(ctx) do
+                = ctx.subject ? ctx.subject : "t| #{ctx.tmpl.subject}"
+            %td= ctx.email_template.slug
+            %td= ctx.created_at.strftime('%Y-%m-%d %l:%M%P %:z')
+            %td= ctx.updated_at.strftime('%Y-%m-%d %l:%M%P %:z')
 
 
     = render 'paginate', resource: @ctxs, param_name: :email_contexts_page, views_prefix: :ish_manager

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

@@ -7,7 +7,7 @@
     .col-md-4
       %ul
         %li <b>From:</b> #{@ctx.from_email}
-        %li <b>To Lead:</b> #{@ctx.lead_id ? @ctx.lead.email : '-'}
+        %li <b>To Lead:</b> #{link_to @ctx.lead.email, lead_path(@ctx.lead)}
         %li <b>Subject:</b> #{@ctx.subject}
 
     .col-md-4

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

@@ -2,28 +2,24 @@
 .email-conversations-show
 
   .header.max-width
-    %i.material-icons mail
-    Inbox (#{Office::EmailConversation.all.length})
+    -# %i.material-icons mail
 
     = link_to '[<<-]', email_conversations_path
-    -# = link_to '[<-]', email_conversations_path
-    #{@email_conversation.subject}
+
+    .subject #{@email_conversation.subject}
     (#{@email_conversation.email_messages.all.count})
 
   .tags.max-width
-    Tags:
+    Tags (#{@email_conversation.tags.length}):
     = @email_conversation.wp_term_ids
     = @email_conversation.tags.map(&:name).join(", ")
 
   .leads.max-width
     Leads (#{@email_conversation.leads.length}):
-    %ul
-      - @email_conversation.leads.each do |p|
-        %li
-          = p.email
-          [existing actions?]
-          = render 'ish_manager/email_templates/form_reply_2_mini'
-          = render 'ish_manager/scheduled_actions/form_mini'
+    = @email_conversation.leads.map(&:id)
+    .leadsC
+      = render 'ish_manager/leads/index_rows', leads: @email_conversation.leads
+
 
 
   .messages.max-width
@@ -59,7 +55,7 @@
           %iframe{ name: msg.message_id }
 
           .my-actions.hide
-            = render 'ish_manager/email_templates/form_reply_2_mini'
+            = render 'ish_manager/email_contexts/form_reply', lead: lead
             -# = button_to 'Reply'
             -# = button_to 'Reply All'
             -# = button_to 'New Template'

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

@@ -2,10 +2,6 @@
 - url = email_template.new_record? ? email_templates_path : email_template_path(email_template.id)
 
 .email-templates--form
-
-  .header
-    %h2 Email Template
-
   = form_for email_template, url: url do |f|
     .row
       .col-md-4
@@ -35,7 +31,9 @@
       .tab-raw
         = f.text_area :body
       .tab-preview
-        -# .descr= render "ish_manager/email_templates/#{email_template.layout}", ctx: Ish::EmailContext.new, tmpl: email_template
-        %iframe{ src: email_template_iframe_path(email_template), width: '100%', height: '100%' }
+        - if email_template.persisted?
+          -# .descr= render "ish_manager/email_templates/#{email_template.layout}", ctx: Ish::EmailContext.new, tmpl: email_template
+          %iframe{ src: email_template_iframe_path(email_template), width: '100%', height: '100%' }
     .actions
-      = f.submit 'Save'
+      = f.submit 'Save'
+

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

@@ -1,18 +1,15 @@
 
 %h3.center.collapse-expand#emailTemplatesIndex
   Email Templates (#{Ish::EmailTemplate.all.count})
-.email-templates-index
-
-  -# = render 'ish_manager/email_templates/form_mini'
 
+.email-templates-index.max-width
   %table.bordered
     %tr
-      %th Actions
+      %th
       %th Slug
       %th Created
       %th Updated
 
-
     - @templates.each do |tmpl|
       %tr
         %td
@@ -20,10 +17,6 @@
           = link_to '[~]', edit_email_template_path({ id: tmpl })
           = button_to '[x]', email_template_path({ id: tmpl }), method: :delete, :data => { :confirm => 'Are you sure?' }, form_class: 'inline'
         %td= link_to tmpl.slug, email_template_path({ id: tmpl })
-        %td= tmpl.created_at
-        %td= tmpl.updated_at
-
-        -# = link_to 'iFrame', email_template_iframe_path({ id: tmpl }), target: :_blank
-
-%hr
+        %td= pp_date tmpl.created_at
+        %td= pp_date tmpl.updated_at
 

data/app/views/ish_manager/email_templates/_plain.html.erb

@@ -0,0 +1,4 @@
+
+
+<%= raw @tmpl.body %>
+

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

@@ -1,5 +1,3 @@
 
-- if @email_template.layout == 'plain'
-  = raw @email_template.body
-- else
-  = render "ish_manager/email_templates/#{@email_template.layout}", ctx: @email_ctx
+-# = render "ish_manager/email_templates/#{@email_template.layout}", ctx: @ctx
+= render "ish_manager/email_templates/#{@email_template.layout}"

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

@@ -1,5 +1,6 @@
 
+.email-templates-new.max-width
+  .header
+    %h2.title New Email Template
 
-%h1 New Email Template
-
-= render 'form', email_template: @new_email_template
+  = render 'form', email_template: @new_email_template

data/app/views/ish_manager/email_templates/plain.html.erb

@@ -1,4 +1,4 @@
 
 
-<%= raw @body %>
+<%= raw @tmpl.body %>
 

data/app/views/ish_manager/leads/_index_rows.haml

@@ -0,0 +1,11 @@
+
+.leads--index-rows
+  - leads.each do |lead|
+    .item
+      = link_to lead.email, lead_path(lead)
+      \(#{lead.scheduled_email_actions.length} sch
+      %span.expand-next [+]
+      .expand-hide= render 'ish_manager/scheduled_actions/form_mini'
+      \)
+      %span.expand-next [reply]
+      .expand-hide= render 'ish_manager/email_contexts/form_reply', lead: lead

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

@@ -11,7 +11,7 @@
     -# = select_tag :email_campaign_id, options_for_select( @email_campaigns_list )
     = submit_tag 'Go'
 
-    %table.bordered
+    %table.bordered.data-table
       %thead
         %tr
           %th  
@@ -19,8 +19,8 @@
           %th Company
           %th Tag
           %th created_at
-          %th (c,s) sends
-          %th Scheduled Actions
+          %th Ctx
+          %th Sch
 
       %tbody
         - @leads.each do |lead|
@@ -30,15 +30,16 @@
             %td= lead.company.company_url
             %td= lead.wp_tags.map(&:name).join(", ")
             %td= lead.created_at.to_s[0..10]
-            %td #{lead.email_campaign_leads.count || '-'}, #{@email_contexts[lead.email] || '-'}
-            %td
+            %td.ctx
+              = @email_contexts[lead.email] || '-'
+            %td.sch
               = lead.scheduled_email_actions.length
               = link_to '[+]', new_scheduled_email_action_path( lead_id: lead.id )
-              %ul
-                - lead.scheduled_email_actions.map do |sch_a|
-                  %li
-                    = link_to sch_a.email_action.slug, edit_scheduled_email_action_path( sch_a )
-                    [x]
+              -# %ul
+              -#   - lead.scheduled_email_actions.map do |sch_a|
+              -#     %li
+              -#       = link_to sch_a.email_action.slug, edit_scheduled_email_action_path( sch_a )
+              -#       [x]
 
 
 

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

@@ -0,0 +1,48 @@
+
+.leads-show
+
+  .header
+    %h2.title
+      Lead ##{@lead.id}
+      = link_to '[~]', edit_lead_path(@lead)
+
+  %ul
+    %li Name: #{@lead.name}
+    %li Email: #{@lead.email}
+
+  .row
+    .col-md-6.ctxs
+      %h5
+        Email Contexts (#{@ctxs.length})
+        = link_to '[new]', '#'
+      %ul
+        - @ctxs.each do |ctx|
+          %li
+            = link_to ctx.subject, email_context_path(ctx)
+            = pp_date ctx.sent_at
+    .col-md-6.schs
+      %h5
+        Scheduled actions (#{@schs.length})
+        = link_to '[new]', '#'
+      %ul
+        - @schs.each do |sch|
+          %li
+            = link_to sch.email_action.slug, edit_scheduled_email_action_path(sch)
+            = sch.state
+
+
+            (#{link_to 'prototype', edit_email_action_path(sch.email_action)})
+
+            In #{sch.email_action.next_in_days} days at #{sch.email_action.next_at_time}
+
+
+  .row
+    .col-md-12.msgs
+      %h5 Email Messages (#{@msgs.length})
+      %ul
+        - @msgs.each do |msg|
+          %li= link_to msg.subject, email_conversation_path( msg.conv )
+
+
+
+

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

@@ -7,7 +7,7 @@
 - url = sch_a.new_record? ? scheduled_email_actions_path : scheduled_email_action_path(sch_a.id)
 
 .scheduled-email-actions--form
-  = form_for scheduled_email_action, url: url, html: { class: "form-mini" } do |f|
+  = form_for scheduled_email_action, url: url, as: :sch, html: { class: "form-mini" } do |f|
     .header
       %h5.title Schedule an email action
 

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

@@ -0,0 +1,4 @@
+
+.scheduled-email-actions-edit.max-width
+
+  = render 'form', scheduled_email_action: @sch

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

@@ -2,14 +2,21 @@
 .scheduled-emails-index.max-width
   .header
     %h2
-      Index
+      Scheduled Email Actions
       -# (#{Sch.kept.count})
       (#{Sch.all.count})
-    = link_to '[+]', new_scheduled_email_path
+      = link_to '[+]', new_scheduled_email_action_path
 
   .items
-    - @scheduled_emails.each do |sch|
+    - @scheduled_email_actions.each do |sch|
       .item
-        = sch.interval
-        = sch.email_template.slug
-        = sch.lead.email
+        .flex-row
+          .gray= sch.id
+          = link_to '[~]', edit_scheduled_email_action_path(sch)
+
+        %ul
+          %li <b>Act:</b> #{link_to sch.email_action.slug, edit_email_action_path(sch.email_action)}
+          %li <b>Tmpl:</b> #{sch.email_action.email_template.slug}
+          %li <b>Lead:</b> #{link_to sch.lead.email, lead_path(sch.lead) }
+          %li <b>State:</b> #{sch.state}
+          %li <b>Perform at:</b> #{sch.perform_at}

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

@@ -34,13 +34,11 @@
     = javascript_include_tag "ish_manager/application"
 
     = csrf_meta_tags
-  %body{ class: [ params[:controller].gsub("ish_manager/",""), "#{params[:controller].gsub("ish_manager/","")}-#{params[:action]}", params[:action]] }
-    .bg-white
-      = render :partial => "ish_manager/application/main_header_#{@current_profile.role_name}"
-      .container.W0
-        = render 'alerts_notices' if notice || alert
-        = yield
+  %body{ class: [ params[:controller].gsub("ish_manager/",""), "#{params[:controller].gsub("ish_manager/","")}-#{params[:action]}", params[:action], "application-fullwidth" ] }
 
+    = render :partial => "ish_manager/application/main_header_#{@current_profile.role_name}"
+    = render 'alerts_notices' if notice || alert
+    = yield
     = render 'ish_manager/application/main_footer'
     = render 'analytics' if Rails.env.production?
 

data/app/views/layouts/ish_manager/{application_fullwidth.haml → done/20230316 application.haml }

@@ -34,11 +34,13 @@
     = javascript_include_tag "ish_manager/application"
 
     = csrf_meta_tags
-  %body{ class: [ params[:controller].gsub("ish_manager/",""), "#{params[:controller].gsub("ish_manager/","")}-#{params[:action]}", params[:action], "application-fullwidth" ] }
+  %body{ class: [ params[:controller].gsub("ish_manager/",""), "#{params[:controller].gsub("ish_manager/","")}-#{params[:action]}", params[:action]] }
+    .bg-white
+      = render :partial => "ish_manager/application/main_header_#{@current_profile.role_name}"
+      .container.W0
+        = render 'alerts_notices' if notice || alert
+        = yield
 
-    = render :partial => "ish_manager/application/main_header_#{@current_profile.role_name}"
-    = render 'alerts_notices' if notice || alert
-    = yield
     = render 'ish_manager/application/main_footer'
     = render 'analytics' if Rails.env.production?
 

data/lib/tasks/office_tasks.rake

@@ -6,6 +6,43 @@ end
 
 namespace :office do
 
+  desc 'schheduled email actions, rolling perform'
+  task :schs => :environment do
+    while true do
+
+      Sch.active.where({ :perform_at.lte => Time.now }).each do |sch|
+        sch.update_attributes({ state: Sch::STATE_INACTIVE })
+
+        # send now
+        ctx = Ctx.new({
+          email_template_id: sch.act.tmpl.id,
+          lead_id: sch.lead.id,
+          send_at: Time.now,
+        })
+        ctx.save!
+
+        # schedule the next action & update the action
+        next_at = eval(sch.act.next_at_exe)
+        sch.act.next_email_actions.each do |nxt|
+          sch_nxt = Sch.find_or_initialize_by({
+            lead_id: sch.lead_id,
+            email_action_id: nxt.id,
+          })
+          sch_nxt.perform_at = next_at
+          sch_nxt.state = Sch::STATE_ACTIVE
+          sch_nxt.save!
+        end
+
+        print '.'
+
+      end
+
+      # sleep 1.minute
+      sleep 10.seconds
+      print '|'
+    end
+  end
+
   desc "send emails"
   task :email_worker => :environment do
     while true do
@@ -20,7 +57,6 @@ namespace :office do
       # sleep 1.minute
       sleep 10.seconds
       print '^'
-
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ish_manager
 version: !ruby/object:Gem::Version
-  version: 0.1.8.374
+  version: 0.1.8.377
 platform: ruby
 authors:
 - piousbox
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-16 00:00:00.000000000 Z
+date: 2023-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -206,6 +206,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: business_time
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.13.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.13.0
 description: Description of IshManager.
 email:
 - piousbox@gmail.com
@@ -384,6 +398,7 @@ files:
 - app/views/ish_manager/email_actions/new.haml
 - app/views/ish_manager/email_campaign_leads/show.haml
 - app/views/ish_manager/email_contexts/_form.haml
+- app/views/ish_manager/email_contexts/_form_reply.haml
 - app/views/ish_manager/email_contexts/edit.haml
 - app/views/ish_manager/email_contexts/index.haml
 - app/views/ish_manager/email_contexts/new.haml
@@ -402,7 +417,6 @@ files:
 - app/views/ish_manager/email_messages/show_stripped.haml
 - app/views/ish_manager/email_templates/_form.haml
 - app/views/ish_manager/email_templates/_form_mini.haml
-- app/views/ish_manager/email_templates/_form_reply_2_mini.haml
 - app/views/ish_manager/email_templates/_form_reply_mini.haml
 - app/views/ish_manager/email_templates/_form_schedule_mini.haml
 - app/views/ish_manager/email_templates/_index.haml
@@ -415,6 +429,7 @@ files:
 - app/views/ish_manager/email_templates/_marketing_wordpress_2.html
 - app/views/ish_manager/email_templates/_piousbox_roundborders.html.erb
 - app/views/ish_manager/email_templates/_piousbox_social.html.erb
+- app/views/ish_manager/email_templates/_plain.html.erb
 - app/views/ish_manager/email_templates/_slug-1.html.erb
 - app/views/ish_manager/email_templates/_slug-2.html.erb
 - app/views/ish_manager/email_templates/_slug-3.html.erb
@@ -458,9 +473,11 @@ files:
 - app/views/ish_manager/kaminari/_prev_page.html.erb
 - app/views/ish_manager/leads/_form.haml
 - app/views/ish_manager/leads/_form_import.haml
+- app/views/ish_manager/leads/_index_rows.haml
 - app/views/ish_manager/leads/edit.haml
 - app/views/ish_manager/leads/index.haml
 - app/views/ish_manager/leads/new.haml
+- app/views/ish_manager/leads/show.haml
 - app/views/ish_manager/leadsets/_form.haml
 - app/views/ish_manager/leadsets/edit.haml
 - app/views/ish_manager/leadsets/index.haml
@@ -512,6 +529,7 @@ files:
 - app/views/ish_manager/reports/show.haml
 - app/views/ish_manager/scheduled_actions/_form_mini.haml
 - app/views/ish_manager/scheduled_email_actions/_form.haml
+- app/views/ish_manager/scheduled_email_actions/edit.haml
 - app/views/ish_manager/scheduled_email_actions/index.haml
 - app/views/ish_manager/scheduled_email_actions/new.haml
 - app/views/ish_manager/scheduled_email_actions/show.haml
@@ -544,7 +562,7 @@ files:
 - app/views/ish_manager/videos/new.haml
 - app/views/ish_manager/videos/show.haml
 - app/views/layouts/ish_manager/application.haml
-- app/views/layouts/ish_manager/application_fullwidth.haml
+- app/views/layouts/ish_manager/done/20230316 application.haml
 - app/views/layouts/ish_manager/email_iframe.haml
 - config/routes.rb
 - lib/ish_manager.rb
@@ -553,7 +571,7 @@ files:
 - lib/systemd/system/README.txt
 - lib/systemd/system/stockwatcher.service
 - lib/systemd/system/watch_stocks.service
-- lib/tasks/done/migrate.rake
+- lib/tasks-done/migrate.rake
 - lib/tasks/ish_manager_tasks.rake
 - lib/tasks/office_tasks.rake
 homepage: http://wasya.co

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

@@ -1,15 +0,0 @@
-
-.email-templates--form-reply-2-mini.form-mini
-  = form_for ::Ish::EmailContext.new, url: email_contexts_path do |f|
-    .field
-      -# = f.label :template
-      = f.select :email_template_id, options_for_select( @email_templates_list )
-    .action
-      = f.submit 'Reply'
-
-    .field.send-at
-      -# = f.label :send_at
-      = f.text_field :send_at, placeholder: 'YYYY-MM-DD', size: 10, class: 'input-date'
-
-    .action
-      = f.submit 'Schedule'