wco_models 3.1.0.131 → 3.1.0.133

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 851e8e001bf09f1042638754ef22c0d943bc00b62519f9f869b9e3876ff6f7b5
-  data.tar.gz: 2e3b5dc89b06e897e21613d13df201033ebf52dc8c067650dd345a568d232c79
+  metadata.gz: '08e95dc229ad1424fb5712f08008e7c36011c34d1185ea68ab62d427d2165459'
+  data.tar.gz: a315d6d0595e141555526012f89a0e9548c0a61f5107441b29ba0f8161414b28
 SHA512:
-  metadata.gz: cc62d5bc28d595a2140efcbadb652b9af60f3e6c4284034e4a1a96bcb6e78497e6e09d7f1566b1934ae4f329b4a765d0dc946c84d63c51ef54ae0fe697df98ce
-  data.tar.gz: 906f395e8a428a1eacebd532b555f7e837f8ac3468923703f7b90bb0e089ad53358928b244352fb7e3ecda684ac5adc4c58127d51e2e3b6c064dec6b7336d4d9
+  metadata.gz: 0fc514ec8dffd6b0be83fd5362f512828bfe0b0bd7f199f51c1f6221a5114049c45b12334e59d4277c4f0e21ea73d0d48d7e58b33259aa2caca4218daf04ba62
+  data.tar.gz: f8f51784b26e0230d815dd68de3230ed5329eb94754c9c6a23b084e6b1c3dcdd973d4909781b5cf9ed65b7f2180a452e9a9828a365a9bce378d4ef1fa055266a

data/app/controllers/wco/api/leads_controller.rb

@@ -0,0 +1,9 @@
+
+class Wco::Api::LeadsController < Wco::ApiController
+
+  def index_hash
+    authorize! :index, Wco::Lead
+    @leads = Wco::Lead.find( params[:lead_ids].split(',') )
+  end
+
+end

data/app/controllers/wco/api_controller.rb

@@ -0,0 +1,19 @@
+
+class Wco::ApiController < ActionController::Base
+  layout false
+
+  before_action :decode_jwt
+
+  ##
+  ## private
+  ##
+  private
+
+  def decode_jwt
+    out = JWT.decode params[:jwt_token], nil, false
+    email = out[0]['email']
+    user = User.find_by({ email: email })
+    sign_in user
+  end
+
+end

data/app/controllers/wco/leads_controller.rb

@@ -67,11 +67,8 @@ class Wco::LeadsController < Wco::ApplicationController
       redirect_to request.referrer
       return
     end
-    @ctxs  = @lead.ctxs.page( params[:ctxs_page] ).per( current_profile.per_page )
-
-    ## not paginated b/c of dataTable:
-    @convs = @lead.conversations # .includes(:messages)
-    #      ).page( params[:convs_page] ).per( current_profile.per_page )
+    @ctxs  = @lead.ctxs.page(          params[:ctxs_page]  ).per( current_profile.per_page )
+    @convs = @lead.conversations.page( params[:convs_page] ).per( current_profile.per_page )
 
   end
 

data/app/views/wco/api/leads/index_hash.jbuilder

@@ -0,0 +1,8 @@
+
+
+@leads.each do |lead|
+  json.set! lead.id.to_s do
+    json.email lead.email
+  end
+end
+

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

@@ -70,5 +70,7 @@
   .row
     .col-md-12.conversations
       %h5 Email Conversations (#{@convs.length})
+      = paginate @convs, param_name: :convs_page
       = render 'wco_email/conversations/table', convs: @convs
+      = paginate @convs, param_name: :convs_page
 

data/config/routes.rb

@@ -2,6 +2,10 @@
 Wco::Engine.routes.draw do
   root to: 'application#home'
 
+  namespace :api do
+    get 'leads/index_hash', to: 'leads#index_hash'
+  end
+
   get 'application/tinymce', to: 'application#tinymce'
 
   resources :assets
@@ -22,10 +26,10 @@ Wco::Engine.routes.draw do
   post 'invoices/:id/send-stripe',  to: 'invoices#send_stripe',        as: :send_invoice_stripe
   resources :invoices
 
-  get 'leads/new',     to: 'leads#new'
+  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: /[^\/]+/
+  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.131
+  version: 3.1.0.133
 platform: ruby
 authors:
 - Victor Pudeyev
@@ -409,6 +409,8 @@ files:
 - app/assets/stylesheets/wco/photos.scss
 - app/assets/stylesheets/wco/utils.scss
 - app/assets/stylesheets/wco/videos.scss
+- app/controllers/wco/api/leads_controller.rb
+- app/controllers/wco/api_controller.rb
 - app/controllers/wco/application_controller.rb
 - app/controllers/wco/galleries_controller.rb
 - app/controllers/wco/headlines_controller.rb
@@ -480,6 +482,7 @@ files:
 - app/views/wco/_main_header.haml
 - app/views/wco/_paginate.haml
 - app/views/wco/_search.haml
+- app/views/wco/api/leads/index_hash.jbuilder
 - app/views/wco/application/_auth_widget.haml
 - app/views/wco/application/_debug.haml
 - app/views/wco/application/_meta.haml