RubyGems - caboose-rets - Versions diffs - 0.1.18 → 0.1.19 - Mend

caboose-rets 0.1.18 → 0.1.19

Files changed (83) hide show

data/app/models/caboose_rets/search_option.rb CHANGED

@@ -10,14 +10,14 @@ class CabooseRets::SearchOption < ActiveRecord::Base
     names = {
       'City'          => ['city'],
-      'County'        => ['county'],
-      'Zip Code'      => ['zip'],
-      'Schools'       => ['elem_school', 'middle_school', 'high_school'],
+      'County'        => ['county_or_parish'],
+      'Zip Code'      => ['postal_code'],
+      'Schools'       => ['elementary_school', 'middle_school', 'high_school'],
       'MLS Area'      => ['area'],
       'Neighborhood'  => ['subdivision'],
       'Street Name'   => ['street_name'],
-      'Property Type' => ['prop_type'],
-      'MLS Number'    => ['mls_acct']
+      'Property Type' => ['property_type'],
+      'MLS Number'    => ['mls_number']
       #'feature',
       #'location',
     }
@@ -32,7 +32,7 @@ class CabooseRets::SearchOption < ActiveRecord::Base
   end
   def self.update_search_options_for_field(name, field)
-    q = ["select distinct(#{field}) from rets_residential where (status = ? or status = ?)", 'Pending', 'Active']
+    q = ["select distinct(#{field}) from rets_properties where (status = ? or status = ?)", 'Pending', 'Active']
     rows = ActiveRecord::Base.connection.select_rows(ActiveRecord::Base.send(:sanitize_sql_array, q))
     rows.each do |row|
       so = self.where(:name => name, :field => field, :value => row[0]).first

data/app/views/caboose/blocks/_layout_rets.html.erb CHANGED

@@ -9,19 +9,19 @@
     <meta charset="utf-8" />
     <meta http-equiv="X-UA-Compatible" content="IE=edge, chrome=1" />
     <meta http-equiv="content-type" content="text/html;charset=utf-8">
-    <meta http-equiv="content-language" content="en">
+    <meta http-equiv="content-language" content="en">
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <title><%= raw page.head_title %></title>
     <% desc = page.meta_description ? page.meta_description : page.head_title %>
-    <% domain = site.primary_domain.domain %>
+    <% domain = site.primary_domain.domain %>
     <meta name="description" content="<%= desc %>" />
     <meta property="og:title" content="<%= page.title %>" />
     <meta property="og:site_name" content="<%= site.description %>"/>
-    <meta property="og:description" content="<%= desc %>" />
+    <meta property="og:description" content="<%= desc %>" />
     <%= raw css %>
     <%= raw csrf_meta_tags %>
   </head>
-  <body>
+  <body>
     <div class="container" id='block_<%= block.id %>'>
       <!--[if lt IE 7]>
         <p class="chromeframe">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> or <a href="http://www.google.com/chromeframe/?redirect=true">activate Google Chrome Frame</a> to improve your experience.</p>
@@ -32,6 +32,9 @@ url = request.original_fullpath
 if    url =~ /^\/residential\/\d(.*?)$/      %><% Caboose.log("Rendering rets_residential_details" ) %><%= block.partial('rets_residential_details' , local_assigns) %><%
 elsif url =~ /^\/residential\/search(.*?)$/  %><% Caboose.log("Rendering rets_residential_index"   ) %><%= block.partial('rets_residential_index'   , local_assigns) %><%
 elsif url =~ /^\/residential(.*?)$/          %><% Caboose.log("Rendering rets_residential_index"   ) %><%= block.partial('rets_residential_index'   , local_assigns) %><%
+elsif url =~ /^\/commercial\/\d(.*?)$/       %><% Caboose.log("Rendering rets_property_details"  ) %><%= block.partial('rets_property_details'  , local_assigns) %><%
+elsif url =~ /^\/commercial\/search(.*?)$/   %><% Caboose.log("Rendering rets_properties_index"    ) %><%= block.partial('rets_properties_index'    , local_assigns) %><%
+elsif url =~ /^\/commercial(.*?)$/           %><% Caboose.log("Rendering rets_properties_index"    ) %><%= block.partial('rets_properties_index'    , local_assigns) %><%
 elsif url =~ /^\/commercial\/\d(.*?)$/       %><% Caboose.log("Rendering rets_commercial_details"  ) %><%= block.partial('rets_commercial_details'  , local_assigns) %><%
 elsif url =~ /^\/commercial\/search(.*?)$/   %><% Caboose.log("Rendering rets_commercial_index"    ) %><%= block.partial('rets_commercial_index'    , local_assigns) %><%
 elsif url =~ /^\/commercial(.*?)$/           %><% Caboose.log("Rendering rets_commercial_index"    ) %><%= block.partial('rets_commercial_index'    , local_assigns) %><%
@@ -51,6 +54,6 @@ elsif url =~ /^\/saved-properties(.*?)$/     %><% Caboose.log("Rendering rets_sa
 end
 %>
     </div>
-  <%= raw js %>
+  <%= raw js %>
   </body>
-</html>
+</html>

data/app/views/caboose/blocks/_rets_agent_listings.html.erb CHANGED

@@ -58,10 +58,10 @@ input#recaptcha_response_field{padding:0px;}
   					<% pg[:properties].each do |l| %>
   						<li class="l-media inflate-bass center-on-mobile">
   							<figure class="media-aside">
-  								<a href="/<%= pg[:url_prefix] %>/<%= l.mls_acct %>/details"><img src='<%= l.images && l.images.count > 0 ? l.images[0].image_url(:thumb) : "" %>'class="h-border" width="150" /></a>
+  								<a href="/<%= pg[:url_prefix] %>/<%= l.mls %>/details"><img src='<%= l.images && l.images.count > 0 ? l.images[0].image_url(:thumb) : "" %>'class="h-border" width="150" /></a>
   							</figure>
   							<div class="media-body h-pos">
-  								<p class="pos-top-right h-type-highlight"><strong>MLS#<%=l.mls_acct%></strong></p>
+  								<p class="pos-top-right h-type-highlight"><strong>MLS#<%=l.mls%></strong></p>
   								<% if l.street_num != '0' && l.street_name != "" %>
@@ -78,7 +78,7 @@ input#recaptcha_response_field{padding:0px;}
   								<div class="l-grid grid-row inflate-tenor">
   									<div class="grid-unit-1of4">
   										<% if pg[:type] == 'RES' || pg[:type] == 'COM' %>
-  											<a class="m-btn btn-red" href="/<%= pg[:url_prefix] %>/<%= l.mls_acct %>/details">See More</a>
+  											<a class="m-btn btn-red" href="/<%= pg[:url_prefix] %>/<%= l.mls %>/details">See More</a>
   										<% else %>
   											<p>&nbsp;</p>
   										<% end %>

data/app/views/caboose_rets/agents/index.html.erb CHANGED

@@ -9,36 +9,19 @@
 			<select class="h-conceal-tenor-baritone h-space-mbm" onchange="location=this.options[this.selectedIndex].value;">
 				<% @agents.each do |a| %>
-				  <% next if !a.assistant_to.nil? && a.assistant_to.length > 0 %>
-					<option class="agent_name" value="/agents/<%= a.la_code %>/listings">
+				  <option class="agent_name" value="/agents/<%= a.mls_id %>/listings">
 						<%= a.first_name %> <%= a.last_name %>
 					</option>
 				<% end %>
 			</select>
 			<ul class="h-reveal-tenor-baritone">
-				<li><a href="/agents/048540000">Richard Ellis, Jr.</a>
-						<ul>
-							<% @agents.each do |as| %>
-								<% if as.assistant_to == "048540000" %>
-									<li class="assistant_name"><%= as.first_name %> <%= as.last_name %></li>
-								<% end %>
-							<% end %>
-						</ul>
-				</li>
+				<li><a href="/agents/048540000">Richard Ellis, Jr.</a></li>
 				<% @agents.each do |a| %>
-				  <% next if !a.assistant_to.nil? && a.assistant_to.length > 0 %>
-				  <% next if a.la_code == '048540000' %>
-					<li class="agent_name"><a class="agent_name" href="/agents/<%= a.la_code %>">
+				  <% next if a.mls_id == '048540000' %>
+					<li class="agent_name"><a class="agent_name" href="/agents/<%= a.mls_id %>">
 					<%= a.first_name %> <%= a.last_name %>
-					</a>
-						<ul>
-							<% @agents.each do |as| %>
-								<% if as.assistant_to == a.la_code %>
-									<li class="assistant_name"><%= as.first_name %> <%= as.last_name %></li>
-								<% end %>
-							<% end %>
-						</ul>
+					</a>
 					</li>
 				<% end %>
 			</ul>
@@ -46,10 +29,10 @@
 		<div class="sidebar-body">
-			<% if @agent.la_code == '048540000' %>
+			<% if @agent.mls_id == '048540000' %>
 					<div class="h-space-mvm">
-					<% if @prev %><a class="m-btn-red" href="/agents/<%= @prev.la_code %>">Previous Agent</a> &nbsp; <% end %>
-					<% if @next %><a class="m-btn-red" href="/agents/<%= @next.la_code %>">Next Agent</a><% end %>
+					<% if @prev %><a class="m-btn-red" href="/agents/<%= @prev.mls_id %>">Previous Agent</a> &nbsp; <% end %>
+					<% if @next %><a class="m-btn-red" href="/agents/<%= @next.mls_id %>">Next Agent</a><% end %>
 				</div>
 				<div class="l-media inflate-baritone">
@@ -70,7 +53,7 @@
 						<%= @agent.first_name %> <%= @agent.last_name %>
 						</h4>
-						<% if @agent.contact_info.nil? || @agent.contact_info.strip.length == 0 %>
+						<% if @agent.office_phone.nil? || @agent.office_phone.strip.length == 0 %>
 						  <ul>
 						  	<% if @agent.office_phone.strip.length > 0  %><li>Work Phone: <a href="tel:<%=    @agent.office_phone %>"><%= @agent.office_phone  %></a></li><% end %>
 						  	<% if @agent.car_phone.strip.length    > 0  %><li>Cell Phone: <a href="tel:<%=    @agent.car_phone    %>"><%= @agent.car_phone     %></a></li><% end %>
@@ -78,18 +61,18 @@
 						  	<% if @agent.member_email.strip.length > 0  %><li>Email:      <a href="mailto:<%= @agent.member_email %>"><%= @agent.member_email  %></a></li><% end %>
 						  </ul>
 						<% else %>
-						  <%= raw @agent.contact_info %>
+						  <%= raw @agent.office_phone %>
 						<% end %>
-						<p class="h-space-mvs"><a class="m-btn-red" href="/agents/<%= @agent.la_code %>/listings">See My Listings</a></p>
+						<p class="h-space-mvs"><a class="m-btn-red" href="/agents/<%= @agent.mls_id %>/listings">See My Listings</a></p>
 					</div> <!-- .media-body -->
 				</div> <!-- .l-media -->
-				<% if @agent.bio %><article class="h-space-mtm"><%= raw @agent.bio %></article> <% end %>
-			<% elsif @agent.la_code != "048540000" %>
+				<% if @agent.middle_name %><article class="h-space-mtm"><%= raw @agent.middle_name %></article> <% end %>
+			<% elsif @agent.mls_id != "048540000" %>
 				<div class="h-space-mvm">
-					<% if @prev %><a class="m-btn-red" href="/agents/<%= @prev.la_code %>">Previous Agent</a> &nbsp; <% end %>
-					<% if @next %><a class="m-btn-red" href="/agents/<%= @next.la_code %>">Next Agent</a><% end %>
+					<% if @prev %><a class="m-btn-red" href="/agents/<%= @prev.mls_id %>">Previous Agent</a> &nbsp; <% end %>
+					<% if @next %><a class="m-btn-red" href="/agents/<%= @next.mls_id %>">Next Agent</a><% end %>
 				</div>
 				<div class="l-media">
@@ -100,7 +83,7 @@
 						<%= @agent.first_name %> <%= @agent.last_name %>
 						</h4>
-						<% if @agent.contact_info.nil? || @agent.contact_info.strip.length == 0 %>
+						<% if @agent.office_phone.nil? || @agent.office_phone.strip.length == 0 %>
 						  <ul>
 						  	<% if @agent.office_phone.strip.length > 0  %><li>Work Phone: <a href="tel:<%=    @agent.office_phone %>"><%= @agent.office_phone  %></a></li><% end %>
 						  	<% if @agent.car_phone.strip.length    > 0  %><li>Cell Phone: <a href="tel:<%=    @agent.car_phone    %>"><%= @agent.car_phone     %></a></li><% end %>
@@ -108,17 +91,17 @@
 						  	<% if @agent.member_email.strip.length > 0  %><li>Email:      <a href="mailto:<%= @agent.member_email %>"><%= @agent.member_email  %></a></li><% end %>
 						  </ul>
 						<% else %>
-						  <%= raw @agent.contact_info %>
+						  <%= raw @agent.office_phone %>
 						<% end %>
-						<p class="h-space-mvs"><a class="m-btn-red" href="/agents/<%= @agent.la_code %>/listings">See My Listings</a></p>
+						<p class="h-space-mvs"><a class="m-btn-red" href="/agents/<%= @agent.mls_id %>/listings">See My Listings</a></p>
 					</div>
 				</div> <!-- .l-media -->
 				<article class="h-space-mtm"><%= raw @agent.bio %></article>
 			<% end %>
-			<% @assistants.each do |a| %>
+			<% @agents.each do |a| %>
 				<div class="l-media inflate-baritone h-space-mtl h-space-ptl" style="border-top: 1px solid #D0D0D0;">
 					<div class="media-aside">
 						<img src="https://s3.amazonaws.com/advantagerealtygroup.com/agents/<%=a.id%>_large.jpg?<%= DateTime.now.strftime('%F') %>" width="150" />
@@ -129,7 +112,7 @@
 						<%= a.first_name %> <%= a.last_name %>
 						</h4>
-						<% if a.contact_info.nil? || a.contact_info.strip.length == 0 %>
+						<% if a.office_phone.nil? || a.office_phone.strip.length == 0 %>
 						<ul>
 							<% if a.office_phone.strip.length > 0 %><li>Work Phone: <a href="tel:<%=    a.office_phone %>"><%= a.office_phone  %></a></li><% end %>
 							<% if a.car_phone.strip.length    > 0 %><li>Cell Phone: <a href="tel:<%=    a.car_phone    %>"><%= a.car_phone     %></a></li><% end %>
@@ -137,10 +120,10 @@
 							<% if a.member_email.strip.length > 0 %><li>Email:      <a href="mailto:<%= a.member_email %>"><%= a.member_email  %></a></li><% end %>
 						</ul>
 						<% else %>
-						  <%= raw a.contact_info %>
+						  <%= raw a.office_phone %>
 						<% end %>
-						<% if !a.bio.nil? && a.bio.strip.length > 0 %>
-						  <%= raw a.bio %>
+						<% if !a.middle_name.nil? && a.middle_name.strip.length > 0 %>
+						  <%= raw a.middle_name %>
 						<% end %>
 					</div> <!-- .media-body -->

data/app/views/caboose_rets/media/admin_property_media.html.erb CHANGED

@@ -1,6 +1,6 @@
 <h1>Property Images and Files</h1>
-<p>MLS#: <%= @property.mls_acct %></p>
+<p>MLS#: <%= @property.mls %></p>
 <p><input type='button' value='< Back to Property' onclick="window.location='/admin<%= @property.url %>/edit';" /></p>
 <h2>Images</h2>
@@ -33,7 +33,7 @@
 var controller = false;
 $(document).ready(function() {
   controller = new MediaController({
-    mls_acct: <%= @property.mls_acct %>,
+    mls: <%= @property.mls %>,
     auth_token: "<%= raw form_authenticity_token %>",
     cdn_domain: "d19w6hbyh7z79c.cloudfront.net",
     s3_domain: "s3.amazonaws.com/advantagerealtygroup"

data/app/views/caboose_rets/{residential → properties}/_search_form.html.erb RENAMED

@@ -1,8 +1,8 @@
-<label onclick="toggle_slide('residential_search_form');">Search Form</label>
+<label onclick="toggle_slide('property_search_form');">Search Form</label>
-<div class='search_form' id='residential_search_form' style='display: none;'>
-  <form action="/residential" method="get" id='search_form'>
+<div class='search_form' id='property_search_form' style='display: none;'>
+  <form action="/property" method="get" id='search_form'>
     <ul>
       <li class='price_range'>
         <label>Price Range</label>
@@ -12,7 +12,7 @@
             <% (10000..50000).step(10000) do |x|   %><option value="<%= x %>"><%= number_to_currency(x, :precision => 0) %></option><% end %>
             <% (100000..950000).step(50000) do |x| %><option value="<%= x %>"><%= number_to_currency(x, :precision => 0) %></option><% end %>
             <option value="1000000">$1,000,000+</option>
-          </select>
+          </select>
           <span>To</span>
           <select id="current_price_lte" name="current_price_lte">
             <option value="" selected="selected">Select</option>
@@ -22,22 +22,22 @@
           </select>
         </div>
       </li>
       <li class='bedroom_count'>
         <label>How Many Beds?</label>
         <div>
           <select id="bedrooms_gte" name="bedrooms_gte">
             <option value="">Any</option>
-            <% (1..5).each do |x| %><option value="<%= x %>"><%= x %></option><% end %>
-          </select>
-          <span>To</span>
+            <% (1..5).each do |x| %><option value="<%= x %>"><%= x %></option><% end %>
+          </select>
+          <span>To</span>
           <select id="bedrooms_lte" name="bedrooms_lte">
             <option value="">Any</option>
             <% (1..5).each do |x| %><option value="<%= x %>"><%= x %></option><% end %>
           </select>
         </div>
       </li>
       <li class='property_type'>
         <label>Property Type</label>
         <div>
@@ -47,40 +47,40 @@
           </select>
         </div>
       </li>
-      <li class='mls_acct'>
+      <li class='mls'>
         <label>MLS #</label>
-        <div><input class="search-input" id="mls_acct" name="mls_acct" type="text" placeholder="Enter Here" /></div>
+        <div><input class="search-input" id="mls" name="mls" type="text" placeholder="Enter Here" /></div>
       </li>
-      <li class='square_footage'>
+      <li class='square_footage'>
         <label>Square Feet</label>
         <div>
           <select id="tot_heat_sqft_gte" name="tot_heat_sqft_gte">
             <option value="" selected="selected">Select</option>
             <% (250..4000).step(250) do |x| %><option value="<%= x %>"><%= x %></option><% end %>
-          </select>
+          </select>
           <span>To</span>
           <select id="tot_heat_sqft_lte" name="tot_heat_sqft_lte">
             <option value="" selected="selected">Select</option>
-            <% (250..4000).step(250) do |x| %><option value="<%= x %>"><%= x %></option><% end %>
+            <% (250..4000).step(250) do |x| %><option value="<%= x %>"><%= x %></option><% end %>
           </select>
         </div>
       </li>
-      <li class='neighborhood'>
-        <label>Neighborhood</label>
-        <div>
+      <li class='neighborhood'>
+        <label>Neighborhood</label>
+        <div>
           <select id="subdivision" name="subdivision">
             <option value="">Neighborhood</option>
             <% @subdivisions.each do |f| %><option value="<%= f %>"><%= f.titleize %></option><% end %>
           </select>
         </div>
       </li>
       <li class='elem_school'>
         <label>Elementary School</label>
-        <div>
+        <div>
           <select id="elem_school" name="elem_school">
             <option value="">Select</option>
             <% @elem_schools.each do |f| %><option value="<%= f %>"><%= f.titleize %></option><% end %>
@@ -89,15 +89,15 @@
       </li>
       <li class='middle_school'>
-        <label>Middle School</label>
+        <label>Middle School</label>
         <div>
           <select id="middle_school" name="middle_school">
             <option value="">Select</option>
-            <% @middle_schools.each do |f| %><option value="<%= f %>"><%= f.titleize %></option><% end %>
+            <% @middle_schools.each do |f| %><option value="<%= f %>"><%= f.titleize %></option><% end %>
           </select>
         </div>
       </li>
       <li class='high_school'>
         <label>High School</label>
         <div>
@@ -108,38 +108,38 @@
         </div>
       </li>
-      <li class='street'>
-        <label>Street</label>
+      <li class='street'>
+        <label>Street</label>
         <div><input id="street_name_like" name="street_name_like" type="text" placeholder="Street" /></div>
       </li>
       <li class='remarks'>
         <label>Search Keyword</label>
         <div><input id="remarks" name="remarks_like" type="text" placeholder="Keywords" /></div>
       </li>
       <li class='waterfront'>
         <label>Waterfront</label>
         <div>
-          <select id="waterfront" name="waterfront">
+          <select id="Waterfronts" name="Waterfronts">
             <option value="" selected="selected">Select</option>
             <option value="Y">Yes</option>
-            <option value="">No</option>
+            <option value="">No</option>
           </select>
         </div>
       </li>
       <li class='golf'>
         <label class="h-float-right">Golf Course</label>
-        <div>
+        <div>
           <select id="ftr_lotdesc_like" name="ftr_lotdesc_like">
             <option value="" selected="selected">Select</option>
             <option value="golf">Yes</option>
-            <option value="">No</option>
+            <option value="">No</option>
           </select>
         </div>
       </li>
       <li class='latest'>
         <label>Show listings created when?</label>
         <div>
@@ -150,7 +150,7 @@
             <% d = DateTime.now - 30 %><option value="<%= d.strftime('%F') %>">In the past month</option>
           </select>
         </div>
-      </li>
+      </li>
       <li class='property_status'>
         <label>Property Status</label>
@@ -162,8 +162,8 @@
         </div>
       </li>
     </ul>
-    <p><input type="submit" value="Search" onclick='search_properties(); return false;' /></p>
+    <p><input type="submit" value="Search" onclick='search_properties(); return false;' /></p>
   </form>
 </div>
@@ -180,18 +180,18 @@ function input_val(el) {
 }
 function search_properties() {
   data = []
-  $('#search_form input'  ).each(function(i, el) { v = input_val(el); if (v) data[data.length] = v; });
+  $('#search_form input'  ).each(function(i, el) { v = input_val(el); if (v) data[data.length] = v; });
   $('#search_form select' ).each(function(i, el) { v = input_val(el); if (v) data[data.length] = v; });
   data = data.join('&');
   if (data.length > 0)
-    data = "?" + data
-  window.location = '/residential' + data
+    data = "?" + data
+  window.location = '/property' + data
 }
 function toggle_slide(el)
 {
   var div = $('#' + el);
-  if (div.is(":visible"))
+  if (div.is(":visible"))
     div.slideUp();
   else
     div.slideDown();