ish_manager 0.1.8.443 → 0.1.8.444

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5d55ebe841eca22e7ba1f170c1b771347e6c1d8ad02216a66f0dc75cae693c2d
-  data.tar.gz: 1b82f291f3fac889449fa5fd6f38b8adaebc0fa26f092660c89c7cb6ec43fc25
+  metadata.gz: 727f6b8c266948d2cd95269f19db438e2a69b4c3ccc3f07af3c1ded29de75c8a
+  data.tar.gz: 0a4a73d9afe9204d55a640404ef1ec38422fd9bc298ee28e76198481af61894b
 SHA512:
-  metadata.gz: 8cf4367cd6125b9d43508d9c01f7892ee4467ab422b9e10338be8c83ec744f9b2402454a8d9813eaf3c147699740fb88dc55b5eebce379f9f676d3e76923a061
-  data.tar.gz: 2c0c6fc842bf3b93bb608ef0a4ab43b761fff3019ce2088666d1144c8059a7a9dbe0408c9739452f8dfcea9212213f0b808af7872750bdc6d2a6d4c078f89cb4
+  metadata.gz: a5e409bffa68c9ef6d658a297da57a7c567e778b2fa0da4b53599ccf49e142e90c2c9a7ceb628b07ccebc6836a69a0133c74321c9f573bfbf586b657c598c87c
+  data.tar.gz: e0fc58a685bfe28908745dd60a6c3772f16d063b9af492caad724f2492c314d77f68b29f9bb41c3498ca0ab8245dbe64e0dfc4e1248243d7fe854bd11c74d092

data/app/controllers/ish_manager/email_campaigns_controller.rb

@@ -1,4 +1,7 @@
 
+##
+## Campaigns send individual contexts to leads.
+##
 class ::IshManager::EmailCampaignsController < IshManager::ApplicationController
 
   before_action :set_lists

data/app/jobs/ish_manager/{email_campaign_job.rb → email_campaign_job.rb-trash}

@@ -1,6 +1,7 @@
 
 ##
 ## EmailContext is mongoid
+## unused? campaigns are just contexts.
 ##
 class IshManager::EmailCampaignJob
   include Sidekiq::Job

data/app/mailers/ish_manager/office_mailer.rb

@@ -1,58 +1,6 @@
 
 class IshManager::OfficeMailer < IshManager::ApplicationMailer
-  default from: 'WasyaCo Consulting <no-reply@wasya.co>'
-
-  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
+  default from: 'WasyaCo Consulting & Software Development <hello@wasya.co>'
 
   ## 2023-04-02 _vp_ Continue.
   def send_context_email ctx_id
@@ -77,7 +25,7 @@ class IshManager::OfficeMailer < IshManager::ApplicationMailer
 
     mail( from: @ctx.from_email,
           to: @ctx.to_email,
-          subject: @ctx.subject,
+          subject: = raw ERB.new( @ctx.subject ).result,
           template_name: "render/_#{@ctx.tmpl.layout}" )
   end
 

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

@@ -0,0 +1,53 @@
+
+
+  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/newsitems/_form.haml

@@ -30,6 +30,9 @@
         = f.label :descr
         = f.text_area :descr
         .descr= raw newsitem.descr
+      .field
+        = f.label :iframe_src
+        = f.text_field :iframe_src
 
     .col-sm-6
       .field

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ish_manager
 version: !ruby/object:Gem::Version
-  version: 0.1.8.443
+  version: 0.1.8.444
 platform: ruby
 authors:
 - piousbox
@@ -481,11 +481,12 @@ files:
 - app/helpers/ish_manager/application_helper.rb
 - app/helpers/ish_manager/images_helper.rb
 - app/jobs/ish_manager/application_job.rb
-- app/jobs/ish_manager/email_campaign_job.rb
+- app/jobs/ish_manager/email_campaign_job.rb-trash
 - app/jobs/ish_manager/test_email_job.rb
 - app/mailers/ish_manager/application_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