caboose-rets 0.1.25 → 0.1.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e857e0eae9ea7efd5fb52056149ab05f4a7b3c96
-  data.tar.gz: 4820e0bc50d32128f67d7d1d220fbc69a889d64e
+  metadata.gz: 254faba117caf0a31d78445efc80d351b8604cfc
+  data.tar.gz: e102328e3e15d0b70fc42fbb0d0221f05aa1c329
 SHA512:
-  metadata.gz: 472d4056bc642fd14d6b2518ed81938f7145f187905295b6d8ab07882e5b49e23a8a3ea171a9ac70a83cef85806dc68fd554bc6c2c289e0d1488ffa9d1dc6f63
-  data.tar.gz: 2105cbfe1b38253048b77401626ecbcc27599cfd53c94164b7047adfaf4c58e4673a4783f870a71aeeb4ddb1015c195d755311e9fb3bbb9c84f28f0a4b0477b1
+  metadata.gz: b789e6caadc04bbcfb3786148b0493fac621cbdab04337be83d9684b2a3e44b33eabc964df9a23d6af2e9a466f4d0f9002176a26cc7542b07f2cd7dee3921f24
+  data.tar.gz: f862d4548e70f064e333d2499dce183d713af35a8cd55e8024720115fcaf27ad77245da088c747bdddde3a7f8450034742206c5348032d3c1905d406d52ce723

data/app/controllers/caboose_rets/properties_controller.rb

@@ -94,7 +94,7 @@ module CabooseRets
       @saved = logged_in? && SavedProperty.where(:user_id => logged_in_user.id, :mls_number => params[:mls_number]).exists?
       if @property.nil?
         @mls_number = params[:mls_number]
-        CabooseRets::RetsImporter.delay(:priority => 10, :queue => 'rets').import_property(@mls_number.to_i)
+      #  CabooseRets::RetsImporter.delay(:priority => 10, :queue => 'rets').import_property(@mls_number.to_i)
         render 'properties/property_not_exists'
         return
       end
@@ -109,7 +109,7 @@ module CabooseRets
 
       if @property.nil?
        @mls = params[:mls]
-       CabooseRets::RetsImporter.delay(:priority => 10, :queue => 'rets').import_property(@mls_number.to_i)
+    #   CabooseRets::RetsImporter.delay(:priority => 10, :queue => 'rets').import_property(@mls_number.to_i)
        render 'properties/property_not_exists'
        return
       end

data/app/controllers/caboose_rets/rets_controller.rb

@@ -12,11 +12,11 @@ module CabooseRets
     def admin_import
       return if !user_is_allowed('properties', 'edit')
                   
-      mls = params[:mls].to_i
-      CabooseRets::RetsImporter.delay(:priority => 10, :queue => 'rets').import_property(mls)
+      mui = params[:mls]
+      CabooseRets::RetsImporter.delay(:priority => 10, :queue => 'rets').import_properties(mui)
       
       resp = Caboose::StdClass.new
-      resp.success = "The property is being imported from MLS.  This may take a few minutes depending on how many images it has."
+      resp.success = "The property is being imported from Matrix.  This may take a few minutes depending on how many images it has."
       render :json => resp
     end
 

data/app/models/caboose_rets/agent.rb

@@ -29,14 +29,14 @@ class CabooseRets::Agent < ActiveRecord::Base
     end
   end
   
-  def refresh_from_mls        
-    CabooseRets::RetsImporter.import('Listing',"(Matrix_Unique_ID=#{self.matrix_unique_id})")
+  def refresh_from_mls
+    CabooseRets::RetsImporter.import('Agent',"(Matrix_Unique_ID=#{self.matrix_unique_id})")
     CabooseRets::RetsImporter.download_property_images(self)
   end
   
   def self.refresh_from_mls(agent_number)
     CabooseRets::RetsImporter.import('Agent', "(Agent_Number=#{self.agent_number})")
-    CabooseRets::RetsImporter.import_property(matrix_unique_id)          
+    CabooseRets::RetsImporter.import_agent(self.matrix_unique_id)          
   end
     
   def parse(data)

data/app/models/caboose_rets/property.rb

@@ -13,7 +13,7 @@ class CabooseRets::Property <ActiveRecord::Base
     def self.geolocatable() all(conditions: "latitude IS NOT NULL AND longitude IS NOT NULL") end
 
     def refresh_from_mls
-        CabooseRets::RetsImporter.import_property(self.matrix_unique_id)
+        CabooseRets::RetsImporter.import_properties(self.matrix_unique_id, false)
     end
 
     def parse(data)

data/app/models/caboose_rets/rets_importer.rb

@@ -151,9 +151,14 @@ class CabooseRets::RetsImporter # < ActiveRecord::Base
   #=============================================================================
 
   # def self.import_property(mui, save_images = true)
-  #   self.import('Listinng', "(Matrix_Unique_ID=*#{mui}*)")
-  #   p = CabooseRets::Property.where(:id => id.to_i).first
-  #   self.download_property_images(p, save_images)
+  #   self.import('Listing', "(Matrix_Unique_ID=#{mui})")
+  #   p = CabooseRets::Property.where(:matrix_unique_id => mui.to_s).first
+  #   if p != nil
+  #     self.download_property_images(p)
+  #     self.update_coords(p)
+  #   else
+  #     self.log("No Property associated with #{mui}")
+  #   end
   # end
 
   def self.import_properties(mui, save_images = true)

data/app/views/caboose_rets/rets/admin_import_form.html.erb

@@ -1,8 +1,8 @@
-<h1>Import Property from MLS</h1>
+<h1>Import Property from Matrix</h1>
 
 <form action='/admin/rets/import' method='post' id='import_form' onsubmit="import_property(); return false;">
 <input type='hidden' name='authenticity_token' value='<%= form_authenticity_token %>' />
-<p><input type='text' name='mls' id='mls' placeholder='MLS #' value="" style='width: 300px;' /></p>
+<p><input type='text' name='mls' id='mls' placeholder='Matrix Unique ID #' value="" style='width: 300px;' /></p>
 <div id='message'></div>
 <p><input type='submit' value='Import Property' /></p>
 </form>
@@ -12,7 +12,7 @@
 
 function import_property()
 {
-  $('#message').html("<p class='loading'>Importing property from MLS...</p>");
+  $('#message').html("<p class='loading'>Importing property from Matrix...</p>");
   $.ajax({
     url: '/admin/rets/import',
     type: 'post',
@@ -25,4 +25,4 @@ function import_property()
 }
 
 </script>
-<% end %>
+<% end %>

data/lib/caboose_rets/version.rb

@@ -1,3 +1,3 @@
 module CabooseRets
-  VERSION = '0.1.25'
+  VERSION = '0.1.26'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-rets
 version: !ruby/object:Gem::Version
-  version: 0.1.25
+  version: 0.1.26
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-06 00:00:00.000000000 Z
+date: 2017-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: caboose-cms