ish_manager 0.1.8.392 → 0.1.8.394

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 93cdc467e77550fd625d0f7161873674bb4a3d6fbe6ffac20f0ab49c5684c61c
-  data.tar.gz: 7a6836e9599041bf4420970a5212c65d0088b16a7933c62f29b8da3dc9a34a66
+  metadata.gz: d5c26994da09cbf70a9dadd1e16d13065210254c3e8f179b4280bf94e362f4e7
+  data.tar.gz: 7f1c8488ca6b6e064cb5acd31697b710ad93d407565099971a52557ba288cb18
 SHA512:
-  metadata.gz: aa535f6d1d318d7c16dd48e7685ce9d1be8854246dc9d527ea8d11871c81aebe4e23315613672feb5df6ac374855b7b417900efea24b473a457bd46cc9422855
-  data.tar.gz: c76fa0c68da834e846c98ce4d40ddb74953d74a090122ac901c2eea7d75e7ea27200f7f20cf8a022376c1ac0970cf8139c75e13c51c40e8b98221987b704562a
+  metadata.gz: 5991b77d0bd5a95d9724547033e3a28f455813d4aef0708167e14452dba4e0972e9f4ac94e8e9f266a5d9842073cdf091bc2ac386c225c76a16638cbfb9ccd04
+  data.tar.gz: 2a859c9c6dd00709ac1563ba471e069e9f1eceda63552b86f5b4443116293ec034916f742e48385f7658b271268c3bb77c712240ac7f47ceb0ee1711a918a1b3

data/app/controllers/ish_manager/email_contexts_controller.rb

@@ -80,12 +80,14 @@ class ::IshManager::EmailContextsController < ::IshManager::ApplicationControlle
 
   def new
     authorize! :new, ::Ish::EmailContext
-    @tmpl = @email_template = Ish::EmailTemplate.where( slug: params[:template_slug] ).first || Ish::EmailTemplate.where( id: params[:template_slug] ).first
+    @tmpl = @email_template = Ish::EmailTemplate.where( slug: params[:template_slug] ).first ||
+      Ish::EmailTemplate.where( id: params[:template_slug] ).first ||
+      Ish::EmailTemplate.new
     attrs = {}
     if @tmpl
       attrs = @tmpl.attributes.slice( :subject, :body, :from_email )
     end
-    @ctx = ::Ish::EmailContext.new( { email_template: @tmpl }.merge(attrs) )
+    @ctx = ::Ish::EmailContext.new({ email_template: @tmpl }.merge(attrs))
   end
 
   def show

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

@@ -36,7 +36,10 @@
       .tab-raw
         = f.text_area :body
       .tab-preview
-        %iframe{ src: email_context_iframe_path(ctx), width: '100%', height: '100%' }
+        - if ctx.new_record?
+          New record...
+        - else
+          %iframe{ src: email_context_iframe_path(ctx), width: '100%', height: '100%' }
 
 
     .actions

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

@@ -11,6 +11,10 @@
     = f.label :email
     = f.text_field :email
 
+  .field
+    = f.label :phone
+    = f.text_field :phone
+
   .field
     = f.label "Leadset (company)"
     = f.select :m3_leadset_id, options_for_select(@leadsets_list, selected: lead.m3_leadset_id), { include_blank: true }, { class: 'select2' }

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

@@ -17,6 +17,7 @@
           %th  
           %th Name/Email
           %th Company
+          %th Phone
           %th Tag
           %th created_at
           %th Ctx
@@ -28,6 +29,7 @@
             %td= check_box_tag 'lead_ids[]', lead.id
             %td= link_to "#{lead.name} <#{lead.email}>", lead_path( lead )
             %td= lead.company.company_url
+            %td= lead.phone
             %td= lead.wp_tags.map(&:name).join(", ")
             %td= lead.created_at.to_s[0..10]
             %td.ctx

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ish_manager
 version: !ruby/object:Gem::Version
-  version: 0.1.8.392
+  version: 0.1.8.394
 platform: ruby
 authors:
 - piousbox