ish_manager 0.1.8.385 → 0.1.8.387

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

@@ -1,28 +1,22 @@
 
--#
--# scheduled_emails / _form
--#
-
 - sch_a = scheduled_email_action
 - 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, as: :sch, html: { class: "form-mini" } do |f|
+  = form_for scheduled_email_action, url: url, as: :sch do |f|
     .header
       %h5.title Schedule an email action
 
-    .field
+    .flex-row
       = f.label :lead
-      = f.select :lead_id, options_for_select(@leads_list, selected: sch_a[:lead_id]||params[:lead_id] ), class: 'select2'
-    .field
+      = f.select :lead_id, options_for_select(@leads_list, selected: sch_a[:lead_id]||params[:lead_id] ), {}, class: 'select2'
+    .flex-row
       %label State
-      = f.select :state, options_for_select(::Office::ScheduledEmailAction::STATES, selected: sch_a.state ), class: 'select2'
-    %br
-    .field
-      %label Email Action
-      = f.select :email_action, options_for_select( @email_actions_list, selected: sch_a[:email_action_id] ), class: 'select2'
-    %br
-    .field
+      = f.select :state, options_for_select(::Office::ScheduledEmailAction::STATES, selected: sch_a.state )
+    .flex-row
+      = f.label :email_action
+      = f.select :email_action, options_for_select( @email_actions_list, selected: sch_a[:email_action_id] ), {}, class: 'select2'
+    .flex-row
       = f.label :perform_at
       = f.text_field :perform_at
 

data/app/views/ish_manager/scheduled_email_actions/_form_mini.haml-trash

@@ -0,0 +1,28 @@
+
+-# unused, but maybe I should separate _form and _form_mini ?
+
+- sch_a = scheduled_email_action
+- 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, as: :sch, html: { class: "form-mini" } do |f|
+    .header
+      %h5.title Schedule an email action
+
+    .flex-row
+      = 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 )
+    %br
+    .flex-row
+      = f.label :email_action
+      = 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/app/views/ish_manager/scheduled_email_actions/index.haml

@@ -6,6 +6,8 @@
       -# (#{Sch.kept.count})
       (#{Sch.all.count})
       = link_to '[+]', new_scheduled_email_action_path
+  .header
+    Time now: #{Time.now.strftime('%Y-%m-%d %l:%M%P')}
 
   .items
     - @scheduled_email_actions.each do |sch|
@@ -19,4 +21,4 @@
           %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}
+          %li <b>Perform at:</b> #{sch.perform_at.in_time_zone}

data/config/routes.rb

@@ -50,6 +50,7 @@ IshManager::Engine.routes.draw do
   # office, below
   #
 
+  post :email_actions, to: 'email_actions#update'
   resources :email_actions
 
   resources :email_campaigns

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,30 +21,31 @@ 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,
+            email_action_id: next_act.id,
           })
-          sch_nxt.perform_at = next_at
-          sch_nxt.state = Sch::STATE_ACTIVE
-          sch_nxt.save!
+          next_sch.perform_at = next_at
+          next_sch.state      = Sch::STATE_ACTIVE
+          next_sch.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.385
+  version: 0.1.8.387
 platform: ruby
 authors:
 - piousbox
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-24 00:00:00.000000000 Z
+date: 2023-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -298,7 +298,7 @@ files:
 - app/assets/stylesheets/ish_manager/office.scss
 - app/assets/stylesheets/ish_manager/pagination.scss
 - app/assets/stylesheets/ish_manager/photos.scss
-- app/assets/stylesheets/ish_manager/scheduled_actions_emails.scss
+- app/assets/stylesheets/ish_manager/scheduled_email_actions.scss
 - app/assets/stylesheets/ish_manager/tags.scss
 - app/assets/stylesheets/ish_manager/trash/bootstrap.css
 - app/assets/stylesheets/ish_manager/trash/materialize.css
@@ -393,6 +393,7 @@ files:
 - app/views/ish_manager/application/_search.haml
 - app/views/ish_manager/application/home.haml
 - app/views/ish_manager/application_mailer/shared_galleries.html.erb
+- app/views/ish_manager/application_mailer/test_email.html.erb
 - app/views/ish_manager/application_mailer/welcome.html.erb
 - app/views/ish_manager/categories/_subtree.haml
 - app/views/ish_manager/categories/index.haml
@@ -405,6 +406,7 @@ files:
 - 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
@@ -434,7 +436,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
@@ -446,7 +448,7 @@ files:
 - app/views/ish_manager/email_templates/iframe_src.haml
 - app/views/ish_manager/email_templates/index.haml
 - app/views/ish_manager/email_templates/new.haml
-- app/views/ish_manager/email_templates/plain.html.erb
+- app/views/ish_manager/email_templates/plain.html.erb-trash
 - app/views/ish_manager/email_templates/show.haml
 - app/views/ish_manager/email_unsubscribes/new.haml
 - app/views/ish_manager/galleries/_form.haml
@@ -538,6 +540,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/_form_mini.haml-trash
 - 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

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

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