ish_manager 0.1.8.376 → 0.1.8.377

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b0ff9a276e00c2464f92167105e1cb686a92433a33979e8ee2f1f9d4d461dd29
-  data.tar.gz: 2ab57d283b26b74871533704e3369ddf72cb2c4f1b14e34dc23c35f539a6491a
+  metadata.gz: 5421ad5b4dc558f6e168566d8bacc5db35ab266e1701abf9cfc5e7fefe605fd1
+  data.tar.gz: fdd493de49a5ace572f87d31f3c61d607bf205c793998f9136ec77a08ae1c7c8
 SHA512:
-  metadata.gz: 9028d3cdd8091a7bc6e458174d71baeb1428d0e40067bddb05d0069f63fa31fa97795b08756b72b3c6000dc63e741fc34e48f1d0726b4b381b133625e8dd4b47
-  data.tar.gz: '082dd5da46c2d5c5620236f898d2e44fdb3252421d7be3a2f5d339addd205fff5a19c5c8aa86e6fd4784f9ebf10d1d1b8e9686037ec3a93d280c0556421fae29'
+  metadata.gz: 1ebe7d90b2bca5b0f029dd7e462ca72c338a61fd513f120ec2e645cd589c17572cdf9650c84a6404be263a74fe74e672fbfc2d7aa412813d6ef3f57fab6fc61d
+  data.tar.gz: 896955dcb964096acd99ddf8ef71e019ba213bf917b5291378d07584b203966dad014c30ea798e73fbd16c650b8c5d9a7916a9faa28125ed0ddbb2a7d874a261

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

@@ -187,6 +187,14 @@ table.dataTable {
 
 
 /* E */
+.eg {
+  font-size: 0.8em;
+
+  &:before {
+    content: "e.g. ";
+  }
+}
+
 .error_explanation {
   border: 1px solid red;
   padding: .8em;

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

@@ -4,6 +4,7 @@
 .email-actions-index,
 .email-filters-index,
 .email-templates-edit,
+.email-templates-new,
 .email-templates-show,
 .email-contexts-edit,
 .email-contexts-show,

data/app/controllers/ish_manager/scheduled_email_actions_controller.rb

@@ -25,7 +25,6 @@ class IshManager::ScheduledEmailActionsController < IshManager::ApplicationContr
   def edit
     @sch = Sch.find params[:id]
     authorize! :edit, @sch
-
   end
 
   def index
@@ -38,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/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 Email Actions', 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/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/edit.haml

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

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

@@ -15,7 +15,8 @@
     %table.bordered.data-table
       %thead
         %tr
-          %th.actions Actions
+          %th.actions
+          %th.from From
           %th.to To
           %th.subject Subject
           %th.template Template
@@ -30,12 +31,15 @@
               - 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 ctx.subject, email_context_path(ctx)
+              = 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')
-            %td= ctx.updated_at.strftime('%Y-%m-%d')
+            %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_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

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/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/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/index.haml

@@ -10,8 +10,13 @@
   .items
     - @scheduled_email_actions.each do |sch|
       .item
-        <b>Lead:</b> #{link_to sch.lead.email, lead_path(sch.lead)}
+        .flex-row
+          .gray= sch.id
+          = link_to '[~]', edit_scheduled_email_action_path(sch)
+
         %ul
-          -# %li= sch.interval
+          %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> #{sch.lead.email}
+          %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/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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ish_manager
 version: !ruby/object:Gem::Version
-  version: 0.1.8.376
+  version: 0.1.8.377
 platform: ruby
 authors:
 - piousbox
@@ -571,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