ish_manager 0.1.8.355 → 0.1.8.356

data/config/routes.rb

@@ -51,10 +51,11 @@ IshManager::Engine.routes.draw do
   # office, below
   #
 
-  resources :office_actions
+  resources :email_actions
 
   resources :email_campaigns
   resources :email_campaign_leads, as: :campaign_leads
+  resources :email_filters
 
   get 'email_messages/iframe/:id',   to: 'email_messages#show_iframe',   as: :email_message_iframe
   get 'email_messages/source/:id',   to: 'email_messages#show_source',   as: :email_message_source
@@ -64,8 +65,9 @@ IshManager::Engine.routes.draw do
   get 'email_conversations', to: 'email_conversations#index'
   get 'email_conversations/:id', to: 'email_conversations#show', as: :email_conversation
 
+  get  'email_contexts/for_lead/:lead_id',       to: 'email_contexts#index', as: :email_contexts_for_lead
   get  'email_contexts/iframe_src/:id',          to: 'email_contexts#iframe_src', as: :email_context_iframe
-  get  'email_contexts/new_with/:template_slug', to: 'email_contexts#new'
+  get  'email_contexts/new_with_template/:template_slug', to: 'email_contexts#new'
   post 'email_contexts/send/:id',                to: 'email_contexts#do_send',    as: :email_context_send
   get  'email_contexts',                         to: 'email_contexts#index',      as: :email_contexts,         defaults: { notsent: false }
   get  'email_contexts/notsent',                 to: 'email_contexts#index',      as: :notsent_email_contexts, defaults: { notsent: true }
@@ -79,6 +81,8 @@ IshManager::Engine.routes.draw do
 
   resources :email_unsubscribes
 
+  resources :lead_leadsets
+
   get 'leads',      :to => 'leads#index'
   post 'leads/bulkop', to: 'leads#bulkop'
   post 'leads/import', to: 'leads#import', as: :leads_import
@@ -86,6 +90,8 @@ IshManager::Engine.routes.draw do
 
   resources :leadsets
 
+  resources :leadset_tags
+
 
   resources :meetings
 
@@ -96,6 +102,8 @@ IshManager::Engine.routes.draw do
 
   resources :reports
 
+  resources :scheduled_email_actions
+
   resources :user_profiles do
     resources :newsitems
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ish_manager
 version: !ruby/object:Gem::Version
-  version: 0.1.8.355
+  version: 0.1.8.356
 platform: ruby
 authors:
 - piousbox
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-28 00:00:00.000000000 Z
+date: 2023-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -234,6 +234,7 @@ files:
 - app/assets/images/wait.gif
 - app/assets/javascripts/ish_manager/application.js
 - app/assets/javascripts/ish_manager/email_contexts.js
+- app/assets/javascripts/ish_manager/email_templates.js
 - app/assets/javascripts/ish_manager/maps.js
 - app/assets/javascripts/ish_manager/shared.js
 - app/assets/javascripts/ish_manager/trash/application_materialize.js
@@ -266,10 +267,12 @@ files:
 - app/assets/javascripts/ish_manager/vendor/jquery.iframe-transport.js
 - app/assets/javascripts/ish_manager/vendor/jquery.ui.widget.js
 - app/assets/stylesheets/ish_manager/application.scss
-- app/assets/stylesheets/ish_manager/email_contexts_templates.scss
+- app/assets/stylesheets/ish_manager/email.scss
+- app/assets/stylesheets/ish_manager/email_contexts.scss
 - app/assets/stylesheets/ish_manager/email_conversations.scss
 - app/assets/stylesheets/ish_manager/email_iframe.css
 - app/assets/stylesheets/ish_manager/email_messages.scss
+- app/assets/stylesheets/ish_manager/email_templates.scss
 - app/assets/stylesheets/ish_manager/galleries.scss
 - app/assets/stylesheets/ish_manager/jquery-ui.css
 - app/assets/stylesheets/ish_manager/leads_leadsets.scss
@@ -278,6 +281,8 @@ files:
 - app/assets/stylesheets/ish_manager/office.scss
 - app/assets/stylesheets/ish_manager/pagination.scss
 - app/assets/stylesheets/ish_manager/photos.scss
+- app/assets/stylesheets/ish_manager/scheduled_actions_emails.scss
+- app/assets/stylesheets/ish_manager/tags.scss
 - app/assets/stylesheets/ish_manager/trash/bootstrap.css
 - app/assets/stylesheets/ish_manager/trash/materialize.css
 - app/assets/stylesheets/ish_manager/trash/reset.css
@@ -285,10 +290,12 @@ files:
 - app/assets/stylesheets/ish_manager/videos.scss
 - app/controllers/ish_manager/application_controller.rb
 - app/controllers/ish_manager/categories_controller.rb
+- app/controllers/ish_manager/email_actions_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
 - app/controllers/ish_manager/email_conversations_controller.rb
+- app/controllers/ish_manager/email_filters_controller.rb
 - app/controllers/ish_manager/email_messages_controller.rb
 - app/controllers/ish_manager/email_templates_controller.rb
 - app/controllers/ish_manager/email_unsubscribes_controller.rb
@@ -297,15 +304,16 @@ files:
 - app/controllers/ish_manager/invoices_controller.rb
 - app/controllers/ish_manager/iro_watches_controller.rb
 - app/controllers/ish_manager/leads_controller.rb
+- app/controllers/ish_manager/leadset_tags_controller.rb
 - app/controllers/ish_manager/leadsets_controller.rb
 - app/controllers/ish_manager/maps_controller.rb
 - app/controllers/ish_manager/markers_controller.rb
 - app/controllers/ish_manager/meetings_controller.rb
 - app/controllers/ish_manager/newsitems_controller.rb
-- app/controllers/ish_manager/office_actions_controller.rb
 - app/controllers/ish_manager/payments_controller.rb
 - app/controllers/ish_manager/photos_controller.rb
 - app/controllers/ish_manager/reports_controller.rb
+- app/controllers/ish_manager/scheduled_email_actions_controller.rb
 - app/controllers/ish_manager/user_profiles_controller.rb
 - app/controllers/ish_manager/videos_controller.rb
 - app/helpers/ish_manager/application_helper.rb
@@ -368,6 +376,10 @@ files:
 - app/views/ish_manager/application_mailer/welcome.html.erb
 - app/views/ish_manager/categories/_subtree.haml
 - app/views/ish_manager/categories/index.haml
+- app/views/ish_manager/email_actions/_form.haml
+- app/views/ish_manager/email_actions/edit.haml
+- app/views/ish_manager/email_actions/index.haml
+- app/views/ish_manager/email_actions/new.haml
 - app/views/ish_manager/email_campaign_leads/show.haml
 - app/views/ish_manager/email_contexts/_form.haml
 - app/views/ish_manager/email_contexts/edit.haml
@@ -376,6 +388,10 @@ files:
 - app/views/ish_manager/email_contexts/show.haml
 - app/views/ish_manager/email_conversations/index.haml
 - app/views/ish_manager/email_conversations/show.haml
+- app/views/ish_manager/email_filters/_form.haml
+- app/views/ish_manager/email_filters/edit.haml
+- app/views/ish_manager/email_filters/index.haml
+- app/views/ish_manager/email_filters/new.haml
 - app/views/ish_manager/email_messages/_show_iframe.haml
 - app/views/ish_manager/email_messages/index.haml
 - app/views/ish_manager/email_messages/show.haml
@@ -384,6 +400,7 @@ files:
 - app/views/ish_manager/email_messages/show_stripped.haml
 - app/views/ish_manager/email_templates/_form.haml
 - app/views/ish_manager/email_templates/_form_mini.haml
+- app/views/ish_manager/email_templates/_form_reply_2_mini.haml
 - app/views/ish_manager/email_templates/_form_reply_mini.haml
 - app/views/ish_manager/email_templates/_form_schedule_mini.haml
 - app/views/ish_manager/email_templates/_index.haml
@@ -401,9 +418,12 @@ files:
 - app/views/ish_manager/email_templates/_slug-3.html.erb
 - app/views/ish_manager/email_templates/_wasyaco_roundborders.html.erb
 - app/views/ish_manager/email_templates/_wasyaco_social.html.erb
+- app/views/ish_manager/email_templates/done/_form.haml
+- app/views/ish_manager/email_templates/done/_form2.haml
 - app/views/ish_manager/email_templates/edit.haml
 - app/views/ish_manager/email_templates/iframe_src.haml
 - app/views/ish_manager/email_templates/index.haml
+- app/views/ish_manager/email_templates/new.haml
 - app/views/ish_manager/email_templates/plain.html.erb
 - app/views/ish_manager/email_templates/show.haml
 - app/views/ish_manager/email_unsubscribes/new.haml
@@ -442,6 +462,7 @@ files:
 - app/views/ish_manager/leadsets/_form.haml
 - app/views/ish_manager/leadsets/edit.haml
 - app/views/ish_manager/leadsets/index.haml
+- app/views/ish_manager/leadsets/index_dataTables.haml
 - app/views/ish_manager/leadsets/new.haml
 - app/views/ish_manager/maps/_form.haml
 - app/views/ish_manager/maps/_index_item.haml
@@ -467,8 +488,6 @@ files:
 - app/views/ish_manager/newsitems/edit.haml
 - app/views/ish_manager/newsitems/index.haml
 - app/views/ish_manager/newsitems/new.haml
-- app/views/ish_manager/office_actions/_form.haml
-- app/views/ish_manager/office_actions/index.haml
 - app/views/ish_manager/office_mailer/morning_reminder.haml
 - app/views/ish_manager/office_mailer/render
 - app/views/ish_manager/office_mailer/test_email.html.haml
@@ -489,6 +508,11 @@ files:
 - app/views/ish_manager/reports/index.haml
 - app/views/ish_manager/reports/new.haml
 - app/views/ish_manager/reports/show.haml
+- app/views/ish_manager/scheduled_actions/_form_mini.haml
+- app/views/ish_manager/scheduled_email_actions/_form.haml
+- app/views/ish_manager/scheduled_email_actions/index.haml
+- app/views/ish_manager/scheduled_email_actions/new.haml
+- app/views/ish_manager/scheduled_email_actions/show.haml
 - app/views/ish_manager/trash/email_campaigns-trash/_form.haml
 - app/views/ish_manager/trash/email_campaigns-trash/edit.haml
 - app/views/ish_manager/trash/email_campaigns-trash/index.haml

data/app/controllers/ish_manager/office_actions_controller.rb

@@ -1,59 +0,0 @@
-
-class ::IshManager::OfficeActionsController < IshManager::ApplicationController
-
-  before_action :set_lists
-
-  ## alphabetized : )
-
-  def create
-    # @lead = ::Lead.new params[:lead].permit!
-    # authorize! :create, @lead
-    # if @lead.save
-    #   flash[:notice] = "created lead"
-    # else
-    #   flash[:alert] = "Cannot create lead: #{@lead.errors.messages}"
-    # end
-    # redirect_to :action => 'index'
-  end
-
-  def edit
-    # @lead = ::Lead.find params[:id]
-    # authorize! :edit, @lead
-  end
-
-  def index
-    @actions = Office::Action.active
-    @new_office_action = Office::Action.new
-    authorize! :index, @new_office_action
-  end
-
-  def new
-    # @new_lead = ::Lead.new
-    # authorize! :new, @new_lead
-  end
-
-  def show
-    # authorize! :redirect, IshManager::Ability
-    # redirect_to :action => :edit, :id => params[:id]
-  end
-
-  def update
-    # @lead = ::Lead.find params[:id]
-    # authorize! :update, @lead
-    # if @lead.update_attributes params[:lead].permit!
-    #   flash[:notice] = 'Successfully updated lead.'
-    # else
-    #   flash[:alert] = "Cannot update lead: #{@lead.errors.messages}"
-    # end
-    # redirect_to :action => 'index'
-  end
-
-  private
-
-  def set_lists
-    super
-    @leadsets_list = [ [nil,nil] ] + ::Leadset.all.map { |k| [ k.name, k.id ] }
-    @email_campaigns_list = [ [nil,nil] ] + Ish::EmailContext.unsent_campaigns.map { |k| [ k.slug, k.id ] }
-  end
-
-end

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

@@ -1,83 +0,0 @@
--#
--# ish_manager / office_actions / _form
--#
-
-= form_for office_action, :html => { :multipart => true, class: 'office-actions--form' } do |f|
-  .row
-    .col-sm-6
-      .field
-        -# = f.label :map
-        -# = f.select :map_id, options_for_select( @maps_list, selected:( newsitem[:map_id] || params[:map_id] ) ), {}, class: 'select2'
-    .col-sm-6
-      = f.submit :submit
-
-  .row
-    .col-sm-12
-      An
-      .bordered-field
-        = f.label :status do
-          = f.check_box :status
-          %span Active
-
-      .input-field.input-outlined.inline
-        = f.select :channel, options_for_select(['email', 'email'])
-        -# = f.label :channel
-
-      action
-      .input-field.input-outlined.inline
-        = f.text_field :match_from, value: 'sync.com'
-        = f.label "From", for: :match_from
-
-
-      Triggers
-      <br />
-
-      .input-field.input-outlined.inline
-        = f.select :channel, options_for_select(['email', 'email'])
-
-      w/ config
-      .input-field.input-outlined.inline
-        = f.text_area :channel, value: '{ "template": "20230207-autoresponse" }'
-
-      <br />
-
-      .input-field.input-outlined.inline
-        = f.select :channel, options_for_select(['create_lead', 'email'])
-
-      w/ config
-      .input-field.input-outlined.inline
-        = f.text_area :channel, value: ''
-
-  .row
-    .col-sm-6
-      .field
-
-      -# .field
-      -#   = label_tag :photo
-      -#   = file_field_tag :photo
-      -# .field
-      -#   = f.label :subhead
-      -#   = f.text_area :subhead
-      -# .field
-      -#   = f.label :descr
-      -#   = f.text_area :descr, :class => :tinymce
-
-    -# .col-sm-6
-    -#   .field
-    -#     = f.label :video
-    -#     = f.select :video_id, options_for_select( @videos_list, :selected => @newsitem.video_id ), {}, class: 'select2'
-    -#   .field
-    -#     = f.label :gallery
-    -#     = f.select :gallery_id, options_for_select( @galleries_list, :selected => @newsitem.gallery_id ), {}, class: 'select2'
-    -#   .field
-    -#     = f.label :report
-    -#     = f.select :report_id, options_for_select( @reports_list, :selected => @newsitem.report_id ), {}, class: 'select2'
-
-
-  .row
-    .col-sm-6
-      .field
-        -# = f.label :map
-        -# = f.select :map_id, options_for_select( @maps_list, selected:( newsitem[:map_id] || params[:map_id] ) ), {}, class: 'select2'
-    .col-sm-6
-      = f.submit :submit

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

@@ -1,9 +0,0 @@
-
-= render 'ish_manager/office_actions/form', office_action: @new_office_action
-
-.title
-  %h1
-    Office Actions
-    = link_to '[+]', new_office_action_path
-
-= @actions.to_a