ish_manager 0.1.8.315 → 0.1.8.317

data/app/controllers/ish_manager/email_contexts_controller.rb

@@ -0,0 +1,74 @@
+
+class ::IshManager::EmailContextsController < ::IshManager::ApplicationController
+
+  before_action :set_lists
+
+  def create
+    authorize! :create, ::Ish::EmailContext
+    @email_ctx = ::Ish::EmailContext.new params[:ish_email_context].permit!
+    if @email_ctx.save
+      flash[:notice] = 'Saved.'
+      redirect_to action: 'show', id: @email_ctx.id
+      return
+    else
+      flash[:alert] = "Could not save: #{@email_ctx.errors.full_messages.join(', ')}"
+      render action: :new
+      return
+    end
+  end
+
+  def do_send
+    authorize! :send, ::Ish::EmailContext
+    IshManager::OfficeMailer.send_context_email(params[:id]).deliver_later
+    flash[:notice] = 'Scheduled send'
+    redirect_to action: 'index'
+  end
+
+  def edit
+    authorize! :edit, ::Ish::EmailContext
+    @email_ctx = ::Ish::EmailContext.find params[:id]
+  end
+
+  def iframe_src
+    authorize! :iframe_src, Ish::EmailContext
+    @email_ctx = EmailContext.find params[:id]
+    render layout: false
+  end
+
+  def index
+    authorize! :index, ::Ish::EmailContext
+    @email_ctxs = ::Ish::EmailContext.all.page( params[:contexts_page] )
+  end
+
+  def new
+    authorize! :new, ::Ish::EmailContext
+    @email_ctx = ::Ish::EmailContext.new email_template: @template
+  end
+
+  def show
+    authorize! :show, ::Ish::EmailContext
+    @email_ctx = ::Ish::EmailContext.find( params[:id] )
+  end
+
+  def update
+    authorize! :update, ::Ish::EmailContext
+    @email_ctx = ::Ish::EmailContext.find params[:id]
+    if @email_ctx.update_attributes params[:ish_email_context].permit!
+      flash[:notice] = 'Saved.'
+      redirect_to action: 'show', id: @email_ctx.id
+      return
+    else
+      flash[:alert] = "Could not save: #{@email_ctx.errors.full_messages.join(', ')}"
+      render action: :edit
+      return
+    end
+  end
+
+  private
+
+  def set_lists
+    @email_templates_list = [ [nil, nil] ] + ::Ish::EmailTemplate.all.map { |tmpl| [ tmpl.slug, tmpl.id ] }
+  end
+
+end
+

data/app/controllers/ish_manager/email_templates_controller.rb

@@ -0,0 +1,43 @@
+
+class ::IshManager::EmailTemplatesController < ::IshManager::ApplicationController
+
+  def create
+    authorize! :create, ::Ish::EmailTemplate
+    template = ::Ish::EmailTemplate.create params[:ish_email_template].permit!
+    if template.persisted?
+      flash[:notice] = 'Success.'
+    else
+      flash[:alert] = "Could not create an email template: #{template.errors.full_messages.join(', ')}."
+    end
+    redirect_to action: :index
+  end
+
+  def destroy
+    authorize! :destroy, ::Ish::EmailTemplate
+    @template = Ish::EmailTemplate.where({ id: params[:id] }).first || Ish::EmailTemplate.find_by({ slug: params[:id] })
+    if @template.destroy
+      flash[:notice] = 'Success.'
+    else
+      flash[:alert] = 'Cannot destroy this template.'
+    end
+    redirect_to action: :index
+  end
+
+  def iframe_src
+    authorize! :iframe_src, Ish::EmailTemplate
+  end
+
+  def index
+    authorize! :index, Ish::EmailTemplate
+    @templates = Ish::EmailTemplate.all.page( params[:templates_page] )
+  end
+
+  def show
+    authorize! :show, Ish::EmailTemplate
+    @email_ctx = EmailContext.new
+    @template = Ish::EmailTemplate.where({ id: params[:id] }).first || Ish::EmailTemplate.find_by({ slug: params[:id] })
+    # render params[:id], layout: false
+  end
+
+
+end

data/app/controllers/ish_manager/galleries_controller.rb

@@ -48,7 +48,7 @@ class IshManager::GalleriesController < IshManager::ApplicationController
       # @galleries.selector.delete('is_done')
     end
     @galleries = @galleries.page( params[:galleries_page] ).per( 10 )
-    render params[:render_type], layout: 'ish_manager/application_no_material'
+    render params[:render_type]
   end
 
   def j_show

data/app/controllers/ish_manager/invoices_controller.rb

@@ -1,5 +1,5 @@
 
-class IshManager::InvoicesController < IshManager::ApplicationController
+class ::IshManager::InvoicesController < IshManager::ApplicationController
 
   before_action :set_lists
 
@@ -39,7 +39,7 @@ class IshManager::InvoicesController < IshManager::ApplicationController
   # private
   #
   private
-  
+
   def set_lists
     @invoice_number = Ish::Invoice.order_by( :number => :desc ).first
     @invoice_number = @invoice_number ? @invoice_number.number + 1 : 1

data/app/controllers/ish_manager/leads_controller.rb

@@ -1,4 +1,5 @@
-class IshManager::LeadsController < IshManager::ApplicationController
+
+class ::IshManager::LeadsController < IshManager::ApplicationController
 
   ## alphabetized : )
 
@@ -27,7 +28,6 @@ class IshManager::LeadsController < IshManager::ApplicationController
     else
       @leads = @leads.where( :is_done => false )
     end
-    render :layout => 'ish_manager/application_no_material'
   end
 
   def new

data/app/controllers/ish_manager/maps_controller.rb

@@ -4,8 +4,6 @@ class IshManager::MapsController < IshManager::ApplicationController
   before_action :set_map, only: [ :destroy, :edit, :export, :map_editor, :show, :update, ] # alphabetized
   before_action :set_lists
 
-  layout 'ish_manager/application_no_material', only: %w| index |
-
   # alphabetized
 
   def create

data/app/controllers/ish_manager/markers_controller.rb

@@ -5,8 +5,6 @@ class IshManager::MarkersController < IshManager::ApplicationController
   before_action :set_marker, only: [ :edit, :update ]
   before_action :set_lists
 
-  layout 'ish_manager/application_no_material'
-
   def new
     authorize! :new_marker, ::Gameui::Map
     @marker = ::Gameui::Marker.new

data/app/controllers/ish_manager/meetings_controller.rb

@@ -1,7 +1,5 @@
 
-class IshManager::MeetingsController < IshManager::ApplicationController
-
-  layout 'ish_manager/application_no_material'
+class ::IshManager::MeetingsController < IshManager::ApplicationController
 
   # alphabetized
 

data/app/controllers/ish_manager/newsitems_controller.rb

@@ -59,8 +59,6 @@ class IshManager::NewsitemsController < IshManager::ApplicationController
     authorize! :destroy, @newsitem
 
     if @newsitem.destroy
-      # City.find(@newsitem.city_id).touch if @newsitem.city_id
-      # Site.find(@newsitem.site_id).touch if @newsitem.site_id
       Tag.find(@newsitem.tag_id).touch if @newsitem.tag_id
       Map.find(@newsitem.map_id).touch if @newsitem.map_id
 
@@ -107,7 +105,6 @@ class IshManager::NewsitemsController < IshManager::ApplicationController
       @newsitem.tag = @tag
     end
     authorize! :new, @newsitem
-    render layout: 'ish_manager/application_no_material'
   end
 
   def update

data/app/controllers/ish_manager/unsubscribes_controller.rb

@@ -1,5 +1,5 @@
 
-class IshManager::UnsubscribesController < IshManager::ApplicationController
+class ::IshManager::UnsubscribesController < IshManager::ApplicationController
 
   layout false
 

data/app/helpers/ish_manager/application_helper.rb

@@ -62,7 +62,7 @@ module IshManager
     end
 
     def api_marker_path marker
-      "/api/markers/view/#{marker.slug}"
+      "/api/markers/view/#{marker.id}"
     end
 
   end

data/app/mailers/ish_manager/office_mailer.rb

@@ -0,0 +1,22 @@
+
+class IshManager::OfficeMailer < IshManager::ApplicationMailer
+  default from: 'piousbox@gmail.com'
+  # layout 'mailer'
+
+  def send_context_email ctx_id
+    @email_ctx = ::Ish::EmailContext.find ctx_id
+    template = "render/_#{@email_ctx.email_template.slug}"
+
+    ac = ActionController::Base.new
+    ac.instance_variable_set( :@email_ctx, @email_ctx )
+    rendered_str = ac.render_to_string("ish_manager/email_templates/_#{@email_ctx.email_template.slug}")
+    @email_ctx.update( rendered_str: rendered_str, sent_at: Time.now )
+
+    mail( to: @email_ctx.to_email,
+          bcc: 'piousbox@gmail.com',
+          subject: @email_ctx.subject,
+          template_name: template )
+
+  end
+
+end

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

@@ -20,4 +20,6 @@
 
         .col-sm-2
           = button_to 'Logout', main_app.destroy_user_session_path, :method => :delete
-.c
+
+    .c
+    = render 'debug' if !Rails.env.production?

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

@@ -1,5 +1,5 @@
 
-.manager--main-header
+.main-header
   .container
     .row
       .col.s12

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

@@ -1,11 +1,11 @@
 
 
-.application--main-header-admin.manager--main-header{ class: "#{ENV['RAILS_ENV']} #{ENV['RAILS_ENV'][0...3]=="dev" ? "development" : ''}" }
+.application--main-header-admin.main-header{ class: "#{ENV['RAILS_ENV']} #{ENV['RAILS_ENV'][0...3]=="dev" ? "development" : ''}" }
   .container
-    %i.fa.fa-compress.collapse-expand#collapseHeader
+    %i.fa.fa-compress.collapse-expand#collapseHeaderIsh
     .content
       %ul
-        %li{ :class => params[:controller] == 'ish_manager/maps' ? 'active' : '' }
+        %li{ :class => params[:controller] == 'ish_manager/maps'          ? 'active' : '' }
           = link_to 'Maps', maps_path
           .inline-search
             = form_tag maps_path, method: :get do
@@ -13,11 +13,7 @@
           = link_to '[+]', new_map_path
 
         %li{ :class => params[:controller] == 'ish_manager/galleries'     ? 'active' : '' }
-          = link_to 'Galleries', galleries_path
-          .inline-search
-            = form_tag galleries_path, method: :get do
-              = text_field_tag :q
-          = link_to '[+]', new_gallery_path
+          = render 'ish_manager/galleries/menu'
         %li{ :class => params[:controller] == 'ish_manager/reports'       ? 'active' : '' }
           = link_to 'Reports',   reports_path
           .inline-search
@@ -40,11 +36,23 @@
         %li{ :class => params[:controller] == 'ish_manager/user_profiles' ? 'active' : '' }= link_to 'Ish::UserProfiles',  user_profiles_path
         %li
           = link_to "Ish::ImageAsset's", image_assets_path
+    .c
+    %i.fa.fa-compress.collapse-expand#collapseHeaderOffice
+    .namespace
       %ul
         %li= link_to 'Leads', leads_path
         %li
           = link_to 'Meetings', meetings_path
           = link_to '[+]', new_meeting_path
+      %ul
+        %li
+          = link_to 'Email Templates', email_templates_path
+        %li
+          = link_to 'Email Contexts', email_contexts_path
+        %li
+          = link_to 'Email Campaigns', email_campaigns_path
+        %li
+          = link_to 'Sent Emails', sent_emails_path
         %li
           = button_to 'Test Email', email_test_path, { form_class: 'inline-block' }
   %hr

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

@@ -1,5 +1,5 @@
 
-.manager--main-header
+.main-header
   .container
     .row
       .col.s12

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

@@ -1,5 +1,5 @@
 
-.manager--main-header
+.main-header
   .container
     .row
       .col.s12

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

@@ -0,0 +1,26 @@
+
+.email-contexts--form
+  %h2
+    New Email Context
+    -# with template `#{email_ctx.email_template&.slug}`
+
+  - url = %w| index new create |.include?( params[:action] ) ? email_contexts_path : email_context_path(email_ctx)
+  = form_for email_ctx, url: url do |f|
+    .field
+      = f.label :email_template_id
+      = f.select :email_template_id, options_for_select(@email_templates_list, selected: params[:email_template_id] || email_ctx.email_template&.id )
+
+    .field
+      = f.label :to_email
+      = f.text_field :to_email
+    .field
+      = f.label :subject
+      = f.text_field :subject
+    .field
+      = f.label :body
+      = f.text_area :body, class: 'tinymce'
+    .actions
+      .left
+        = f.submit 'Preview'
+      .right
+        -# = f.submit 'Schedule/Send'

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

@@ -0,0 +1,3 @@
+
+.email-contexts-edit
+  = render 'ish_manager/email_contexts/form', template: @template, email_ctx: @email_ctx

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

@@ -0,0 +1,4 @@
+
+-# = @email_ctx.email_template.inspect
+
+= render "ish_manager/email_templates/#{@email_ctx.email_template.slug}", ctx: @ctx

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

@@ -0,0 +1,21 @@
+
+.email-contexts-index
+
+  %h2
+    Paginated Email Contexts (aka emails)
+    = link_to '+', new_email_context_path
+
+  %ul
+    - @email_ctxs.each do |ctx|
+      %li
+        - if ctx.sent_at
+          \----
+        - else
+          = link_to '~', edit_email_context_path(ctx)
+        = link_to email_context_path(ctx) do
+          view
+          -# %i.fa.fa-external-link
+        = link_to email_context_iframe_path(ctx), target: :_blank do
+          iframe
+          %i.fa.fa-external-link
+        To #{ctx.to_email}: #{ctx.subject}

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

@@ -0,0 +1,3 @@
+
+.email-contexts-new
+  = render 'ish_manager/email_contexts/form', template: @template, email_ctx: @email_ctx

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

@@ -0,0 +1,16 @@
+
+.email-contexts-show
+
+  %ul
+    %li <b>To:</b> #{@email_ctx.to_email}
+    %li <b>Subject:</b> #{@email_ctx.subject}
+    %li <b>Template:</b> #{@email_ctx.email_template.slug}
+    - if @email_ctx.sent_at
+      %li <b>Sent at:</b> #{@email_ctx.sent_at.strftime('%Y-%m-%d %l:%M%P')}
+    - else
+      %li= button_to 'Send', email_context_send_path(@email_ctx)
+
+  - if @email_ctx.sent_at
+    =raw @email_ctx.rendered_str
+  - else
+    %iframe{ src: email_context_iframe_path(@email_ctx), width: '100%', height: '100%' }

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

@@ -0,0 +1,11 @@
+
+- 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|
+    %h3 New Email Template
+    .field
+      = f.label :slug
+      = f.text_field :slug
+    .actions
+      = f.submit 'Submit'