ish_manager 0.1.8.384 → 0.1.8.386

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6bebeac16a23bc0a3d32dfe6ed2f17ffa40f12f5651d2ed96b6c536107982361
-  data.tar.gz: c0bb4c816f75c97b8baa1c158f340618cb30a594b4eb7366b1a2c6342b1a3af3
+  metadata.gz: ad5f6ecf804df03a3acafbff94f1136e5372aed88b43e0949603620cfeb87c30
+  data.tar.gz: 7d49e60a9d8ad7f9bd732f02d03ea313232262cb44e56365d671c5665a87f5a9
 SHA512:
-  metadata.gz: b963eb5535ea6ff9e746c16a8ede99eddd69bb99147ff02d1426b587eddfbb153afa6fc4867500dcc1cc5cd40688cd1add88f34dc45abbce2fda09f950499719
-  data.tar.gz: 80c4f372cc882d4bf282128fe4caaa71a8eb4efe037ae471649862f0bb1ce8f618e61a32da87e8756ff256aff72d80f17588ba1b1ec242f45885177c43aa2317
+  metadata.gz: 3e2b8b77466307c9e709209632a7013851900dccc7ed29b65e627170ec20be937b9ce58229e76a8d32101b6698516757065927f23b0cb0f8521a89c9ae558054
+  data.tar.gz: a16b163f1ba2a29dd335711c8c508104ecf06812661cb82b50460bfc61f64acea6a1346d77643da3ef8cc613f1001c811994c1960bae26246453411dba9f86d0

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

@@ -91,7 +91,7 @@ $(function () {
     if (!!$('body').select2) {
       $('.select2').each(function() {
         $( this ).select2({
-          width: '100%'
+          width: 'auto',
         })
       })
     }

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

@@ -208,6 +208,10 @@ table.dataTable {
 
 /* F */
 
+.flex-grow {
+  flex-grow: 1;
+}
+
 .flex-row {
   display: flex;
   flex-wrap: wrap;
@@ -327,6 +331,8 @@ textarea.large {
   margin-top: 1em;
 
   flex-grow: 1;
+
+  z-index: -1;
 }
 
 .max-width {
@@ -400,6 +406,7 @@ textarea.large {
 
 .select2-container {
   max-width: 100%;
+  min-width: 250px;
   display: block;
 }
 

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

@@ -20,6 +20,11 @@
   }
 }
 
+.email-actions--form {
+  .select2-container {
+    flex-grow: 1;
+  }
+}
 
 .form-mini {
 

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/controllers/ish_manager/application_controller.rb

@@ -66,7 +66,7 @@ module IshManager
 
       @leads_list = Lead.list
       @leadsets_list = Leadset.list
-      @email_actions_list = ::Office::EmailAction.all.map { |a| [ a.slug, a.id ] }
+      @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 ] }
     end
 

data/app/controllers/ish_manager/email_actions_controller.rb

@@ -29,6 +29,7 @@ class ::IshManager::EmailActionsController < IshManager::ApplicationController
 
   def edit
     @act = @email_action = Office::EmailAction.find( params[:id] )
+    @act.ties.push Office::EmailActionTie.new( next_email_action_id: nil )
     authorize! :edit, @act
   end
 
@@ -43,25 +44,29 @@ class ::IshManager::EmailActionsController < IshManager::ApplicationController
   end
 
   def show
+    @act = @email_action = Office::EmailAction.find( params[:id] )
+    authorize! :show, @act
   end
 
   def update
     @act = @email_action = Office::EmailAction.find( params[:id] )
     authorize! :update, @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] )
+    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
 
     flag = @act.update_attributes( params[:email_action].permit! )
     if flag
       flash[:notice] = 'Success'
     else
-      flash[:alert] = "No luck: #{@act.errors.full_messages.join(', ')}"
+      flash[:alert] = "No luck: #{@act.errors.full_messages.join(', ')}. #{@act.ties.map { |t| t.errors.full_messages.join(', ') }.join(' | ') }"
     end
 
     redirect_to action: 'index'

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/controllers/ish_manager/scheduled_email_actions_controller.rb

@@ -4,14 +4,9 @@ class IshManager::ScheduledEmailActionsController < IshManager::ApplicationContr
   before_action :set_lists
 
   def create
-    puts! params, 'params'
-
     authorize! :scheduled_emails_create, ::IshManager
 
-    @scheduled = Office::ScheduledEmailAction .new({
-      lead_id: params[:lead_id],
-      email_action_id: params[:email_action_id],
-    })
+    @scheduled = Office::ScheduledEmailAction.new( params[:sch].permit! )
 
     flag = @scheduled.save
     if flag

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

@@ -22,35 +22,23 @@
           = f.select :email_template_id, options_for_select( @email_templates_list, selected: act.email_template_id ), {}, class: 'select2'
 
       .col-md-6
-        .field
-          %label Next At Exe
-          .eg rand(1..5).business_days.from_now.to_date + rand(8..16).hours + rand(1..59).minutes
-          = f.text_field :next_at_exe
-        -# .field
-        -#   %label Next in Days
-        -#   .eg eg: rand(1..5)
-        -#   = f.text_field :next_in_days
-        -# .field
-        -#   %label Next at Time
-        -#   .eg eg: rand(8..16).hours + rand(1..59).minutes
-        -#   = f.text_field :next_at_time
         .field
           %label Next Email Actions
-          = f.select :next_email_actions, options_for_select( @email_actions_list, selected: act.next_email_actions.map(&:id) ), { }, { class: 'select2', multiple: true }
+          .eg rand(1..5).business_days.from_now.to_date + rand(8..16).hours + rand(1..59).minutes
+          %br
+
+          = f.fields_for :ties do |next_f|
+            .flex-row.field
+              = next_f.label :next_at_exe
+              = next_f.text_field :next_at_exe, class: 'flex-grow'
+            .flex-row.field
+              = next_f.label :to_delete
+              = next_f.check_box :to_delete
+              = next_f.select :next_email_action_id, options_for_select( @email_actions_list, selected: next_f.object.next_email_action_id ), { }, { class: 'select2' }
+            %br
 
     .row
       .col-sm-6
         = f.submit :submit
 
 
-
-
-
-
-
-        -# .field
-        -#   %label State
-        -#   = f.select :state, options_for_select( ::Office::EmailAction::STATES, selected: act.state )
-        -# .field
-        -#   %label Lead
-        -#   = f.select :lead_id, options_for_select( @leads_list, selected: act.lead_id ), {}, class: 'select2'

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

@@ -1,5 +1,5 @@
 
-.email-actions-edit
+.email-actions-edit.padded
   .header
     %h2.title Edit Email Action
 

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

@@ -1,5 +1,5 @@
 
-.email-actions-index.max-width
+.email-actions-index.padded
 
   .header
     %h2.title
@@ -17,10 +17,16 @@
       %tr
         %td= check_box_tag 'abba'
         %td= link_to '[~]', edit_email_action_path( act )
-        %td= act.slug
+        %td= link_to act.slug, email_action_path( act )
         %td= act.descr
         -# %td= act.lead&.email
         %td
           %ul
-            - act.next_email_actions.map do |next_a|
-              %li= link_to next_a.slug, edit_email_action_path( next_a )
+            - act.ties.map do |next_a|
+              %li
+                .a= next_a.next_at_exe
+                .a
+                  - if next_a.next_email_action.slug == act.slug
+                    (same)
+                  = next_a.next_email_action.slug
+              -# %li= link_to next_a.next_email_action.slug, edit_email_action_path( next_a.next_email_action )

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

@@ -1,5 +1,5 @@
 
-.email-actions-new.max-width
+.email-actions-new.padded
   .header
     %h2.title
       New Email Action

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

@@ -0,0 +1,3 @@
+
+.email-actions-show.max-width
+  show...

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}", body: @body
+

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,3 @@
+
+= raw ERB.new( body ).result
+