wco_email 0.1.1.48 → 0.1.1.50

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 92016ce179b88dd8a7e125ea321f7fbd063c62eba53ae985d15d597201c089b7
-  data.tar.gz: baf6b4270b2067b541167328f86081d70ae982f9d65312601728d8c477412e51
+  metadata.gz: a8b3bc2eba0acec70837677886c89711208050bb409cb1a10124dcaaf9582d9a
+  data.tar.gz: ca74500d7835c3eb35548f83f3b503ba70075c0ab9050a89925188589c4d6c4c
 SHA512:
-  metadata.gz: c28fe7d5fc5c74f9d9764601e5106ebfe0e0ed7745b4d0c7c6d8605be31777d6a6032531f29cbdfa3788876213763788f723f34d1da94b3657fc3acb88362393
-  data.tar.gz: 7d136d2e07998fd9ade589167dbce85f41404d55fef3e14f28377ec9579428c3ff9d8695d0b028ccc36821aba79cb04ba27970da177411716c7d0d172a26b8af
+  metadata.gz: 04061ac88baa77afa3d4f5456830e25608de8df6e4fb4073edd34a6c9f2dcb8d4f6eb323b9648c287e21879b1d0823607d74a9833933035238471996b65467d9
+  data.tar.gz: 3681168ce29b4263bb44ccf824877fa017eef329752e7405b302428fbe2e6f6978a918d03a67e1367f60b9c4b7b15ea23d6d0a896b84fc5ac80860d426ea9a40

data/app/controllers/wco_email/conversations_controller.rb

@@ -22,6 +22,11 @@ class WcoEmail::ConversationsController < WcoEmail::ApplicationController
     # redirect_to request.referrer # || root_path
   end
 
+  def edit
+    @conversation = ::WcoEmail::Conversation.find( params[:id] )
+    authorize! :edit, @conversation
+  end
+
   def index
     authorize! :index, WcoEmail::Conversation
     @conversations = WcoEmail::Conversation.all
@@ -43,6 +48,10 @@ class WcoEmail::ConversationsController < WcoEmail::ApplicationController
       @conversations = @conversations.where({ from_emails: /.*#{params[:from_email]}.*/i })
     end
 
+    if params[:lead_id].present?
+      @conversations = @conversations.where( lead_ids: params[:lead_id] )
+    end
+
     @conversations = @conversations.order_by( latest_at: :desc
       ).includes( :leads, :messages
       ).page( params[:conv_page]
@@ -86,8 +95,8 @@ class WcoEmail::ConversationsController < WcoEmail::ApplicationController
   end
 
   def show
-    authorize! :show, WcoEmail::Conversation
     @conversation = ::WcoEmail::Conversation.find( params[:id] )
+    authorize! :show, @conversation
     @messages     = @conversation.messages.order_by( date: :asc )
     @conversation.update_attributes({ status: Conv::STATUS_READ })
 
@@ -102,6 +111,16 @@ class WcoEmail::ConversationsController < WcoEmail::ApplicationController
     end
   end
 
+  def update
+    @conversation = ::WcoEmail::Conversation.find( params[:id] )
+    authorize! :update, @conversation
+    if @conversation.update( params[:conversation].permit! )
+      flash_notice 'ok'
+    else
+      flash_alert @conversation
+    end
+    redirect_to action: 'show', id: @conversation.id
+  end
 
   ##
   ## private

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

@@ -20,7 +20,7 @@
     = 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"
+    = javascript_include_tag "//cdn.jsdelivr.net/npm/select2@4.0.0/dist/js/select2.min.js", defer: 'defer'
 
     = 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"

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

@@ -0,0 +1,7 @@
+
+= form_for conversation do |f|
+  .d-flex
+    %label Subject
+    = f.text_field :subject, class: 'w-100'
+  .actions
+    = f.submit

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

@@ -9,4 +9,6 @@
       %label by subject
       = text_field_tag :subject, params[:subject]
       = submit_tag '>'
+      - if params[:lead_id]
+        <b>lead_id:</b>#{params[:lead_id]}
 

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

@@ -0,0 +1,3 @@
+
+.conversations-edit.maxwidth
+  = render 'form', conversation: @conversation

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

@@ -6,7 +6,12 @@
   %h5
     = @conversation.subject
     <b>(#{@conversation.messages.length})</b>
+    = link_to '[~]', edit_conversation_path(@conversation)
     %span.gray.mini= @conversation.id
+  .leads
+    .d-inline <b>Leads:</b>
+    - @conversation.leads.each do |lead|
+      .Chip= link_to lead.email, wco.lead_path( lead )
 
 
   - if @other_convs.present?

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wco_email
 version: !ruby/object:Gem::Version
-  version: 0.1.1.48
+  version: 0.1.1.50
 platform: ruby
 authors:
 - Victor Pudeyev
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-02-01 00:00:00.000000000 Z
+date: 2024-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-s3
@@ -383,7 +383,9 @@ files:
 - app/views/wco_email/contexts/summary.csv.erb
 - app/views/wco_email/contexts/summary.haml
 - app/views/wco_email/conversations/_actions.haml
+- app/views/wco_email/conversations/_form.haml
 - app/views/wco_email/conversations/_search.haml
+- app/views/wco_email/conversations/edit.haml
 - app/views/wco_email/conversations/index.haml
 - app/views/wco_email/conversations/show.haml
 - app/views/wco_email/email_action_templates/_form.haml