ish_manager 0.1.8.345 → 0.1.8.347

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e8966431173daa6235f2a4115d5bcecb8311bc339b6ccdd3b31a32c005ffb291
-  data.tar.gz: 0f9afa55bc4556e6fdd6c8fe557191cf6c6af7a612250205675928095cda7786
+  metadata.gz: 1e2fddc1d3c422db421f3a2b2fbf7744614acc45149c8e703de1def817f02063
+  data.tar.gz: c187f60ca2a6fd5e4c137e65444ae2870c01a447f8918d3bb0c11e17d6071089
 SHA512:
-  metadata.gz: ea2bf99f0ef48892bde0a1eddc551e10a40f1666fc8df7b2b6c42587512934de540c56ded70bf3eff8ddb8f572a196efa7c6d099c2cd2b488bb4d64da2d63973
-  data.tar.gz: 07cb467809b7d5d4a532dac35d5c95bfcf553f0dac139cefdf9ffb952bb6fb9ba54f6e1beeb5011e37412c7d78aabfec7fbbd1dcdeddf623e3f81b6bbd99e5ba
+  metadata.gz: 67f229406a971c6ada4d8a235ae5a594a4986f4197ec564a0b9e6c838034b4d8b3248c7672372bb9c46857e34525a40068045087fb50e34e673eca58ceeb124a
+  data.tar.gz: 4abfe9f4e0a32277d52e4b774aebea6a6e9857763e71b8a18bacfbe19f7083c082b7ee84d73bb0b60e700e6fe2911ea251982ec9701842b93a3a69ea0b718881

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

@@ -1,7 +1,10 @@
 
 
-.email-contexts-new {
+.email-contexts-new,
+.email-contexts-edit {
   .actions {
+    margin-top: 10px;
+    margin-bottom: 50px;
     display: flex;
     justify-content: space-between;
   }

data/app/controllers/ish_manager/email_contexts_controller.rb

@@ -15,7 +15,8 @@ class ::IshManager::EmailContextsController < ::IshManager::ApplicationControlle
       redirect_to action: 'show', id: @email_ctx.id
       return
     else
-      flash[:alert] = "Could not save: #{@email_ctx.errors.full_messages.join(', ')}"
+      # flash[:alert] = "Could not save: #{@email_ctx.errors.full_messages.join(', ')}"
+      flash[:alert] = ['Could not save:'] + @email_ctx.errors.full_messages
       render action: :new
       return
     end
@@ -38,8 +39,9 @@ class ::IshManager::EmailContextsController < ::IshManager::ApplicationControlle
     authorize! :do_send, @ctx
     case @ctx.type
     when ::Ish::EmailContext::TYPE_SINGLE
-      flash[:notice] = 'Scheduled a single send'
-      IshManager::OfficeMailer.send_context_email(params[:id]).deliver_later
+      flash[:notice] = 'Scheduled a single send - v2'
+      @ctx.send_at = Time.now
+      @ctx.save
     when ::Ish::EmailContext::TYPE_CAMPAIGN
       flash[:notice] = 'Scheduled campaign send'
       IshManager::EmailCampaignJob.new.perform(params[:id])

data/app/controllers/ish_manager/email_templates_controller.rb

@@ -32,7 +32,7 @@ class ::IshManager::EmailTemplatesController < ::IshManager::ApplicationControll
     authorize! :iframe_src, Ish::EmailTemplate
     @email_template = Ish::EmailTemplate.where({ id: params[:id] }).first ||
       Ish::EmailTemplate.find_by({ slug: params[:id] })
-    @email_ctx = EmailContext.new({ body: Ish::LoremIpsum.html })
+    @email_ctx = Ish::EmailContext.new({ body: Ish::LoremIpsum.html })
     render layout: false
   end
 
@@ -47,7 +47,7 @@ class ::IshManager::EmailTemplatesController < ::IshManager::ApplicationControll
 
     @email_template = Ish::EmailTemplate.where({ id: params[:id] }).first ||
       Ish::EmailTemplate.find_by({ slug: params[:id] })
-    @email_ctx = EmailContext.new({ body: Ish::LoremIpsum.html })
+    @email_ctx = ::Ish::EmailContext.new({ body: Ish::LoremIpsum.html })
   end
 
   def update

data/app/mailers/ish_manager/office_mailer.rb

@@ -16,9 +16,13 @@ class IshManager::OfficeMailer < IshManager::ApplicationMailer
       '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,
@@ -27,12 +31,13 @@ class IshManager::OfficeMailer < IshManager::ApplicationMailer
 
     @click_tracking = {
       'cid' => @lead.cid,
+      'uid' => @lead.uid,
       't'   => 'event',
       'ec'  => 'email',
       'ea'  => 'clk-ctct', # clicked contact us
-      'utm_source'   => 'eror1',
+      'utm_source'   => @campaign.slug,
       'utm_medium'   => 'email',
-      'utm_campaign' => 'eror1',
+      'utm_campaign' => @campaign.slug,
     }.map { |k, v| "#{k}=#{v}" }.join("&")
     actl.instance_variable_set( :@click_tracking, @click_tracking )
 
@@ -64,7 +69,7 @@ class IshManager::OfficeMailer < IshManager::ApplicationMailer
       rendered_str = ac.render_to_string("ish_manager/email_templates/plain")
     end
 
-    @email_ctx.update( rendered_str: rendered_str, sent_at: Time.now )
+    @email_ctx.update( rendered_str: rendered_str, sent_at: Time.now.to_s )
 
     mail( from: @email_ctx.from_email,
           to: @email_ctx.to_email,