ish_manager 0.1.8.469 → 0.1.8.471

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3b3a788b6e7e83e53fdbf17a632d57eb0d506ca7bf5c8127396d5c8e39070f01
-  data.tar.gz: 71361bf035d9484a5de3b4c01193f938828e8ba3e1e01676bc8a30faab4b2c71
+  metadata.gz: 3041801c1b15c0929b1b230aa72313e7de831fb3609afc1cec4dd664b8422af1
+  data.tar.gz: d2b711abd1fa459dfcdce279a58045d0cffab9ba1a00050deb511ef21083816b
 SHA512:
-  metadata.gz: 1e83bdd682a7a94e681af8ae269380eb15afd8078f055a6058d997dcf1e4a58944b57f5279e25727302bbaf7ae9712b72d941340c6f7bbf5ac453661faa32bd3
-  data.tar.gz: fe8ed81b42f3b4195c407fdbfcb45c194db504181c7918e8c9054e72c70cd58826b033630244302096dc76d8e82c03168af9fd9f3dd9fdb282a9499e04b52a5b
+  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

@@ -1,7 +1,9 @@
 
 module IshManager
   class ApplicationMailer < ActionMailer::Base
-    default from: 'WasyaCo Consulting <no-reply@wasya.co>'
+    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 Consulting & Software Development <no-reply@mail.wasyaco.com>'
 
   ## 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,
@@ -13,25 +13,43 @@ class IshManager::OfficeMailer < IshManager::ApplicationMailer
       'utm_source'   => @ctx.tmpl.slug,
     }.map { |k, v| "#{k}=#{v}" }.join("&")
 
-    ac   = ActionController::Base.new
-    ac.instance_variable_set( :@ctx, @ctx )
-    ac.instance_variable_set( :@lead, @ctx.lead )
-    ac.instance_variable_set( :@utm_tracking_str, @utm_tracking_str )
+    @domain         = 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,
+    })
+    # 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 )
 
     if 'plain' == @ctx.tmpl.layout
       rendered_str = ERB.new( @ctx.body ).result( @ctx.get_binding )
     else
-      rendered_str = ac.render_to_string("ish_manager/email_templates/_#{@ctx.tmpl.layout}")
+      rendered_str = renderer.render_to_string("ish_manager/email_templates/_#{@ctx.tmpl.layout}")
     end
     @ctx.update({
       rendered_str: rendered_str,
       sent_at: Time.now.to_s,
     })
 
-    mail( from: @ctx.from_email,
-          to: @ctx.to_email,
+    mail( from:    @ctx.from_email,
+          to:      @ctx.to_email,
           subject: ERB.new( @ctx.subject ).result( @ctx.get_binding ),
-          body: rendered_str,
+          body:    rendered_str,
           content_type: "text/html" )
   end
 

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

@@ -21,7 +21,7 @@
 
     .field
       = f.label "From"
-      = f.select :from_email, options_for_select(Ish::EmailContext.from_email_list, selected: campaign.from_email), {}, class: 'select2'
+      = f.select :from_email, options_for_select(Ish::EmailTemplate.from_email_list, selected: campaign.from_email), {}, class: 'select2'
 
     .actions
       = f.submit 'Submit'

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

@@ -12,7 +12,7 @@
 
     .field
       = f.label "From"
-      = f.select :from_email, options_for_select(Ish::EmailContext.from_email_list, selected: ctx.from_email)
+      = f.select :from_email, options_for_select(Ish::EmailTemplate.from_email_list, selected: ctx.from_email)
 
     .field.flex-row
       = f.label "To lead"

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/_form.haml

@@ -15,7 +15,7 @@
       .col-md-4
         .field
           = f.label "From"
-          = f.select :from_email, options_for_select(Ish::EmailContext.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)
     .field.field-subject
       = f.label :subject
       = f.text_field :subject
@@ -39,6 +39,10 @@
           -# .descr= render "ish_manager/email_templates/#{email_template.layout}", ctx: Ish::EmailContext.new, tmpl: email_template
           %iframe{ src: email_template_iframe_path(email_template), width: '100%', height: '100%' }
 
+    .field
+      = f.label :config_json
+      = f.text_area :config_json
+
     .field
       = f.label :config_exe
       = f.text_area :config_exe

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

@@ -3,6 +3,7 @@
 
   %h3.center.collapse-expand#emailTemplatesIndex
     Email Templates (#{Ish::EmailTemplate.all.count})
+    = link_to '[+]', new_email_template_path
 
   = paginate @templates, :param_name => :templates_page, :views_prefix => 'ish_manager'
   .email-templates-index.max-width

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

@@ -840,7 +840,7 @@
                                     <td align="center" valign="middle" class="mcnButtonContent"
                                       style="font-family: Helvetica; font-size: 18px; padding: 18px;">
                                       <a class="mcnButton " title="Wasya Co Project Intake for ReactJs Development"
-                                        href="https://wasya.co/contact-us-2/" target="_blank"
+                                        href="https://wasyaco.com/contact-us-2/" target="_blank"
                                         style="font-weight: bold;letter-spacing: -0.5px;line-height: 100%;text-align: center;text-decoration: none;color: #FFFFFF;"
                                       >Tell us About your Project!</a>
                                     </td>
@@ -1040,7 +1040,7 @@
                                                       style="font-family: Helvetica; font-size: 18px;">
                                                       <a class="mcnButton "
                                                         title="Wasya Co Project Intake for ReactJs Development"
-                                                        href="https://wasya.co/our-work/" target="_blank"
+                                                        href="https://wasyaco.com/our-work/" target="_blank"
                                                         style="padding: 18px; font-weight: bold;letter-spacing: -0.5px;line-height: 100%;text-align: center;text-decoration: none;color: #FFFFFF;"
                                                       >See Our Successful <br />ReactJs Deliveries</a>
                                                     </td>