ish_manager 0.1.8.355 → 0.1.8.356

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

@@ -0,0 +1,24 @@
+
+.email-filters-index
+  .header
+    %h2.title
+      Email Filters (#{@email_filters.length})
+      = link_to '[+]', new_email_filter_path
+
+  %table.bordered
+    %tr
+      %th  
+      %th  
+      %th From Regex
+      %th Body Regex
+      %th Kind
+    - @email_filters.each do |ef|
+
+      %tr
+        %td= check_box_tag 'checked'
+        %td= link_to '[~]', edit_email_filter_path(ef)
+        %td= ef.from_regex
+        %td= ef.body_regex
+        %td= ef.kind
+
+

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

@@ -0,0 +1,5 @@
+
+.emails-ns.email-filters-new
+  .header
+    %h2.title New Email Filter
+  = render 'form', email_filter: @email_filter

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

@@ -1,22 +1,38 @@
 
-- url = %w| index new create |.include?( params[:action] ) ? email_templates_path : email_template_path(email_template.id)
+- url = email_template.new_record? ? email_templates_path : email_template_path(email_template.id)
 
 .email-templates--form
+
+  .header
+    %h2 Email Template
+
   = 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)
+    .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'
+
+    .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
+        -# .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 'Submit'
+      = f.submit 'Save'

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

@@ -0,0 +1,15 @@
+
+.email-templates--form-reply-2-mini.form-mini
+  = form_for ::Ish::EmailContext.new, url: email_contexts_path do |f|
+    .field
+      -# = f.label :template
+      = f.select :email_template_id, options_for_select( @email_templates_list )
+    .action
+      = f.submit 'Reply'
+
+    .field.send-at
+      -# = f.label :send_at
+      = f.text_field :send_at, placeholder: 'YYYY-MM-DD', size: 10, class: 'input-date'
+
+    .action
+      = f.submit 'Schedule'

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

@@ -3,6 +3,6 @@
   = form_for ::Ish::EmailContext.new, url: email_contexts_path do |f|
     .field
       -# = f.label :template
-      = f.select :email_template_id, options_for_select([ ['abba', 'abba'], ['zetta', 'zetta'] ])
+      = f.select :email_template_id, options_for_select( @email_templates_list )
     .actions
       = f.submit 'Reply'

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

@@ -1,16 +1,29 @@
 
-%h3.collapse-expand#emailTemplatesIndex
-  Email Templates
+%h3.center.collapse-expand#emailTemplatesIndex
+  Email Templates (#{Ish::EmailTemplate.all.count})
 .email-templates-index
 
-  = render 'ish_manager/email_templates/form_mini'
-  %ul
+  -# = render 'ish_manager/email_templates/form_mini'
+
+  %table.bordered
+    %tr
+      %th Actions
+      %th Slug
+      %th Created
+      %th Updated
+
+
     - @templates.each do |tmpl|
-      %li
-        = link_to 'Use', new_email_context_path({ email_template_id: tmpl.id })
-        = link_to 'Edit', edit_email_template_path({ id: tmpl })
-        = link_to 'View', email_template_path({ id: tmpl })
-        = link_to 'iFrame', email_template_iframe_path({ id: tmpl }), target: :_blank
-        = tmpl.slug
-        = button_to '[x]', email_template_path({ id: tmpl }), method: :delete, :data => { :confirm => 'Are you sure?' }, form_class: 'inline'
+      %tr
+        %td
+          = link_to '[use]', new_email_context_path({ email_template_id: tmpl.id })
+          = link_to '[~]', edit_email_template_path({ id: tmpl })
+          = button_to '[x]', email_template_path({ id: tmpl }), method: :delete, :data => { :confirm => 'Are you sure?' }, form_class: 'inline'
+        %td= link_to tmpl.slug, email_template_path({ id: tmpl })
+        %td= tmpl.created_at
+        %td= tmpl.updated_at
+
+        -# = link_to 'iFrame', email_template_iframe_path({ id: tmpl }), target: :_blank
+
+%hr
 

data/app/views/ish_manager/email_templates/_piousbox_roundborders.html.erb

@@ -1,3 +1,4 @@
+
 <!doctype html>
 <html xmlns="http://www.w3.org/1999/xhtml" xmlns:v="urn:schemas-microsoft-com:vml" xmlns:o="urn:schemas-microsoft-com:office:office" >
 <head>
@@ -907,7 +908,9 @@ h4 {
                     <![endif]-->
 
                             <div style="border: 2px solid #999; border-radius: 4px; padding: 1em; margin-bottom: 1em;">
-                              <%== @email_ctx.body %>
+                              <!-- herehere -->
+                              <%== ERB.new(@tmpl.body).result((@ctx||@tmpl).get_binding) %>
+
                             </div>
 
                     <!--[if mso]>

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

@@ -0,0 +1,22 @@
+
+- 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

@@ -0,0 +1,26 @@
+
+- 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'

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

@@ -1,2 +1,3 @@
 
-= render 'form', email_template: @template
+.email-templates-edit.max-width
+  = render 'form', email_template: @email_template

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

@@ -1,4 +1,5 @@
 
--# = @email_template.inspect
-
-= render "ish_manager/email_templates/#{@email_template.slug}", ctx: @email_ctx
+- if @email_template.layout == 'plain'
+  = raw @email_template.body
+- else
+  = render "ish_manager/email_templates/#{@email_template.layout}", ctx: @email_ctx

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

@@ -0,0 +1,5 @@
+
+
+%h1 New Email Template
+
+= render 'form', email_template: @new_email_template

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

@@ -1,7 +1,13 @@
 
-= render 'index'
-%hr
+-# = render 'index'
+
 .email-templates-show
-  %h4.center= @email_template.slug
+  .header
+    %h2.title
+      = @email_template.slug
+      = link_to '[~]', edit_email_template_path( @email_template )
+      = link_to '[src ^]', '#'
+      = link_to '[preview ^]', '#'
+      = link_to '[use]', '#'
 
   %iframe{ src: email_template_iframe_path(@email_template.slug), width: '100%', height: '100%' }

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

@@ -1,19 +1,24 @@
 
-- url = lead.persisted? ? lead_path( lead.id ) : leads_path
+- url = lead.new_record? ? leads_path : lead_path( lead.id )
 
 = form_for lead, :as => :lead, :url => url do |f|
+
   .field
     = f.label :name
     = f.text_field :name
+
   .field
     = f.label :email
     = f.text_field :email
+
   .field
-    = f.label :company
-    = f.select :m3_leadset_id, options_for_select(@leadsets_list, selected: lead.m3_leadset_id), { include_blank: true }, {class: 'select2' }
-  .field
-    = f.label :tag
-    = f.text_field :tag
+    = f.label "Leadset (company)"
+    = f.select :m3_leadset_id, options_for_select(@leadsets_list, selected: lead.m3_leadset_id), { include_blank: true }, { class: 'select2' }
+
+  -# .field
+  -#   = f.label "Tags"
+  -#   = f.text_field :wp_tags
+
   .actions
     = f.submit
 

data/app/views/ish_manager/leads/_form_import.haml

@@ -11,9 +11,9 @@
   -#   %label Leadset
   -#   = select_tag :leadset_id, options_for_select(@leadsets_list), class: 'select2'
 
-  .field
-    %label Campaign
-    = select_tag :email_campaign_id, options_for_select(@email_campaigns_list), class: 'select2'
+  -# .field
+  -#   %label Campaign
+  -#   = select_tag :email_campaign_id, options_for_select(@email_campaigns_list), class: 'select2'
 
   .actions
     = submit_tag 'Submit'

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

@@ -1,19 +1,22 @@
 
-%h1 Edit lead
-= render 'form', :lead => @lead
+.leads-edit.max-width
+  .header
+    %h2.title Edit lead
 
-%hr
-%h1 Email Campaigns:
-%ul
-  - @lead.email_campaign_leads.each do |x|
-    %li
-      <b>Sent on ::</b> #{x.sent_at.to_s[0..10]}
-      <b>Slug ::</b> #{x.email_campaign.slug}
+  = render 'form', :lead => @lead
 
-%hr
-%h1 Single Emails:
-%ul
-  - @lead.email_contexts.each do |x|
-    %li
-      <b>Sent at ::</b> #{x.sent_at.to_s[0..10]}
-      <b>Subject ::</b> #{x.subject}
+  -# %hr
+  -# %h1 Email Campaigns:
+  -# %ul
+  -#   - @lead.email_campaign_leads.each do |x|
+  -#     %li
+  -#       <b>Sent on ::</b> #{x.sent_at.to_s[0..10]}
+  -#       <b>Slug ::</b> #{x.email_campaign.slug}
+
+  -# %hr
+  -# %h1 Single Emails:
+  -# %ul
+  -#   - @lead.email_contexts.each do |x|
+  -#     %li
+  -#       <b>Sent at ::</b> #{x.sent_at.to_s[0..10]}
+  -#       <b>Subject ::</b> #{x.subject}

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

@@ -1,37 +1,46 @@
 
-.manager-leads-index
-  %h5
-    SQL #{link_to 'Leads', leads_path} (#{::Lead.all.count})
-    = link_to raw("<i class='fa fa-plus-square'></i>"), new_lead_path
+.leads-index
+  .header
+    %h2.title
+      #{link_to 'Leads', leads_path} (#{::Lead.all.count})
+      = link_to raw("<i class='fa fa-plus-square'></i>"), new_lead_path
 
   = form_tag leads_bulkop_path do
     = label_tag 'Act on Selected:'
     = select_tag :a, options_for_select( %w| delete add_to_campaign | )
-    = select_tag :email_campaign_id, options_for_select( @email_campaigns_list )
+    -# = select_tag :email_campaign_id, options_for_select( @email_campaigns_list )
     = submit_tag 'Go'
 
-    %table#dataTable.display.compact
+    %table.bordered
       %thead
         %tr
           %th &nbsp;
-          %th Name
+          %th Name/Email
           %th Company
-          %th Email
           %th Tag
           %th created_at
-          %th n campaign sends
-          %th n single sends
+          %th (c,s) sends
+          %th Scheduled Actions
 
       %tbody
         - @leads.each do |lead|
           %tr
             %td= check_box_tag 'lead_ids[]', lead.id
-            %td= link_to lead.name, lead_path( lead )
-            %td= lead.leadset&.id
-            %td= lead.email
-            %td= lead.tag
+            %td= link_to "#{lead.name} <#{lead.email}>", lead_path( lead )
+            %td= lead.leadsets.first&.name
+            %td= lead.wp_tags.map(&:name).join(", ")
             %td= lead.created_at.to_s[0..10]
-            %td= lead.email_campaign_leads.count
-            %td= @email_contexts[lead.email] || '-'
+            %td #{lead.email_campaign_leads.count || '-'}, #{@email_contexts[lead.email] || '-'}
+            %td
+              = lead.scheduled_email_actions.length
+              = link_to '[+]', new_scheduled_email_action_path( lead_id: lead.id )
+              %ul
+                - lead.scheduled_email_actions.map do |sch_a|
+                  %li
+                    = link_to sch_a.email_action.slug, edit_scheduled_email_action_path( sch_a )
+                    [x]
+
+
+
 
 

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

@@ -1,8 +1,9 @@
 
-.row
-  .col-sm-12.col-md-6
-    %h1 New Lead
-    = render 'form', :lead => @new_lead
-  .col-sm-12.col-md-6
-    %h1 Import Leads
-    = render 'form_import'
+.leads-new.max-width
+  .row
+    .col-sm-12.col-md-6
+      %h1 New Lead
+      = render 'form', :lead => @new_lead
+    .col-sm-12.col-md-6
+      %h1 Import Leads
+      = render 'form_import'

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

@@ -2,31 +2,79 @@
 .manager-leadsets-index
   %h5
     = link_to 'Leadsets', leadsets_path
-    (#{Leadset.all.count})
+    (#{Leadset.kept.length})
+    (trash: #{Leadset.discarded.length})
     = link_to raw("<i class='fa fa-plus-square'></i>"), new_leadset_path
 
   .actions
     %label.select-all
       = check_box_tag :select_all
       select all
-    %label.n-selected -
+      .n-selected -
     = button_tag 'Delete', method: :delete, class: 'delete-btn'
 
-  %table.data-table.compact
+  %table
     %thead
       %tr
         %th &nbsp;
-        %th created at
-        %th Name
-        %th Tag
+        -# %th created at
+        -# %th Name
         %th.company-url Company Url
-        %th Location
+        %th Tags
+        %th +
+        %th.leads Leads
     %tbody
-      - @leadsets.each do |leadset|
+      - @leadsets.each_with_index do |leadset, idx1|
         %tr
           %td= check_box_tag 'leadset_ids[]', leadset.id, nil, { class: 'i-sel' }
-          %td= leadset.created_at.strftime("%Y-%m-%d %H:%M")
-          %td= link_to leadset.name, leadset_path( leadset )
-          %td= leadset.tag
+          -# %td= leadset.created_at.strftime("%Y-%m-%d %H:%M%P")
+          -# %td= link_to leadset.name, leadset_path( leadset )
           %td= link_to leadset.company_url, leadset.company_url
-          %td= leadset.location
+          %td.tags
+
+            - leadset.wp_tags.each_with_index do |tag, idx2|
+              .chip
+                = tag.name
+
+          %td.tags-add
+            %i.fa.fa-plus.expand-next
+            = form_tag leadset_tags_path, { class: 'tags--form-mini form-mini', style: 'display: none' } do
+              .header
+                %h5 Add a Tag
+              = hidden_field_tag :leadset_id, leadset.id.to_s
+              = select_tag :term_id, options_for_select( @tags_list ), class: [ 'select2' ]
+              .actions
+                = submit_tag 'Add'
+
+          %td.leads
+            -# = leadset.leads.count
+            - leadset.leads.each do |lead|
+              .item
+
+                .chip
+                  -# = lead.email
+                  = link_to lead.name, lead_path( lead )
+
+                .relative
+                  %a.chip{ href: email_contexts_for_lead_path( lead ) }
+                    \(
+                    = lead.email_contexts.count
+                    %i.fa.fa-envelope
+                    \)
+
+                .relative
+                  %i.fa.fa-pencil.expand-next
+                  %form.form-mini{ style: 'display: none' }
+                    Editing...
+
+                .relative
+                  %i.fa.fa-clock-o.expand-next
+                  = render 'ish_manager/scheduled_emails/form', scheduled_email: Sch.new({ lead_id: lead.id })
+
+                .scheduled
+                  - lead.scheduled_emails.each do |sch|
+                    .chip
+                      .interval= sch.interval
+                      .tmpl= sch.email_template.slug
+
+

data/app/views/ish_manager/leadsets/index_dataTables.haml

@@ -0,0 +1,33 @@
+
+.manager-leadsets-index
+  %h5
+    = link_to 'Leadsets', leadsets_path
+    (#{Leadset.kept.length})
+    (trash: #{Leadset.discarded.length})
+    = link_to raw("<i class='fa fa-plus-square'></i>"), new_leadset_path
+
+  .actions
+    %label.select-all
+      = check_box_tag :select_all
+      select all
+    %label.n-selected -
+    = button_tag 'Delete', method: :delete, class: 'delete-btn'
+
+  %table.data-table.compact
+    %thead
+      %tr
+        %th &nbsp;
+        %th created at
+        %th Name
+        %th Tag
+        %th.company-url Company Url
+        %th Location
+    %tbody
+      - @leadsets.each do |leadset|
+        %tr
+          %td= check_box_tag 'leadset_ids[]', leadset.id, nil, { class: 'i-sel' }
+          %td= leadset.created_at.strftime("%Y-%m-%d %H:%M")
+          %td= link_to leadset.name, leadset_path( leadset )
+          %td= leadset.tag
+          %td= link_to leadset.company_url, leadset.company_url
+          %td= leadset.location

data/app/views/ish_manager/scheduled_actions/_form_mini.haml

@@ -0,0 +1,16 @@
+
+.scheduled-actions--form-mini
+
+  %form
+    .field
+      %label Every
+      = text_field_tag :every_min_days, nil, placeholder: 'min', size: 3, class: 'input-mini'
+      %label -
+      = text_field_tag :every_max_days, nil, placeholder: 'max', size: 3, class: 'input-mini'
+      %label Days
+
+    .field
+      = select_tag :email_template_id, options_for_select( @email_templates_list )
+
+    .action
+      = button_tag 'Schedule'

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

@@ -0,0 +1,26 @@
+
+-#
+-# scheduled_emails / _form
+-#
+
+- sch_a = scheduled_email_action
+- url = sch_a.new_record? ? scheduled_email_actions_path : scheduled_email_action_path(sch_a.id)
+
+
+= form_for scheduled_email_action, url: url, html: { class: "form-mini" } do |f|
+  .header
+    %h5.title Schedule an email action
+
+  .field
+    %label Lead
+    = select_tag :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 ), class: 'select2'
+  %br
+  .field
+    %label Email Action
+    = select_tag :email_action_id, options_for_select( @email_actions_list, selected: sch_a[:email_action_id] ), class: 'select2'
+
+  .actions
+    = submit_tag 'Schedule'

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

@@ -0,0 +1,15 @@
+
+.scheduled-emails-index.max-width
+  .header
+    %h2
+      Index
+      -# (#{Sch.kept.count})
+      (#{Sch.all.count})
+    = link_to '[+]', new_scheduled_email_path
+
+  .items
+    - @scheduled_emails.each do |sch|
+      .item
+        = sch.interval
+        = sch.email_template.slug
+        = sch.lead.email

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

@@ -0,0 +1,4 @@
+
+.scheduled-email-actions-new.max-width
+
+  = render 'form', scheduled_email_action: @scheduled_email_action

data/app/views/layouts/ish_manager/application.haml

@@ -22,8 +22,8 @@
     = javascript_include_tag "//cdn.jsdelivr.net/npm/popper.js@1.14.7/dist/umd/popper.min.js"
     = javascript_include_tag "//cdn.jsdelivr.net/npm/bootstrap@4.3.1/dist/js/bootstrap.min.js"
 
-    = stylesheet_link_tag "//cdn.jsdelivr.net/npm/select2@4.1.0-rc.0/dist/css/select2.min.css"
-    = javascript_include_tag "//cdn.jsdelivr.net/npm/select2@4.1.0-rc.0/dist/js/select2.min.js"
+    = stylesheet_link_tag "//cdn.jsdelivr.net/npm/select2@4.0.0/dist/css/select2.min.css"
+    = javascript_include_tag "//cdn.jsdelivr.net/npm/select2@4.0.0/dist/js/select2.min.js"
 
     - # @TODO: document? test-drive?
     - if @include_materialize

data/app/views/layouts/ish_manager/application_fullwidth.haml

@@ -22,8 +22,8 @@
     = javascript_include_tag "//cdn.jsdelivr.net/npm/popper.js@1.14.7/dist/umd/popper.min.js"
     = javascript_include_tag "//cdn.jsdelivr.net/npm/bootstrap@4.3.1/dist/js/bootstrap.min.js"
 
-    = stylesheet_link_tag "//cdn.jsdelivr.net/npm/select2@4.1.0-rc.0/dist/css/select2.min.css"
-    = javascript_include_tag "//cdn.jsdelivr.net/npm/select2@4.1.0-rc.0/dist/js/select2.min.js"
+    = stylesheet_link_tag "//cdn.jsdelivr.net/npm/select2@4.0.0/dist/css/select2.min.css"
+    = javascript_include_tag "//cdn.jsdelivr.net/npm/select2@4.0.0/dist/js/select2.min.js"
 
     - # @TODO: document? test-drive?
     - if @include_materialize