ish_manager 0.1.8.504 → 0.1.8.506

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5bf2d01a70b7522f7e27afa1e25a7ac42cc95e5e7da3c3eeef5eaf32b454bcc3
-  data.tar.gz: 72f5c516ce6d697ce8e036f825aa97dae89a38a8a7c4209518c454980d679dac
+  metadata.gz: 4a1655bc4586c7be2fc0d3f600510d7d30536054ce87c2fdaf084314b78439fa
+  data.tar.gz: 6210a54fa0dbfa839adf118e85e9014a992eeb27d2dbeb3c9e95f2f038db095a
 SHA512:
-  metadata.gz: 30aaaae64eb60915a5bfb9f775e2d6c00dff588414d646157bccac3d4617a2f7a6cea952185c7ae1d6f97df4ee2700d443fbd9c0266aa0d2a51fad1eea8f4fcd
-  data.tar.gz: e801605b0c81d7c6a0e1eaa4164e224242660a754c9ecc6982c749bf0f9314bce74a5eeb41e68f5bc434bfd9277b5eb559fdcc0ae5a86c66abf40dc73f41272a
+  metadata.gz: 67e252e726b3c850cbf53fb76eeae01dbf51ab0b02c2e4af139961a005a1d0fa7c1ca3f42601147a14c93095de7e66dbe8fdb5de023a1b672ca31aa1668fc77f
+  data.tar.gz: bfdc4132df9dc1f42d7b97841fd078627281cab3b92bf8e82e70ba422b5946c21e18b1dd2cf585e5891abc1a48483a790edaa1e32cc639313ff61bb287bf5d28

data/app/assets/javascripts/ish_manager/email_conversations.js

@@ -60,15 +60,18 @@ $(document).ready(() => {
       out.push(val)
     })
 
+    let data = {
+      ids: out,
+      jwt_token: jwt_token,
+      emailtag: emailtag,
+    }
+    if ($("#is_move").prop('checked')) {
+      data.is_move = true
+    }
     $.ajax({
       url: action_path,
       type: 'POST',
-      data: {
-        ids: out,
-        jwt_token: jwt_token,
-        emailtag: emailtag,
-
-      },
+      data: data,
       success: e => {
         logg((e||{}).responseText, 'Ok')
         location.reload()

data/app/controllers/ish_manager/application_controller.rb

@@ -101,7 +101,7 @@ class IshManager::ApplicationController < ActionController::Base
     @blank_template       = Tmpl.new
 
     @email_campaigns_list = [[nil,nil]] + Ish::EmailCampaign.all.map { |c| [ c.slug, c.id ] }
-    @email_actions_list   = [[nil,nil]] + Office::EmailAction.all.map { |a| [ a.slug, a.id ] }
+    @email_actions_list   = EAct.list
     @email_templates_list = [[nil,nil]] + Ish::EmailTemplate.all.map { |t| [ t.slug, t.id ] }
     @email_tags_list      = [[nil,nil]] + WpTag.email_tags.map { |t| [ t.name, t.id ] }
     @leads_list           = Lead.list

data/app/controllers/ish_manager/email_actions_controller.rb

@@ -5,6 +5,14 @@ class ::IshManager::EmailActionsController < IshManager::ApplicationController
 
   ## Alphabetized : )
 
+  def destroy
+    @act = @email_action = Office::EmailAction.find( params[:id] )
+    authorize! :delete, @act
+    @act.update_attributes({ deleted_at: Time.now })
+    flash_notice 'Probably success'
+    redirect_to action: :index
+  end
+
   def edit
     @act = @email_action = Office::EmailAction.find( params[:id] )
     @act.ties.push Office::EmailActionTie.new( next_email_action_id: nil )
@@ -12,7 +20,7 @@ class ::IshManager::EmailActionsController < IshManager::ApplicationController
   end
 
   def index
-    @email_actions = Office::EmailAction.all
+    @email_actions = Office::EmailAction.where({ :deleted_at => nil })
 
     authorize! :index, @new_email_action
   end

data/app/controllers/ish_manager/email_attachments_controller.rb

@@ -0,0 +1,13 @@
+
+class ::IshManager::EmailAttachmentsController < IshManager::ApplicationController
+
+  def show
+    att = Office::EmailAttachment.find params[:id]
+    authorize! :show, att
+    send_data(
+      att.content,
+      filename: att.filename || "this_download",
+      type: att.content_type )
+  end
+
+end

data/app/controllers/ish_manager/email_conversations_controller.rb

@@ -25,6 +25,14 @@ class ::IshManager::EmailConversationsController < IshManager::ApplicationContro
       @email_conversations = @email_conversations.not_in_emailtag( params[:not_slug] )
     end
 
+    if params[:subject].present?
+      @email_conversations = @email_conversations.where({ subject: /.*#{params[:subject]}.*/i })
+    end
+
+    if params[:from_email].present?
+      @email_conversations = @email_conversations.where({ from_emails: /.*#{params[:from_email]}.*/i })
+    end
+
     @email_conversations = @email_conversations.order_by( latest_at: :desc
       ).includes( :email_messages # , :lead_ties
       ).page( params[:conv_page]

data/app/controllers/ish_manager/email_filters_controller.rb

@@ -35,6 +35,7 @@ class ::IshManager::EmailFiltersController < ::IshManager::ApplicationController
 
   def index
     authorize! :index, Office::EmailFilter.new
+    @email_filter = Office::EmailFilter.new
     @email_filters = Office::EmailFilter.active
   end
 

data/app/views/ish_manager/application/_main_header_admin.haml

@@ -67,7 +67,7 @@
               = text_field_tag :q
           = link_to '[+]', new_leadset_path
         %li
-          = link_to "EActions (#{Office::EmailAction.all.length})", email_actions_path
+          = link_to "EActions", email_actions_path
           = link_to '[+]', new_email_action_path
       %ul
         %li

data/app/views/ish_manager/email_actions/index.haml

@@ -3,7 +3,7 @@
 
   .header
     %h2.title
-      Email Actions
+      Email Actions (#{@email_actions.length})
       = link_to '[+]', new_email_action_path
 
   %table.bordered
@@ -15,7 +15,11 @@
     - @email_actions.each do |eact|
       %tr
         %td= check_box_tag 'abba'
-        %td= link_to '[~]', edit_email_action_path( eact )
+        %td.flex-row
+
+          = link_to '[~]', edit_email_action_path( eact )
+          = button_to '[x]', email_action_path( eact ), data: { confirm: 'Are you sure?' }, method: :delete
+
         %td
           -# = link_to eact.slug, email_action_path( eact )
           = eact.slug

data/app/views/ish_manager/email_conversations/index.haml

@@ -22,7 +22,18 @@
         %label New Tag:
         = f.text_field :name
         = f.submit '>'
-
+  .search.Card
+    .inline-block
+      = form_tag email_conversations_path do
+        %label Search from_email
+        = text_field_tag :from_email, params[:from_email]
+        -# = submit_tag '>'
+        -# .inline-block
+        -#   = form_tag email_conversations_path do
+        %label by subject
+        = text_field_tag :subject, params[:subject]
+        = submit_tag '>'
+  .c
   .actions
 
     %a.btn.archive-btn{ href: "javascript: void(0)", data: { url: "/api/email_conversations/rmtag/#{WpTag::INBOX}" } }
@@ -37,6 +48,8 @@
 
     .bordered.inline-block
       = select_tag :emailtag, options_for_select(@emailtags_list)
+      = check_box_tag :is_move
+      %label move?
       %a.btn.add-tag-btn{ href: "javascript: void(0)", data: { url: "/api/email_conversations/addtag" } }
         %i.material-icons add
         Addtag

data/app/views/ish_manager/email_conversations/show.haml

@@ -20,9 +20,15 @@
                 .a <b>From:</b> #{lead.email}
                 .a <b>to's:</b> #{msg.tos&.join(", ")}
                 .a <b>cc's:</b> #{msg.ccs&.join(", ")}
+
               .col-md-6
                 .a <b>msg.id:</b> #{msg.id}
                 .a <b>object_key:</b> #{msg.object_key}
+                .a
+                  <b>N attachments:</b> #{msg.attachments.length}
+                  <b>N email_attachments:</b>
+                  - msg.email_attachments.each_with_index do |attachment, idx|
+                    .a= link_to "Download #{attachment.filename} #{idx}", email_attachment_path( attachment )
 
 
               .position-absolute.top-0.right-0.datetime

data/app/views/ish_manager/email_filters/_form.haml

@@ -2,36 +2,39 @@
 - url = email_filter.new_record? ? email_filters_path : email_filter_path( email_filter )
 .email-filters--from
   = form_for email_filter, url: url, as: :email_filter do |f|
-    .field
-      %label From Regex
-      = f.text_field :from_regex
-    .field
-      %label From Exact
-      = f.text_field :from_exact
-    .field
-      %label Subject Regex
-      = f.text_field :subject_regex
-    .field
-      %label Subject Exact
-      = f.text_field :subject_exact
-    -# .field
-    -#   %label Body Regex
-    -#   = f.text_field :body_regex
-    .field
-      %label Body Exact
-      = f.text_field :body_exact
-    %hr
-    .field
-      %label Kind
-      = f.select :kind, options_for_select( ::Office::EmailFilter::KINDS, selected: email_filter.kind )
-    .field
-      %label Template
-      = f.select :email_template_id, options_for_select(@email_templates_list, selected: params[:email_template_id] || email_filter.email_template_id ), {}, { class: 'select2' }
-    .field
-      = f.label :email_action
-      = f.select :email_action, options_for_select( @email_actions_list, selected: email_filter.email_action_id ), {}, class: 'select2'
-    .field
-      = f.label :wp_term_id
-      = f.select :wp_term_id, options_for_select( @email_tags_list, selected: email_filter.wp_term_id ), {}, class: 'select2'
-    .actions
-      = f.submit
+    .row.maxwidth
+      .col-md-6
+        .field
+          %label From Regex
+          = f.text_field :from_regex
+        .field
+          %label From Exact
+          = f.text_field :from_exact
+        .field
+          %label Subject Regex
+          = f.text_field :subject_regex
+        .field
+          %label Subject Exact
+          = f.text_field :subject_exact
+        -# .field
+        -#   %label Body Regex
+        -#   = f.text_field :body_regex
+        .field
+          %label Body Exact
+          = f.text_field :body_exact
+      .col-md-6
+
+        .field
+          %label Kind
+          = f.select :kind, options_for_select( ::Office::EmailFilter::KINDS, selected: email_filter.kind )
+        .field
+          %label Template
+          = f.select :email_template_id, options_for_select(@email_templates_list, selected: params[:email_template_id] || email_filter.email_template_id ), {}, { class: 'select2' }
+        .field
+          = f.label :email_action
+          = f.select :email_action, options_for_select( @email_actions_list, selected: email_filter.email_action_id ), {}, class: 'select2'
+        .field
+          = f.label :wp_term_id
+          = f.select :wp_term_id, options_for_select( @email_tags_list, selected: email_filter.wp_term_id ), {}, class: 'select2'
+        .actions
+          = f.submit

data/app/views/ish_manager/email_filters/index.haml

@@ -5,6 +5,13 @@
       Email Filters (#{@email_filters.length})
       = link_to '[+]', new_email_filter_path
 
+
+  .maxwidth
+    %hr
+    %h5.title.collapse-expand#newEmailFilter New Email Filter
+    = render 'form', email_filter: @email_filter
+  %hr
+
   -# %input#dataTableSearch
   %table.bordered.data-table
     %thead

data/config/routes.rb

@@ -79,6 +79,8 @@ IshManager::Engine.routes.draw do
   post :email_actions, to: 'email_actions#update'
   resources :email_actions
 
+  get 'email_attachments/:id', to: 'email_attachments#show', as: :email_attachment
+
   post 'email_campaigns/:id/send', to: 'email_campaigns#do_send', as: :send_email_campaign
   resources :email_campaigns
 
@@ -91,10 +93,12 @@ IshManager::Engine.routes.draw do
   get 'email_messages/stripped/:id', to: 'email_messages#show_stripped', as: :email_message_stripped
   resources :email_messages
 
-  get 'email_conversations',                   to: 'email_conversations#index'
-  get 'email_conversations/in/:slug',          to: 'email_conversations#index',         as: :email_conversations_in
-  get 'email_conversations/notin/:not_slug',   to: 'email_conversations#index',         as: :email_conversations_notin
-  get 'email_conversations/show/:id',          to: 'email_conversations#show',          as: :email_conversation
+  # post 'email_conversations/search',          to: 'email_conversations#index', as: :search_email_convos
+  post 'email_conversations',                 to: 'email_conversations#index'
+  get  'email_conversations',                 to: 'email_conversations#index'
+  get  'email_conversations/in/:slug',        to: 'email_conversations#index', as: :email_conversations_in
+  get  'email_conversations/notin/:not_slug', to: 'email_conversations#index', as: :email_conversations_notin
+  get  'email_conversations/show/:id',        to: 'email_conversations#show',  as: :email_conversation
 
   get 'email_contexts/summary', to: 'email_contexts#summary',                           as: :email_contexts_summary
   get  'email_contexts/for_lead/:lead_id',       to: 'email_contexts#index',            as: :email_contexts_for_lead

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ish_manager
 version: !ruby/object:Gem::Version
-  version: 0.1.8.504
+  version: 0.1.8.506
 platform: ruby
 authors:
 - piousbox
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-11-03 00:00:00.000000000 Z
+date: 2023-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -489,6 +489,7 @@ files:
 - app/controllers/ish_manager/application_mailer_controller.rb
 - app/controllers/ish_manager/categories_controller.rb
 - app/controllers/ish_manager/email_actions_controller.rb
+- app/controllers/ish_manager/email_attachments_controller.rb
 - app/controllers/ish_manager/email_campaign_leads_controller.rb
 - app/controllers/ish_manager/email_campaigns_controller.rb
 - app/controllers/ish_manager/email_contexts_controller.rb