caboose-rets 0.1.165 → 0.1.170

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 575ad2e3864bf9aeee0b474f229122782d39b3e429d5ead96766f51ec6de5ca0
-  data.tar.gz: 173608e4becd1718b1222743b1d33a3b8186e707a01a00b6a3d8bcb01fa54bc6
+  metadata.gz: 613aa2563eab7cf1e488088657635585fc93c58f4dac400bd71b1afaa4d0bf62
+  data.tar.gz: c40bc36c632506231f2d13119a69b1008044ac213141cc9a552087e321e2b8b3
 SHA512:
-  metadata.gz: f5b7dd109072d5d01b4356afa60864150b8dedbe70055fd670d7ed7b8a4bc4b8c4a12223b4706fc6ccb537790b7c117ad3a55ee030e0bc6dac0875d2d09de625
-  data.tar.gz: b7456f435f69fb61885f9faefd498e2b3652dfd95f0611a77ee6e18eb780358c4149938c0d3fcce0d9d4f16d42408533124455406624231855b55cfb3c66da3e
+  metadata.gz: e522910205a4d3c206888b3972501ea4ad7a78ea8f3103418cda5aa7e7e8247e7f6287a0773bf199b01ad5c8b037fd17e79127ec0d7526425eb239ea6b2388ed
+  data.tar.gz: c92917dc214b87feb180442f3225f06e5d39ee598851484471b19016eabdb706c2dbc2a40154af5ec05e280252139d80744a13cf2995bd32c9bc4a61351a8a23

data/app/controllers/caboose_rets/properties_controller.rb

@@ -1,4 +1,3 @@
-
 module CabooseRets
   class PropertiesController < ApplicationController
 
@@ -22,7 +21,11 @@ module CabooseRets
     			params[:street_name_like][0] = '' if params[:street_name_like][0].to_i == 0
     		end
     	end
-      where = @site && @site.id == 558 ? "(style ILIKE '%condo%' OR res_style ILIKE '%condo%' OR property_subtype ILIKE '%condo%' OR property_subtype ILIKE '%townhouse%')" : "(id is not null)"
+      where = "(id is not null)"
+      if (@site && @site.id == 558) || request.original_fullpath =~ /^\/tuscaloosa-condos-for-sale(.*?)$/
+        where = "(style ILIKE '%condo%' OR res_style ILIKE '%condo%' OR property_subtype ILIKE '%condo%' OR property_subtype ILIKE '%townhouse%')"
+      end
+   #   where = @site && @site.id == 558 ? "(style ILIKE '%condo%' OR res_style ILIKE '%condo%' OR property_subtype ILIKE '%condo%' OR property_subtype ILIKE '%townhouse%')" : "(id is not null)"
       sortby = @site && @site.id == 558 ? "original_entry_timestamp" : CabooseRets::default_property_sort
       @saved_properties = CabooseRets::SavedProperty.where(:user_id => logged_in_user.id).pluck(:mls_number)
       @pager = Caboose::PageBarGenerator.new(params, {
@@ -78,14 +81,14 @@ module CabooseRets
       })
 
       @properties = @pager.items
-      if params[:waterfronts].present?   then @properties.reject!{|p| p.waterfronts.blank?} end
+      if params[:waterfronts].present?   then @properties = @properties.reject{|p| p.waterfronts.blank?} end
       # if params[:ftr_lotdesc] == 'golf' then @properties.reject!{|p| p.ftr_lotdesc != 'golf'} end 
-      if params[:foreclosure_yn] then @properties.reject!{|p| p.foreclosure_yn != "Y"} end
+      if params[:foreclosure_yn] then @properties = @properties.reject{|p| p.foreclosure_yn != "Y"} end
 
-      @saved_search = nil
-      if CabooseRets::SavedSearch.exists?(:uri => request.fullpath)
-        @saved_search = CabooseRets::SavedSearch.where(:uri => request.fullpath).first
-      end
+      # @saved_search = nil
+      # if CabooseRets::SavedSearch.exists?(:uri => request.fullpath)
+      #   @saved_search = CabooseRets::SavedSearch.where(:uri => request.fullpath).first
+      # end
 
       @block_options = {
         :properties   => @properties,

data/app/controllers/caboose_rets/saved_properties_controller.rb

@@ -17,7 +17,7 @@ module CabooseRets
 
     # GET /admin/mls/user-report
     def user_report
-      @users = Caboose::User.where(:site_id => @site.id).order('id desc').limit(500)
+      @users = Caboose::User.where(:site_id => @site.id).where("rets_agent_mls_id is not null").order('id desc').limit(500)
       render :layout => 'caboose/admin'
     end
 

data/app/models/caboose_rets/property.rb

@@ -161,7 +161,7 @@ class CabooseRets::Property <ActiveRecord::Base
         self.matrix_unique_id                 = data['ListingKey']
         self.matrix_modified_dt               = data['ModificationTimestamp']
         self.max_sqft                         = data['LivingArea']
-        self.middle_school                    = data['MiddleSchool']
+        self.middle_school                    = data['MiddleOrJuniorSchool']
     #    self.mineral_rights                   = data['MineralRights']
         self.min_sqft                         = data['LivingArea']
         self.misc_indoor_featuresa            = data['BuildingFeatures']

data/app/views/caboose_rets/properties/facebook_listings_feed.rss.builder

@@ -1,5 +1,4 @@
 domain = Caboose::Domain.where(:site_id => @site.id, :primary => true).first.domain
-hp = Caboose::Page.where(:site_id => @site.id, :title => "Home").first
 xml.instruct! :xml, :version => "1.0"
   xml.listings do
     xml.title @site.id == 558 ? "The Gray Group" : @site.description
@@ -39,7 +38,8 @@ xml.instruct! :xml, :version => "1.0"
         elsif !property.alternate_link.blank? && @use_alternate_link == true
           xml.url(property.alternate_link)
         else
-          xml.url("https://" + domain + "/properties/#{property.mls_number}/details")
+          url = "https://" + domain + "/properties/#{property.mls_number}/details?utm_source=Nine&utm_medium=Facebook&utm_campaign=Retargeting"
+          xml.url( url )
         end
         xml.year_built(property.year_built)
         if !property.property_type.blank?

data/app/views/caboose_rets/saved_properties/user_report.html.erb

@@ -20,6 +20,4 @@
 		margin-bottom: 10px;
 	}
 </style>
-<% end %>
-
-
+<% end %>

data/lib/caboose_rets/version.rb

@@ -1,3 +1,3 @@
 module CabooseRets
-  VERSION = '0.1.165'
+  VERSION = '0.1.170'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-rets
 version: !ruby/object:Gem::Version
-  version: 0.1.165
+  version: 0.1.170
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-24 00:00:00.000000000 Z
+date: 2020-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: caboose-cms