ish_manager 0.1.8.384 → 0.1.8.386

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

@@ -1,5 +1,5 @@
 
-.leads-show
+.leads-show.padded
 
   .header
     %h2.title
@@ -14,7 +14,7 @@
     .col-md-6.ctxs
       %h5
         Email Contexts (#{@ctxs.length})
-        = link_to '[new]', '#'
+        = link_to '[+]', '#'
       %ul
         - @ctxs.each do |ctx|
           %li
@@ -23,17 +23,14 @@
     .col-md-6.schs
       %h5
         Scheduled actions (#{@schs.length})
-        = link_to '[new]', '#'
+        = link_to '[+]', '#'
       %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}
+            (#{link_to 'proto-action', edit_email_action_path(sch.email_action)})
+            = sch.perform_at
 
 
   .row

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

@@ -12,15 +12,19 @@
       %h5.title Schedule an email action
 
     .field
-      %label Lead
-      = select_tag :lead_id, options_for_select( @leads_list, selected: sch_a[:lead_id]||params[:lead_id] ), class: 'select2'
+      = f.label :lead
+      = f.select :lead_id, options_for_select(@leads_list, selected: sch_a[:lead_id]||params[:lead_id] ), class: 'select2'
     .field
       %label State
       = f.select :state, options_for_select(::Office::ScheduledEmailAction::STATES, selected: sch_a.state ), class: 'select2'
     %br
     .field
       %label Email Action
-      = select_tag :email_action_id, options_for_select( @email_actions_list, selected: sch_a[:email_action_id] ), class: 'select2'
+      = f.select :email_action, options_for_select( @email_actions_list, selected: sch_a[:email_action_id] ), class: 'select2'
+    %br
+    .field
+      = f.label :perform_at
+      = f.text_field :perform_at
 
     .actions
       = submit_tag 'Schedule'

data/lib/tasks/office_tasks.rake

@@ -7,7 +7,7 @@ end
 namespace :office do
 
   desc 'schheduled email actions, rolling perform'
-  task :schs => :environment do
+  task schs: :environment do
     while true do
 
       Sch.active.where({ :perform_at.lte => Time.now }).each do |sch|
@@ -21,10 +21,11 @@ namespace :office do
         })
         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({
+        # schedule next actions & update the action
+        sch.act.ties.each do |tie|
+          next_act = tie.next_email_action
+          next_at  = eval(tie.next_at_exe)
+          next_sch = Sch.find_or_initialize_by({
             lead_id: sch.lead_id,
             email_action_id: nxt.id,
           })
@@ -33,18 +34,18 @@ namespace :office do
           sch_nxt.save!
         end
 
-        print '.'
+        print '+'
 
       end
 
       # sleep 1.minute
       sleep 10.seconds
-      print '|'
+      print '.'
     end
   end
 
   desc "send emails"
-  task :email_worker => :environment do
+  task email_worker: :environment do
     while true do
 
       ctxs = ::Ish::EmailContext.scheduled.unsent

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ish_manager
 version: !ruby/object:Gem::Version
-  version: 0.1.8.384
+  version: 0.1.8.386
 platform: ruby
 authors:
 - piousbox
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-24 00:00:00.000000000 Z
+date: 2023-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -400,10 +400,12 @@ files:
 - app/views/ish_manager/email_actions/edit.haml
 - app/views/ish_manager/email_actions/index.haml
 - app/views/ish_manager/email_actions/new.haml
+- app/views/ish_manager/email_actions/show.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/iframe_src.haml
 - app/views/ish_manager/email_contexts/index.haml
 - app/views/ish_manager/email_contexts/new.haml
 - app/views/ish_manager/email_contexts/show.haml
@@ -433,7 +435,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/_plain.haml
 - 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

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

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