caboose-rets 0.1.180 → 0.1.181

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2b2fe2e36e342c415299f45cc81d83b301ab00b4c9d7878211c8836626726a43
-  data.tar.gz: 4c481cd54cfcb3f5c96d58f25948fb1d99ead965380a29d413e8382ddf837cbc
+  metadata.gz: ceb96a622cb163188374b4aeed6b1baee791b0e767c9aea00de93dffe90b1c8c
+  data.tar.gz: ed302be050341854d58534b57c5a5ea8e0c58c376631444ed6d01f84225a3347
 SHA512:
-  metadata.gz: 005a9205c08fc9e64a09a4e9e1fad9c975cdde0f038ab20d7466dc029fd6804e433d2eb022d7bb5e4f3546fd0167cf5802a03ce1e511aefe6c2cb152efc6ed1c
-  data.tar.gz: e120530752e605448eb07b0dc5c8e66ebd30f8b203091f85234bf8d42ade2da2a9878a6452188b550fd4c302804460056fbb25034a085656e4577e42c32f04a7
+  metadata.gz: 2f03b3418f74afdbbcadf3f50c98a12338646014fcaacc6e9467ba46279baf55d2696a6cf78d9e321850e72d1a0b1e0217b845f8f4d93090aefdd870fce192a5
+  data.tar.gz: 7c382a79cac4e9cb2353d8980013eed3bf22d48f78c5f9a8f3276e755e6429cd210c9f6215ce34a8683f1edac3e2511115e44134f74b8eacae5cb9af3e6a6e23

data/app/controllers/caboose_rets/agents_controller.rb

@@ -23,6 +23,29 @@ module CabooseRets
       @agent = Agent.where(:slug => params[:slug]).where("office_mls_id ILIKE ?", @site.rets_office_id).first if !params[:slug].blank?
     end
 
+    # @route GET /rets-unsubscribe
+    def user_unsubscribe
+      user_id = params[:token].blank? ? nil : params[:token].strip.gsub("7b8v9j","").gsub("9b6h0c2n","")
+      @user = user_id ? Caboose::User.where(:id => user_id, :site_id => @site.id).first : nil
+      @token = params[:token]
+      render :file => "caboose/extras/error404", :layout => "caboose/application", :status => 404 and return if @user.nil? || @token.blank?
+      @page.meta_robots = "noindex, nofollow"
+      @page.uri = "rets-unsubscribe"
+      @page.seo_title = "Confirm Unsubscription | #{@site.description}"
+    end
+
+    # @route GET /rets-unsubscribe/confirm
+    def user_unsubscribe_confirm
+      user_id = params[:token].blank? ? nil : params[:token].strip.gsub("7b8v9j","").gsub("9b6h0c2n","")
+      @user = user_id ? Caboose::User.where(:id => user_id, :site_id => @site.id).first : nil
+      render :file => "caboose/extras/error404", :layout => "caboose/application", :status => 404 and return if @user.nil?
+      @page.meta_robots = "noindex, nofollow"
+      @page.uri = "rets-unsubscribe/confirm"
+      @page.seo_title = "Unsubscribed | #{@site.description}"
+      @user.tax_exempt = true # this means unsubscribed
+      @user.save
+    end
+
     #=============================================================================
     # Admin functions 
     #=============================================================================

data/app/mailers/caboose_rets/rets_mailer.rb

@@ -1,8 +1,13 @@
 class CabooseRets::RetsMailer < ActionMailer::Base
 
-  default from: "noreply <noreply@caboosecms.com>"
+  def from_address(site_id, from_name)
+    settings = Caboose::SmtpConfig.where(:site_id => site_id).first
+    fn = from_name.blank? ? (settings ? settings.site.description : "Caboose CMS") : from_name
+    fn = fn.gsub(",","").gsub("<","").gsub(">","").gsub("@","").gsub(":","").truncate(30)
+    return settings ? "#{fn} <#{settings.from_address}>" : "#{fn} <noreply@caboosecms.com>"
+  end
 
-  def new_user(agent, user, from_address)
+  def new_user(agent, user)
     @agent = agent
     @user = user
     @site = user.site
@@ -11,10 +16,42 @@ class CabooseRets::RetsMailer < ActionMailer::Base
     mail(
       :to => to_address,
       :bcc => bcc_address,
-      :from => from_address,
+      :from => from_address(@site.id, nil),
       :subject => "New User Registration",
       :reply_to => bcc_address
     )
   end
 
+  def user_welcome(agent, user)
+    @agent = agent
+    @user = user
+    @site = user.site
+    to_address = user.email
+    reply_to = @site.contact_email.blank? ? 'noreply@caboosecms.com' : @site.contact_email
+
+    setting = Caboose::Setting.where(:site_id => @site.id, :name => "welcome_email_subject").first
+    subject = setting && !setting.value.blank? ? setting.value : "Welcome to #{@site.description}"
+
+    setting2 = Caboose::Setting.where(:site_id => @site.id, :name => "welcome_email_body").first
+    @body = setting2 && !setting2.value.blank? ? setting2.value : "We're excited to see that you've registered for #{@site.description}. As a registered user, we'll notify you when there's a price drop or pending sale on your favorite properties. We'll also notify you of new listings and similar properties you may be interested in. Your assigned REALTOR® is |agent_name| and will be in touch with you shortly. Thank you for choosing #{@site.description}!"
+    @body = @body.gsub("|agent_name|", "#{@agent.first_name} #{@agent.last_name}")
+
+    @color = @site.theme ? @site.theme.color_main : @site.theme_color
+
+    @url = "https://#{@site.primary_domain.domain}"
+    @url += "/real-estate" if @site.id == 541
+
+    @logo_url = @site.logo.url(:large)
+    @logo_url = "https:#{@logo_url}" if !@logo_url.include?('http')
+
+    @unsubscribe_url = "https://#{@site.primary_domain.domain}/rets-unsubscribe?token=7b8v9j#{@user.id}9b6h0c2n"
+
+    mail(
+      :to => to_address,
+      :from => from_address(@site.id, nil),
+      :subject => subject,
+      :reply_to => reply_to
+    )
+  end
+
 end

data/app/models/caboose_rets/agent.rb

@@ -40,23 +40,26 @@ class CabooseRets::Agent < ActiveRecord::Base
     CabooseRets::RetsImporter.import_agent(self.mls_id)          
   end
 
-  def send_new_user_email(user)
-    if !self.email.blank? && user && user.site
-      settings = Caboose::SmtpConfig.where(:site_id => user.site_id).first
-      if settings
-        delivery_options = {
-          user_name: settings.user_name, 
-          password: settings.password,
-          address: settings.address,
-          port: settings.port,
-          domain: settings.domain,
-          authentication: settings.authentication,
-          enable_starttls_auto: settings.enable_starttls_auto
-        }
-        from_address = "#{settings.site.description} <#{settings.from_address}>"
-        msg = CabooseRets::RetsMailer.send("new_user", self, user, from_address)
-        msg.delivery_method.settings.merge!(delivery_options)
-        msg.deliver_now
+  # Sends a SMS to the agent (using Twilio) notifying them that a new user has registered and been assigned to them
+  def send_text(message, site_id)
+    s1 = Caboose::Setting.where(:site_id => site_id, :name => "twilio_account_sid").first
+    account_sid = s1 ? s1.value : nil
+    s2 = Caboose::Setting.where(:site_id => site_id, :name => "twilio_auth_token").first
+    auth_token = s2 ? s2.value : nil
+    s3 = Caboose::Setting.where(:site_id => site_id, :name => "twilio_from_number").first
+    twilio_number = s3 ? s3.value : nil
+    send_to = self.cell_phone.blank? ? (self.direct_work_phone.blank? ? self.other_phone : self.direct_work_phone) : self.cell_phone
+    send_to = '205-657-0937' if Rails.env.development? # Billy's cell
+    if account_sid && auth_token && twilio_number && !send_to.blank? && !message.blank?
+      @client = Twilio::REST::Client.new account_sid, auth_token
+      begin
+        message = @client.messages.create(
+          body: message,
+          to:   "+1#{send_to.gsub(/[(\- )]/, '')}",
+          from: "#{twilio_number}"
+        )
+      rescue
+        Caboose.log("invalid phone number")
       end
     end
   end
@@ -78,7 +81,21 @@ class CabooseRets::Agent < ActiveRecord::Base
       user.rets_agent_mls_id = agent.mls_id
       last_agent_mls_id.value = agent.mls_id
       user.save
-      Rails.env.production? ? agent.delay(:queue => 'rets').send_new_user_email(user) : agent.send_new_user_email(user)
+
+      s1 = Caboose::Setting.where(:site_id => user.site_id, :name => "agent_text_message").first
+      message = s1 ? s1.value : nil
+
+      if !message.blank?
+        message = message.gsub("|user_first_name|", user.first_name)
+        message = message.gsub("|user_last_name|", user.last_name)
+        message = message.gsub("|user_email|", user.email)
+        message = message.gsub("|user_phone|", user.phone)
+        agent.delay(:queue => 'rets', :priority => 0).send_text(message, user.site_id)
+      end
+
+      CabooseRets::RetsMailer.configure_for_site(user.site_id).new_user(agent, user).deliver_later
+      CabooseRets::RetsMailer.configure_for_site(user.site_id).user_welcome(agent, user).deliver_later
+
       last_agent_mls_id.save
       role = Caboose::Role.where(:name => 'RETS Visitor', :site_id => user.site_id).exists? ? Caboose::Role.where(:name => 'RETS Visitor', :site_id => user.site_id).first : Caboose::Role.create(:name => 'RETS Visitor', :site_id => user.site_id)
       Caboose::RoleMembership.create(:user_id => user.id, :role_id => role.id)

data/app/views/caboose_rets/agents/user_unsubscribe.html.erb

@@ -0,0 +1,5 @@
+<div class="constrain richtext" style="text-align:center;font-size:18px;padding-top:50px;padding-bottom:50px;">
+	<h4>Are you sure you want to unsubscribe?</h4>
+	<p>By unsubscribing, you will no longer receive email updates for saved properties or suggested listings.</p>
+	<p><a style="margin-top:20px;display:inline-block;" href="/rets-unsubscribe/confirm?token=<%= @token %>">Yes, unsubscribe from all property updates and suggested listings.</a></p>
+</div>

data/app/views/caboose_rets/agents/user_unsubscribe_confirm.html.erb

@@ -0,0 +1,3 @@
+<div class="constrain richtext" style="text-align:center;font-size:18px;padding-top:30px;padding-bottom:30px;">
+	<p>You have successfully unsubscribed.</p>
+</div>

data/app/views/caboose_rets/rets_mailer/user_welcome.html.erb

@@ -0,0 +1,20 @@
+<div style="text-align:center;margin-bottom:20px;padding:20px;background-color:<%= @color %>;">
+	<a style="display:inline-block;text-decoration:none;" href="<%= @url %>" target="_blank">
+		<img style="display:block;" src="<%= @logo_url %>" alt="<%= @site.description %>" width="220" />
+	</a>
+</div>
+
+<div style="text-align:center;padding:20px;">
+	<div style="max-width:500px;font-size:18px;margin:0 auto;line-height:26px;">
+		<h2>Welcome!</h2>
+		<p><%== @body %></p>
+	</div>
+</div>
+
+<div style="text-align:center;margin-top:20px;padding:20px;background-color:<%= @color %>;">
+	<p style="margin-top:20px;font-size:13px;">
+		<a style="color:#fff;text-decoration:none;font-size:13px;display:inline-block;" target="_blank" href="<%= @unsubscribe_url %>">
+			Unsubscribe
+		</a>
+	</p>
+</div>

data/lib/caboose_rets/version.rb

@@ -1,3 +1,3 @@
 module CabooseRets
-  VERSION = '0.1.180'
+  VERSION = '0.1.181'
 end

data/lib/tasks/caboose_rets.rake

@@ -115,7 +115,7 @@ namespace :caboose_rets do
       params = {
         :search_type => 'OpenHouse',
         :class       => 'OpenHouse',
-        :query       => "(OpenHouseKey=#{args.query})",
+        :query       => "(ListingId=#{args.query})",
         :limit       => 1,
         :timeout     => -1
       }
@@ -271,8 +271,8 @@ namespace :caboose_rets do
 
   desc "update test"
   task :update_test => :environment do
-    d = DateTime.now - 1.hours
-    CabooseRets::RetsImporter.update_helper("Property", d, true)
+    d = DateTime.now - 6.hours
+    CabooseRets::RetsImporter.update_helper("OpenHouse", d, false)
   end
 
   desc "Updates all the listings from MLS"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-rets
 version: !ruby/object:Gem::Version
-  version: 0.1.180
+  version: 0.1.181
 platform: ruby
 authors:
 - William Barry
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-06 00:00:00.000000000 Z
+date: 2021-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: caboose-cms
@@ -90,6 +90,8 @@ files:
 - app/views/caboose_rets/agents/contact.html.erb
 - app/views/caboose_rets/agents/details.html.erb
 - app/views/caboose_rets/agents/index.html.erb
+- app/views/caboose_rets/agents/user_unsubscribe.html.erb
+- app/views/caboose_rets/agents/user_unsubscribe_confirm.html.erb
 - app/views/caboose_rets/media/admin_property_media.html.erb
 - app/views/caboose_rets/offices/admin_edit.html.erb
 - app/views/caboose_rets/offices/admin_index.html.erb
@@ -106,6 +108,7 @@ files:
 - app/views/caboose_rets/properties/test_form.html.erb
 - app/views/caboose_rets/rets/admin_import_form.html.erb
 - app/views/caboose_rets/rets_mailer/new_user.html.erb
+- app/views/caboose_rets/rets_mailer/user_welcome.html.erb
 - app/views/caboose_rets/saved_properties/index.html.erb
 - app/views/caboose_rets/saved_properties/rets_info.html.erb
 - app/views/caboose_rets/saved_properties/user_report.html.erb