ish_manager 0.1.8.439 → 0.1.8.441

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9ab6080d06ed44c29d7f0e1e6abe18506f8fca69ec32241ccf30f76a9d66d66b
-  data.tar.gz: 71ec0d289090ef315715edb360ec53e446e8a72496f6dcee767e09f01c7231e8
+  metadata.gz: 6ce64aaafb4bd3dbd060130af2561c9fa55c05e2bb40421ec488ed7cadd49949
+  data.tar.gz: 24bf8ebaa112f151a9fe0f5a95629a879aa102061dd6b3b9385501eec0e453a4
 SHA512:
-  metadata.gz: b6c2e8d712417a16aa1ac599c7519f946d97d8587a37710464f066df0506f8b688755e3323ee0a97a6992799b8a3d6dd3fbdb9733755aa56ba1d3846911bca33
-  data.tar.gz: 99168ca8e5e930d0567a707973ea3a1446df384f2655ca278298f02125a6a49891be9267eb5e58ca94747b92a367ed476cfcc6a1a6afe292f55977c87dd7de91
+  metadata.gz: 0f6c63048a0449bf28aabdf076364e421c4c515ecc0ec2061c399bbfd680bfd483c9b0baa1d7e1422443576db7bd741077532cf9bdb115fe78edc1d56a1d8305
+  data.tar.gz: 902decd1516986d31701c458f7236e3dc137f1cda1e067abe2b4f728e7f20e69b95b4a684ffbf6475cbf7e2464058a9b46405832a867a84e53102075ba8f0162

data/app/assets/stylesheets/ish_manager/application.scss

@@ -254,6 +254,17 @@ table.dataTable {
   display: none;
   position: absolute;
   min-width: 250px;
+  z-index: 1;
+
+  form {
+    min-width: 300px;
+    border: 1px solid blue;
+    border-radius: 0.5em;
+    padding: 0.5em;
+
+    background: #ccc;
+    display: inline-block;
+  }
 }
 
 /* E */

data/app/assets/stylesheets/ish_manager/email_conversations.scss

@@ -67,6 +67,7 @@
 
   .leads {
     .item {
+      display: inline;
       border: 1px solid green;
       // background: cyan;
     }

data/app/assets/stylesheets/ish_manager/scheduled_email_actions.scss

@@ -1,8 +1,4 @@
 
-.scheduled-email-actions--form {
-  min-width: 300px;
-}
-
 .scheduled-emails-new {
   border: 1px solid red;
   border-radius: .5em;
@@ -24,16 +20,6 @@
 }
 
 .scheduled-email-actions--form {
-
-  form {
-    border: 1px solid blue;
-    border-radius: 0.5em;
-    padding: 0.5em;
-
-    background: #ccc;
-    display: inline-block;
-  }
-
   .actions {
     display: flex;
     justify-content: flex-end;
@@ -43,5 +29,4 @@
   .flex-row {
     justify-content: space-between;
   }
-
 }

data/app/controllers/ish_manager/application_controller.rb

@@ -85,6 +85,7 @@ class IshManager::ApplicationController < ActionController::Base
     @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_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 ] }
     @galleries_list       = Gallery.all.list
     @leads_list           = Lead.list
     @leadsets_list        = Leadset.list
@@ -101,19 +102,27 @@ class IshManager::ApplicationController < ActionController::Base
     @page_title = "#{ params[:controller].gsub('ish_manager/', '') } #{params[:action]} #{params[:slug]||params[:id]} ".gsub("  ", " ")
   end
 
-  # @TODO: obsolete, remove _vp_ 2022-10-15
-  def update_profile_pic
-    return unless params[:photo]
-    @photo = Photo.new :photo => params[:photo]
-    @photo.user_profile = @current_profile
-    flag = @photo.save
-    @resource.profile_photo = @photo
-    flagg = @resource.save
-    if flag && flagg
-      flash[:notice] = 'Success'
-    else
-      flash[:alert] = "No Luck. #{@photo.errors.messages} #{@resource.errors.messages}"
-    end
-  end
 
 end
+
+
+
+
+
+
+
+  # ## @TODO: obsolete, remove _vp_ 2022-10-15
+  # def update_profile_pic
+  #   return unless params[:photo]
+  #   @photo = Photo.new :photo => params[:photo]
+  #   @photo.user_profile = @current_profile
+  #   flag = @photo.save
+  #   @resource.profile_photo = @photo
+  #   flagg = @resource.save
+  #   if flag && flagg
+  #     flash[:notice] = 'Success'
+  #   else
+  #     flash[:alert] = "No Luck. #{@photo.errors.messages} #{@resource.errors.messages}"
+  #   end
+  # end
+

data/app/controllers/ish_manager/email_contexts_controller.rb

@@ -69,15 +69,15 @@ class ::IshManager::EmailContextsController < ::IshManager::ApplicationControlle
     authorize! :index, ::Ish::EmailContext
     @ctxs = ::Ish::EmailContext.all.page( params[:ctxs_page] ).per( current_profile.per_page )
 
-    if my_truthy? params[:sent]
-      @ctxs = @ctxs.where( :sent_at.ne => nil )
-    else
-      @ctxs = @ctxs.where( sent_at: nil )
-    end
-
     if params[:lead_id]
       @lead = Lead.find params[:lead_id]
-      @ctxs = @ctxs.where( to_email: @lead.email )
+      @ctxs = @ctxs.where( lead_id: @lead.id )
+    else
+      if my_truthy? params[:sent]
+        @ctxs = @ctxs.where( :sent_at.ne => nil )
+      else
+        @ctxs = @ctxs.where( sent_at: nil )
+      end
     end
   end
 

data/app/controllers/ish_manager/email_filters_controller.rb

@@ -1,7 +1,7 @@
 
 class ::IshManager::EmailFiltersController < ::IshManager::ApplicationController
 
-  # before_action :set_lists
+  before_action :set_lists
 
   # alphabetized : )
 
@@ -16,6 +16,18 @@ class ::IshManager::EmailFiltersController < ::IshManager::ApplicationController
     redirect_to action: 'index'
   end
 
+  def destroy
+    @email_filter = Office::EmailFilter.find params[:id]
+    authorize! :destroy, @email_filter
+    flag = @email_filter.destroy
+    if flag
+      flash[:notice] = 'Success'
+    else
+      flash[:alert] = 'Error'
+    end
+    redirect_to action: 'index'
+  end
+
   def edit
     @email_filter = Office::EmailFilter.find params[:id]
     authorize! :edit, @email_filter
@@ -34,8 +46,8 @@ class ::IshManager::EmailFiltersController < ::IshManager::ApplicationController
   def update
     @email_filter = Office::EmailFilter.find params[:id]
     authorize! :update, @email_filter
-    @email_filter.update_attributes( params[:email_filter].permit! )
-    if @email_filter.persisted?
+    flag = @email_filter.update_attributes( params[:email_filter].permit! )
+    if flag
       flash[:notice] = 'Success'
     else
       flash[:alert] = "No luck: #{@email_filter.errors.full_messages.join(', ')}."

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

@@ -3,15 +3,17 @@
 
   .header.collapse-expand-trash#emailContextsIndex
     %h2.title
-      - if my_truthy? params[:sent]
-        = link_to '[notsent]', email_contexts_path({ sent: false })
-        <u>sent</u>
-      - else
-        <u>notsent</u>
-        = link_to '[sent]', email_contexts_path({ sent: true })
+
       Email Contexts (#{@ctxs.length})
       - if @lead
-        For lead `#{@lead.name}`
+        For lead #{@lead.email}
+      - else
+        - if my_truthy? params[:sent]
+          = link_to '[notsent]', email_contexts_path({ sent: false })
+          <u>sent</u>
+        - else
+          <u>notsent</u>
+          = link_to '[sent]', email_contexts_path({ sent: true })
       = link_to '[+]', new_email_context_path
 
 

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

@@ -16,8 +16,20 @@
 
   .leads.max-width
     Leads (#{@email_conversation.leads.length}):
-    = @email_conversation.leads.map(&:id)
-    -# .leadsC= render 'ish_manager/leads/index_rows', leads: @email_conversation.leads
+    - @email_conversation.leads.each do |lead|
+      .item
+        = link_to "#{lead.id} #{lead.email}", lead_path(lead)
+        \(ctxs:
+        = link_to email_contexts_for_lead_path( lead ) do
+          = lead.email_contexts.count
+          %i.fa.fa-envelope
+        .relative.inline-block
+          %i.fa.fa-plus.expand-next
+          .expand-hide= render 'ish_manager/email_contexts/form', ctx: Ctx.new({ lead_id: lead.id, email_template: Tmpl.blank })
+        \)
+        .relative.inline-block
+          %i.fa.fa-clock-o.expand-next{ style: "color: red;" }
+          .expand-hide= render 'ish_manager/scheduled_email_actions/form', scheduled_email_action: Sch.new({ lead_id: lead.id })
 
   .messages.max-width
     - @email_messages.each do |msg|
@@ -31,14 +43,7 @@
                 = msg.id
                 <b>To:</b> #{msg.to}
                 <b>From:</b> #{lead.email}
-                = link_to email_contexts_for_lead_path( lead ) do
-                  \(
-                  = lead.email_contexts.count
-                  %i.fa.fa-envelope
-                  \)
-                .relative.inline-block
-                  %i.fa.fa-clock-o.expand-next{ style: "color: red;" }
-                  .expand-hide= render 'ish_manager/scheduled_email_actions/form', scheduled_email_action: Sch.new({ lead_id: lead.id })
+
 
           .datetime
             .date= msg.date&.strftime('%Y-%m-%d')

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

@@ -5,14 +5,33 @@
     .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 Body Regex
-      = f.text_field :body_regex
+      %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

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

@@ -1,5 +1,5 @@
 
-.email-filters-index.max-width
+.email-filters-index.padded
   .header
     %h2.title
       Email Filters (#{@email_filters.length})
@@ -10,17 +10,29 @@
       %th  
       %th  
       %th From Regex
+      %th From Exact
       %th Subject Regex
-      %th Body Regex
+      %th Subject Exact
+      %th Body Exact
       %th Kind
+      %th Email Action
+      %th Email Template
+      %th Email Tag
     - @email_filters.each do |ef|
 
       %tr
         %td= check_box_tag 'checked'
-        %td= link_to '[~]', edit_email_filter_path(ef)
+        %td
+          = link_to '[~]', edit_email_filter_path(ef)
+          .inline-block= button_to '[x]', email_filter_path(ef), method: :delete, data: { confirm: 'Are you sure?' }
         %td= ef.from_regex
+        %td= ef.from_exact
         %td= ef.subject_regex
-        %td= ef.body_regex
+        %td= ef.subject_exact
+        %td= ef.body_exact
         %td= ef.kind
+        %td= ef.email_action&.slug
+        %td= ef.email_template&.slug
+        %td= ef.category&.name
 
 

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

@@ -22,8 +22,8 @@
       %ul
         - @ctxs.each do |ctx|
           %li
-            = link_to ctx.subject, email_context_path(ctx)
-            = pp_date ctx.sent_at
+            = pp_date( ctx.sent_at ) || 'not sent'
+            = link_to ctx.subject.presence||"No Subj?!", email_context_path(ctx)
     .col-md-6.schs
       %h5
         Scheduled actions (#{@schs.length})

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

@@ -18,7 +18,7 @@
       = f.select :email_action, options_for_select( @email_actions_list, selected: sch_a[:email_action_id] ), {}, class: 'select2'
     .flex-row
       = f.label :perform_at
-      = f.text_field :perform_at
+      = f.text_field :perform_at, value: sch_a.new_record? ? Time.now : sch_a.perform_at
 
     .actions
       = submit_tag 'Schedule'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ish_manager
 version: !ruby/object:Gem::Version
-  version: 0.1.8.439
+  version: 0.1.8.441
 platform: ruby
 authors:
 - piousbox
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-05-18 00:00:00.000000000 Z
+date: 2023-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails