ish_manager 0.1.8.385 → 0.1.8.386

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b543b5f1c79e4a3938be93fc4701c085393798b4bb8809bb9eca0c7d825937ac
-  data.tar.gz: 335bb44f73016350aa4c8d44e800425376bfdd7659d621819002a18a97b05504
+  metadata.gz: ad5f6ecf804df03a3acafbff94f1136e5372aed88b43e0949603620cfeb87c30
+  data.tar.gz: 7d49e60a9d8ad7f9bd732f02d03ea313232262cb44e56365d671c5665a87f5a9
 SHA512:
-  metadata.gz: c289826afe4fc20ccd178005e48c2a4ed28fdadefb148edc134b73fd7b560ef63c8685ebd267a226e04bf95b06fd29da3d021191f5da68c47681c825cad34061
-  data.tar.gz: 107bca0378ff2406e639735fc132f4c7512dc8cd8f1fbb7b1d892a5e8682e6115a8e972b5a5843ce2de3ef7e8086c9d4d2ef9e50e502b81126e8cbf43fa49a52
+  metadata.gz: 3e2b8b77466307c9e709209632a7013851900dccc7ed29b65e627170ec20be937b9ce58229e76a8d32101b6698516757065927f23b0cb0f8521a89c9ae558054
+  data.tar.gz: a16b163f1ba2a29dd335711c8c508104ecf06812661cb82b50460bfc61f64acea6a1346d77643da3ef8cc613f1001c811994c1960bae26246453411dba9f86d0

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

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

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/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/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
+

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

@@ -13,7 +13,7 @@
   <meta charset="UTF-8">
   <meta http-equiv="X-UA-Compatible" content="IE=edge">
   <meta name="viewport" content="width=device-width, initial-scale=1">
-  <title><%= @ctx.preview_str %></title>
+  <title><%= @ctx&.preview_str.presence || @tmpl&.preview_str %></title>
 
 <style type="text/css">
   .mcnTextBlock {
@@ -155,369 +155,166 @@ a.mcnButton {
   table-layout: fixed !important;
 }
 
-/*
-@tab Page
-@section Background Style
-@tip Set the background color and top border for your email. You may want to choose colors that match your company's branding.
-*/
 body,
 #bodyTable {
-  /*@editable*/
   background-color: #fff;
 }
 
-/*
-@tab Page
-@section Background Style
-@tip Set the background color and top border for your email. You may want to choose colors that match your company's branding.
-*/
 #bodyCell {
-  /*@editable*/
   border-top: 0;
 }
 
-/*
-@tab Page
-@section Email Border
-@tip Set the border for your email.
-*/
-.templateContainer {
-}
-
-/*
-@tab Page
-@section Heading 1
-@tip Set the styling for all first-level headings in your emails. These should be the largest of your headings.
-@style heading 1
-*/
 h1 {
-
-  /*@editable*/
   font-family: Helvetica;
-  /*@editable*/
   font-size: 26px;
-  /*@editable*/
   font-style: normal;
-  /*@editable*/
   font-weight: bold;
-  /*@editable*/
   line-height: 125%;
-  /*@editable*/
   letter-spacing: normal;
-  /*@editable*/
   text-align: left;
 }
 
-/*
-@tab Page
-@section Heading 2
-@tip Set the styling for all second-level headings in your emails.
-@style heading 2
-*/
 h2 {
-  /*@editable*/
   color: #202020;
-  /*@editable*/
   font-family: Helvetica;
-  /*@editable*/
   font-size: 22px;
-  /*@editable*/
   font-style: normal;
-  /*@editable*/
   font-weight: bold;
-  /*@editable*/
   line-height: 125%;
-  /*@editable*/
   letter-spacing: normal;
-  /*@editable*/
   text-align: left;
 }
 
-/*
-@tab Page
-@section Heading 3
-@tip Set the styling for all third-level headings in your emails.
-@style heading 3
-*/
 h3 {
-  /*@editable*/
   color: #202020;
-  /*@editable*/
   font-family: Helvetica;
-  /*@editable*/
   font-size: 20px;
-  /*@editable*/
   font-style: normal;
-  /*@editable*/
   font-weight: bold;
-  /*@editable*/
   line-height: 125%;
-  /*@editable*/
   letter-spacing: normal;
-  /*@editable*/
   text-align: left;
 }
 
-/*
-@tab Page
-@section Heading 4
-@tip Set the styling for all fourth-level headings in your emails. These should be the smallest of your headings.
-@style heading 4
-*/
 h4 {
-  /*@editable*/
   color: #202020;
-  /*@editable*/
   font-family: Helvetica;
-  /*@editable*/
   font-size: 18px;
-  /*@editable*/
   font-style: normal;
-  /*@editable*/
   font-weight: bold;
-  /*@editable*/
   line-height: 125%;
-  /*@editable*/
   letter-spacing: normal;
-  /*@editable*/
   text-align: left;
 }
 
-/*
-@tab Preheader
-@section Preheader Style
-@tip Set the background color and borders for your email's preheader area.
-*/
 #templatePreheader {
-  /*@editable*/
   background-color: transparent;
-  /*@editable*/
   background-image: none;
-  /*@editable*/
   background-repeat: no-repeat;
-  /*@editable*/
   background-position: center;
-  /*@editable*/
   background-size: cover;
-  /*@editable*/
   border-top: 0;
-  /*@editable*/
   border-bottom: 0;
-  /*@editable*/
   padding-top: 9px;
-  /*@editable*/
   padding-bottom: 9px;
 }
 
-/*
-@tab Preheader
-@section Preheader Text
-@tip Set the styling for your email's preheader text. Choose a size and color that is easy to read.
-*/
 #templatePreheader .mcnTextContent,
 #templatePreheader .mcnTextContent p {
-  /*@editable*/
   color: #656565;
-  /*@editable*/
   font-family: Helvetica;
-  /*@editable*/
   font-size: 12px;
-  /*@editable*/
   line-height: 150%;
-  /*@editable*/
   text-align: left;
 }
 
-/*
-@tab Preheader
-@section Preheader Link
-@tip Set the styling for your email's preheader links. Choose a color that helps them stand out from your text.
-*/
 #templatePreheader .mcnTextContent a,
 #templatePreheader .mcnTextContent p a {
-  /*@editable*/
   color: #656565;
-  /*@editable*/
   font-weight: normal;
-  /*@editable*/
   text-decoration: underline;
 }
 
-/*
-@tab Header
-@section Header Style
-@tip Set the background color and borders for your email's header area.
-*/
 #templateHeader {
-  /*@editable*/
   background-color: #FFFFFF;
-  /*@editable*/
   background-image: none;
-  /*@editable*/
   background-repeat: no-repeat;
-  /*@editable*/
   background-position: center;
-  /*@editable*/
   background-size: cover;
-  /*@editable*/
   border-top: 0;
-  /*@editable*/
   border-bottom: 0;
-  /*@editable*/
   padding-top: 9px;
-  /*@editable*/
   padding-bottom: 0;
 }
 
-/*
-@tab Header
-@section Header Text
-@tip Set the styling for your email's header text. Choose a size and color that is easy to read.
-*/
 #templateHeader .mcnTextContent,
 #templateHeader .mcnTextContent p {
-  /*@editable*/
   color: #202020;
-  /*@editable*/
   font-family: Helvetica;
-  /*@editable*/
   font-size: 16px;
-  /*@editable*/
   line-height: 150%;
-  /*@editable*/
   text-align: left;
 }
 
-/*
-@tab Header
-@section Header Link
-@tip Set the styling for your email's header links. Choose a color that helps them stand out from your text.
-*/
 #templateHeader .mcnTextContent a,
 #templateHeader .mcnTextContent p a {
-  /*@editable*/
   color: #007C89;
-  /*@editable*/
   font-weight: normal;
-  /*@editable*/
   text-decoration: underline;
 }
 
-/*
-@tab Body
-@section Body Style
-@tip Set the background color and borders for your email's body area.
-*/
 #templateBody {
-  /*@editable*/
   background-color: #FFFFFF;
-  /*@editable*/
   background-image: none;
-  /*@editable*/
   background-repeat: no-repeat;
-  /*@editable*/
   background-position: center;
-  /*@editable*/
   background-size: cover;
-  /*@editable*/
   border-top: 0;
-  /*@editable*/
   border-bottom: 2px solid #EAEAEA;
-  /*@editable*/
   padding-top: 0;
-  /*@editable*/
   padding-bottom: 9px;
 }
 
-/*
-@tab Body
-@section Body Text
-@tip Set the styling for your email's body text. Choose a size and color that is easy to read.
-*/
 #templateBody .mcnTextContent,
 #templateBody .mcnTextContent p {
-  /*@editable*/
   color: #202020;
-  /*@editable*/
   font-family: Helvetica;
-  /*@editable*/
   font-size: 16px;
-  /*@editable*/
   line-height: 150%;
-  /*@editable*/
   text-align: left;
 }
 
-/*
-@tab Body
-@section Body Link
-@tip Set the styling for your email's body links. Choose a color that helps them stand out from your text.
-*/
 #templateBody .mcnTextContent a,
 #templateBody .mcnTextContent p a {
-  /*@editable*/
   color: #007C89;
-  /*@editable*/
   font-weight: normal;
-  /*@editable*/
   text-decoration: underline;
 }
 
-/*
-@tab Footer
-@section Footer Style
-@tip Set the background color and borders for your email's footer area.
-*/
 #templateFooter {
-  /*@editable*/
   background-color: #FAFAFA;
-  /*@editable*/
   background-image: none;
-  /*@editable*/
   background-repeat: no-repeat;
-  /*@editable*/
   background-position: center;
-  /*@editable*/
   background-size: cover;
-  /*@editable*/
   border-top: 0;
-  /*@editable*/
   border-bottom: 0;
-  /*@editable*/
   padding-top: 9px;
-  /*@editable*/
   padding-bottom: 9px;
 }
 
-/*
-@tab Footer
-@section Footer Text
-@tip Set the styling for your email's footer text. Choose a size and color that is easy to read.
-*/
 #templateFooter .mcnTextContent,
 #templateFooter .mcnTextContent p {
-  /*@editable*/
   color: #656565;
-  /*@editable*/
   font-family: Helvetica;
-  /*@editable*/
   font-size: 12px;
-  /*@editable*/
   line-height: 150%;
 }
 
-/*
-@tab Footer
-@section Footer Link
-@tip Set the styling for your email's footer links. Choose a color that helps them stand out from your text.
-*/
 #templateFooter .mcnTextContent a,
 #templateFooter .mcnTextContent p a {
-  /*@editable*/
   color: #656565;
-  /*@editable*/
   font-weight: normal;
-  /*@editable*/
   text-decoration: underline;
 }
 
@@ -525,11 +322,9 @@ h4 {
   .templateContainer {
     width: 600px !important;
   }
-
 }
 
 @media only screen and (max-width: 480px) {
-
   body,
   table,
   td,
@@ -539,7 +334,6 @@ h4 {
   blockquote {
     -webkit-text-size-adjust: none !important;
   }
-
 }
 
 @media only screen and (max-width: 480px) {
@@ -547,25 +341,18 @@ h4 {
     width: 100% !important;
     min-width: 100% !important;
   }
-
 }
 
 @media only screen and (max-width: 480px) {
   .mcnRetinaImage {
     max-width: 100% !important;
   }
-
 }
 
 @media only screen and (max-width: 480px) {
   .mcnImage {
     width: 100% !important;
   }
-
-}
-
-@media only screen and (max-width: 480px) {
-
   .mcnCartContainer,
   .mcnCaptionTopContent,
   .mcnRecContentContainer,
@@ -591,40 +378,33 @@ h4 {
   .mcnBoxedTextContentContainer {
     min-width: 100% !important;
   }
-
 }
 
 @media only screen and (max-width: 480px) {
   .mcnImageGroupContent {
     padding: 9px !important;
   }
-
 }
 
 @media only screen and (max-width: 480px) {
-
   .mcnCaptionLeftContentOuter .mcnTextContent,
   .mcnCaptionRightContentOuter .mcnTextContent {
     padding-top: 9px !important;
   }
-
 }
 
 @media only screen and (max-width: 480px) {
-
   .mcnImageCardTopImageContent,
   .mcnCaptionBottomContent:last-child .mcnCaptionBottomImageContent,
   .mcnCaptionBlockInner .mcnCaptionTopContent:last-child .mcnTextContent {
     padding-top: 18px !important;
   }
-
 }
 
 @media only screen and (max-width: 480px) {
   .mcnImageCardBottomImageContent {
     padding-bottom: 9px !important;
   }
-
 }
 
 @media only screen and (max-width: 480px) {
@@ -632,7 +412,6 @@ h4 {
     padding-top: 0 !important;
     padding-bottom: 0 !important;
   }
-
 }
 
 @media only screen and (max-width: 480px) {
@@ -640,28 +419,23 @@ h4 {
     padding-top: 9px !important;
     padding-bottom: 9px !important;
   }
-
 }
 
 @media only screen and (max-width: 480px) {
-
   .mcnTextContent,
   .mcnBoxedTextContentColumn {
     padding-right: 18px !important;
     padding-left: 18px !important;
   }
-
 }
 
 @media only screen and (max-width: 480px) {
-
   .mcnImageCardLeftImageContent,
   .mcnImageCardRightImageContent {
     padding-right: 18px !important;
     padding-bottom: 0 !important;
     padding-left: 18px !important;
   }
-
 }
 
 @media only screen and (max-width: 480px) {
@@ -669,170 +443,80 @@ h4 {
     display: none !important;
     width: 100% !important;
   }
-
 }
 
 @media only screen and (max-width: 480px) {
-
-  /*
-@tab Mobile Styles
-@section Heading 1
-@tip Make the first-level headings larger in size for better readability on small screens.
-*/
   h1 {
-    /*@editable*/
     font-size: 22px !important;
-    /*@editable*/
     line-height: 125% !important;
   }
-
 }
 
 @media only screen and (max-width: 480px) {
-
-  /*
-@tab Mobile Styles
-@section Heading 2
-@tip Make the second-level headings larger in size for better readability on small screens.
-*/
   h2 {
-    /*@editable*/
     font-size: 20px !important;
-    /*@editable*/
     line-height: 125% !important;
   }
-
 }
 
 @media only screen and (max-width: 480px) {
-
-  /*
-@tab Mobile Styles
-@section Heading 3
-@tip Make the third-level headings larger in size for better readability on small screens.
-*/
   h3 {
-    /*@editable*/
     font-size: 18px !important;
-    /*@editable*/
     line-height: 125% !important;
   }
-
 }
 
 @media only screen and (max-width: 480px) {
-
-  /*
-@tab Mobile Styles
-@section Heading 4
-@tip Make the fourth-level headings larger in size for better readability on small screens.
-*/
   h4 {
-    /*@editable*/
     font-size: 16px !important;
-    /*@editable*/
     line-height: 150% !important;
   }
-
 }
 
 @media only screen and (max-width: 480px) {
-
-  /*
-@tab Mobile Styles
-@section Boxed Text
-@tip Make the boxed text larger in size for better readability on small screens. We recommend a font size of at least 16px.
-*/
   .mcnBoxedTextContentContainer .mcnTextContent,
   .mcnBoxedTextContentContainer .mcnTextContent p {
-    /*@editable*/
     font-size: 14px !important;
-    /*@editable*/
     line-height: 150% !important;
   }
-
 }
 
 @media only screen and (max-width: 480px) {
-
-  /*
-@tab Mobile Styles
-@section Preheader Visibility
-@tip Set the visibility of the email's preheader on small screens. You can hide it to save space.
-*/
   #templatePreheader {
-    /*@editable*/
     display: block !important;
   }
-
 }
 
 @media only screen and (max-width: 480px) {
-
-  /*
-@tab Mobile Styles
-@section Preheader Text
-@tip Make the preheader text larger in size for better readability on small screens.
-*/
   #templatePreheader .mcnTextContent,
   #templatePreheader .mcnTextContent p {
-    /*@editable*/
     font-size: 14px !important;
-    /*@editable*/
     line-height: 150% !important;
   }
-
 }
 
 @media only screen and (max-width: 480px) {
-
-  /*
-@tab Mobile Styles
-@section Header Text
-@tip Make the header text larger in size for better readability on small screens.
-*/
   #templateHeader .mcnTextContent,
   #templateHeader .mcnTextContent p {
-    /*@editable*/
     font-size: 16px !important;
-    /*@editable*/
     line-height: 150% !important;
   }
-
 }
 
 @media only screen and (max-width: 480px) {
-
-  /*
-@tab Mobile Styles
-@section Body Text
-@tip Make the body text larger in size for better readability on small screens. We recommend a font size of at least 16px.
-*/
   #templateBody .mcnTextContent,
   #templateBody .mcnTextContent p {
-    /*@editable*/
     font-size: 16px !important;
-    /*@editable*/
     line-height: 150% !important;
   }
-
 }
 
 @media only screen and (max-width: 480px) {
-
-  /*
-@tab Mobile Styles
-@section Footer Text
-@tip Make the footer content text larger in size for better readability on small screens.
-*/
   #templateFooter .mcnTextContent,
   #templateFooter .mcnTextContent p {
-    /*@editable*/
     font-size: 14px !important;
-    /*@editable*/
     line-height: 150% !important;
   }
-
 }
 </style>
 </head>
@@ -842,7 +526,7 @@ h4 {
 
 <!--[if !gte mso 9]>-->
   <span class="mcnPreviewText" style="display:none; font-size:0px; line-height:0px; max-height:0px; max-width:0px; opacity:0; overflow:hidden; visibility:hidden; mso-hide:all;"
-  ><%= @ctx.preview_str %></span>
+  ><%= @ctx&.preview_str.presence || @tmpl&.preview_str %></span>
 <!--<![endif]-->
 
 <center>
@@ -906,7 +590,7 @@ h4 {
                     <![endif]-->
 
                             <div style="border: 2px solid #999; border-radius: 4px; padding: 1em; margin-bottom: 1em;">
-                              <%== @email_ctx.body %>
+                              <%== ERB.new( @ctx&.body.presence || @tmpl&.body ).result %>
                             </div>
 
                     <!--[if mso]>

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

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

data/lib/tasks/office_tasks.rake

@@ -7,7 +7,7 @@ end
 namespace :office do
 
   desc 'schheduled email actions, rolling perform'
-  task :schs => :environment do
+  task schs: :environment do
     while true do
 
       Sch.active.where({ :perform_at.lte => Time.now }).each do |sch|
@@ -21,10 +21,11 @@ namespace :office do
         })
         ctx.save!
 
-        # schedule the next action & update the action
-        next_at = eval(sch.act.next_at_exe)
-        sch.act.next_email_actions.each do |nxt|
-          sch_nxt = Sch.find_or_initialize_by({
+        # schedule next actions & update the action
+        sch.act.ties.each do |tie|
+          next_act = tie.next_email_action
+          next_at  = eval(tie.next_at_exe)
+          next_sch = Sch.find_or_initialize_by({
             lead_id: sch.lead_id,
             email_action_id: nxt.id,
           })
@@ -33,18 +34,18 @@ namespace :office do
           sch_nxt.save!
         end
 
-        print '.'
+        print '+'
 
       end
 
       # sleep 1.minute
       sleep 10.seconds
-      print '|'
+      print '.'
     end
   end
 
   desc "send emails"
-  task :email_worker => :environment do
+  task email_worker: :environment do
     while true do
 
       ctxs = ::Ish::EmailContext.scheduled.unsent

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ish_manager
 version: !ruby/object:Gem::Version
-  version: 0.1.8.385
+  version: 0.1.8.386
 platform: ruby
 authors:
 - piousbox
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-24 00:00:00.000000000 Z
+date: 2023-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -405,6 +405,7 @@ files:
 - app/views/ish_manager/email_contexts/_form.haml
 - app/views/ish_manager/email_contexts/_form_reply.haml
 - app/views/ish_manager/email_contexts/edit.haml
+- app/views/ish_manager/email_contexts/iframe_src.haml
 - app/views/ish_manager/email_contexts/index.haml
 - app/views/ish_manager/email_contexts/new.haml
 - app/views/ish_manager/email_contexts/show.haml
@@ -434,7 +435,7 @@ files:
 - app/views/ish_manager/email_templates/_marketing_wordpress_2.html
 - app/views/ish_manager/email_templates/_piousbox_roundborders.html.erb
 - app/views/ish_manager/email_templates/_piousbox_social.html.erb
-- app/views/ish_manager/email_templates/_plain.html.erb
+- app/views/ish_manager/email_templates/_plain.haml
 - app/views/ish_manager/email_templates/_slug-1.html.erb
 - app/views/ish_manager/email_templates/_slug-2.html.erb
 - app/views/ish_manager/email_templates/_slug-3.html.erb

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

@@ -1,4 +0,0 @@
-
-
-<%= raw @tmpl.body %>
-