wco_models 3.1.0.75 → 3.1.0.77

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7ac0ff430c81efd11aced2ffa36e17bd8aebdad6e337ea3ef981adbe6154e35b
-  data.tar.gz: bc47f58cbac8d53afd585068c2f2de34768176a268126b1f05779c8cda55ec68
+  metadata.gz: 75d573c20e2daa8d9ce98511e31788bef7f389ce4c67ff693e10cbd51062a704
+  data.tar.gz: aace2791f359a233c5ea2c48fb88e84e17fd6c0d0a92dd6a8e2d581f243de576
 SHA512:
-  metadata.gz: b2b311cab305457585ca0a98e9f8381537747a3c2d6b5b407be0c8c0d88615b13292e6849118d81bc16cb30116b20a8a3b65b12f5fd9edb3a91512489333d84e
-  data.tar.gz: f4484697303ebf15d0f39b35f835911c01ea812336d14ba833d0df4ca7de4fb3ac9b53313cdd328e81c234c64b162c8209d928f6d0952cef7a17b5cec9f5e914
+  metadata.gz: 55b718c4db30af9bae6c6448337e1195766ab2efbf6d35df0c1a6be1380de61be33f414cbd17610dbee94882d7c7b9329d4510ffd4c4a64ee73633d7c67d38fd
+  data.tar.gz: 8aabf72c5aef2900b195c704ee3875bb31c95ec1cf814f091d09692c9480265cd507ca510e5e48b2e67009b700b83231dc31a6c1ca8778432295155424d8f2a9

data/app/assets/stylesheets/wco/utils.scss

@@ -35,12 +35,12 @@ textarea {
 
 table.bordered {
   table-layout:fixed;
-  width: 100%;
+  width: auto; // 100%;
   word-wrap: break-word;
 
   border: 1px solid gray;
-  border-bottom: 0;
-  border-right: 0;
+  // border-bottom: 0;
+  // border-right: 0;
 
   th {
     background: #ddd;

data/app/models/wco_email/conversation.rb

@@ -30,5 +30,10 @@ class WcoEmail::Conversation
   has_and_belongs_to_many :tags,  class_name: 'Wco::Tag'
   has_and_belongs_to_many :leads, class_name: 'Wco::Lead'
 
+  belongs_to :filter, class_name: 'WcoEmail::EmailFilter', inverse_of: :conversations, optional: true
+
+  def to_s
+    "#{subject} (#{messages.length})"
+  end
 end
 Conv = WcoEmail::Conversation

data/app/models/wco_email/email_filter.rb

@@ -42,5 +42,7 @@ class WcoEmail::EmailFilter
   belongs_to :email_template,        class_name: 'WcoEmail::EmailTemplate',         optional: true
   belongs_to :email_action_template, class_name: 'WcoEmail::EmailActionTemplate',   optional: true
 
+  has_many :conversations, class_name: 'WcoEmail::Conversation', inverse_of: :filter
+
 end
 

data/app/models/wco_email/message.rb

@@ -77,6 +77,7 @@ class WcoEmail::Message
 
   def apply_filter filter
     puts! filter, 'WcoEmail::Message#apply_filter'
+    conv.filter = filter
 
     case filter.kind
 

data/app/models/wco_email/message_stub.rb

@@ -77,9 +77,10 @@ class WcoEmail::MessageStub
       end
       conv = in_reply_to_msg.conversation
     else
-      conv = WcoEmail::Conversation.find_or_create_by({
+      conv = WcoEmail::Conversation.unscoped.find_or_create_by({
         subject: subject,
       })
+      conv.deleted_at = nil
     end
 
 

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

@@ -73,13 +73,5 @@
       %ul
         - @lead.convs.each do |conv|
           %li
-            = link_to conv.subject, wco_email.email_conversation_path( conv )
-
-  -# .row
-  -#   .col-md-6
-  -#     = render 'ish_manager/galleries/index', galleries: @lead.galleries
-  -#   .col-md-6
-  -#     = render 'ish_manager/videos/index', videos: @lead.videos
-
-
+            = link_to conv.subject, wco_email.conversation_path( conv )
 

data/lib/wco_models.rb

@@ -39,3 +39,4 @@ class Wco::HTTParty
 end
 
 ActiveSupport.escape_html_entities_in_json = true
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wco_models
 version: !ruby/object:Gem::Version
-  version: 3.1.0.75
+  version: 3.1.0.77
 platform: ruby
 authors:
 - Victor Pudeyev
@@ -435,7 +435,6 @@ files:
 - app/views/wco/_analytics.erb
 - app/views/wco/_main_footer.haml
 - app/views/wco/_main_header.haml
-- app/views/wco/_main_header.haml-bk
 - app/views/wco/_paginate.haml
 - app/views/wco/_search.haml
 - app/views/wco/application/_auth_widget.haml

data/app/views/wco/_main_header.haml-bk

@@ -1,109 +0,0 @@
-
-.application--main-header.main-header{ class: "#{ENV['RAILS_ENV']} #{ENV['RAILS_ENV'][0...3]=="dev" ? "development" : ''}" }
-
-  %i.fa.fa-compress.collapse-expand#collapseHeaderMain
-    Wco Suite
-  .container
-
-    %i.fa.fa-compress.collapse-expand#collapseHeaderOffice
-      Wco Email & CRM
-    .a
-      %ul
-        %li= link_to 'Tags', tags_path
-        -# %li
-        -#   = link_to "#{WpTag::INBOX} (#{Office::EmailConversation.in_emailtag(WpTag::INBOX).length})", email_conversations_in_path(WpTag::INBOX), class: 'chip'
-        -#   = link_to '[+]', new_email_context_path
-        %li
-          = link_to "Tmpls (#{WcoEmail::EmailTemplate.all.length})", email_templates_path
-          = link_to '[+]', new_email_template_path
-        %li
-          = link_to "Companies (#{Leadset.kept.length})", leadsets_path
-          .inline-search
-            = form_tag leadsets_path, method: :get do
-              = text_field_tag :q
-          = link_to '[+]', new_leadset_path
-        %li
-          = link_to "EActions", email_actions_path
-          = link_to '[+]', new_email_action_path
-      %ul
-        %li
-          = link_to "Filters (#{Office::EmailFilter.active.length})", email_filters_path
-          = link_to '[+]', new_email_filter_path
-        %li
-          = link_to "Ctxs (#{Ctx.notsent.length})", email_contexts_path({ sent: false })
-          = link_to '[+]', new_email_context_path
-          %br
-          = link_to 'summary', email_contexts_summary_path( format: :html )
-          = link_to '[csv]', email_contexts_summary_path( format: :csv )
-
-        %li
-          = link_to "Leads (#{Lead.kept.length})", leads_path
-          .inline-search
-            = form_tag leads_path, method: :get do
-              = text_field_tag :q
-          = link_to '[+]', new_lead_path
-        %li
-          = link_to "Schs (#{Sch.active.length})", scheduled_email_actions_path
-          = link_to '[+]', new_scheduled_email_action_path
-
-      %ul
-        %li
-          = link_to 'OLATs', lead_action_templates_path
-          = link_to '[+]', new_lead_action_template_path
-          = link_to 'Lead Actions', lead_actions_path
-
-
-        %li
-          = link_to "Campaigns (#{Ish::EmailCampaign.all.length})", email_campaigns_path
-          = link_to '[+]', new_email_campaign_path
-        %li
-          = link_to "OActions (#{Office::Action.all.length})", office_actions_path
-          = link_to '[+]', new_office_action_path
-        %li
-          = link_to 'Unsubs', unsubscribes_path
-          = link_to 'Analytics', analytics_path
-
-    .c
-
-    %i.fa.fa-compress.collapse-expand#collapseHeaderWco
-      Wasya Co Rb
-    .a
-      %ul
-        %li
-          = link_to 'ApplianceTmpl\'s', appliance_tmpls_path
-        %li
-          = link_to 'Appliance\'s', appliances_path
-        %li
-          = link_to 'Serverhost\'s', serverhosts_path
-      %ul
-        %li
-          = link_to 'Products & Prices', products_path
-        %li
-          = link_to 'Subscriptions', subscriptions_path
-          = link_to '[+]', new_wco_subscription_path
-        %li
-          = link_to 'Wco::Leadset\'s', wco_leadsets_path
-
-
-    .c
-
-
-
-    -# %i.fa.fa-compress.collapse-expand#collapseHeaderIro Iro Wor
-    -# .a
-    -#   %ul
-    -#     %li
-    -#       = link_to 'Alerts', iro_alerts_path
-    -#       = link_to 'Watchers', iro_watchers_path
-    -#     %li
-    -#       = link_to 'Plots', 'http://localhost:3000/iron_warbler/NOPE-1', target: '_blank'
-    -#     %li
-    -#       = link_to 'Purses', iro_purses_path
-    -#       - Iro::Purse.all.map do |p|
-    -#         = "[#{p.id}"
-    -#         = link_to "show", iro_purse_path(p)
-    -#         = link_to "gui", iro_purse_path({ id: p.id, kind: 'show_gameui' })
-    -#         = "]"
-    -#       = link_to '[+]', new_iro_purse_path
-    -# .c
-