wco_models 3.1.0.76 → 3.1.0.78

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ce2fdb73b44011dfcb8d9805e54ca598aefa78f7912afab54aa855d4e02a4707
-  data.tar.gz: 7c3689e7460ee1ada0ee293417f72d4c860c1360d7d35ac03c4990bbfaf421f5
+  metadata.gz: e0f8f4f03a6fe53303a403050d9ca34e5b81caefda6dbeef36ea5b994643ebe9
+  data.tar.gz: b8b19c8349d9783a54ee8da11db8a414506164216a4e87f9b6cd3f4768eb8f9f
 SHA512:
-  metadata.gz: 302daada8d9b6344abe54308ca9532a15588f4463c5218cbff9aecd73df1d8d76d4653c612cddf70e4120814a4cd7d432141d488fa75e5e8d9f383b9a0d278e0
-  data.tar.gz: 63d7c4e56bee07d53c0c9e390bea15b3307a2339b8e633d72cb72c4c2b4e33b061706b5e9fa73ac955a4dc69cf0aa26adf503eee720507bcf3dbe2a08335fd81
+  metadata.gz: 98de670421120a2e745a6af46cecd4238a9528bc0c001a12135469c54e3de70e69222910f8a63a5de3c051953f272685786f5953dd87cb1d03ca490dcb0581fb
+  data.tar.gz: f775ed1e9c82d7464d837c6325fb1b2308436352743bff39617165ebeea1617424929ef69366249fc83376c0eee287aec69b9268e1ba78c2fe649c14a08a6d6e

data/app/models/wco_email/email_filter.rb

@@ -33,12 +33,6 @@ class WcoEmail::EmailFilter
   KINDS = [ nil, KIND_AUTORESPOND_TMPL, KIND_AUTORESPOND_EACT, KIND_ADD_TAG, KIND_REMOVE_TAG, KIND_DESTROY_SCHS]
   field :kind
 
-  STATUS_ACTIVE   = 'active'
-  STATUS_INACTIVE = 'inactive'
-  STATUSES        = [ STATUS_ACTIVE, STATUS_INACTIVE ]
-  field :status, type: :string, default: STATUS_ACTIVE
-  scope :active, ->{ where( status: STATUS_ACTIVE ) }
-
   belongs_to :email_template,        class_name: 'WcoEmail::EmailTemplate',         optional: true
   belongs_to :email_action_template, class_name: 'WcoEmail::EmailActionTemplate',   optional: true
 

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
 
 
@@ -177,9 +178,9 @@ class WcoEmail::MessageStub
 
 
     ## Actions & Filters
-    email_filters = WcoEmail::EmailFilter.active
+    email_filters = WcoEmail::EmailFilter.all
     email_filters.each do |filter|
-      reson = nil
+      reason = nil
       if filter.from_regex.present? && @message.from.downcase.match( filter.from_regex )
         reason = 'from_regex'
       end
@@ -197,7 +198,7 @@ class WcoEmail::MessageStub
       end
 
       if reason
-        puts! "Applying filter #{filter} to conv #{conv} for matching #{reason}" if DEBUG
+        puts! "Applying filter #{filter} to conv #{@message.conversation} for matching #{reason}" if DEBUG
         @message.apply_filter( filter )
       end
     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 )
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wco_models
 version: !ruby/object:Gem::Version
-  version: 3.1.0.76
+  version: 3.1.0.78
 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
-