ish_manager 0.1.8.470 → 0.1.8.471

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 83591733d1b01247d332cf8f8530b2054de05f46cc11dba6869193a5b32a1ccb
-  data.tar.gz: 4f1443e9c20101dc1b24a7a889478b85933c95c4587e356849bbb49ccbd43711
+  metadata.gz: 3041801c1b15c0929b1b230aa72313e7de831fb3609afc1cec4dd664b8422af1
+  data.tar.gz: d2b711abd1fa459dfcdce279a58045d0cffab9ba1a00050deb511ef21083816b
 SHA512:
-  metadata.gz: b1af535f9b4559c5c884741f743a5b6ca0b14bc59b409b7db34ce92d4de345648275ea3826b17f12b43fcad1ed828b6588d538ea3d78e3035a0fb4a6436cf4b4
-  data.tar.gz: 5c148eddff5913d73ec126c112801ef1881e868a796b90d8414e30b61012b66f55804bb09cd145f2f19c6b2f569919ca866729e6b2ef39dc79b5c712bdb48d51
+  metadata.gz: 49543de291e21a10bbf953b4a432d04fa665b81b7c9b7d5b58daf9b2bfa8d8c6ad83ffc178f077bed668835a3e60d9e11b1d41a9805c08a8b481c0664d29adbf
+  data.tar.gz: 8a7cc1777b3e019742179abcacb9108fecca78d65e795074cb022af1d5cf5be033176720d5c9dee093edc0ef5b659b5bd7c137b7832ad30d99a408d32a9ebc88

data/app/controllers/ish_manager/application_controller.rb

@@ -1,7 +1,5 @@
-
 require 'business_time'
 
-
 class IshManager::ApplicationController < ActionController::Base
 
   protect_from_forgery :with => :exception, :prepend => true

data/app/controllers/ish_manager/application_mailer_controller.rb

@@ -0,0 +1,10 @@
+
+class IshManager::ApplicationMailerController < ActionController::Base
+  helper IshManager::ApplicationHelper
+
+  def url_options
+    {
+      host: 'test-host',
+    }
+  end
+end

data/app/controllers/ish_manager/email_contexts_controller.rb

@@ -38,17 +38,6 @@ class ::IshManager::EmailContextsController < ::IshManager::ApplicationControlle
     redirect_to action: :index
   end
 
-  def do_send
-    @ctx = ::Ish::EmailContext.find params[:id]
-    authorize! :do_send, @ctx
-
-    flash[:notice] = 'Scheduled a single send - v2'
-    @ctx.send_at = Time.now
-    @ctx.save
-
-    redirect_to action: 'index'
-  end
-
   def edit
     @ctx = ::Ish::EmailContext.find params[:id]
     authorize! :edit, @ctx
@@ -93,6 +82,28 @@ class ::IshManager::EmailContextsController < ::IshManager::ApplicationControlle
     @ctx = ::Ish::EmailContext.new({ email_template: @tmpl }.merge(attrs))
   end
 
+  def send_immediate
+    @ctx = ::Ish::EmailContext.find params[:id]
+    authorize! :do_send, @ctx
+    flash[:notice] = 'Sent immediately.'
+
+    out = IshManager::OfficeMailer.send_context_email( @ctx[:id].to_s )
+    Rails.env.production? ? out.deliver_later : out.deliver_now
+
+    redirect_to action: 'index'
+  end
+
+  def send_schedule
+    @ctx = ::Ish::EmailContext.find params[:id]
+    authorize! :do_send, @ctx
+
+    flash[:notice] = 'Scheduled a single send - v2'
+    @ctx.send_at = Time.now
+    @ctx.save
+
+    redirect_to action: 'index'
+  end
+
   def show
     @ctx = @email_context = ::Ish::EmailContext.find( params[:id] )
     authorize! :show, @ctx

data/app/controllers/ish_manager/email_conversations_controller.rb

@@ -17,9 +17,11 @@ class ::IshManager::EmailConversationsController < IshManager::ApplicationContro
     if params[:slug]
       @email_conversations = @email_conversations.in_emailtag( params[:slug] )
     end
+
     if params[:not_slug]
-      @email_conversations = @email_conversations.not_in_emailtag(params[:not_slug])
+      @email_conversations = @email_conversations.not_in_emailtag( params[:not_slug] )
     end
+
     @email_conversations = @email_conversations.order_by( latest_at: :desc
       ).page( params[:conv_page]
       ).per( per_page )

data/app/helpers/ish_manager/application_helper.rb

@@ -38,8 +38,12 @@ module IshManager
     ## O
     ##
 
+    # def self.obfuscate link
+    #   obf = Office::ObfuscatedRedirect.find_or_create_by({ to: link })
+    #   return Ishapi::Engine.routes.url_helpers.obf_url( obf.id )
+    # end
     def obfuscate link
-      puts! link, 'obfuscate helper'
+      # puts! link, 'obfuscate helper'
       obf = Office::ObfuscatedRedirect.find_or_create_by({ to: link })
       return Ishapi::Engine.routes.url_helpers.obf_url( obf.id )
     end

data/app/mailers/ish_manager/application_mailer.rb

@@ -2,6 +2,8 @@
 module IshManager
   class ApplicationMailer < ActionMailer::Base
     default from: 'WasyaCo Consulting <no-reply@wco.com.de>'
+    helper(IshManager::ApplicationHelper)
+
     layout 'mailer'
 
     def shared_galleries profiles, gallery

data/app/mailers/ish_manager/office_mailer.rb

@@ -1,10 +1,10 @@
 
 class IshManager::OfficeMailer < IshManager::ApplicationMailer
-  default from: 'WasyaCo Mailer <no-reply@wco.com.de>'
 
   ## 2023-04-02 _vp_ Continue.
   def send_context_email ctx_id
-    @ctx = Ctx.find ctx_id
+    @ctx  = Ctx.find ctx_id
+    @lead = Lead.find @ctx.lead_id
 
     @utm_tracking_str = {
       'cid'          => @ctx.lead_id,
@@ -16,10 +16,23 @@ class IshManager::OfficeMailer < IshManager::ApplicationMailer
     @domain         = Rails.application.config.action_mailer.default_url_options[:host]
     @origin         = "https://#{Rails.application.config.action_mailer.default_url_options[:host]}"
 
-    renderer = ActionController::Base.new
+    @unsubscribe_url = Ishapi::Engine.routes.url_helpers.email_unsubscribes_url({
+      host: 'text-host-3',
+      template_id: @ctx.tmpl.id,
+      lead_id:     @lead.id,
+      token:       @lead.unsubscribe_token,
+    })
+    # renderer = Tmp6Ctl.new
+    # renderer = IshManager::ApplicationController.new
+    # renderer.send( :include, ::IshManager::ApplicationHelper )
+    # renderer.send( :request, { host: 'test-host' } )
+    renderer = IshManager::ApplicationMailer.new
+
+
     renderer.instance_variable_set( :@ctx,              @ctx )
     renderer.instance_variable_set( :@lead,             @ctx.lead )
     renderer.instance_variable_set( :@utm_tracking_str, @utm_tracking_str )
+    renderer.instance_variable_set( :@unsubscribe_url,  @unsubscribe_url )
 
     eval( @ctx.tmpl.config_exe )
 

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

@@ -1,5 +1,7 @@
 
 .email-contexts-edit.max-width
   .header
-    %h2.title Edit email Context
+    %h2.title
+      Edit email Context
+      = link_to "[view]", email_context_path( @ctx )
   = render 'ish_manager/email_contexts/form', ctx: @ctx, tmpl: @tmpl

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

@@ -3,7 +3,6 @@
 
   .header.collapse-expand-trash#emailContextsIndex
     %h2.title
-
       Email Contexts (#{@ctxs.length})
       - if @lead
         For lead #{@lead.email}
@@ -33,12 +32,14 @@
       %tbody
         - @ctxs.each do |ctx|
           %tr
-            %td.actions
+            %td.actions.padded
               - if ctx.sent_at
-                [~]
+                \--
               - 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?' }
+                = link_to '[~]',    edit_email_context_path(ctx)
+                = button_to 'x',         email_context_path(ctx), method: :delete, form_class: :inline, data: { confirm: 'Are you sure?' }
+                = button_to 'send', send_immediate_email_context_path(ctx),        form_class: :inline, data: { confirm: 'Are you sure?' }
+
             %td.from
               = ctx.from_email ? ctx.from_email : "t| #{ctx.tmpl.from_email}"
             %td.to= link_to ctx.lead.email, lead_path(ctx.lead)

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

@@ -4,23 +4,22 @@
     %h2.title Email Context
 
   .row
-    .col-md-4
+    .col-md-6
       %ul
+        %li <b>Template:</b> #{link_to @ctx.email_template.slug, email_template_path(@ctx.email_template), target: :_blank }
+        %li <b>Layout:</b> #{@ctx.email_template.layout}
+        %hr
         %li <b>From:</b> #{@ctx.from_email}
         %li <b>To Lead:</b> #{link_to @ctx.lead.email, lead_path(@ctx.lead)}
         %li <b>Subject:</b> #{@ctx.subject}
 
-    .col-md-4
-      %ul
-        %li <b>Template:</b> #{link_to @ctx.email_template.slug, email_template_path(@ctx.email_template), target: :_blank }
-        %li <b>Layout:</b> #{@ctx.email_template.layout}
 
-    .col-md-4
+    .col-md-6
       %ul
         %li <b>Send at:</b> #{@ctx.send_at&.strftime('%Y-%m-%d %l:%M%P')}
         %li <b>Sent at:</b> #{@ctx.sent_at&.strftime('%Y-%m-%d %l:%M%P')}
         %li
-          = button_to 'Send', send_email_context_path(@ctx), form_class: 'inline', :data => { :confirm => 'Are you sure?' }
+          = button_to 'Send', send_immediate_email_context_path(@ctx), form_class: 'inline', :data => { :confirm => 'Are you sure?' }
           = link_to '[~]', edit_email_context_path(@ctx)
 
   .max-width

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

@@ -13,10 +13,8 @@
 
         201 W 5th St 11th Floor, Austin, TX 78701<br><br>
 
-        Want to change how you receive these emails?<br>
-
-        You can <%= link_to 'update your preferences', @update_preferences_url %> or
-
+        Want to change how you receive these emails? You can <br>
+        <%= link_to 'update your preferences', '#' %> or
         <%= link_to 'unsubscribe from this list', @unsubscribe_url %>.<br><br>
 
       </td>

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

@@ -960,7 +960,7 @@
 										<tr>
 											<td align="center" valign="top" style="padding:9px" class="mcnFollowBlockInner">
 
-												<%= render 'footer_unsubscribe' %>
+												<%= render 'ish_manager/email_templates/footer_unsubscribe' %>
 
 											</td>
 										</tr>

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ish_manager
 version: !ruby/object:Gem::Version
-  version: 0.1.8.470
+  version: 0.1.8.471
 platform: ruby
 authors:
 - piousbox
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-09-22 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

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