ish_manager 0.1.8.386 → 0.1.8.387

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ad5f6ecf804df03a3acafbff94f1136e5372aed88b43e0949603620cfeb87c30
-  data.tar.gz: 7d49e60a9d8ad7f9bd732f02d03ea313232262cb44e56365d671c5665a87f5a9
+  metadata.gz: 69f00f3a091162a2aa2b6535f519bd2a9437984131334224bbd8936fe9bf0bac
+  data.tar.gz: d3272e499c6b92122a07cac2879f62fa38ea2f44a09562728b6adb7c89d1ab33
 SHA512:
-  metadata.gz: 3e2b8b77466307c9e709209632a7013851900dccc7ed29b65e627170ec20be937b9ce58229e76a8d32101b6698516757065927f23b0cb0f8521a89c9ae558054
-  data.tar.gz: a16b163f1ba2a29dd335711c8c508104ecf06812661cb82b50460bfc61f64acea6a1346d77643da3ef8cc613f1001c811994c1960bae26246453411dba9f86d0
+  metadata.gz: fc3f0866b54220116e7ebdac586f19a0333c973b1adfc819ab66ed03a10e691801a09a7dba0baced8cd10079b2078becb9c39c484c0724613177cb0350328818
+  data.tar.gz: e3a7dda50885710cb50c784e5d6185dd78c31c0c1fdc3779922ee4523efa073ef761e93c4fb553054d82db8da659f95ad1e516fa8afc29ae4935c1892cb324c8

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

@@ -18,7 +18,7 @@
  *= require ish_manager/office
  *= require ish_manager/pagination
  *= require ish_manager/photos
- *= require ish_manager/scheduled_actions_emails
+ *= require ish_manager/scheduled_email_actions
  *= require ish_manager/tags
  *= require ish_manager/user_profiles
  *= require ish_manager/videos

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

@@ -2,6 +2,7 @@
 
 .email-actions-edit,
 .email-actions-index,
+.email-actions-new,
 .email-filters-index,
 .email-templates-edit,
 .email-templates-new,
@@ -13,6 +14,7 @@
 .leads-edit,
 .leads-index,
 .leads-show,
+.scheduled-email-actions--form,
 .scheduled-emails-index {
   .header {
     display: flex;

data/app/assets/stylesheets/ish_manager/{scheduled_actions_emails.scss → scheduled_email_actions.scss}

@@ -4,8 +4,6 @@
 }
 
 .scheduled-emails-new {
-
-
   border: 1px solid red;
   border-radius: .5em;
   padding: .5em;
@@ -18,13 +16,32 @@
 
 }
 
-.scheduled-actions--form-mini {
-  display: inline-block;
+.form-mini {
+  border: 1px solid blue;
   background: #ccc;
 
+  display: inline-block;
+}
+
+.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;
+    padding-top: .5em;
   }
+
+  .flex-row {
+    justify-content: space-between;
+  }
+
 }

data/app/controllers/ish_manager/application_controller.rb

@@ -1,6 +1,7 @@
 
 module IshManager
   class ApplicationController < ActionController::Base
+
     protect_from_forgery :with => :exception, :prepend => true
     before_action :set_current_ability
     before_action :set_changelog
@@ -9,7 +10,11 @@ module IshManager
     check_authorization
     rescue_from ::CanCan::AccessDenied, :with => :access_denied
 
-    http_basic_authenticate_with :name => BASIC_AUTH_NAME, :password => BASIC_AUTH_PASSWORD
+    before_action :basic_auth
+    def basic_auth
+      return if Rails.env.test?
+      http_basic_authenticate_or_request_with :name => BASIC_AUTH_NAME, :password => BASIC_AUTH_PASSWORD
+    end
 
     def home
       authorize! :home, IshManager::Ability
@@ -26,6 +31,11 @@ module IshManager
       redirect_to user_signed_in? ? root_path : Rails.application.routes.url_helpers.new_user_session_path, :alert => exception.message
     end
 
+    def encode(payload, exp = 48.hours.from_now) # @TODO: definitely change, right now I expire once in 2 days.
+      payload[:exp] = exp.to_i
+      JWT.encode(payload, Rails.application.secrets.secret_key_base.to_s)
+    end
+
     def pp_errors err
       err
     end
@@ -51,23 +61,17 @@ module IshManager
       @jwt_token = encode(user_profile_id: @current_user.profile.id.to_s)
     end
 
-    def encode(payload, exp = 48.hours.from_now) # @TODO: definitely change, right now I expire once in 2 days.
-      payload[:exp] = exp.to_i
-      JWT.encode(payload, Rails.application.secrets.secret_key_base.to_s)
-    end
-
     def set_lists
-      @galleries_list = Gallery.all.list
-      @locations_list = ::Gameui::Map.list
-      @maps_list = ::Gameui::Map.list # @TODO: missing nonpublic!
-      @reports_list = Report.all.list
-      @user_profiles_list = Ish::UserProfile.list
-      @videos_list = Video.all.list
-
-      @leads_list = Lead.list
-      @leadsets_list = Leadset.list
-      @email_actions_list = [[nil,nil]] + ::Office::EmailAction.all.map { |a| [ a.slug, a.id ] }
-      @email_templates_list = Ish::EmailTemplate.all.map { |t| [ t.slug, t.id ] }
+      @galleries_list       = Gallery.all.list
+      @locations_list       = ::Gameui::Map.list
+      @maps_list            = ::Gameui::Map.list # @TODO: missing nonpublic!
+      @reports_list         = Report.all.list
+      @user_profiles_list   = Ish::UserProfile.list
+      @videos_list          = Video.all.list
+      @leads_list           = Lead.list
+      @leadsets_list        = Leadset.list
+      @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 ] }
     end
 
     def set_title

data/app/controllers/ish_manager/email_actions_controller.rb

@@ -5,28 +5,6 @@ class ::IshManager::EmailActionsController < IshManager::ApplicationController
 
   ## Alphabetized : )
 
-  def create
-    @act = @email_action = Office::EmailAction.new
-    authorize! :create, @act
-
-    next_ids = params[:email_action].delete(:next_email_actions)
-    next_ids.delete("")
-    Office::EmailAction.where(prev_email_action_id: params[:id] ).update_all(prev_email_action_id: nil)
-    next_ids.each do |next_id|
-      next_action = ::Office::EmailAction.find next_id
-      next_action.update_attribute( :prev_email_action_id, params[:id] )
-    end
-
-    flag = @act.update_attributes( params[:email_action].permit! )
-    if flag
-      flash[:notice] = 'Success'
-    else
-      flash[:alert] = "No luck: #{@act.errors.full_messages.join(', ')}"
-    end
-
-    redirect_to action: 'index'
-  end
-
   def edit
     @act = @email_action = Office::EmailAction.find( params[:id] )
     @act.ties.push Office::EmailActionTie.new( next_email_action_id: nil )
@@ -48,28 +26,37 @@ class ::IshManager::EmailActionsController < IshManager::ApplicationController
     authorize! :show, @act
   end
 
+  ## def create; update; end
+  ## def upsert; update; end
   def update
-    @act = @email_action = Office::EmailAction.find( params[:id] )
-    authorize! :update, @act
-
-    params[:email_action][:ties_attributes].each do |k, v|
-      if !v[:next_email_action_id].present?
-        params[:email_action][:ties_attributes].delete( k )
-      end
-      if v[:to_delete] == "1"
-        Actie.find( v[:id] ).delete
-        params[:email_action][:ties_attributes].delete( k )
+    if params[:id]
+      @act = @email_action = Office::EmailAction.find( params[:id] )
+    else
+      @act = @email_action = Office::EmailAction.new
+    end
+    authorize! :upsert, @act
+
+    if params[:email_action][:ties_attributes]
+      params[:email_action][:ties_attributes].each do |k, v|
+        if !v[:next_email_action_id].present?
+          params[:email_action][:ties_attributes].delete( k )
+        end
+        if v[:to_delete] == "1"
+          Actie.find( v[:id] ).delete
+          params[:email_action][:ties_attributes].delete( k )
+        end
       end
     end
 
     flag = @act.update_attributes( params[:email_action].permit! )
     if flag
       flash[:notice] = 'Success'
+      redirect_to action: 'index'
     else
       flash[:alert] = "No luck: #{@act.errors.full_messages.join(', ')}. #{@act.ties.map { |t| t.errors.full_messages.join(', ') }.join(' | ') }"
+      render action: 'edit'
     end
 
-    redirect_to action: 'index'
   end
 
   ##

data/app/jobs/ish_manager/test_email_job.rb

@@ -9,3 +9,5 @@ class IshManager::TestEmailJob
   end
 
 end
+
+

data/app/mailers/ish_manager/application_mailer.rb

@@ -25,5 +25,9 @@ module IshManager
       mail( :to => stock.profile.email, :subject => "IshManager Stock Alert :: #{stock.ticker}" ).deliver
     end
 
+    def test_email
+      mail( to: 'piousbox@gmail.com', subject: "Test email at #{Time.now}" )
+    end
+
   end
 end

data/app/mailers/ish_manager/office_mailer.rb

@@ -56,28 +56,18 @@ class IshManager::OfficeMailer < IshManager::ApplicationMailer
   end
 
   def send_context_email ctx_id
-    @email_ctx = ::Ish::EmailContext.find ctx_id
+    @ctx = ::Ish::EmailContext.find ctx_id
     ac = ActionController::Base.new
-    ac.instance_variable_set( :@email_ctx, @email_ctx )
+    ac.instance_variable_set( :@ctx, @ctx )
 
-    raise '@TODO: re-implement. _vp_ 2023-03-04'
-    # case @email_ctx.email_template.type
-    # when 'partial'
-    #   template = "render/_#{@email_ctx.email_template.slug}"
-    #   rendered_str = ac.render_to_string("ish_manager/email_templates/_#{@email_ctx.email_template.slug}")
-    # when 'plain'
-    #   @body = @email_ctx.body_templated
-    #   template = "render/plain"
-    #   rendered_str = ac.render_to_string("ish_manager/email_templates/plain")
-    # end
-
-    @email_ctx.update( rendered_str: rendered_str, sent_at: Time.now.to_s )
+    rendered_str = ac.render_to_string("ish_manager/email_templates/_#{@ctx.tmpl.slug}")
+    @ctx.update( rendered_str: rendered_str, sent_at: Time.now.to_s )
 
     mail( from: @email_ctx.from_email,
           to: @email_ctx.to_email,
           bcc: 'piousbox@gmail.com',
           subject: @email_ctx.subject,
-          template_name: template )
+          template_name: "render/_#{@ctx.tmpl.slug}" )
   end
 
 end

data/app/views/ish_manager/application_mailer/test_email.html.erb

@@ -0,0 +1,3 @@
+
+<p>This is a test email.</p>
+<p>Time now: <%= Time.now %>.</p>

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

@@ -14,10 +14,10 @@
         .field
           %label Slug
           = f.text_field :slug
-        .field
-          %label Descr
-          = f.text_area :descr
-        .field
+        -# .field
+        -#   %label Descr
+        -#   = f.text_area :descr
+        .field.flex-row
           %label Template
           = f.select :email_template_id, options_for_select( @email_templates_list, selected: act.email_template_id ), {}, class: 'select2'
 

data/app/views/ish_manager/email_actions/new.haml

@@ -1,4 +1,6 @@
 
+-# padded b/c eval(next_time_at) is long
+
 .email-actions-new.padded
   .header
     %h2.title

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

@@ -1,3 +1,11 @@
 
 .email-actions-show.max-width
-  show...
+  .header
+    .title Email Action #{@act.id}
+
+  %ul
+    - @act.ties.map do |next_a|
+      %li
+        .a <b>Next act:</b> #{"(same)" if next_a.next_email_action.slug == @act.slug} #{next_a.next_email_action.slug}
+        .a <b>Next at exe:</b> #{next_a.next_at_exe}
+        .a <b>Eval'ed:</b> #{eval( next_a.next_at_exe )}

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

@@ -1,4 +1,4 @@
 
 
-= render "ish_manager/email_templates/#{@email_template.layout}", body: @body
+= render "ish_manager/email_templates/#{@email_template.layout}"
 

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

@@ -1,3 +1,4 @@
 
-= raw ERB.new( body ).result
+
+= raw ERB.new( @ctx.body ).result
 

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

@@ -1,28 +1,22 @@
 
--#
--# scheduled_emails / _form
--#
-
 - sch_a = scheduled_email_action
 - url = sch_a.new_record? ? scheduled_email_actions_path : scheduled_email_action_path(sch_a.id)
 
 .scheduled-email-actions--form
-  = form_for scheduled_email_action, url: url, as: :sch, html: { class: "form-mini" } do |f|
+  = form_for scheduled_email_action, url: url, as: :sch do |f|
     .header
       %h5.title Schedule an email action
 
-    .field
+    .flex-row
       = f.label :lead
-      = f.select :lead_id, options_for_select(@leads_list, selected: sch_a[:lead_id]||params[:lead_id] ), class: 'select2'
-    .field
+      = f.select :lead_id, options_for_select(@leads_list, selected: sch_a[:lead_id]||params[:lead_id] ), {}, class: 'select2'
+    .flex-row
       %label State
-      = f.select :state, options_for_select(::Office::ScheduledEmailAction::STATES, selected: sch_a.state ), class: 'select2'
-    %br
-    .field
-      %label Email Action
-      = f.select :email_action, options_for_select( @email_actions_list, selected: sch_a[:email_action_id] ), class: 'select2'
-    %br
-    .field
+      = f.select :state, options_for_select(::Office::ScheduledEmailAction::STATES, selected: sch_a.state )
+    .flex-row
+      = f.label :email_action
+      = 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
 

data/app/views/ish_manager/scheduled_email_actions/_form_mini.haml-trash

@@ -0,0 +1,28 @@
+
+-# unused, but maybe I should separate _form and _form_mini ?
+
+- sch_a = scheduled_email_action
+- url = sch_a.new_record? ? scheduled_email_actions_path : scheduled_email_action_path(sch_a.id)
+
+.scheduled-email-actions--form
+  = form_for scheduled_email_action, url: url, as: :sch, html: { class: "form-mini" } do |f|
+    .header
+      %h5.title Schedule an email action
+
+    .flex-row
+      = f.label :lead
+      = f.select :lead_id, options_for_select(@leads_list, selected: sch_a[:lead_id]||params[:lead_id] ), {}, class: 'select2'
+    .field
+      %label State
+      = f.select :state, options_for_select(::Office::ScheduledEmailAction::STATES, selected: sch_a.state )
+    %br
+    .flex-row
+      = f.label :email_action
+      = f.select :email_action, options_for_select( @email_actions_list, selected: sch_a[:email_action_id] ), {}, class: 'select2'
+    %br
+    .field
+      = f.label :perform_at
+      = f.text_field :perform_at
+
+    .actions
+      = submit_tag 'Schedule'

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

@@ -6,6 +6,8 @@
       -# (#{Sch.kept.count})
       (#{Sch.all.count})
       = link_to '[+]', new_scheduled_email_action_path
+  .header
+    Time now: #{Time.now.strftime('%Y-%m-%d %l:%M%P')}
 
   .items
     - @scheduled_email_actions.each do |sch|
@@ -19,4 +21,4 @@
           %li <b>Tmpl:</b> #{sch.email_action.email_template.slug}
           %li <b>Lead:</b> #{link_to sch.lead.email, lead_path(sch.lead) }
           %li <b>State:</b> #{sch.state}
-          %li <b>Perform at:</b> #{sch.perform_at}
+          %li <b>Perform at:</b> #{sch.perform_at.in_time_zone}

data/config/routes.rb

@@ -50,6 +50,7 @@ IshManager::Engine.routes.draw do
   # office, below
   #
 
+  post :email_actions, to: 'email_actions#update'
   resources :email_actions
 
   resources :email_campaigns

data/lib/tasks/office_tasks.rake

@@ -27,11 +27,11 @@ namespace :office do
           next_at  = eval(tie.next_at_exe)
           next_sch = Sch.find_or_initialize_by({
             lead_id: sch.lead_id,
-            email_action_id: nxt.id,
+            email_action_id: next_act.id,
           })
-          sch_nxt.perform_at = next_at
-          sch_nxt.state = Sch::STATE_ACTIVE
-          sch_nxt.save!
+          next_sch.perform_at = next_at
+          next_sch.state      = Sch::STATE_ACTIVE
+          next_sch.save!
         end
 
         print '+'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ish_manager
 version: !ruby/object:Gem::Version
-  version: 0.1.8.386
+  version: 0.1.8.387
 platform: ruby
 authors:
 - piousbox
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-25 00:00:00.000000000 Z
+date: 2023-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -298,7 +298,7 @@ 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/scheduled_email_actions.scss
 - app/assets/stylesheets/ish_manager/tags.scss
 - app/assets/stylesheets/ish_manager/trash/bootstrap.css
 - app/assets/stylesheets/ish_manager/trash/materialize.css
@@ -393,6 +393,7 @@ files:
 - app/views/ish_manager/application/_search.haml
 - app/views/ish_manager/application/home.haml
 - app/views/ish_manager/application_mailer/shared_galleries.html.erb
+- app/views/ish_manager/application_mailer/test_email.html.erb
 - app/views/ish_manager/application_mailer/welcome.html.erb
 - app/views/ish_manager/categories/_subtree.haml
 - app/views/ish_manager/categories/index.haml
@@ -447,7 +448,7 @@ files:
 - 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/plain.html.erb-trash
 - app/views/ish_manager/email_templates/show.haml
 - app/views/ish_manager/email_unsubscribes/new.haml
 - app/views/ish_manager/galleries/_form.haml
@@ -539,6 +540,7 @@ files:
 - 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/_form_mini.haml-trash
 - app/views/ish_manager/scheduled_email_actions/edit.haml
 - app/views/ish_manager/scheduled_email_actions/index.haml
 - app/views/ish_manager/scheduled_email_actions/new.haml