wco_models 3.1.0.90 → 3.1.0.92

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c7d502c6769f16c3fee34412c86b5646aa84c22c9c399da8c56cc2b496aa96b4
-  data.tar.gz: a4d4fef5edd8dea9656e2526b60b8c6b2a421e1955bc4c79dc1f04dfd4402d40
+  metadata.gz: 8acb70bd0285b4695c50cab2fa2c2338fa51dacb535df93fcfa805cd58e47f6f
+  data.tar.gz: 0c1ce2b3a16a79982db08be8d129eced17acbf36cc246c6b095fbed813f14c43
 SHA512:
-  metadata.gz: 4fbd26066c57cc0796a23dbb647b59816553fd87d6dbf87bc56bc0e6aa2d6039e017c6bd204519d4f4fff85c668a020e13558a52ec0e6d708941b9e369e5dd79
-  data.tar.gz: 951707c1098329b6df362e3050c02e5d0310021e9ebc7b1bc50d41096d1ab7f79bce5382db6610875953ce12846a17b9b3db0e25f03ad7e7375fd17e0d606240
+  metadata.gz: efd8df489b52203a347f640a572433eb71f567de9454ac5de57d2949f08de48836d6dc394dd0bcc9ac025b7303004bb9575080618eebfc02d144f93d1efb871f
+  data.tar.gz: 6bf11e6d4cf82022a4db7d1f07e7fb520bbe47d4a9e00c15bf31ecb73c5c7576f3c12a46c808912da35ea24002df622b72ae895028e2d72dc3912f9c790de06f

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

@@ -6,15 +6,6 @@ class WcoEmail::ApplicationMailer < ActionMailer::Base
 
   layout 'mailer'
 
-  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 )
-    return out
-  end
 
   def forwarder_notify msg_id
     @msg = WcoEmail::Message.find msg_id
@@ -53,13 +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 : )
-  ## 2024-01-17 _vp_ Continue : )
+
   def send_context_email ctx_id
     @ctx         = Ctx.find ctx_id
-    renderer     = self.class.renderer ctx: @ctx
-    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,
     })
@@ -73,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,34 @@ 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
+  def self.normalize_email a
+    a = a.downcase
+    if a.index('+')
+      a.slice!( a[a.index('+')...a.index('@')] )
+    end
+    return a
+  end
+  def self.find_or_create_by_email email
+    email = self.normalize_email email
+    out = where( email: email ).first
+    if !out
+      domain    = email.split('@')[1]
+      leadset   = Wco::Leadset.where(  company_url: domain ).first
+      leadset ||= Wco::Leadset.create( company_url: domain, email: email )
+      out = create!( email: email, leadset: leadset )
+    end
+    return out
+  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

@@ -123,7 +123,7 @@ class WcoEmail::Context
   end
 
   def unsubscribe_url
-    WcoEmail::Engine.routes.url_helpers.unsubscribes_url({
+    Wco::Engine.routes.url_helpers.unsubscribes_url({
       host:        Rails.application.routes.default_url_options[:host],
       lead_id:     lead_id,
       template_id: tmpl.id,

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

@@ -86,17 +86,13 @@ 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 )
-    lead      = Wco::Lead.find_or_create_by( email: from, leadset: leadset )
-
+    lead      = Wco::Lead.find_or_create_by_email( from )
 
     message   = WcoEmail::Message.unscoped.where( message_id: message_id ).first
     if message
       message.message_id = "#{Time.now.strftime('%Y%m%d')}-trash-#{message.message_id}"
       message.object_key = "#{Time.now.strftime('%Y%m%d')}-trash-#{message.object_key}"
-      message.save!( validate: false )
+      message.save( validate: false )
       message.delete
     end
 
@@ -119,7 +115,7 @@ class WcoEmail::MessageStub
       tos: the_mail.to,
 
       cc:  the_mail.cc ? the_mail.cc[0] : nil,
-      ccs:  the_mail.cc,
+      ccs: the_mail.cc,
     })
     puts! @message, '@message'
 
@@ -152,14 +148,11 @@ class WcoEmail::MessageStub
       puts! @message.errors.full_messages.join(", "), "Could not save @message"
     end
 
-
     conv.leads.push lead
     conv.save
 
     the_mail.cc&.each do |cc|
-      domain  = cc.split('@')[1] rescue 'unknown.domain'
-      leadset = Wco::Leadset.find_or_create_by( company_url: domain )
-      Wco::Lead.find_or_create_by( email: cc, leadset: leadset )
+      Wco::Lead.find_or_create_by_email( cc )
     end
 
     conv.update_attributes({

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 />