caboose-rets 0.1.157 → 0.1.162

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d7c455214de36afc5b11afe204efef57bbbfbc4538753f8b97f57cf8ceff78a0
-  data.tar.gz: 980d9c0bb72aa56d7f9c330ba0d106ee47ab26fd27cc9c313c39a7eae767039f
+  metadata.gz: d8c8d11ba12eb19f306b37dda313b8c01f004624ab63a286b050edf22223513d
+  data.tar.gz: c72ce936ab2069d0318e9935566923079264d1942e16715476c3fd7a74681a9a
 SHA512:
-  metadata.gz: 7ea96fc5bb8285e0df843213fc336d5e5c897c3fd0c62dfc07e5698252faf7ae659b622588cee85f8a574d1f4f65dc1754e0b8abd87fbbd9db5887cde078caa5
-  data.tar.gz: a7591c65e012b91e9281b915fc988b41dee4bf84cc13b5206750ee9593548218edafce2e53980dd2a5f995972ff6f0bf7a895976a5c43e35f68e165da63f0b22
+  metadata.gz: a30e4ef8f1ea47ebcfc1a55703dd94e18004774218158b61a748ee60b650badf70a71fd51df486dc2adf545c7080e1b6c664b491c0aaed396f49e079c4bf026c
+  data.tar.gz: 8204ede788b546815ba4afd896984ea15cd5019b84817a3ce9f9074cd32e452e4e680f26cad2f580d249d4ca07e2c3f2df17cba73a526e2d81033b06f6ceeec4

data/app/assets/javascripts/caboose_rets/rets_functions.js

@@ -1,47 +1,55 @@
 function rets_save_property(mls_number) {
-  $.each( $("a[data-mls='" + mls_number + "']"), function(k,v) {
-    var oldoc = $(v).attr("onclick");
-    var newoc = $(v).attr("onclick2");
-    $(v).attr("onclick",newoc).attr("onclick2",oldoc);
-    $(v).mouseleave(function() {
-      $(v).addClass("active");
+  if ( !window.logged_in )
+    window.location = '/login?return_url=/properties/' + mls_number + '/details';
+  else {
+    $.each( $("a[data-mls='" + mls_number + "']"), function(k,v) {
+      var oldoc = $(v).attr("onclick");
+      var newoc = $(v).attr("onclick2");
+      $(v).attr("onclick",newoc).attr("onclick2",oldoc);
+      $(v).mouseleave(function() {
+        $(v).addClass("active");
+      });
     });
-  });
-	$.ajax({
-    url: '/api/save-property',
-    type: 'put',
-    data: {
-    	mls: mls_number
-    },
-    success: function(resp) {
-    	if (resp && resp.success) {
-    		gtag('event', 'Saved Listing', {'event_category': 'Listings', 'event_label': ('MLS #' + mls_number),'value': 1});
+  	$.ajax({
+      url: '/api/save-property',
+      type: 'put',
+      data: {
+      	mls: mls_number
+      },
+      success: function(resp) {
+      	if (resp && resp.success) {
+      		gtag('event', 'Saved Listing', {'event_category': 'Listings', 'event_label': ('MLS #' + mls_number),'value': 1});
+        }
       }
-    }
-  });
+    });
+  }
 }
 
 function rets_unsave_property(mls_number) {
-  $.each( $("a[data-mls='" + mls_number + "']"), function(k,v) {
-    var oldoc = $(v).attr("onclick");
-    var newoc = $(v).attr("onclick2");
-    $(v).attr("onclick",newoc).attr("onclick2",oldoc);
-    $(v).mouseleave(function() {
-      $(v).removeClass("active");
+  if ( !window.logged_in )
+    window.location = '/login?return_url=/properties/' + mls_number + '/details';
+  else {
+    $.each( $("a[data-mls='" + mls_number + "']"), function(k,v) {
+      var oldoc = $(v).attr("onclick");
+      var newoc = $(v).attr("onclick2");
+      $(v).attr("onclick",newoc).attr("onclick2",oldoc);
+      $(v).mouseleave(function() {
+        $(v).removeClass("active");
+      });
+      if ( $(v).closest(".saved-list").length > 0 )
+        $(v).closest(".property").remove();
     });
-    if ( $(v).closest(".saved-list").length > 0 )
-      $(v).closest(".property").remove();
-  });
-	$.ajax({
-    url: '/api/unsave-property',
-    type: 'put',
-    data: {
-    	mls: mls_number
-    },
-    success: function(resp) {
-    	if (resp && resp.success) {
-      	gtag('event', 'Unsaved Listing', {'event_category': 'Listings', 'event_label': ('MLS #' + mls_number),'value': 1});
+  	$.ajax({
+      url: '/api/unsave-property',
+      type: 'put',
+      data: {
+      	mls: mls_number
+      },
+      success: function(resp) {
+      	if (resp && resp.success) {
+        	gtag('event', 'Unsaved Listing', {'event_category': 'Listings', 'event_label': ('MLS #' + mls_number),'value': 1});
+        }
       }
-    }
-  });
+    });
+  }
 }

data/app/controllers/caboose_rets/saved_properties_controller.rb

@@ -15,6 +15,13 @@ module CabooseRets
       render :layout => 'caboose/admin'
     end
 
+    # GET /admin/mls/user-report
+    def user_report
+      d = DateTime.now - 30.days
+      @users = Caboose::User.where(:site_id => @site.id).where("date_created > ?", d).order('id desc').all
+      render :layout => 'caboose/admin'
+    end
+
     # PUT /api/save-property
     def save
       return if !verify_logged_in
@@ -46,7 +53,10 @@ module CabooseRets
     # GET /saved-properties/:mls/toggle
     # def toggle_save
     #   return if !verify_logged_in
-    #   resp = Caboose::StdClass.new
+    #   resp = Caboose::StdClass.new 
+
+    
+
     #   if SavedProperty.where(:user_id => logged_in_user.id, :mls => params[:mls]).exists?
     #     SavedProperty.where(:user_id => logged_in_user.id, :mls => params[:mls]).destroy_all
     #     resp.saved = false

data/app/mailers/{rets_mailer.rb → caboose_rets/rets_mailer.rb}

@@ -1,4 +1,4 @@
-class RetsMailer < ActionMailer::Base
+class CabooseRets::RetsMailer < ActionMailer::Base
 
   default from: "noreply <noreply@caboosecms.com>"
 

data/app/models/caboose_rets/agent.rb

@@ -56,7 +56,7 @@ class CabooseRets::Agent < ActiveRecord::Base
         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
+        msg.deliver_now
       end
     end
   end
@@ -78,7 +78,7 @@ class CabooseRets::Agent < ActiveRecord::Base
       user.rets_agent_mls_id = agent.mls_id
       last_agent_mls_id.value = agent.mls_id
       user.save
-      agent.delay(:queue => 'rets').send_new_user_email(user)
+      Rails.env.production? ? agent.delay(:queue => 'rets').send_new_user_email(user) : agent.send_new_user_email(user)
       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/models/caboose_rets/rets_importer.rb

@@ -225,7 +225,7 @@ class CabooseRets::RetsImporter # < ActiveRecord::Base
   end
 
   def self.import_agent(mls_id, save_images = true)
-    return if mls_id = "T/ISC-SA-MATRIXMONITOR"
+    return if mls_id == "T/ISC-SA-MATRIXMONITOR"
     a = CabooseRets::Agent.where(:mls_id => mls_id.to_s).first
     if a.nil?
       self.log3('Agent',mls_id,"Importing new Agent #{mls_id}...")

data/app/models/caboose_rets/rets_plugin.rb

@@ -19,7 +19,7 @@ class CabooseRets::RetsPlugin < Caboose::CaboosePlugin
     # item['children'] << { 'id' => 'commercial'       , 'href' => '/admin/multi-family'     , 'text' => 'Multi-Family Property' , 'modal' => false }
     # item['children'] << { 'id' => 'land'             , 'href' => '/admin/land'             , 'text' => 'Land Property'         , 'modal' => false }
     # item['children'] << { 'id' => 'saved-properties' , 'href' => '/saved-properties'       , 'text' => 'Saved Properties'      , 'modal' => false }
-    # item['children'] << { 'id' => 'saved-searches'   , 'href' => '/saved-searches'         , 'text' => 'Saved Searches'        , 'modal' => false }
+    item['children'] << { 'id' => 'user-report'   , 'icon' => 'users', 'href' => '/admin/mls/user-report'         , 'text' => 'User Report'        , 'modal' => false }
     nav << item
     
     return nav

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

@@ -4,6 +4,7 @@
 
 <div class="mb-holder">
   <p><div id='user_<%= @edituser.id %>_rets_agent_mls_id' ></div></p>
+  <% if @edituser.date_created %><p>Date Registered: <%= @edituser.date_created.in_time_zone('Central Time (US & Canada)').strftime('%B %-d, %Y') %></p><% end %>
 </div>
 
 <% if @saved.count > 0 %>

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

@@ -0,0 +1,25 @@
+<h1>User Report</h1>
+
+<p>Last 30 Days</p>
+
+<p>New users registered: <%= @users.count %></p>
+
+<ul class="users">
+	<% @users.each do |u| %>
+		<% agent = CabooseRets::Agent.where(:mls_id => u.rets_agent_mls_id).first %>
+		<li>
+			<a href="/admin/users/<%= u.id %>"><%= u.first_name %> <%= u.last_name %></a>
+			<% if u.date_created %><span>- <%= u.date_created.in_time_zone('Central Time (US & Canada)').strftime('%B %-d, %Y') %></span><% end %>
+			<br />
+			<% if agent %><span style="display:block;margin-top:2px;">Assigned Agent: <%= agent.first_name %> <%= agent.last_name %></span><% end %>
+		</li>
+	<% end %>
+</ul>
+
+<% content_for :caboose_css do %>
+<style>
+	ul.users li {
+		margin-bottom: 10px;
+	}
+</style>
+<% end %>

data/config/routes.rb

@@ -97,6 +97,7 @@ CabooseRets::Engine.routes.draw do
   put    "/api/save-property"                 => "saved_properties#save"
   put    "/api/unsave-property"               => "saved_properties#unsave"
   get    "/admin/users/:id/mls"               => "saved_properties#rets_info"
+  get    "/admin/mls/user-report"             => "saved_properties#user_report"
 
   get    "/admin/properties/:mls/photos"       => "rets_media#admin_photos"
   get    "/admin/properties/:mls/files"        => "rets_media#admin_files"

data/lib/caboose_rets/version.rb

@@ -1,3 +1,3 @@
 module CabooseRets
-  VERSION = '0.1.157'
+  VERSION = '0.1.162'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-rets
 version: !ruby/object:Gem::Version
-  version: 0.1.157
+  version: 0.1.162
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-23 00:00:00.000000000 Z
+date: 2020-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: caboose-cms
@@ -66,7 +66,7 @@ files:
 - app/controllers/caboose_rets/saved_properties_controller.rb
 - app/controllers/caboose_rets/saved_searches_controller.rb
 - app/helpers/caboose_rets/application_helper.rb
-- app/mailers/rets_mailer.rb
+- app/mailers/caboose_rets/rets_mailer.rb
 - app/models/caboose_rets/agent.rb
 - app/models/caboose_rets/agent_meta.rb
 - app/models/caboose_rets/log.rb
@@ -108,6 +108,7 @@ files:
 - app/views/caboose_rets/rets_mailer/new_user.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
 - app/views/caboose_rets/saved_searches/edit.html.erb
 - app/views/caboose_rets/saved_searches/index.html.erb
 - config/routes.rb