wco_email 0.1.1.71 → 0.1.1.73

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d19500786f1ed1265575707c15d0692ef028bce2787bb319bd79fb9fa565843c
-  data.tar.gz: 7db5eb86566d1bfc24a191a6d5f95779be918789e83fb137270d98bb39f4f523
+  metadata.gz: 126de881448d4a9f4f776b68c39afa8676637b654752390b502f1bb89ed6a30b
+  data.tar.gz: 7264f72eb0bde6a68faed340e3eeb1ac4179d27dbd2e2cfc03ebde2e9b10bb17
 SHA512:
-  metadata.gz: 34f610f692aa355f5bb27b1f78078b674a7aa462fc10103d25b2267dbfe14b95da8ed1a3879375f42e38c443b9ca2e3fbdc4f67d14c8b89ce8966bcba350d296
-  data.tar.gz: 0c29c54a11eb251087e12571e127a7569f6ded7fef5b9e406ca7d269c19a8be0555aafc6dcaf3b99db162d62286248e6c0f29cff4be1e9fd7b2f0b9159c9063f
+  metadata.gz: 7a18ddfdd69412bac0a35cb7bfae4016d5ab955931329ecab4b22f0b7e1258d2c9119c755be6bf078fd775d2e6341c194767a6e2050eaf5e8939c4dee9006d92
+  data.tar.gz: 2e389076abd1dd1c3f01d7afb13764740817e41495ec66f5d3de0dc7a005e44ce9475411b9b6890958a4ae16ad3e34d4b5e73183564e1ed9fa738c260248b057

data/app/controllers/wco_email/email_actions_controller.rb

@@ -22,8 +22,19 @@ class WcoEmail::EmailActionsController < WcoEmail::ApplicationController
   end
 
   def index
-    @schs = Sch.all
-    authorize! :index, @schs
+    @email_actions = WcoEmail::EmailAction.all
+    authorize! :index, @email_actions
+    if params[:q]
+      email_template_ids        = WcoEmail::EmailTemplate.where( slug: /#{params[:q]}/i ).map &:id
+      email_action_template_ids = WcoEmail::EmailActionTemplate.any_of(
+        { :email_template_id.in => email_template_ids },
+        { slug:                    /#{params[:q]}/i },
+      ).map &:id
+
+      @email_actions = @email_actions.where({
+        :email_action_template_id.in => email_action_template_ids,
+      })
+    end
   end
 
   def new

data/app/controllers/wco_email/email_filters_controller.rb

@@ -41,6 +41,12 @@ class WcoEmail::EmailFiltersController < WcoEmail::ApplicationController
     @email_filter = WcoEmail::EmailFilter.new
     authorize! :new, @email_filter
   end
+  def new2
+    @email_filter = WcoEmail::EmailFilter.new
+    authorize! :new, @email_filter
+
+    @new_email_filter_condition = WcoEmail::EmailFilterCondition.new
+  end
 
   def show
     @email_filter = WcoEmail::EmailFilter.find params[:id]

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

@@ -3,7 +3,7 @@
   .header
     %h2
       Email Actions
-      (#{Sch.all.count})
+      (#{WcoEmail::EmailAction.all.length})
       = link_to '[+]', new_email_action_path
 
   %table.bordered.data-table
@@ -16,19 +16,19 @@
         %td.tmpl Email Template
         %td Perform at
     %tbody
-      - @schs.each do |sch|
+      - @email_actions.each do |ea|
         %tr
-          %td= link_to '[~]', edit_email_action_path(sch)
-          %td= sch.status == 'active' ? 'Y' : '-'
+          %td= link_to '[~]', edit_email_action_path(ea)
+          %td= ea.status == 'active' ? 'Y' : '-'
           %td.email_action_template
-            = render '/wco_email/email_action_templates/show_cell', tmpl: sch.tmpl
+            = render '/wco_email/email_action_templates/show_cell', tmpl: ea.tmpl
           %td.to
-            = link_to sch.lead.email, wco.lead_path(sch.lead)
+            = link_to ea.lead.email, wco.lead_path(ea.lead)
           %td.tmpl
-            = render '/wco_email/email_templates/show_cell', tmpl: sch.tmpl.email_template
+            = render '/wco_email/email_templates/show_cell', tmpl: ea.tmpl.email_template
           %td
-            = pp_date sch.perform_at.in_time_zone
-            = pp_time sch.perform_at.in_time_zone
+            = pp_date ea.perform_at.in_time_zone
+            = pp_time ea.perform_at.in_time_zone
 
 
 

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

@@ -0,0 +1,12 @@
+
+.d-flex
+  .field
+    %label Field
+    = f.select :field, options_for_select(WcoEmail::EmailFilter::FIELD_OPTS)
+  .field
+    %label Matchtype
+    = f.select :matchtype, options_for_select(WcoEmail::EmailFilter::MATCHTYPE_OPTS)
+  .field
+    %label Value
+    = f.text_field :value
+  [-]

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

@@ -1,4 +1,8 @@
 
+-##
+-## 2024-04-13 Before email_filter_condition was introduced
+-##
+
 - 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|

data/app/views/wco_email/email_filters/_form2.haml

@@ -0,0 +1,46 @@
+
+-##
+-## 2024-04-13 Introducing email_filter_condition
+-##
+
+- url = email_filter.new_record? ? email_filters_path : email_filter_path( email_filter )
+.email-filters--from.maxwidth
+  = form_for email_filter, url: url, as: :email_filter do |f|
+
+    %p If
+    - f.fields_for( :email_filter_conditions ) do |f_cond|
+      = render '/wco_email/email_filter_conditions/form', f: f_cond
+    = form_for @new_email_filter_condition do |ff|
+      = render '/wco_email/email_filter_conditions/form', f: ff
+
+    .d-flex [+]
+    %p Skip
+    - email_filter.email_filter_skip_conditions.each do |f_cond|
+      .d-flex
+        .field
+          %label Field
+          = f_cond.select :field, options_for_select(WcoEmail::EmailFilter::FIELD_OPTS, selected: f_cond.field)
+        .field
+          %label Matchtype
+          = f_cond.select :matchtype, options_for_select(WcoEmail::EmailFilter::MATCHTYPE_OPTS, selected: f_cond.matchtype)
+        .field
+          %label Value
+          = f_cond.text_field :value
+        [-]
+    .d-flex [+]
+    %p Then [test]
+    - email_filter.action_tmpls.each do |f_act_tmpl|
+      .d-flex
+        %label Office Action
+        .field
+          %label slug
+          = f_act_tmpl.slug
+        .field
+          %label config
+          = f_act_tmpl.text_area :config
+        [-]
+    .d-flex [+]
+    [perform]
+
+    .actions
+      = f.submit 'Go'

data/app/views/wco_email/email_filters/new2.haml

@@ -0,0 +1,5 @@
+
+.emails-ns.email-filters-new.maxwidth
+  .header
+    %h2.title New2 Email Filter
+  = render 'form2', email_filter: @email_filter

data/config/routes.rb

@@ -26,7 +26,11 @@ WcoEmail::Engine.routes.draw do
   get  'contexts/summary',            to: 'contexts#summary'
   post 'contexts/send_immediate/:id', to: 'contexts#send_immediate',   as: :send_context
   resources :contexts
+
+  get 'email_filters/new2', to: 'email_filters#new2'
   resources :email_filters
+  resources :email_filter_conditions
+
   get 'email_templates/:id/iframe', to: 'email_templates#show_iframe', as: :email_template_iframe
   resources :email_templates
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wco_email
 version: !ruby/object:Gem::Version
-  version: 0.1.1.71
+  version: 0.1.1.73
 platform: ruby
 authors:
 - Victor Pudeyev
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-04-13 00:00:00.000000000 Z
+date: 2024-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-s3
@@ -401,11 +401,14 @@ files:
 - app/views/wco_email/email_campaigns/index.haml
 - app/views/wco_email/email_campaigns/new.haml
 - app/views/wco_email/email_campaigns/show.haml
+- app/views/wco_email/email_filter_conditions/_form.haml
 - app/views/wco_email/email_filters/_form.haml
+- app/views/wco_email/email_filters/_form2.haml
 - app/views/wco_email/email_filters/_header.haml
 - app/views/wco_email/email_filters/edit.haml
 - app/views/wco_email/email_filters/index.haml
 - app/views/wco_email/email_filters/new.haml
+- app/views/wco_email/email_filters/new2.haml
 - app/views/wco_email/email_filters/show.haml
 - app/views/wco_email/email_templates/_form.haml
 - app/views/wco_email/email_templates/_form_mini.haml