ish_manager 0.1.8.385 → 0.1.8.387

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b543b5f1c79e4a3938be93fc4701c085393798b4bb8809bb9eca0c7d825937ac
-  data.tar.gz: 335bb44f73016350aa4c8d44e800425376bfdd7659d621819002a18a97b05504
+  metadata.gz: 69f00f3a091162a2aa2b6535f519bd2a9437984131334224bbd8936fe9bf0bac
+  data.tar.gz: d3272e499c6b92122a07cac2879f62fa38ea2f44a09562728b6adb7c89d1ab33
 SHA512:
-  metadata.gz: c289826afe4fc20ccd178005e48c2a4ed28fdadefb148edc134b73fd7b560ef63c8685ebd267a226e04bf95b06fd29da3d021191f5da68c47681c825cad34061
-  data.tar.gz: 107bca0378ff2406e639735fc132f4c7512dc8cd8f1fbb7b1d892a5e8682e6115a8e972b5a5843ce2de3ef7e8086c9d4d2ef9e50e502b81126e8cbf43fa49a52
+  metadata.gz: fc3f0866b54220116e7ebdac586f19a0333c973b1adfc819ab66ed03a10e691801a09a7dba0baced8cd10079b2078becb9c39c484c0724613177cb0350328818
+  data.tar.gz: e3a7dda50885710cb50c784e5d6185dd78c31c0c1fdc3779922ee4523efa073ef761e93c4fb553054d82db8da659f95ad1e516fa8afc29ae4935c1892cb324c8

data/app/assets/javascripts/ish_manager/email_contexts.js

@@ -3,26 +3,12 @@
 $(document).ready(() => {
 
   if ($(".email-contexts--form").length) {
+
     $("#ish_email_context_email_template_id").on('change', (ev) => {
       const val = ev.target.value
       window.location.href = AppRouter.new_email_context_with_template_path(val)
     })
 
-    $("#ish_email_context_type").on('change', (ev) => {
-      const val = ev.target.value
-      if (val == 'TYPE_CAMPAIGN') {
-        $(".email-contexts--form .TYPE_SINGLE").css('display', 'none')
-      } else {
-        $(".email-contexts--form .TYPE_SINGLE").css('display', 'block')
-      }
-    })
-    // on page load:
-    if ($("#ish_email_context_type").val() == 'TYPE_CAMPAIGN') {
-      $(".email-contexts--form .TYPE_SINGLE").css('display', 'none')
-    } else {
-      $(".email-contexts--form .TYPE_SINGLE").css('display', 'block')
-    }
-
   }
 
 })

data/app/assets/javascripts/ish_manager/email_templates.js

@@ -1,7 +1,7 @@
 
 $(document).ready(() => {
 
-  if ($(".email-templates--form").length) {
+  if ($(".email-templates--form").length || $(".email-contexts--form").length) {
     $(".tab-labels > a").click(function() {
       logg( $(this).data('ref'), 'ref')
 

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
@@ -406,6 +406,7 @@ textarea.large {
 
 .select2-container {
   max-width: 100%;
+  min-width: 250px;
   display: block;
 }
 

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/email_contexts.scss

@@ -24,10 +24,6 @@
 
   .field-template {
     display: flex;
-
-    a.action-view {
-      width: 150px;
-    }
   }
 
   textarea {

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

@@ -1,4 +1,5 @@
 
+.email-contexts--form,
 .email-templates--form {
   form {
     > .actions {
@@ -9,7 +10,6 @@
       // border: 1px solid red;
       margin-top: 1em;
 
-
       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/controllers/ish_manager/email_contexts_controller.rb

@@ -6,8 +6,7 @@ class ::IshManager::EmailContextsController < ::IshManager::ApplicationControlle
   before_action :set_lists
 
   def create
-    pparams = params[:ish_email_context].permit!
-    @ctx    = ::Ish::EmailContext.new pparams
+    @ctx    = ::Ish::EmailContext.new params[:ctx].permit!
     @tmpl   = ::Ish::EmailTemplate.find @ctx.email_template_id
 
     @ctx.from_email ||= @tmpl.from_email
@@ -57,9 +56,12 @@ class ::IshManager::EmailContextsController < ::IshManager::ApplicationControlle
   def iframe_src
     @ctx = @email_context = Ish::EmailContext.find params[:id]
     authorize! :iframe_src, @ctx
+
     @tmpl = @email_template = @ctx.email_template
     @lead = @ctx.lead
-    render "ish_manager/email_templates/_#{@tmpl.layout}", layout: false
+    @body = @ctx.body
+
+    render layout: false
   end
 
   def index
@@ -80,10 +82,10 @@ class ::IshManager::EmailContextsController < ::IshManager::ApplicationControlle
     authorize! :new, ::Ish::EmailContext
     @tmpl = @email_template = Ish::EmailTemplate.where( slug: params[:template_slug] ).first || Ish::EmailTemplate.where( id: params[:template_slug] ).first
     attrs = {}
-    if @template
-      attrs = @template.attributes.slice( :subject, :body, :from_email )
+    if @tmpl
+      attrs = @tmpl.attributes.slice( :subject, :body, :from_email )
     end
-    @ctx = ::Ish::EmailContext.new( { email_template: @template }.merge(attrs) )
+    @ctx = ::Ish::EmailContext.new( { email_template: @tmpl }.merge(attrs) )
   end
 
   def show
@@ -94,11 +96,10 @@ class ::IshManager::EmailContextsController < ::IshManager::ApplicationControlle
   def update
     @ctx = ::Ish::EmailContext.find params[:id]
     authorize! :update, @ctx
-    pparams = params[:ish_email_context].permit!
 
-    if @ctx.update_attributes pparams
+    if @ctx.update_attributes params[:ctx].permit!
       flash[:notice] = 'Saved.'
-      redirect_to action: 'show', id: @ctx.id
+      redirect_to action: 'edit', id: @ctx.id
       return
     else
       flash[:alert] = "Could not save: #{@ctx.errors.full_messages.join(', ')}"

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/_form.haml

@@ -1,12 +1,7 @@
 
 .email-contexts--form
-  .header
-    %h2.title Email Context
-
   - url = ctx.new_record? ? email_contexts_path : email_context_path(ctx)
-  = form_for ctx, url: url do |f|
-    .row
-      = f.submit 'Save'
+  = form_for ctx, as: :ctx, url: url do |f|
     .row
       .col-md-6
         .field.field-template
@@ -15,36 +10,35 @@
           - if ctx.email_template_id
             = link_to 'view', email_template_path( ctx.email_template_id ), target: :_blank, class: [ 'action-view' ]
             = link_to '~', edit_email_template_path( ctx.email_template_id ), target: :_blank, class: [ 'action-view' ]
-        -# .field
-        -#   = f.label :slug
-        -#   = f.text_field :slug
+            layout: #{ctx.tmpl.layout}
 
         .field
           = f.label "From"
           = f.select :from_email, options_for_select(Ish::EmailContext.from_email_list, selected: ctx.from_email)
 
-      -# .col-md-6
-      -#   %h5 Context
-      -#   %div Commonly: name, companyName
-      -#   .field
-      -#     = f.text_area :tmpl, value: JSON.pretty_generate( ctx.tmpl )
     .row
       .col-md-4
-        .field
+        .field.flex-row
           = f.label "To lead"
-          = f.select :lead_id, options_for_select( @leads_list ), {}, { class: 'select2' }
+          = f.select :lead_id, options_for_select( @leads_list, selected: ctx.lead_id ), {}, { class: 'select2' }
       .col-md-8
         .field.field-subject
           = f.label :subject
           = f.text_field :subject
 
-    - if 'plain' == ctx.email_template&.layout
-      .body
-        = raw ctx.email_template.body
-    - else
-      .field
-        = f.label :body
-        = f.text_area :body, class: 'tinymce'
+
+
+    .tab-labels
+      %a.label-raw{ href: "javascript: void(0)", data: { ref: '.tab-raw' } } Raw
+      %a.label-preview.active{ href: "javascript: void(0)", data: { ref: '.tab-preview' } } Preview
+      .label-save-preview= f.submit 'Save & Preview'
+    .tabs
+      .tab-raw
+        = f.text_area :body
+      .tab-preview
+        %iframe{ src: email_context_iframe_path(ctx), width: '100%', height: '100%' }
+
+
     .actions
       .left
         = f.submit 'Preview'

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

@@ -1,3 +1,5 @@
 
-.email-contexts-edit
+.email-contexts-edit.max-width
+  .header
+    %h2.title Edit email Context
   = render 'ish_manager/email_contexts/form', ctx: @ctx, tmpl: @tmpl

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

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

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

@@ -20,8 +20,6 @@
           %th.to To
           %th.subject Subject
           %th.template Template
-          %th.created_at Created at
-          %th.updated_at Updated at
       %tbody
         - @ctxs.each do |ctx|
           %tr
@@ -38,8 +36,6 @@
               = link_to email_context_path(ctx) do
                 = ctx.subject ? ctx.subject : "t| #{ctx.tmpl.subject}"
             %td= ctx.email_template.slug
-            %td= ctx.created_at.strftime('%Y-%m-%d %l:%M%P %:z')
-            %td= ctx.updated_at.strftime('%Y-%m-%d %l:%M%P %:z')
 
 
     = render 'paginate', resource: @ctxs, param_name: :email_contexts_page, views_prefix: :ish_manager

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

@@ -1,3 +1,5 @@
 
-.email-contexts-new
+.email-contexts-new.max-width
+  .header
+    %h2.title New email context
   = render 'ish_manager/email_contexts/form', ctx: @ctx

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

@@ -23,10 +23,11 @@
           = button_to 'Send', email_context_send_path(@ctx), form_class: 'inline', :data => { :confirm => 'Are you sure?' }
           = link_to '[~]', edit_email_context_path(@ctx)
 
-  - if @ctx.sent_at
-    = raw @ctx.rendered_str
-    = @ctx.tmpl
+  .max-width
+    - if @ctx.sent_at
+      = raw @ctx.rendered_str
+      -# = @ctx.tmpl
 
-  - else
-    = link_to 'i-src', email_context_iframe_path(@ctx), target: :_blank
-    %iframe{ src: email_context_iframe_path(@ctx), width: '100%', height: '100%' }
+    - else
+      -# = link_to 'i-src', email_context_iframe_path(@ctx), target: :_blank
+      %iframe{ src: email_context_iframe_path(@ctx), width: '100%', height: '100%' }

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

@@ -31,7 +31,8 @@
                 = msg.id
                 <b>To:</b> #{msg.to}
               %li
-                <b>From:</b> #{msg.from}
+                <b>From:</b>
+                -# #{msg.from}
                 = lead.email
                 %a.chip{ href: email_contexts_for_lead_path( lead ) }
                   \(

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

@@ -23,6 +23,7 @@
       = f.label :preview_str
       = f.text_field :preview_str
 
+
     .tab-labels
       %a.label-raw{ href: "javascript: void(0)", data: { ref: '.tab-raw' } } Raw
       %a.label-preview.active{ href: "javascript: void(0)", data: { ref: '.tab-preview' } } Preview
@@ -34,6 +35,8 @@
         - if email_template.persisted?
           -# .descr= render "ish_manager/email_templates/#{email_template.layout}", ctx: Ish::EmailContext.new, tmpl: email_template
           %iframe{ src: email_template_iframe_path(email_template), width: '100%', height: '100%' }
+
+
     .actions
       = f.submit 'Save'
 

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

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