ish_manager 0.1.8.439 → 0.1.8.440

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9ab6080d06ed44c29d7f0e1e6abe18506f8fca69ec32241ccf30f76a9d66d66b
-  data.tar.gz: 71ec0d289090ef315715edb360ec53e446e8a72496f6dcee767e09f01c7231e8
+  metadata.gz: c76d84dfb6865e2469dcf6c92fa6ba382aaf6121664bc6c2c5030d517e436def
+  data.tar.gz: bb81afa3195283fe7e37347dd126490daa13a3e9ee79e4e7aebcfcb4cc330933
 SHA512:
-  metadata.gz: b6c2e8d712417a16aa1ac599c7519f946d97d8587a37710464f066df0506f8b688755e3323ee0a97a6992799b8a3d6dd3fbdb9733755aa56ba1d3846911bca33
-  data.tar.gz: 99168ca8e5e930d0567a707973ea3a1446df384f2655ca278298f02125a6a49891be9267eb5e58ca94747b92a367ed476cfcc6a1a6afe292f55977c87dd7de91
+  metadata.gz: 1b7c4a6015f671f1d7814d4cf0e706e6a0f41a3d88b42267193256c145e1a8c164427433389be0c58384abaed4de6e25c4bc4f77da0fb95fd3e430208f8f2c8a
+  data.tar.gz: dd66635adab427556e6590d3ebfc10eeae6441be0deaeece93eb39804d48fdbc5896da15493f6cab9621faeadfb6f3d203d08c64ffca49d65c0473fa78a07eba

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_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_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
 
 

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.440
 platform: ruby
 authors:
 - piousbox
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-05-18 00:00:00.000000000 Z
+date: 2023-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails