wco_models 3.1.0.87 → 3.1.0.88

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f087d4035087c7f802c07037989c33caa48b4d6c6cc9e2672339afcae1be46d3
-  data.tar.gz: c88854d0a647ba472eb7585c9526304d3d4020f6bcefd0596430ea0b9379d3ec
+  metadata.gz: 2677535542d4c58553358f87c01db219b8995a4d299bc0e7019b3c61bb002c60
+  data.tar.gz: 8d78aeb3a31e0c4704267b9cea11cd8b4f570186101c5309ecaade26de4dfa2a
 SHA512:
-  metadata.gz: 6aa78933c0e1dfce14ce9059a4b3d0bbacefdcfe080308197ff427728ae60d6508b9f61a7b573bc2bf31b790160a8fe74c5e0459f204dc6c2b0c2e4457ee3700
-  data.tar.gz: '0939f3c387a52c1edee06afcd4487cf3bd9be91c9c3c9c1bd406fbc6cdaa9b697e63130cd8d95145174e2f9493c1ddd1015b9a2efebfed40992aeeb44c7197dd'
+  metadata.gz: 6784c7d5c6d8f601d9f7a86b342a8874629d91df36a326a1953176123fadff3124c7374ccf2fa7a745be36571ea70d019f63775290ef3f99e6a8cfa44e2d96a0
+  data.tar.gz: 574a70b6ca0e9def07f79938feb6193fc3dc1e6a9b4625f4c35b304fbfecb4d4339878962b6fdb6a343c0543f789521211b77223ff0c97814ec3b997201c81f9

data/app/controllers/wco/leads_controller.rb

@@ -3,6 +3,20 @@ class Wco::LeadsController < Wco::ApplicationController
 
   before_action :set_lists
 
+  def create
+    params[:lead][:tags].delete ''
+    params[:lead][:leadset] = nil if params[:lead][:leadset].blank?
+
+    @lead = Wco::Lead.new params[:lead].permit!
+    authorize! :crete, @lead
+    if @lead.save
+      flash_notice 'ok'
+    else
+      flash_alert @lead
+    end
+    redirect_to action: :index
+  end
+
   def index
     authorize! :index, Wco::Lead
     @leads = Wco::Lead.all
@@ -27,6 +41,11 @@ class Wco::LeadsController < Wco::ApplicationController
     @leads = @leads.page( params[:leads_page ] ).per( current_profile.per_page )
   end
 
+  def new
+    authorize! :new, Wco::Lead
+    @lead = Wco::Lead.new
+  end
+
   def show
     @lead      = Wco::Lead.where({ id: params[:id] }).first
     @lead    ||= Wco::Lead.where({ email: params[:id] }).first
@@ -44,6 +63,10 @@ class Wco::LeadsController < Wco::ApplicationController
     # @videos    = @lead.videos.page( params[:videos_page]       ).per( current_profile.per_page )
   end
 
+  def update
+    params[:tags].delete ''
+  end
+
   ##
   ## private
   ##
@@ -51,6 +74,7 @@ class Wco::LeadsController < Wco::ApplicationController
 
   def set_lists
     @email_campaigns_list = [[nil,nil]] + WcoEmail::Campaign.all.map { |c| [ c.slug, c.id ] }
+    @leadsets_list        = Wco::Leadset.list
     @tags_list            = Wco::Tag.list
   end
 

data/app/models/wco/lead.rb

@@ -29,7 +29,6 @@ class Wco::Lead
   has_many                :email_contexts,          class_name: '::WcoEmail::Context'
   def ctxs; email_contexts; end
   has_many                :email_actions,           class_name: '::WcoEmail::EmailAction'
-  # has_and_belongs_to_many :scheduled_email_actions, class_name: '::WcoEmail::ScheduledEmailAction'
   def schs; email_actions; end
   has_and_belongs_to_many :email_campaigns,         class_name: '::WcoEmail::Campaign'
   has_and_belongs_to_many :tags,                    class_name: '::Wco::Tag'
@@ -37,13 +36,9 @@ class Wco::Lead
   # has_many :galleries, class_name: 'Wco::Gallery'
   # has_many :videos, class_name: 'Wco::Video'
 
-  def self.list
-    [[nil,nil]] + all.map { |p| [ p.email, p.id ] }
-  end
-
-  OP_DELETE = 'delete'
+  OP_DELETE          = 'delete'
   OP_ADD_TO_CAMPAIGN = 'add_to_campaign'
-  OPS = [ OP_DELETE, OP_ADD_TO_CAMPAIGN ]
+  OPS                = [ OP_DELETE, OP_ADD_TO_CAMPAIGN ]
 
   has_many :unsubscribes, class_name: '::WcoEmail::Unsubscribe'
   field :unsubscribe_token
@@ -54,4 +49,10 @@ class Wco::Lead
     self[:unsubscribe_token]
   end
 
+  def to_s
+    email
+  end
+  def self.list
+    [[nil,nil]] + all.map { |p| [ p.email, p.id ] }
+  end
 end

data/app/models/wco/leadset.rb

@@ -50,5 +50,7 @@ class Wco::Leadset
   def to_s
     company_url
   end
-
+  def self.list
+    [[nil,nil]] + all.map { |ttt| [ ttt.company_url, ttt.id ] }
+  end
 end

data/app/models/wco/publisher.rb

@@ -52,6 +52,7 @@ class Wco::Publisher
           httparty: out,
           label: "publisher#do_run non-201 status",
         } )
+      raise out.body
     end
 
     eval( after_eval ) if after_eval.present?

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

@@ -1,7 +1,5 @@
 
-- url = lead.new_record? ? leads_path : lead_path( lead.id )
-
-= form_for lead, html: { multipart: true }, as: :lead, url: url do |f|
+= form_for lead, html: { multipart: true } do |f|
 
   .field
     = f.label :name
@@ -21,20 +19,19 @@
 
   .field
     = f.label "Leadset (company)"
-    = f.select :m3_leadset_id, options_for_select(@leadsets_list, selected: lead.m3_leadset_id), { include_blank: true }, { class: :select2 }
+    = f.select :leadset, options_for_select(@leadsets_list, selected: lead.leadset_id), { class: :select2 }
 
-  .field
-    %label Rating
-    = f.number_field :rating
+  -# .field
+  -#   %label Rating
+  -#   = f.number_field :rating
 
-  .field
-    = f.label :comment
-    = f.text_area :comment, class: :tinymce
+  -# .field
+  -#   = f.label :comment
+  -#   = f.text_area :comment, class: :tinymce
 
   .field
     = f.label "Tags"
-    = lead.wp_tags.inspect
-    = f.select :lead_tags, options_for_select(@tags_list, selected: lead.wp_tags.map(&:term_id) ), {}, { class: :select2, multiple: true }
+    = f.select :tags, options_for_select(@tags_list, selected: lead.tag_ids ), {}, { class: :select2, multiple: true }
 
   .field
     = f.label :photo

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

@@ -4,6 +4,7 @@
     .col-sm-12.col-md-6
       %h1 New Lead
       = render 'form', lead: @lead
-    .col-sm-12.col-md-6
-      %h1 Import Leads
-      = render 'form_import'
+
+    -# .col-sm-12.col-md-6
+    -#   %h1 Import Leads
+    -#   = render 'form_import'

data/config/routes.rb

@@ -22,9 +22,10 @@ Wco::Engine.routes.draw do
   post 'invoices/:id/send-stripe',  to: 'invoices#send_stripe',        as: :send_invoice_stripe
   resources :invoices
 
-  get 'leads/:id',     to: 'leads#show', id: /[^\/]+/
+  get 'leads/new',     to: 'leads#new'
   post 'leads/bulkop', to: 'leads#bulkop'
   post 'leads/import', to: 'leads#import', as: :leads_import
+  get 'leads/:id',     to: 'leads#show', id: /[^\/]+/
   resources :leads
   resources :leadsets
   delete 'logs/bulkop', to: 'logs#bulkop', as: :logs_bulkop

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wco_models
 version: !ruby/object:Gem::Version
-  version: 3.1.0.87
+  version: 3.1.0.88
 platform: ruby
 authors:
 - Victor Pudeyev