wco_models 3.1.0.91 → 3.1.0.93

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c267b89943c2cb18139bdd044522d142fca56a81cadd7930b21eec7f6349d813
-  data.tar.gz: 42c005b73cdb2d15d3157b2d485a57166519a594383caf5a959400c18ae693cb
+  metadata.gz: 2ce69cb552cc8f072d6cab730355f2680f5080773b5ba38f15cb45827c1d69ce
+  data.tar.gz: df88159670a5a92bade97d647c652bbd11b5d8e7a7d630b8ff4837fd878fc8d5
 SHA512:
-  metadata.gz: 77f0973a4e5ecddd767b045a6c77a5ba6b1dc98eacef09931fbc71413143f5966a3104fa763526f61b0f4a96029b082b025918423146e8703c434469455e74a5
-  data.tar.gz: 564da09016bf7490ad15c0c394d15ffb1b453f610536dc4bd9f0cafb8fa8e855f6d7a66c999c5e7f75c4347157ec3a1cbe5e99d77a6dac1809555fe89757e6e0
+  metadata.gz: 0cccea65fbae4e19a976408913ae73f9fe602019ae1ed4d1314a61b6ea3bb2a1c70333b9eb84ff39152f0a8d361c730d9922c77bdb7b60a07670f9be9ce6c282
+  data.tar.gz: 89592dfbb1197a866983d79573cae2d61109cf7d635a06e4b9609edb0e615108d3f8f1f2181934fdadb8ff90f11a7bc33160e35306127e111798361160c22dc0

data/app/controllers/wco/leads_controller.rb

@@ -8,7 +8,7 @@ class Wco::LeadsController < Wco::ApplicationController
     params[:lead][:leadset] = nil if params[:lead][:leadset].blank?
 
     @lead = Wco::Lead.new params[:lead].permit!
-    authorize! :crete, @lead
+    authorize! :create, @lead
     if @lead.save
       flash_notice 'ok'
     else
@@ -17,6 +17,11 @@ class Wco::LeadsController < Wco::ApplicationController
     redirect_to action: :index
   end
 
+  def edit
+    authorize! :edit, Wco::Lead
+    @lead = Wco::Lead.find params[:id]
+  end
+
   def index
     authorize! :index, Wco::Lead
     @leads = Wco::Lead.all
@@ -64,7 +69,17 @@ class Wco::LeadsController < Wco::ApplicationController
   end
 
   def update
-    params[:tags].delete ''
+    params[:lead][:tags].delete ''
+    params[:lead][:leadset] = nil if params[:lead][:leadset].blank?
+
+    @lead = Wco::Lead.new params[:lead].permit!
+    authorize! :update, @lead
+    if @lead.save
+      flash_notice 'ok'
+    else
+      flash_alert @lead
+    end
+    redirect_to action: :show, id: @lead.id
   end
 
   ##

data/app/models/wco/lead.rb

@@ -28,6 +28,24 @@ class Wco::Lead
       self[:email] = a
     end
   end
+  def self.normalize_email a
+    a = a.downcase
+    if a.index('+')
+      a.slice!( a[a.index('+')...a.index('@')] )
+    end
+    return a
+  end
+  def self.find_or_create_by_email email
+    email = self.normalize_email email
+    out = where( email: email ).first
+    if !out
+      domain    = email.split('@')[1]
+      leadset   = Wco::Leadset.where(  company_url: domain ).first
+      leadset ||= Wco::Leadset.create( company_url: domain, email: email )
+      out = create!( email: email, leadset: leadset )
+    end
+    return out
+  end
 
 
   has_one :photo,      class_name: 'Wco::Photo'

data/app/models/wco_email/message_stub.rb

@@ -86,17 +86,13 @@ class WcoEmail::MessageStub
 
     ## Leadset, Lead
     from      = the_mail.from ? the_mail.from[0] : "nobody@unknown-doma.in"
-    domain    = from.split('@')[1]
-    leadset   = Wco::Leadset.where(  company_url: domain.downcase ).first
-    leadset ||= Wco::Leadset.create( company_url: domain.downcase, email: from.downcase )
-    lead      = Wco::Lead.find_or_create_by( email: from, leadset: leadset )
-
+    lead      = Wco::Lead.find_or_create_by_email( from )
 
     message   = WcoEmail::Message.unscoped.where( message_id: message_id ).first
     if message
       message.message_id = "#{Time.now.strftime('%Y%m%d')}-trash-#{message.message_id}"
       message.object_key = "#{Time.now.strftime('%Y%m%d')}-trash-#{message.object_key}"
-      message.save!( validate: false )
+      message.save( validate: false )
       message.delete
     end
 
@@ -119,7 +115,7 @@ class WcoEmail::MessageStub
       tos: the_mail.to,
 
       cc:  the_mail.cc ? the_mail.cc[0] : nil,
-      ccs:  the_mail.cc,
+      ccs: the_mail.cc,
     })
     puts! @message, '@message'
 
@@ -156,9 +152,7 @@ class WcoEmail::MessageStub
     conv.save
 
     the_mail.cc&.each do |cc|
-      domain  = cc.split('@')[1] rescue 'unknown.domain'
-      leadset = Wco::Leadset.find_or_create_by( company_url: domain )
-      Wco::Lead.find_or_create_by( email: cc, leadset: leadset )
+      Wco::Lead.find_or_create_by_email( cc )
     end
 
     conv.update_attributes({

data/app/views/wco/leads/_form.haml

@@ -19,7 +19,7 @@
 
   .field
     = f.label "Leadset (company)"
-    = f.select :leadset, options_for_select(@leadsets_list, selected: lead.leadset_id), { class: :select2 }
+    = f.select :leadset, options_for_select(@leadsets_list, selected: lead.leadset_id), {}, { class: :select2 }
 
   -# .field
   -#   %label Rating

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wco_models
 version: !ruby/object:Gem::Version
-  version: 3.1.0.91
+  version: 3.1.0.93
 platform: ruby
 authors:
 - Victor Pudeyev
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-18 00:00:00.000000000 Z
+date: 2024-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-s3