ish_manager 0.1.8.481 → 0.1.8.483

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: acc807d1aa7e5d4d60cf5ef25018b4511a6bce0c0e137421f79d292dce82c11b
-  data.tar.gz: c4c52895d3f55008a7e93aa0ad8c6e657f5b0402d88b90487e1ddba8389a27b1
+  metadata.gz: 413d410c7b13b3474c6120e08fe190d3c784f278bd12799654ac5c349cf403ae
+  data.tar.gz: 678b35ebae9ab11be5e4836240361102b4fadc86fb449e5a61b7aeab0cc882a2
 SHA512:
-  metadata.gz: 574313b67f7b1a79d2529732cf986d7939094636b2886e0261f9b40cedcaf8b8649575af22d5caa68c0ca67849f50ae364f57f1a14a6bd35f0e888bc9d086443
-  data.tar.gz: d2b36ac20385d5bfaed08a30123e4d7244d972b124a92475668b20ab2594a511f86b962364e1ef9fc2380bbbbdb35fcfcda1815f6daff8f9a2318582e18c58ed
+  metadata.gz: 0c70237a28212e66ecc12d36f6debcb47d941595f1592278269cfc62e18307218e511e1a436a100a9b54bf812b9cea3fc9b16d27b6a9ee9dec8b16d94e95350c
+  data.tar.gz: 2c257330903133b0e1da36ed4c9c2de560e7ace007cce7a3aadd9aa33562a328ebd04c06a7a6cd8fb72edb7d78f292d6000cb33a82dff48abbe58d2e0fbc61c4

data/app/controllers/ish_manager/email_contexts_controller.rb

@@ -47,9 +47,10 @@ class ::IshManager::EmailContextsController < ::IshManager::ApplicationControlle
     @ctx = @email_context = Ish::EmailContext.find params[:id]
     authorize! :iframe_src, @ctx
 
-    @tmpl = @email_template = @ctx.email_template
-    @lead = @ctx.lead
-    @body = @ctx.body
+    @tmpl        = @email_template = @ctx.email_template
+    @tmpl_config = OpenStruct.new JSON.parse( @ctx.tmpl[:config_json] )
+    @lead        = @ctx.lead
+    @body        = @ctx.body
 
     render layout: false
   end
@@ -65,9 +66,9 @@ class ::IshManager::EmailContextsController < ::IshManager::ApplicationControlle
       @ctxs = @ctxs.where( lead_id: @lead.id )
     else
       if my_truthy? params[:sent]
-        @ctxs = @ctxs.where( :sent_at.ne => nil )
+        @ctxs = @ctxs.or({ :sent_at.ne => nil }, { :unsubscribed_at.ne => nil })
       else
-        @ctxs = @ctxs.where( sent_at: nil )
+        @ctxs = @ctxs.where( sent_at: nil, unsubscribed_at: nil )
       end
     end
   end
@@ -87,7 +88,7 @@ class ::IshManager::EmailContextsController < ::IshManager::ApplicationControlle
   def send_immediate
     @ctx = ::Ish::EmailContext.find params[:id]
     authorize! :do_send, @ctx
-    flash[:notice] = 'Sent immediately.'
+    flash_notice 'Sent immediately.'
 
     out = IshManager::OfficeMailer.send_context_email( @ctx[:id].to_s )
     Rails.env.production? ? out.deliver_later : out.deliver_now

data/app/controllers/ish_manager/email_templates_controller.rb

@@ -35,8 +35,9 @@ class ::IshManager::EmailTemplatesController < ::IshManager::ApplicationControll
       Ish::EmailTemplate.find_by({ slug: params[:id] })
     authorize! :iframe_src, @email_template
 
-    @lead = Lead.find_by({ email: 'poxlovi@gmail.com' })
-    @ctx = Ctx.new({ email_template: @tmpl, lead_id: @lead.id })
+    @lead        = Lead.find_by({ email: 'poxlovi@gmail.com' })
+    @ctx         = Ctx.new({ email_template: @tmpl, lead_id: @lead.id })
+    @tmpl_config = OpenStruct.new JSON.parse( @ctx.tmpl[:config_json] )
 
     @utm_tracking_str = {
       'cid'          => @ctx.lead_id,
@@ -45,21 +46,11 @@ class ::IshManager::EmailTemplatesController < ::IshManager::ApplicationControll
       'utm_source'   => @ctx.tmpl.slug,
     }.map { |k, v| "#{k}=#{v}" }.join("&")
 
-    to = Ishapi::Engine.routes.url_helpers.email_unsubscribes_url({
+    @unsubscribe_url = Ishapi::Engine.routes.url_helpers.email_unsubscribes_url({
       template_id: @ctx.tmpl.id,
       lead_id:     @lead.id,
       token:       @lead.unsubscribe_token,
     })
-    obf = Office::ObfuscatedRedirect.find_or_create_by({ to: to })
-    @unsubscribe_url = Ishapi::Engine.routes.url_helpers.obf_url( obf.id )
-
-    to = Ishapi::Engine.routes.url_helpers.users_dashboard_url({
-      lead_id: @lead.id,
-    })
-    obf = Office::ObfuscatedRedirect.find_or_create_by({ to: to })
-    @update_preferences_url = Ishapi::Engine.routes.url_helpers.obf_url( obf.id )
-
-    eval( @ctx.tmpl.config_exe )
 
     render layout: false
   end

data/app/helpers/ish_manager/application_helper.rb

@@ -43,7 +43,7 @@ module IshManager
     #   return Ishapi::Engine.routes.url_helpers.obf_url( obf.id )
     # end
     def obfuscate link
-      # puts! link, 'obfuscate helper'
+      puts! link, 'obfuscate helper' if DEBUG
       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/office_mailer.rb

@@ -2,9 +2,11 @@
 class IshManager::OfficeMailer < IshManager::ApplicationMailer
 
   ## 2023-04-02 _vp_ Continue.
+  ## 2023-09-24 _vp_ Continue : )
   def send_context_email ctx_id
-    @ctx  = Ctx.find ctx_id
-    @lead = Lead.find @ctx.lead_id
+    @ctx         = Ctx.find ctx_id
+    @lead        = Lead.find @ctx.lead_id
+    @tmpl_config = OpenStruct.new JSON.parse( @ctx.tmpl[:config_json] )
 
     @utm_tracking_str = {
       'cid'          => @ctx.lead_id,
@@ -13,11 +15,9 @@ class IshManager::OfficeMailer < IshManager::ApplicationMailer
       'utm_source'   => @ctx.tmpl.slug,
     }.map { |k, v| "#{k}=#{v}" }.join("&")
 
-    @domain         = Rails.application.config.action_mailer.default_url_options[:host]
-    @origin         = "https://#{Rails.application.config.action_mailer.default_url_options[:host]}"
+    # @origin         = "https://#{Rails.application.config.action_mailer.default_url_options[:host]}"
 
     @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,
@@ -28,13 +28,13 @@ class IshManager::OfficeMailer < IshManager::ApplicationMailer
     # 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 )
+    renderer.instance_variable_set( :@tmpl_config,      @tmpl_config )
 
-    eval( @ctx.tmpl.config_exe )
+    # eval( @ctx.tmpl.config_exe )
 
     if 'plain' == @ctx.tmpl.layout
       rendered_str = ERB.new( @ctx.body ).result( @ctx.get_binding )

data/app/views/ish_manager/email_actions/_form.haml

@@ -25,6 +25,7 @@
         .field
           %label Next Email Actions
           .eg rand(1..5).business_days.from_now.to_date + rand(8..16).hours + rand(1..59).minutes
+          .eg This is not an interval! But you can do Time.now + 30.seconds
           %br
 
           = f.fields_for :ties do |next_f|

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

@@ -10,9 +10,9 @@
         = link_to '~', edit_email_template_path( ctx.email_template_id ), target: :_blank, class: [ 'action-view' ]
         layout: #{ctx.tmpl.layout}
 
-    .field
+    .field.flex-row
       = f.label "From"
-      = f.select :from_email, options_for_select(Ish::EmailTemplate.from_email_list, selected: ctx.from_email)
+      = f.select :from_email, options_for_select(Ish::EmailTemplate.from_email_list, selected: ctx.from_email), {}, { class: 'select2' }
 
     .field.flex-row
       = f.label "To lead"

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

@@ -4,4 +4,5 @@
     %h2.title
       Edit email Context
       = link_to "[view]", email_context_path( @ctx )
+      = button_to 'Send', send_immediate_email_context_path(@ctx), form_class: 'inline', :data => { :confirm => 'Are you sure?' }
   = render 'ish_manager/email_contexts/form', ctx: @ctx, tmpl: @tmpl

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

@@ -19,7 +19,7 @@
   .W0
     = render 'paginate', resource: @ctxs, param_name: :ctxs_page, views_prefix: :ish_manager
 
-    %table.bordered
+    %table.bordered.data-table
       %thead
         %tr
           %th.actions
@@ -29,11 +29,12 @@
           %th.template Template
           %th.send_at Send at
           %th.sent_at Sent at
+          %th.unsubscribed_at Unsubscribed at
       %tbody
         - @ctxs.each do |ctx|
           %tr
             %td.actions.padded
-              - if ctx.sent_at
+              - if ctx.sent_at || ctx.unsubscribed_at
                 \--
               - else
                 = link_to '[~]',    edit_email_context_path(ctx)
@@ -53,6 +54,8 @@
                 .time= pp_time ctx.send_at
             %td
               .datetime.padded= pp_date ctx.sent_at
+            %td
+              .datetime.padded= pp_date ctx.unsubscribed_at
 
 
     = render 'paginate', resource: @ctxs, param_name: :ctxs_page, views_prefix: :ish_manager

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

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

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

@@ -15,7 +15,7 @@
       .col-md-4
         .field
           = f.label "From"
-          = f.select :from_email, options_for_select(Ish::EmailTemplate.from_email_list, selected: email_template.from_email)
+          = f.select :from_email, options_for_select(Ish::EmailTemplate.from_email_list, selected: email_template.from_email), {}, class: 'select2'
     .field.field-subject
       = f.label :subject
       = f.text_field :subject
@@ -43,9 +43,9 @@
       = f.label :config_json
       = f.text_area :config_json
 
-    .field
-      = f.label :config_exe
-      = f.text_area :config_exe
+    -# .field
+    -#   = f.label :config_exe
+    -#   = f.text_area :config_exe
 
     .actions
       = f.submit 'Save'

data/app/views/ish_manager/email_templates/_index.haml

@@ -6,13 +6,14 @@
     = link_to '[+]', new_email_template_path
 
   = paginate @templates, :param_name => :templates_page, :views_prefix => 'ish_manager'
-  .email-templates-index.max-width
-    %table.bordered
-      %tr
-        %th
-        %th Slug
-        %th Created
-        %th Updated
+  .email-templates-index.maxwidth
+    %table.bordered.data-table
+      %thead
+        %tr
+          %th  
+          %th Slug
+          %th Created
+          %th Updated
 
       - @templates.each do |tmpl|
         %tr

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

@@ -325,11 +325,6 @@
 			text-align: left;
 		}
 
-		/*
-	@tab Preheader
-	@section Preheader Link
-	@tip Set the styling for your email's preheader links. Choose a color that helps them stand out from your text.
-	*/
 		#templatePreheader .mcnTextContent a,
 		#templatePreheader .mcnTextContent p a {
 			/*@editable*/
@@ -385,11 +380,6 @@
 			text-align: left;
 		}
 
-		/*
-	@tab Header
-	@section Header Link
-	@tip Set the styling for your email's header links. Choose a color that helps them stand out from your text.
-	*/
 		#templateHeader .mcnTextContent a,
 		#templateHeader .mcnTextContent p a {
 			/*@editable*/
@@ -445,11 +435,6 @@
 			text-align: left;
 		}
 
-		/*
-	@tab Body
-	@section Body Link
-	@tip Set the styling for your email's body links. Choose a color that helps them stand out from your text.
-	*/
 		#templateBody .mcnTextContent a,
 		#templateBody .mcnTextContent p a {
 			/*@editable*/
@@ -1028,10 +1013,10 @@
 
 
 																								<a class="mcnButton " title="Read More"
-																									href='<%= obfuscate "#{@origin}#{@button_path}?#{@utm_tracking_str}" %>'
+																									href='<%= obfuscate "#{@tmpl_config[:button_link]}?#{@utm_tracking_str}" %>'
 																									target="_blank"
-																									style="font-weight: bold;letter-spacing: -0.5px;line-height: 100%;text-align: center;text-decoration: none;color: #FFFFFF;">Learn
-																									More</a>
+																									style="font-weight: bold;letter-spacing: -0.5px;line-height: 100%;text-align: center;text-decoration: none;color: #FFFFFF;"
+																								>Learn More</a>
 																							</td>
 																						</tr>
 																					</tbody>

data/lib/tasks/office_tasks.rake

@@ -10,12 +10,13 @@ namespace :office do
 
         sch.send_and_roll
 
-        print '+'
+        print '.'
       end
 
-      # sleep 1.minute
-      sleep 10.seconds
-      print '.'
+      duration = Rails.env.production? ? 120 : 15 # 2 minutes or 15 seconds
+      sleep duration
+      print '^'
+
     end
   end
 
@@ -51,25 +52,30 @@ namespace :office do
       ctxs = ::Ish::EmailContext.scheduled.notsent
       ctxs.map do |ctx|
 
-        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.email_template_id }).first
         if unsub
-          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)
+          puts! 'This user is unsubscribed; the context cannot be sent.' if DEBUG
+          Office::AdminMessage.create({ message: "Lead `#{ctx.lead.full_name}` [mailto:#{ctx.lead.email}] has already unsubscribed from template `#{Ish::EmailTemplate.find( ctx.email_template_id ).slug}` ." })
+          email_action_ids = EAct.where({ email_template_id: ctx.email_template_id }).map(&:id)
           schs = Sch.active.where({
             lead_id: ctx.lead_id,
             :email_action_id.in => email_action_ids,
           })
           schs.update({ state: Office::ScheduledEmailAction::STATE_UNSUBSCRIBED })
+          ctx.update({
+            unsubscribed_at: Time.now.to_s,
+          })
+        else
+          out = IshManager::OfficeMailer.send_context_email( ctx[:id].to_s )
+          Rails.env.production? ? out.deliver_later : out.deliver_now
         end
 
-        out = IshManager::OfficeMailer.send_context_email( ctx[:id].to_s )
-        Rails.env.production? ? out.deliver_later : out.deliver_now
-        print '^'
+        print '.'
       end
 
       duration = Rails.env.production? ? 120 : 15 # 2 minutes or 15 seconds
       sleep duration
-      print '.'
+      print '^'
 
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ish_manager
 version: !ruby/object:Gem::Version
-  version: 0.1.8.481
+  version: 0.1.8.483
 platform: ruby
 authors:
 - piousbox
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-09-24 00:00:00.000000000 Z
+date: 2023-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails