ish_manager 0.1.8.469 → 0.1.8.471

data/config/routes.rb

@@ -87,14 +87,15 @@ IshManager::Engine.routes.draw do
   get 'email_conversations',                   to: 'email_conversations#index'
   get 'email_conversations/in/:slug',          to: 'email_conversations#index',         as: :email_conversations_in
   get 'email_conversations/notin/:not_slug',   to: 'email_conversations#index',         as: :email_conversations_notin
-  get 'email_conversations/show/:id',          to: 'email_conversations#show', as: :email_conversation
+  get 'email_conversations/show/:id',          to: 'email_conversations#show',          as: :email_conversation
 
-  get 'email_contexts/summary', to: 'email_contexts#summary', as: :email_contexts_summary
-  get  'email_contexts/for_lead/:lead_id',       to: 'email_contexts#index', as: :email_contexts_for_lead
-  get  'email_contexts/iframe_src/:id',          to: 'email_contexts#iframe_src', as: :email_context_iframe
+  get 'email_contexts/summary', to: 'email_contexts#summary',                           as: :email_contexts_summary
+  get  'email_contexts/for_lead/:lead_id',       to: 'email_contexts#index',            as: :email_contexts_for_lead
+  get  'email_contexts/iframe_src/:id',          to: 'email_contexts#iframe_src',       as: :email_context_iframe
   get  'email_contexts/new_with_template/:template_slug', to: 'email_contexts#new'
-  post 'email_contexts/send/:id',                to: 'email_contexts#do_send',    as: :send_email_context
-  get  'email_contexts',                         to: 'email_contexts#index',      as: :email_contexts
+  post 'email_contexts/send_schedule/:id',       to: 'email_contexts#send_schedule',    as: :send_schedule_email_context
+  post 'email_contexts/send_immediate/:id',      to: 'email_contexts#send_immediate',   as: :send_immediate_email_context
+  get  'email_contexts',                         to: 'email_contexts#index',            as: :email_contexts
   resources :email_contexts
 
   get    'email_templates/iframe_src/:id', to: 'email_templates#iframe_src', as: :email_template_iframe

data/lib/ish_manager.rb

@@ -7,8 +7,6 @@ require 'kaminari/actionview'
 require 'mongoid_paperclip'
 
 module IshManager
-  # Your code goes here...
-
   module Gameui
   end
 end

data/lib/tasks/office_tasks.rake

@@ -5,6 +5,7 @@ namespace :office do
   task schs: :environment do
     while true do
 
+      ## Office::ScheduledEmailAction
       Sch.active.where({ :perform_at.lte => Time.now }).each do |sch|
 
         sch.send_and_roll
@@ -24,11 +25,7 @@ namespace :office do
 
       ## send and roll
       Office::Action.active.where({ :perform_at.lte => Time.now }).each do |oact|
-
-        oact.update({
-          perform_at: nil,
-          # state: OAct::STATE_INACTIVE, ## @TODO: remove, they remain active but non-perform.
-        })
+        oact.update({ perform_at: nil })
         eval( oact.action_exe )
         oact.ties.each do |tie|
           next_oact            = tie.next_office_action
@@ -54,21 +51,15 @@ namespace :office do
       ctxs = ::Ish::EmailContext.scheduled.notsent
       ctxs.map do |ctx|
 
-
-        throw "@TODO: continue iterating here. _vp_ 2023-09-18"
-
-        unsub    = Ish::EmailUnsubscribe.where({ lead_id: ctx.lead_id, template_id: ctx.template_id }).first
+        unsub = Ish::EmailUnsubscribe.where({ lead_id: ctx.lead_id, template_id: ctx.template_id }).first
         if unsub
-          template = Ish::EmailTemplate.find( ctx.template_id )
-          puts! "Lead `#{ctx.lead.full_name}` [mailto:#{ctx.lead.email}] has already unsubscribed from template `#{template.slug}` ."
+          Office::AdminMessage.create({ message: "Lead `#{ctx.lead.full_name}` [mailto:#{ctx.lead.email}] has already unsubscribed from template `#{Ish::EmailTemplate.find( ctx.template_id ).slug}` ." })
           email_action_ids = EAction.where({ email_template_id: ctx.template_id }).map(&:id)
-          scheduled_oacts = Sch.active.where({
+          schs = Sch.active.where({
             lead_id: ctx.lead_id,
             :email_action_id.in => email_action_ids,
           })
-          scheduled_oacts.update_attributes({
-            state: Office::ScheduledEmailAction::STATE_UNSUBSCRIBED,
-          })
+          schs.update({ state: Office::ScheduledEmailAction::STATE_UNSUBSCRIBED })
         end
 
         out = IshManager::OfficeMailer.send_context_email( ctx[:id].to_s )
@@ -79,6 +70,7 @@ namespace :office do
       duration = Rails.env.production? ? 120 : 15 # 2 minutes or 15 seconds
       sleep duration
       print '.'
+
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ish_manager
 version: !ruby/object:Gem::Version
-  version: 0.1.8.469
+  version: 0.1.8.471
 platform: ruby
 authors:
 - piousbox
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-09-19 00:00:00.000000000 Z
+date: 2023-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -483,6 +483,7 @@ files:
 - app/controllers/ish_manager/appliance_tmpls_controller.rb
 - app/controllers/ish_manager/appliances_controller.rb
 - app/controllers/ish_manager/application_controller.rb
+- app/controllers/ish_manager/application_mailer_controller.rb
 - app/controllers/ish_manager/categories_controller.rb
 - app/controllers/ish_manager/email_actions_controller.rb
 - app/controllers/ish_manager/email_campaign_leads_controller.rb
@@ -528,9 +529,7 @@ files:
 - app/jobs/ish_manager/test_email_job.rb
 - app/mailers/ish_manager/application_mailer.rb
 - app/mailers/ish_manager/leadset_mailer.rb
-- app/mailers/ish_manager/meeting_mailer.rb
 - app/mailers/ish_manager/office_mailer.rb
-- app/mailers/ish_manager/offier_mailer.rb-trash
 - app/models/ish_manager/ability.rb
 - app/views/202212 Mailchimp Templates/202212 1col fixed-width.html
 - app/views/202212 Mailchimp Templates/202212 1col full-width.html
@@ -666,6 +665,7 @@ files:
 - app/views/ish_manager/email_templates/_m202309_holiday_thanksgiving.html.erb
 - app/views/ish_manager/email_templates/_m202309_holiday_valentines.html.erb
 - app/views/ish_manager/email_templates/_m202309_holiday_veterans_day.html.erb
+- app/views/ish_manager/email_templates/_m202309_ror4.html.erb
 - app/views/ish_manager/email_templates/_marketing_node_1.html.erb
 - app/views/ish_manager/email_templates/_marketing_react_1.html
 - app/views/ish_manager/email_templates/_marketing_react_2.html.erb
@@ -688,8 +688,6 @@ files:
 - app/views/ish_manager/email_templates/_tracking_footer.html.erb
 - app/views/ish_manager/email_templates/_wasyaco_roundborders.html.erb
 - app/views/ish_manager/email_templates/_wasyaco_social.html.erb
-- app/views/ish_manager/email_templates/done/_form.haml
-- app/views/ish_manager/email_templates/done/_form2.haml
 - app/views/ish_manager/email_templates/edit.haml
 - app/views/ish_manager/email_templates/iframe_src.haml
 - app/views/ish_manager/email_templates/index.haml

data/app/mailers/ish_manager/meeting_mailer.rb

@@ -1,13 +0,0 @@
-
-class IshManager::MeetingMailer < IshManager::ApplicationMailer
-  default from: 'WasyaCo Consulting <no-reply@wasya.co>'
-
-  # layout 'mailer'
-
-  def morning_reminder meeting_id:
-    @meeting = Ish::Meeting.find meeting_id
-    mail( to: @meeting.invitee_email,
-          subject: 'A reminder for your upcoming meeting' )
-  end
-
-end

data/app/mailers/ish_manager/offier_mailer.rb-trash

@@ -1,53 +0,0 @@
-
-
-  def send_campaign_email campaign_id, c_lead_id
-    @ctx = @campaign = ::Ish::EmailContext.find campaign_id
-    @lead = EmailCampaignLead.find c_lead_id
-
-    if @lead.sent_at
-      raise "This campaign_lead #{@lead.id} has already been sent."
-    end
-
-    actl = ActionController::Base.new
-    actl.instance_variable_set( :@ctx, @ctx )
-
-    @pixel_tracking = {
-      'v'   => 1,
-      'tid' => 'UA-53077236-2',
-      'cid' => @lead.cid,
-      'uid' => @lead.uid,
-      't'   => 'event',
-      'ec'  => 'email',
-      'ea'  => 'open',
-      'cn'  => @campaign.slug,
-      'ci'  => @campaign.slug,
-      'cm'  => 'email',
-      'utm_source'   => @campaign.slug,
-      'utm_medium'   => 'email',
-      'utm_campaign' => @campaign.slug,
-    }.map { |k, v| "#{k}=#{v}" }.join("&")
-    actl.instance_variable_set( :@pixel_tracking, @pixel_tracking )
-
-    @click_tracking = {
-      'cid' => @lead.cid,
-      'uid' => @lead.uid,
-      't'   => 'event',
-      'ec'  => 'email',
-      'ea'  => 'clk-ctct', # clicked contact us
-      'utm_source'   => @campaign.slug,
-      'utm_medium'   => 'email',
-      'utm_campaign' => @campaign.slug,
-    }.map { |k, v| "#{k}=#{v}" }.join("&")
-    actl.instance_variable_set( :@click_tracking, @click_tracking )
-
-    actl.instance_variable_set( :@lead, @lead )
-
-    template = "render/_#{@ctx.email_template.slug}"
-    rendered_str = actl.render_to_string("ish_manager/email_templates/_#{@ctx.email_template.slug}")
-    @lead.update( rendered_str: rendered_str, sent_at: Time.now )
-
-    mail( from: @ctx.from_email,
-          to: @lead.email,
-          subject: @ctx.subject,
-          template_name: template )
-  end

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

@@ -1,22 +0,0 @@
-
-- url = %w| index new create |.include?( params[:action] ) ? email_templates_path : email_template_path(email_template.id)
-
-.email-templates--form
-  = form_for email_template, url: url do |f|
-    .field
-      = f.label :type
-      = f.select :type, options_for_select(Ish::EmailTemplate.type_list, selected: email_template.type)
-    .field
-      = f.label :slug
-      = f.text_field :slug
-    .field
-      = f.label :from_email
-      = f.select :from_email, options_for_select(Ish::EmailContext.from_email_list, selected: email_template.from_email)
-    .field.field-subject
-      = f.label :subject
-      = f.text_field :subject
-    .field
-      = f.label :body
-      = f.text_area :body, class: 'tinymce'
-    .actions
-      = f.submit 'Submit'

data/app/views/ish_manager/email_templates/done/_form2.haml

@@ -1,26 +0,0 @@
-
-- url = email_template.new_record? ? email_templates_path : email_template_path(email_template.id)
-
-.email-templates--form
-  = form_for email_template, url: url do |f|
-    .row
-      .col-md-4
-        .field
-          = f.label :slug
-          = f.text_field :slug
-      .col-md-4
-        .field
-          = f.label :layout
-          = f.select :layout, options_for_select(Ish::EmailTemplate::LAYOUTS, selected: email_template.layout)
-      .col-md-4
-        .field
-          = f.label "From"
-          = f.select :from_email, options_for_select(Ish::EmailContext.from_email_list, selected: email_template.from_email)
-    .field.field-subject
-      = f.label :subject
-      = f.text_field :subject
-    .field
-      -# = f.label :body
-      = f.text_area :body, class: 'tinymce'
-    .actions
-      = f.submit 'Submit'