wco_models 3.1.0.89 → 3.1.0.91

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a31a3f2a942a120f14f6749392ccae5a144062995f359be3827b989f238737da
-  data.tar.gz: fd1fb43f8997d6cfd7e4750db138a59fecc0d3afa1613a7ab93ba530ca714730
+  metadata.gz: c267b89943c2cb18139bdd044522d142fca56a81cadd7930b21eec7f6349d813
+  data.tar.gz: 42c005b73cdb2d15d3157b2d485a57166519a594383caf5a959400c18ae693cb
 SHA512:
-  metadata.gz: 5bb910e3451c67d9703797fa050786c4895b978ae55752f281949daa245b40364dfe05d87c27b8b597baeb30bc43b8b258e54a8b41c86d0efc07744962fb45d8
-  data.tar.gz: cae491d9f519fa1cb60c0d0fa9509d0cd9b22ae97550d6910007c3af920a8aaf8d235b14866107779627fa58790a3e7f093732cab891e66be454bcda8fbad3aa
+  metadata.gz: 77f0973a4e5ecddd767b045a6c77a5ba6b1dc98eacef09931fbc71413143f5966a3104fa763526f61b0f4a96029b082b025918423146e8703c434469455e74a5
+  data.tar.gz: 564da09016bf7490ad15c0c394d15ffb1b453f610536dc4bd9f0cafb8fa8e855f6d7a66c999c5e7f75c4347157ec3a1cbe5e99d77a6dac1809555fe89757e6e0

data/app/assets/stylesheets/wco/utils.scss

@@ -123,8 +123,12 @@ textarea.monospace {
 }
 
 /* H */
-h5.title {
+.header {
   display: flex;
+
+  h5.title {
+    display: flex;
+  }
 }
 
 .h-500px {

data/app/controllers/wco/application_controller.rb

@@ -10,6 +10,12 @@ class Wco::ApplicationController < ActionController::Base
     authorize! :home, Wco
   end
 
+  def tinymce
+    authorize! :home, Wco
+    render layout: false
+  end
+
+
   ##
   ## private
   ##

data/app/controllers/wco/leadsets_controller.rb

@@ -37,7 +37,7 @@ class Wco::LeadsetsController < Wco::ApplicationController
     authorize! :index, Leadset
     @leadsets = Leadset.all.includes(:leads)
     if params[:q].present?
-      @leadsets = @leadsets.where(" company_url LIKE ? ", "%#{params[:q]}%" )
+      @leadsets = @leadsets.where({ company_url: /.*#{params[:q]}.*/i })
       if @leadsets.length == 1
         return redirect_to action: :show, id: @leadsets[0][:id]
       end

data/app/controllers/wco/unsubscribes_controller.rb

@@ -0,0 +1,40 @@
+
+
+class Wco::UnsubscribesController < WcoEmail::ApplicationController
+
+  def create
+    authorize! :open_permission, Wco
+    @lead = Wco::Lead.find params[:lead_id]
+
+    if( !params[:token] ||
+        @lead.unsubscribe_token != params[:token] )
+      render code: 400, message: "We're sorry, but something went wrong. Please try again later."
+      return
+    end
+
+    @unsubscribe = WcoEmail::Unsubscribe.find_or_create_by({
+      lead_id:     params[:lead_id],
+      template_id: params[:template_id],
+      campaign_id: params[:campaign_id],
+    })
+    flag = @unsubscribe.update_attributes({
+      unsubscribed_at: Time.now,
+    })
+    if flag
+      flash_notice "You have been unsubscribed."
+    else
+      flash_alert "We're sorry, but something went wrong. Please try again later."
+    end
+
+    render layout: false
+  end
+
+  def index
+    authorize! :index, WcoEmail::Unsubscribe
+    @unsubscribes = WcoEmail::Unsubscribe.all
+
+    render '_table'
+  end
+
+end
+

data/app/mailers/wco_email/application_mailer.rb

@@ -44,35 +44,11 @@ class WcoEmail::ApplicationMailer < ActionMailer::Base
     mail( to: DEFAULT_RECIPIENT, subject: "Test email at #{Time.now}" )
   end
 
-  ## 2023-04-02 _vp_ Continue.
-  ## 2023-09-24 _vp_ Continue : )
+
   def send_context_email ctx_id
     @ctx         = Ctx.find ctx_id
-    @lead        = Wco::Lead.find @ctx.lead_id
-    @tmpl_config = OpenStruct.new JSON.parse( @ctx.tmpl[:config_json] )
-
-    @utm_tracking_str = {
-      'cid'          => @ctx.lead_id,
-      'utm_campaign' => @ctx.tmpl.slug,
-      'utm_medium'   => 'email',
-      'utm_source'   => @ctx.tmpl.slug,
-    }.map { |k, v| "#{k}=#{v}" }.join("&")
-
-    @unsubscribe_url = WcoEmail::Engine.routes.url_helpers.unsubscribes_url({
-      template_id: @ctx.tmpl.id,
-      lead_id:     @lead.id,
-      token:       @lead.unsubscribe_token,
-      host:        Rails.application.routes.default_url_options[:host],
-    })
-    renderer = WcoEmail::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 )
-
-    rendered_str = renderer.render_to_string("/wco_email/email_templates/_#{@ctx.tmpl.layout}")
+    @renderer    = self.class.renderer ctx: @ctx
+    rendered_str = @renderer.render_to_string("/wco_email/email_layouts/_#{@ctx.tmpl.layout}")
     @ctx.update({
       rendered_str: rendered_str,
     })
@@ -86,4 +62,16 @@ class WcoEmail::ApplicationMailer < ActionMailer::Base
           content_type: "text/html" )
   end
 
+
+  def self.renderer ctx:
+    out = self.new
+    out.instance_variable_set( :@ctx,              ctx )
+    out.instance_variable_set( :@lead,             ctx.lead )
+    out.instance_variable_set( :@utm_tracking_str, ctx.utm_tracking_str )
+    out.instance_variable_set( :@unsubscribe_url,  ctx.unsubscribe_url )
+    out.instance_variable_set( :@config,           ctx.config )
+    out.instance_variable_set( :@renderer,         out )
+    return out
+  end
+
 end

data/app/models/wco/lead.rb

@@ -19,6 +19,16 @@ class Wco::Lead
     domain         = email.split('@')[1]
     self.leadset ||= Wco::Leadset.find_or_create_by({ company_url: domain })
   end
+  before_validation :normalize_email, on: :create
+  def normalize_email
+    self[:email] = email.downcase
+    if email.index('+')
+      a = email
+      a.slice!( a[a.index('+')...a.index('@')] )
+      self[:email] = a
+    end
+  end
+
 
   has_one :photo,      class_name: 'Wco::Photo'
 

data/app/models/wco/leadset.rb

@@ -8,6 +8,10 @@ class Wco::Leadset
   field     :company_url
   validates :company_url, presence: true, uniqueness: true
   index({ company_url: 1 }, { unique: true, name: 'company_url' })
+  before_validation :normalize_company_url, on: :create
+  def normalize_company_url
+    company_url.downcase!
+  end
 
   field :email
   index({ email: 1 }, { name: 'email' })

data/app/models/wco_email/context.rb

@@ -24,6 +24,7 @@ class WcoEmail::Context
   end
 
   field :body
+  ## Looks good... 2024-01-17
   def body
     if self[:body].presence
       return self[:body]
@@ -91,14 +92,9 @@ class WcoEmail::Context
   attr_reader :tid
 
   def get_binding
-    @lead = lead()
-    @utm_tracking_str = {
-      'cid'          => lead.id,
-      'utm_campaign' => tmpl.slug,
-      'utm_medium'   => 'email',
-      'utm_source'   => tmpl.slug,
-    }.map { |k, v| "#{k}=#{v}" }.join("&")
-    eval( tmpl.config_exe )
+    @lead             = lead
+    @utm_tracking_str = utm_tracking_str
+    # eval( tmpl.config_exe ) ## @TODO: remove? 2024-01-17
     binding()
   end
 
@@ -113,6 +109,28 @@ class WcoEmail::Context
     outs.to_a
   end
 
+  def config
+    OpenStruct.new JSON.parse( tmpl[:config_json] )
+  end
+
+  def utm_tracking_str
+    {
+      'cid'          => lead_id,
+      'utm_campaign' => tmpl.slug,
+      'utm_medium'   => 'email',
+      'utm_source'   => tmpl.slug,
+    }.map { |k, v| "#{k}=#{v}" }.join("&")
+  end
+
+  def unsubscribe_url
+    Wco::Engine.routes.url_helpers.unsubscribes_url({
+      host:        Rails.application.routes.default_url_options[:host],
+      lead_id:     lead_id,
+      template_id: tmpl.id,
+      token:       lead.unsubscribe_token,
+    })
+  end
+
 end
 Ctx = WcoEmail::Context
 

data/app/models/wco_email/email_template.rb

@@ -31,7 +31,7 @@ class WcoEmail::EmailTemplate
     marketing_wordpress_2
     piousbox_roundborders
     plain
-    tracking_footer
+    test_tracking_footer
     wasyaco_roundborders |
 
   field :subject

data/app/models/wco_email/message_stub.rb

@@ -87,8 +87,8 @@ class WcoEmail::MessageStub
     ## Leadset, Lead
     from      = the_mail.from ? the_mail.from[0] : "nobody@unknown-doma.in"
     domain    = from.split('@')[1]
-    leadset   = Wco::Leadset.where(  company_url: domain ).first
-    leadset ||= Wco::Leadset.create( company_url: domain, email: from )
+    leadset   = Wco::Leadset.where(  company_url: domain.downcase ).first
+    leadset ||= Wco::Leadset.create( company_url: domain.downcase, email: from.downcase )
     lead      = Wco::Lead.find_or_create_by( email: from, leadset: leadset )
 
 
@@ -152,7 +152,6 @@ class WcoEmail::MessageStub
       puts! @message.errors.full_messages.join(", "), "Could not save @message"
     end
 
-
     conv.leads.push lead
     conv.save
 

data/app/views/wco/application/tinymce.html.erb

@@ -0,0 +1,33 @@
+
+<html>
+  <head>
+    <!-- include libraries(jQuery, bootstrap) -->
+    <link href="https://stackpath.bootstrapcdn.com/bootstrap/3.4.1/css/bootstrap.min.css" rel="stylesheet">
+    <script src="https://code.jquery.com/jquery-3.5.1.min.js"></script>
+    <script src="https://stackpath.bootstrapcdn.com/bootstrap/3.4.1/js/bootstrap.min.js"></script>
+
+    <!-- include codemirror (codemirror.css, codemirror.js, xml.js, formatting.js) -->
+    <link rel="stylesheet" type="text/css" href="//cdnjs.cloudflare.com/ajax/libs/codemirror/3.20.0/codemirror.css">
+    <link rel="stylesheet" type="text/css" href="//cdnjs.cloudflare.com/ajax/libs/codemirror/3.20.0/theme/monokai.css">
+    <script type="text/javascript" src="//cdnjs.cloudflare.com/ajax/libs/codemirror/3.20.0/codemirror.js"></script>
+    <script type="text/javascript" src="//cdnjs.cloudflare.com/ajax/libs/codemirror/3.20.0/mode/xml/xml.js"></script>
+    <script type="text/javascript" src="//cdnjs.cloudflare.com/ajax/libs/codemirror/2.36.0/formatting.js"></script>
+
+    <!-- include summernote css/js-->
+    <link rel="stylesheet" type="text/css" href="//cdn.jsdelivr.net/npm/summernote@0.8.18/dist/summernote.min.css">
+    <script type="text/javascript" src="//cdn.jsdelivr.net/npm/summernote@0.8.18/dist/summernote.min.js"></script>
+  </head>
+  <body>
+
+    <textarea class='tinymce'>
+    </textarea>
+
+  <script>
+    $('.tinymce').summernote({
+    height: 150,   //set editable area's height
+    codemirror: { // codemirror options
+      theme: 'monokai'
+    }
+  });
+  </script>
+  </body></html>

data/app/views/wco_email/application_mailer/_footer_unsubscribe.html.erb

@@ -0,0 +1,24 @@
+<table align="left" border="0" cellpadding="0" cellspacing="0"
+  style="max-width:100%; min-width:100%;" width="100%"
+  class="mcnTextContentContainer">
+  <tbody>
+    <tr>
+
+      <td valign="top" class="mcnTextContent"
+        style="padding-top:0; padding-right:160px; padding-bottom:9px; padding-left:160px;">
+
+        <em>Copyright © Wasya Co</em><br><br>
+
+        <strong>Our mailing address is:</strong><br>
+
+        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', obfuscate( user_dashboard_url ) ) + ' or ' %>
+        <%= link_to 'unsubscribe from this list', obfuscate( @unsubscribe_url ) %>.<br><br>
+
+      </td>
+
+    </tr>
+  </tbody>
+</table>

data/app/views/wco_email/application_mailer/_header_logo.html.erb

@@ -0,0 +1,12 @@
+
+<table cellpadding="0" cellspacing="0" width="100%">
+  <tr>
+    <td align="center">
+      <br />
+      <img
+        src="https://d15g8hc4183yn4.cloudfront.net/wp-content/uploads/2022/09/29185755/259x66-WasyaCo-Logo-YellowShadow.png"
+        alt="Wasya Co [logo]" />
+    </td>
+  </tr>
+</table>
+<br /><br />