ish_manager 0.1.8.468 → 0.1.8.470

data/app/views/ish_manager/email_templates/edit.haml

@@ -1,3 +1,6 @@
 
 .email-templates-edit.max-width
+  %h5
+    Edit
+    = link_to @email_template.slug, email_template_path( @email_template )
   = render 'form', email_template: @email_template

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

@@ -0,0 +1,12 @@
+
+- url = tmpl.new_record? ? lead_action_templates_path : lead_action_template_path( tmpl )
+.lead-action-templates--form
+  = form_for tmpl, url: url, as: :tmpl do |f|
+    .field
+      %label slug
+      = f.text_field :slug
+    .field
+      %label Action exe
+      = f.text_area :action_exe
+    .actions
+      = f.submit 'Submit'

data/app/views/ish_manager/lead_action_templates/edit.haml

@@ -0,0 +1,5 @@
+
+.lead-action-templates-edit.maxwidth
+  %h5 Edit Lead Action Template
+
+  = render 'form', tmpl: @tmpl

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

@@ -0,0 +1,11 @@
+
+.lead-action-templates-index.maxwidth
+  %h5 Lead Action Templates
+
+  %ul
+    - @tmpls.each do |tmpl|
+      %li
+        = link_to "[~ #{tmpl.slug}]", edit_lead_action_template_path( tmpl )
+
+  %hr
+  = render 'form', tmpl: @new_lat

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

@@ -0,0 +1,12 @@
+
+.lead-actions-index.maxwidth
+  %h5 Lead Actions
+
+  %ul
+    - @lead_actions.each do |la|
+      %li
+        %ul
+          - JSON.parse( la.params ).each do |k, v|
+            %li
+              = k
+              = v

data/config/routes.rb

@@ -105,6 +105,8 @@ IshManager::Engine.routes.draw do
 
   resources :email_unsubscribes
 
+  ## L
+  resources :lead_actions
   resources :lead_leadsets
 
   get 'leads',      :to => 'leads#index'
@@ -116,13 +118,23 @@ IshManager::Engine.routes.draw do
 
   resources :leadset_tags
 
+  resources :lead_actions
+  resources :lead_action_templates
+
+  ## M
 
   resources :meetings
 
+  ## N
+
   resources :newsitems
 
+  ## O
+
   resources :office_actions
 
+  ## P
+
   resources :photos
   resources :payments
   resources :prices

data/lib/ish_manager.rb

@@ -7,8 +7,6 @@ require 'kaminari/actionview'
 require 'mongoid_paperclip'
 
 module IshManager
-  # Your code goes here...
-
   module Gameui
   end
 end

data/lib/tasks/office_tasks.rake

@@ -5,6 +5,7 @@ namespace :office do
   task schs: :environment do
     while true do
 
+      ## Office::ScheduledEmailAction
       Sch.active.where({ :perform_at.lte => Time.now }).each do |sch|
 
         sch.send_and_roll
@@ -24,11 +25,7 @@ namespace :office do
 
       ## send and roll
       Office::Action.active.where({ :perform_at.lte => Time.now }).each do |oact|
-
-        oact.update({
-          perform_at: nil,
-          # state: OAct::STATE_INACTIVE, ## @TODO: remove, they remain active but non-perform.
-        })
+        oact.update({ perform_at: nil })
         eval( oact.action_exe )
         oact.ties.each do |tie|
           next_oact            = tie.next_office_action
@@ -53,6 +50,18 @@ namespace :office do
 
       ctxs = ::Ish::EmailContext.scheduled.notsent
       ctxs.map do |ctx|
+
+        unsub = Ish::EmailUnsubscribe.where({ lead_id: ctx.lead_id, template_id: ctx.template_id }).first
+        if unsub
+          Office::AdminMessage.create({ message: "Lead `#{ctx.lead.full_name}` [mailto:#{ctx.lead.email}] has already unsubscribed from template `#{Ish::EmailTemplate.find( ctx.template_id ).slug}` ." })
+          email_action_ids = EAction.where({ email_template_id: ctx.template_id }).map(&:id)
+          schs = Sch.active.where({
+            lead_id: ctx.lead_id,
+            :email_action_id.in => email_action_ids,
+          })
+          schs.update({ state: Office::ScheduledEmailAction::STATE_UNSUBSCRIBED })
+        end
+
         out = IshManager::OfficeMailer.send_context_email( ctx[:id].to_s )
         Rails.env.production? ? out.deliver_later : out.deliver_now
         print '^'
@@ -61,6 +70,7 @@ namespace :office do
       duration = Rails.env.production? ? 120 : 15 # 2 minutes or 15 seconds
       sleep duration
       print '.'
+
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ish_manager
 version: !ruby/object:Gem::Version
-  version: 0.1.8.468
+  version: 0.1.8.470
 platform: ruby
 authors:
 - piousbox
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-09-16 00:00:00.000000000 Z
+date: 2023-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -492,7 +492,6 @@ files:
 - 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
 - app/controllers/ish_manager/events_controller.rb
 - app/controllers/ish_manager/galleries_controller.rb
 - app/controllers/ish_manager/image_assets_controller.rb
@@ -502,6 +501,8 @@ files:
 - app/controllers/ish_manager/iro_purses_controller.rb
 - app/controllers/ish_manager/iro_strategies_controller.rb
 - app/controllers/ish_manager/iro_watches_controller.rb
+- app/controllers/ish_manager/lead_action_templates_controller.rb
+- app/controllers/ish_manager/lead_actions_controller.rb
 - app/controllers/ish_manager/leads_controller.rb
 - app/controllers/ish_manager/leadset_tags_controller.rb
 - app/controllers/ish_manager/leadsets_controller.rb
@@ -620,6 +621,11 @@ files:
 - 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_layouts/can_unsubscribe.html.erb
+- app/views/ish_manager/email_layouts/piousbox_roundborders.html.erb
+- app/views/ish_manager/email_layouts/plain.html.erb
+- app/views/ish_manager/email_layouts/roundborders.html.erb
+- app/views/ish_manager/email_layouts/wco_roundborders.html.erb
 - 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
@@ -627,6 +633,7 @@ files:
 - app/views/ish_manager/email_messages/show_source.haml
 - app/views/ish_manager/email_messages/show_stripped.haml
 - app/views/ish_manager/email_templates/_acknowledgement_of_document_receipt.html.erb
+- app/views/ish_manager/email_templates/_footer_unsubscribe.html.erb
 - 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_mini.haml
@@ -634,6 +641,32 @@ files:
 - app/views/ish_manager/email_templates/_index.haml
 - app/views/ish_manager/email_templates/_m20221201react.html.erb
 - app/views/ish_manager/email_templates/_m20221222merryxmas.html.erb
+- app/views/ish_manager/email_templates/_m202309_feedback.html.erb
+- app/views/ish_manager/email_templates/_m202309_holiday_black_friday.html.erb
+- app/views/ish_manager/email_templates/_m202309_holiday_christmas.html.erb
+- app/views/ish_manager/email_templates/_m202309_holiday_cinco_de_mayo.html.erb
+- app/views/ish_manager/email_templates/_m202309_holiday_columbus_day.html.erb
+- app/views/ish_manager/email_templates/_m202309_holiday_cyber_monday.html.erb
+- app/views/ish_manager/email_templates/_m202309_holiday_easter.html.erb
+- app/views/ish_manager/email_templates/_m202309_holiday_fathers_day.html.erb
+- app/views/ish_manager/email_templates/_m202309_holiday_flag_day.html.erb
+- app/views/ish_manager/email_templates/_m202309_holiday_groundhog_day.html.erb
+- app/views/ish_manager/email_templates/_m202309_holiday_halloween.html.erb
+- app/views/ish_manager/email_templates/_m202309_holiday_inauguration_day.html.erb
+- app/views/ish_manager/email_templates/_m202309_holiday_independence_day.html.erb
+- app/views/ish_manager/email_templates/_m202309_holiday_juneteenth.html.erb
+- app/views/ish_manager/email_templates/_m202309_holiday_labor_day.html.erb
+- app/views/ish_manager/email_templates/_m202309_holiday_may_forth.html.erb
+- app/views/ish_manager/email_templates/_m202309_holiday_memorial_day.html.erb
+- app/views/ish_manager/email_templates/_m202309_holiday_mlk.html.erb
+- app/views/ish_manager/email_templates/_m202309_holiday_mothers_day.html.erb
+- app/views/ish_manager/email_templates/_m202309_holiday_newyear.html.erb
+- app/views/ish_manager/email_templates/_m202309_holiday_presidents_day.html.erb
+- app/views/ish_manager/email_templates/_m202309_holiday_st_patricks.html.erb
+- app/views/ish_manager/email_templates/_m202309_holiday_thanksgiving.html.erb
+- app/views/ish_manager/email_templates/_m202309_holiday_valentines.html.erb
+- app/views/ish_manager/email_templates/_m202309_holiday_veterans_day.html.erb
+- app/views/ish_manager/email_templates/_m202309_ror4.html.erb
 - app/views/ish_manager/email_templates/_marketing_node_1.html.erb
 - app/views/ish_manager/email_templates/_marketing_react_1.html
 - app/views/ish_manager/email_templates/_marketing_react_2.html.erb
@@ -656,8 +689,6 @@ files:
 - app/views/ish_manager/email_templates/_tracking_footer.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
@@ -721,6 +752,10 @@ files:
 - app/views/ish_manager/kaminari/_page.html.erb
 - app/views/ish_manager/kaminari/_paginator.html.erb
 - app/views/ish_manager/kaminari/_prev_page.html.erb
+- app/views/ish_manager/lead_action_templates/_form.haml
+- app/views/ish_manager/lead_action_templates/edit.haml
+- app/views/ish_manager/lead_action_templates/index.haml
+- app/views/ish_manager/lead_actions/index.haml
 - app/views/ish_manager/leads/_form.haml
 - app/views/ish_manager/leads/_form_import.haml
 - app/views/ish_manager/leads/_index.haml

data/app/controllers/ish_manager/email_unsubscribes_controller.rb

@@ -1,17 +0,0 @@
-
-class ::IshManager::EmailUnsubscribesController < IshManager::ApplicationController
-
-  layout false
-
-  # alphabetized : )
-
-  def new
-    @unsubscribe = Ish::Unsubscribe.new
-    authorize! :new, @unsubscribe
-  end
-
-  def create
-    authorize! :open_permission, IshManager::Ability
-  end
-
-end

data/app/views/ish_manager/email_templates/done/_form.haml

@@ -1,22 +0,0 @@
-
-- url = %w| index new create |.include?( params[:action] ) ? email_templates_path : email_template_path(email_template.id)
-
-.email-templates--form
-  = form_for email_template, url: url do |f|
-    .field
-      = f.label :type
-      = f.select :type, options_for_select(Ish::EmailTemplate.type_list, selected: email_template.type)
-    .field
-      = f.label :slug
-      = f.text_field :slug
-    .field
-      = f.label :from_email
-      = f.select :from_email, options_for_select(Ish::EmailContext.from_email_list, selected: email_template.from_email)
-    .field.field-subject
-      = f.label :subject
-      = f.text_field :subject
-    .field
-      = f.label :body
-      = f.text_area :body, class: 'tinymce'
-    .actions
-      = f.submit 'Submit'

data/app/views/ish_manager/email_templates/done/_form2.haml

@@ -1,26 +0,0 @@
-
-- url = email_template.new_record? ? email_templates_path : email_template_path(email_template.id)
-
-.email-templates--form
-  = form_for email_template, url: url do |f|
-    .row
-      .col-md-4
-        .field
-          = f.label :slug
-          = f.text_field :slug
-      .col-md-4
-        .field
-          = f.label :layout
-          = f.select :layout, options_for_select(Ish::EmailTemplate::LAYOUTS, selected: email_template.layout)
-      .col-md-4
-        .field
-          = f.label "From"
-          = f.select :from_email, options_for_select(Ish::EmailContext.from_email_list, selected: email_template.from_email)
-    .field.field-subject
-      = f.label :subject
-      = f.text_field :subject
-    .field
-      -# = f.label :body
-      = f.text_area :body, class: 'tinymce'
-    .actions
-      = f.submit 'Submit'