wco_models 3.1.0.116 → 3.1.0.118

data/app/controllers/wco/leads_controller.rb

@@ -67,12 +67,8 @@ class Wco::LeadsController < Wco::ApplicationController
       redirect_to request.referrer
       return
     end
-    # @schs      = Sch.where( lead_id: @lead.id )
-    # @ctxs      = Ctx.where( lead_id: @lead.id )
-    # @convs     = Conv.find( Office::EmailConversationLead.where( lead_id: @lead.id ).map( &:email_conversation_id ) )
-    # @msgs      = Msg.where( from: @lead.email )
-    # @galleries = @lead.galleries.page( params[:galleries_page] ).per( current_profile.per_page )
-    # @videos    = @lead.videos.page( params[:videos_page]       ).per( current_profile.per_page )
+    @ctxs  = @lead.ctxs
+    @convs = @lead.conversations.includes(:messages)
   end
 
   def update
@@ -97,6 +93,8 @@ class Wco::LeadsController < Wco::ApplicationController
 
   def set_lists
     @email_campaigns_list = [[nil,nil]] + WcoEmail::Campaign.all.map { |c| [ c.slug, c.id ] }
+    @email_templates_list = WcoEmail::EmailTemplate.list
+    @leads_list           = Wco::Lead.list
     @leadsets_list        = Wco::Leadset.list
     @tags_list            = Wco::Tag.list
   end

data/app/mailers/wco_email/application_mailer.rb

@@ -56,7 +56,7 @@ class WcoEmail::ApplicationMailer < ActionMailer::Base
     mail( from:    @ctx.from_email,
           to:      @ctx.to_email,
           cc:      @ctx.cc,
-          bcc:     "poxlovi@gmail.com",
+          bcc:     "poxlovi+sent@gmail.com",
           subject: ERB.new( @ctx.subject ).result( @ctx.get_binding ),
           body:    rendered_str,
           content_type: "text/html" )

data/app/models/wco/lead.rb

@@ -52,14 +52,14 @@ class Wco::Lead
 
   has_many                :email_messages,          class_name: '::WcoEmail::Message', inverse_of: :lead
 
-  has_and_belongs_to_many :conversations,           class_name: '::WcoEmail::Conversation'
+  has_and_belongs_to_many :conversations,           class_name: '::WcoEmail::Conversation', index: true
   def convs; conversations; end
   has_many                :email_contexts,          class_name: '::WcoEmail::Context'
   def ctxs; email_contexts; end
   has_many                :email_actions,           class_name: '::WcoEmail::EmailAction'
   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'
+  has_and_belongs_to_many :tags,                    class_name: '::Wco::Tag', index: true
 
   # has_many :galleries, class_name: 'Wco::Gallery'
   # has_many :videos, class_name: 'Wco::Video'

data/app/models/wco/tag.rb

@@ -13,10 +13,10 @@ class Wco::Tag
 
   has_many :email_filters, class_name: 'WcoEmail::EmailFilter', inverse_of: :tag
 
-  has_and_belongs_to_many :conversations, class_name: 'WcoEmail::Conversation'
+  has_and_belongs_to_many :conversations, class_name: 'WcoEmail::Conversation', index: true
   has_and_belongs_to_many :message_stubs, class_name: 'WcoEmail::MessageStub'
   has_and_belongs_to_many :headlines # ,     class_name: 'Headline'
-  has_and_belongs_to_many :leads # ,         class_name: 'Lead'
+  has_and_belongs_to_many :leads, index: true # ,         class_name: 'Lead'
   has_and_belongs_to_many :leadsets # ,      class_name: 'Leadset'
   has_and_belongs_to_many :reports
   has_and_belongs_to_many :logs

data/app/models/wco_email/conversation.rb

@@ -26,12 +26,15 @@ class WcoEmail::Conversation
   field :preview, default: ''
 
   has_many :messages,             class_name: '::WcoEmail::Message'
+  default_scope ->{ includes(:messages) }
 
-  has_and_belongs_to_many :tags,  class_name: 'Wco::Tag'
-  has_and_belongs_to_many :leads, class_name: 'Wco::Lead'
+  has_and_belongs_to_many :tags,  class_name: 'Wco::Tag', index: true
+  has_and_belongs_to_many :leads, class_name: 'Wco::Lead', index: true
 
   belongs_to :filter, class_name: 'WcoEmail::EmailFilter', inverse_of: :conversations, optional: true
 
+
+
   def to_s
     "#{subject} (#{messages.length})"
   end

data/app/models/wco_email/email_template.rb

@@ -1,5 +1,5 @@
 
-DEFAULT_FROM_EMAIL = 'victor@wasya.co'
+DEFAULT_FROM_EMAIL = 'no-reply@wasya.co'
 
 class WcoEmail::EmailTemplate
   include Mongoid::Document
@@ -41,7 +41,7 @@ class WcoEmail::EmailTemplate
   field :config_json,     type: Object,   default: '{}'
   field :layout, default: 'plain'
 
-  DEFAULT_FROM_EMAIL = 'Victor Pudeyev <victor@wasya.co>'
+  DEFAULT_FROM_EMAIL = 'Victor Pudeyev <no-reply@wasya.co>'
   FROM_EMAILS = [
     'Annesque Studio <hello@annesque.studio>',
     'Annesque Studio <no-reply@annesque.studio>',
@@ -134,6 +134,4 @@ class WcoEmail::EmailTemplate
   def self.list
     [[nil,nil]] + all.map { |p| [ p.slug, p.id ] }
   end
-
 end
-ET = WcoEmail::EmailTemplate

data/app/models/wco_email/message.rb

@@ -26,6 +26,8 @@ class WcoEmail::Message
   field :subject
 
   field :part_html
+  field :read_at, type: DateTime
+  index({ read_at: -1 })
 
   def part_html_sanitized
     doc = Nokogiri::HTML part_html
@@ -233,6 +235,7 @@ class WcoEmail::Message
     end
   end
 
+  scope :unread, ->{ where( read_at: nil ) }
 
 end
 ::Msg = WcoEmail::Message

data/app/views/layouts/wco/application.haml

@@ -4,23 +4,23 @@
     %meta{content: "text/html; charset=UTF-8", "http-equiv" => "Content-Type"}
     %title Wco Models
 
-    = javascript_include_tag "//code.jquery.com/jquery-3.3.1.min.js"
+    -# = javascript_include_tag "//code.jquery.com/jquery-3.3.1.min.js"
 
-    %script{ :src => "//cdn.datatables.net/1.10.16/js/jquery.dataTables.min.js" }
-    = stylesheet_link_tag "//cdn.datatables.net/1.10.16/css/jquery.dataTables.min.css"
+    -# %script{ :src => "//cdn.datatables.net/1.10.16/js/jquery.dataTables.min.js" }
+    -# = stylesheet_link_tag "//cdn.datatables.net/1.10.16/css/jquery.dataTables.min.css"
 
     = stylesheet_link_tag "//maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css", :media => 'all'
     = stylesheet_link_tag "//fonts.googleapis.com/icon?family=Material+Icons"
 
-    = stylesheet_link_tag "//cdn.jsdelivr.net/npm/bootstrap@4.3.1/dist/css/bootstrap.min.css"
-    = javascript_include_tag "//cdn.jsdelivr.net/npm/popper.js@1.14.7/dist/umd/popper.min.js"
-    = javascript_include_tag "//cdn.jsdelivr.net/npm/bootstrap@4.3.1/dist/js/bootstrap.min.js"
+    -# = stylesheet_link_tag "//cdn.jsdelivr.net/npm/bootstrap@4.3.1/dist/css/bootstrap.min.css"
+    -# = javascript_include_tag "//cdn.jsdelivr.net/npm/popper.js@1.14.7/dist/umd/popper.min.js"
+    -# = javascript_include_tag "//cdn.jsdelivr.net/npm/bootstrap@4.3.1/dist/js/bootstrap.min.js"
 
-    = stylesheet_link_tag "//cdn.jsdelivr.net/npm/select2@4.0.0/dist/css/select2.min.css"
-    = javascript_include_tag "//cdn.jsdelivr.net/npm/select2@4.0.0/dist/js/select2.min.js"
+    -# = stylesheet_link_tag "//cdn.jsdelivr.net/npm/select2@4.0.0/dist/css/select2.min.css"
+    -# = javascript_include_tag "//cdn.jsdelivr.net/npm/select2@4.0.0/dist/js/select2.min.js"
 
-    = stylesheet_link_tag "//cdn.jsdelivr.net/npm/summernote@0.8.18/dist/summernote.min.css"
-    = javascript_include_tag "//cdn.jsdelivr.net/npm/summernote@0.8.18/dist/summernote.min.js"
+    -# = stylesheet_link_tag "//cdn.jsdelivr.net/npm/summernote@0.8.18/dist/summernote.min.css"
+    -# = javascript_include_tag "//cdn.jsdelivr.net/npm/summernote@0.8.18/dist/summernote.min.js"
 
     = javascript_include_tag "wco/application"
     = stylesheet_link_tag    "wco/application", media: "all"

data/app/views/wco/application/tinymce.html.erb

@@ -2,9 +2,9 @@
 <html>
   <head>
     <!-- include libraries(jQuery, bootstrap) -->
-    <link href="https://stackpath.bootstrapcdn.com/bootstrap/3.4.1/css/bootstrap.min.css" rel="stylesheet">
-    <script src="https://code.jquery.com/jquery-3.5.1.min.js"></script>
-    <script src="https://stackpath.bootstrapcdn.com/bootstrap/3.4.1/js/bootstrap.min.js"></script>
+    <link href="//stackpath.bootstrapcdn.com/bootstrap/3.4.1/css/bootstrap.min.css" rel="stylesheet">
+    <script src="//code.jquery.com/jquery-3.5.1.min.js"></script>
+    <script src="//stackpath.bootstrapcdn.com/bootstrap/3.4.1/js/bootstrap.min.js"></script>
 
     <!-- include codemirror (codemirror.css, codemirror.js, xml.js, formatting.js) -->
     <link rel="stylesheet" type="text/css" href="//cdnjs.cloudflare.com/ajax/libs/codemirror/3.20.0/codemirror.css">

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

@@ -9,9 +9,9 @@
     %h2.title
       Leads
       - if !defined?( skip_pagination ) || !skip_pagination
-        (#{leads.total_count})
+        (#{@leads.total_count})
       - else
-        (#{leads.length})
+        (#{@leads.length})
       = link_to raw("<i class='fa fa-plus-square'></i>"), new_lead_path
 
   = render 'index', leads: @leads, search_path: leads_path

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

@@ -39,7 +39,7 @@
         Email Contexts (#{@lead.ctxs.length})
         = link_to '[+]', '#'
       %ul
-        - @lead.ctxs.each do |ctx|
+        - @ctxs.each do |ctx|
           %li
             = pp_date( ctx.sent_at ) || 'not sent'
             = link_to ctx.subject.presence||"No Subj?!", wco_email.context_path(ctx)
@@ -69,6 +69,6 @@
 
   .row
     .col-md-12.conversations
-      %h5 Email Conversations (#{@lead.convs.length})
-      = render 'wco_email/conversations/table', convs: @lead.convs
+      %h5 Email Conversations (#{@convs.length})
+      = render 'wco_email/conversations/table', convs: @convs
 

data/app/views/wco_email/contexts/_form_reply_mini.haml

@@ -0,0 +1,25 @@
+
+- url = ctx.new_record? ? wco_email.contexts_path : wco_email.context_path(ctx)
+
+.collapse-expand [reply]
+.email-contexts--form-reply-mini.form-mini.descr{ style: 'display: none' }
+  = form_for ctx, url: url, html: { target: :_blank } do |f|
+
+    .flex-row
+      .flex-row
+        -# %label from
+        = f.select :from_email, options_for_select( WcoEmail::EmailTemplate.from_emails_list, selected: ctx.from_email ), {}, class: 'select2'
+        -# %label to (lead)
+        = f.select :lead, options_for_select( @leads_list, selected: lead_id ), {}, class: 'select2', required: true
+      .flex-row
+        = f.label :template
+        = f.select :email_template_id, options_for_select( @email_templates_list, selected: ctx.email_template_id ), {}, class: 'select2', required: true
+        -# = link_to '[+]', new_email_template_path, target: :_blank
+    .flex-row
+      .flex-row
+        %label Respond inline?
+        = check_box_tag :respond_inline, message.id, checked: true
+      .flex-row
+        = f.label :send_at
+        = f.text_field :send_at, placeholder: 'YYYY-MM-DD', value: Time.now, size: 30, class: 'input-date'
+      = f.submit 'Send/Schedule'

data/app/views/wco_email/conversations/_table.haml

@@ -26,8 +26,17 @@
             <b>#{link_to conv.subject, wco_email.conversation_path(conv)}</b>
           - else
             = link_to conv.subject, wco_email.conversation_path(conv)
-          <b>(#{conv.messages.length})</b>
-          %span.gray= conv.preview
+          <b>#{conv.messages.unread.length}</b> (#{conv.messages.length})
+          - conv.messages.unread.each do |msg|
+            .border-bottom
+              .gray= msg.preview_str
+              = render '/wco_email/contexts/form_reply_mini', lead_id: msg.lead_id, message: msg, ctx: WcoEmail::Context.new({ from_email: msg.to&.downcase, subject: msg.subject, email_template_id: ET.find_by( slug: 'blank').id })
+          - if conv.messages.unread.blank?
+            - msg = conv.messages.last
+            .border-bottom
+              .gray= msg.preview_str
+              = render '/wco_email/contexts/form_reply_mini', lead_id: msg.lead_id, message: msg, ctx: WcoEmail::Context.new({ from_email: msg.to&.downcase, subject: msg.subject, email_template_id: ET.find_by( slug: 'blank').id })
+
         %td.tags.mini
           - conv.tags.each do |tag|
             .mb-1

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wco_models
 version: !ruby/object:Gem::Version
-  version: 3.1.0.116
+  version: 3.1.0.118
 platform: ruby
 authors:
 - Victor Pudeyev
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-02-20 00:00:00.000000000 Z
+date: 2024-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-s3
@@ -355,6 +355,13 @@ extra_rdoc_files: []
 files:
 - README.txt
 - Rakefile
+- app/assets/fonts/summernote.eot
+- app/assets/fonts/summernote.ttf
+- app/assets/fonts/summernote.woff
+- app/assets/fonts/summernote.woff2
+- app/assets/images/sort_asc.png
+- app/assets/images/sort_both.png
+- app/assets/images/sort_desc.png
 - app/assets/javascripts/vendor/bootstrap-4.6.2.min.js
 - app/assets/javascripts/vendor/fontawesome-5.0.13.js
 - app/assets/javascripts/vendor/fontawesome-5.15.4.min.js
@@ -364,10 +371,16 @@ files:
 - app/assets/javascripts/vendor/jquery-3.3.1.slim.min.js
 - app/assets/javascripts/vendor/jquery-3.4.1.min.js
 - app/assets/javascripts/vendor/jquery-ui.min.js
+- app/assets/javascripts/vendor/jquery.dataTables-1.10.16.js
+- app/assets/javascripts/vendor/jquery.dataTables-1.10.16.min.js
 - app/assets/javascripts/vendor/jquery.fileupload.js
 - app/assets/javascripts/vendor/jquery.iframe-transport.js
 - app/assets/javascripts/vendor/jquery.ui.widget.js
 - app/assets/javascripts/vendor/popper-1.14.0.min.js
+- app/assets/javascripts/vendor/select2-4.0.0.js
+- app/assets/javascripts/vendor/select2-4.0.0.min.js
+- app/assets/javascripts/vendor/summernote-0.8.18.js
+- app/assets/javascripts/vendor/summernote-0.8.18.min.js
 - app/assets/javascripts/vendor/summernote-bs4.min.js
 - app/assets/javascripts/wco/alerts-notices.js
 - app/assets/javascripts/wco/application.js
@@ -379,6 +392,12 @@ files:
 - app/assets/stylesheets/dark_theme.scss
 - app/assets/stylesheets/production_theme.scss
 - app/assets/stylesheets/vendor/bootstrap-4.6.2.min.css
+- app/assets/stylesheets/vendor/jquery.dataTables-1.10.16.css
+- app/assets/stylesheets/vendor/jquery.dataTables-1.10.16.min.css
+- app/assets/stylesheets/vendor/select2-4.0.0.css
+- app/assets/stylesheets/vendor/select2-4.0.0.min.css
+- app/assets/stylesheets/vendor/summernote-0.8.18.css
+- app/assets/stylesheets/vendor/summernote-0.8.18.min.css
 - app/assets/stylesheets/wco/alerts_notices.scss
 - app/assets/stylesheets/wco/application.scss
 - app/assets/stylesheets/wco/chip.scss
@@ -583,6 +602,7 @@ files:
 - app/views/wco_email/application_mailer/_footer_unsubscribe.html.erb
 - app/views/wco_email/application_mailer/_header_logo.html.erb
 - app/views/wco_email/application_mailer/forwarder_notify.html.erb
+- app/views/wco_email/contexts/_form_reply_mini.haml
 - app/views/wco_email/conversations/_table.haml
 - app/views/wco_email/email_layouts/_m20221201react.html.erb
 - app/views/wco_email/email_layouts/_m20221222merryxmas.html.erb