caboose-rets 0.1.168 → 0.1.169

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 85653f2bfcadd1d7fe60ccbc72c44e29b507ddf8b7e2ca711d7c2d7c9facb255
-  data.tar.gz: 270f490ae2fa77a1973ea18f1f1491369dbee8ad093151710644762a39c35c3e
+  metadata.gz: cfcd614cf28fd3ed0edff6c61880fbf14d40e84c6170cea36db9bd383247e633
+  data.tar.gz: 10d153852b2ffab78fdda69dcc9394e4ae7d4347b8c3a74a964cc9bddfc702b4
 SHA512:
-  metadata.gz: 79d76f9992f5539ee453214c9832f5c194b2de9c91f76209de155b6a60c548ff24cdd772380e03cc52531b6ca0212d0515d45fff713c34fe0d5a8939a6250680
-  data.tar.gz: 805993e693ca53874f547e004046049ddda5f07269a1f270efd199a8a1858df66dd8787361c85e1e0db62a139e61063b9fb3f105460c53518e3979ed963a25b5
+  metadata.gz: b63d94a24059dd9a53163371064388dcb2ed45f3807da1b60fb323a94da63cb105191815d95ca3c25ad67491c327fc90c6c5883cf99a5685d3314c35ae77a9da
+  data.tar.gz: 2d50bcce74ecdc06f4bcdacd03fd2d8b53727f846e03d0005e0bff4132b2519c2eec8f88a52f249d07690031584830f5dbe971f728c7886c7ec245e8546852bb

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, {
@@ -82,10 +85,10 @@ module CabooseRets
       # 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
 
-      @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/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?utm_source=Nine&utm_medium=Facebook&utm_campaign=Retargeting")
+          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/properties/facebook_products_feed.rss.builder

@@ -12,7 +12,7 @@ xml.rss :version => "2.0", "xmlns:g" => "http://base.google.com/ns/1.0" do
         xml.g(:id, property.mls_number)
         xml.g(:title, property.full_address)
         xml.g(:description, property.public_remarks)
-        xml.g(:link, "https://" + domain + "/properties/#{property.mls_number}/details?utm_source=Nine&utm_medium=Facebook&utm_campaign=Retargeting")
+        xml.g(:link, "https://" + domain + "/properties/#{property.mls_number}/details")
         first_image = property.images.first if property.images
         m = Caboose::Media.where(:id => first_image.media_id).first if first_image && !first_image.media_id.blank?
         if m && m.image

data/lib/caboose_rets/version.rb

@@ -1,3 +1,3 @@
 module CabooseRets
-  VERSION = '0.1.168'
+  VERSION = '0.1.169'
 end

metadata

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