ish_manager 0.1.8.352 → 0.1.8.354

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9d9e52ea6ace8b144c0c2065384efe385987a6786e19ba474478aa23ccce0938
-  data.tar.gz: '085aba80ac62b36db6552d0f40e2e87067cf68cbf810c78eb042996142aa0b45'
+  metadata.gz: 25a65353583bdf870122f899dec308c352aa71854a99113b12649a4a38626856
+  data.tar.gz: dafc5ba0c1af8b439640e91a238dd467252be0800930cfc8679c57eab6042c9f
 SHA512:
-  metadata.gz: 26d36d40b4c76ddebcfb79fdb8226fa470aaf5f4e5320eb3e2fcf6b3f53c7ed01cd40cd24bdf766da7535162051776a698fa93bf68e683d5492681bcfc88e834
-  data.tar.gz: 605363d860050a83def8d03f20a1d2f5e247fec8df09532b0d3651154db836698b00604df6b12da14a4af1fb500cdf40159ef2ff3667f083e56e844f26371adc
+  metadata.gz: 37feabe9bca20cb0c1d3201359ccd7799a85b699adfbb496a766fa19148f82bd3f553032498d45790eb8134b944ca62a464170816eaf69261d04a594fa2c98d8
+  data.tar.gz: 95c0a9dd0b822d92bc715f207ef7da3f72ad8dd41d4c187aa74aa8f92774feebad919ef325c00dbebf15cc0a1c6be923a81258992456b2a1573fa02251c21361

data/app/controllers/ish_manager/application_controller.rb

@@ -4,6 +4,7 @@ module IshManager
     protect_from_forgery :with => :exception, :prepend => true
     before_action :set_current_ability
     before_action :set_changelog
+    before_action :set_title
     check_authorization
     rescue_from ::CanCan::AccessDenied, :with => :access_denied
 
@@ -22,6 +23,15 @@ module IshManager
       redirect_to user_signed_in? ? root_path : Rails.application.routes.url_helpers.new_user_session_path, :alert => exception.message
     end
 
+    def pp_errors err
+      err
+    end
+
+    def puts! a, b=''
+      puts "+++ +++ #{b}"
+      puts a.inspect
+    end
+
     def set_changelog
       @version = Gem.loaded_specs['ish_manager'].version.to_s
     end
@@ -43,13 +53,8 @@ module IshManager
       @videos_list = Video.all.list
     end
 
-    def pp_errors err
-      err
-    end
-
-    def puts! a, b=''
-      puts "+++ +++ #{b}"
-      puts a.inspect
+    def set_title
+      @page_title = "#{ params[:controller].gsub('ish_manager/', '') } #{params[:action]} #{params[:slug]||params[:id]}"
     end
 
     # @TODO: obsolete, remove _vp_ 2022-10-15

data/app/controllers/ish_manager/email_messages_controller.rb

@@ -0,0 +1,14 @@
+
+class ::IshManager::EmailMessagesController < IshManager::ApplicationController
+
+  def index
+    authorize! :index, Ish::EmailCampaign # @TODO: change!
+    @email_messages = Office::EmailMessage.all
+  end
+
+  def show
+    authorize! :index, Ish::EmailCampaign # @TODO: change!
+    @email_message = Office::EmailMessage.find params[:id]
+  end
+
+end

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

@@ -60,6 +60,8 @@
         %li
           = link_to 'Meetings', meetings_path
           = link_to '[+]', new_meeting_path
+        %li
+          = link_to 'EmailMessages', email_messages_path
       %ul
         %li
           = link_to 'Leads', leads_path

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

@@ -14,8 +14,8 @@
           = 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 :title
-          = f.text_field :title
+          = f.label :slug
+          = f.text_field :slug
 
         .field
           = f.label :from_email

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

@@ -2,35 +2,16 @@
 .email-contexts-show
 
   %ul
-    %li <b>Type:</b> #{@email_ctx.type}
     %li <b>Title:</b> #{@email_ctx.title}
     %li <b>From:</b> #{@email_ctx.from_email}
     %li <b>Subject:</b> #{@email_ctx.subject}
-    - if @email_ctx.type == Ish::EmailContext::TYPE_SINGLE
-      %li <b>To:</b> #{@email_ctx.to_email}
-      %li <b>Template:</b> #{@email_ctx.email_template.slug} <b>Type:</b> #{@email_ctx.email_template.type}
+    %li <b>To:</b> #{@email_ctx.to_email}
+    %li <b>Template:</b> #{@email_ctx.email_template.slug} <b>Type:</b> #{@email_ctx.email_template.type}
     %li <b>Send at:</b> #{@email_ctx.send_at&.strftime('%Y-%m-%d %l:%M%P')}
     %li <b>Sent at:</b> #{@email_ctx.sent_at&.strftime('%Y-%m-%d %l:%M%P')}
-
-    -#
-    -# Yes sent
-    -#
-    - if @email_ctx.sent_at
-      - if @email_ctx.type == Ish::EmailContext::TYPE_CAMPAIGN
-        %li
-          <b>C_Leads (#{@email_ctx.campaign_leads.length}):</b>
-          - @email_ctx.campaign_leads&.each do |c_lead|
-            = c_lead.lead.email
-            = link_to '[view]', campaign_lead_path( c_lead )
-            ,
-
-    - else # Draft
-      - if @email_ctx.type == Ish::EmailContext::TYPE_CAMPAIGN
-        %li <b>Leads (#{@email_ctx.leads.length}):</b> #{@email_ctx.leads.map { |p| p&.email }.join(", ") }
-
-      %li
-        = button_to 'Send', email_context_send_path(@email_ctx), form_class: 'inline', :data => { :confirm => 'Are you sure?' }
-        = link_to '[~]', edit_email_context_path(@email_ctx)
+    %li
+      = button_to 'Send', email_context_send_path(@email_ctx), form_class: 'inline', :data => { :confirm => 'Are you sure?' }
+      = link_to '[~]', edit_email_context_path(@email_ctx)
 
   - if @email_ctx.sent_at
     = raw @email_ctx.rendered_str

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

@@ -0,0 +1,8 @@
+
+%h2 Email Messages
+
+%ol
+  - @email_messages.each do |msg|
+    %li
+      From: #{msg.from}
+      = link_to 'view', email_message_path(msg)

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

@@ -0,0 +1,4 @@
+
+
+= raw @email_message.part_html
+

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

@@ -1,9 +1,9 @@
 !!!
 %html
   %head
-    %title #{@page_title} | PiousboxCMS
+    %title #{@page_title}| PiousboxCMS
     %link{ :rel => 'icon', :href => "/favicon_#{ENV['RAILS_ENV']}.gif" }
-    %meta{ :name => :viewport, :content => 'width=device-width, initial-scale=1.0' }
+    %meta{ :name => :viewport, :content => 'width=device-width, initial-scale=1, minimum-scale=1, maximum-scale=2' }
     %meta{ :charset => 'UTF-8' }
     %meta{ :description => @page_description }
 

data/config/routes.rb

@@ -54,6 +54,8 @@ IshManager::Engine.routes.draw do
   resources :email_campaigns
   resources :email_campaign_leads, as: :campaign_leads
 
+  resources :email_messages
+
   get  'email_contexts/iframe_src/:id',          to: 'email_contexts#iframe_src', as: :email_context_iframe
   get  'email_contexts/new_with/:template_slug', to: 'email_contexts#new'
   post 'email_contexts/send/:id',                to: 'email_contexts#do_send',    as: :email_context_send

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ish_manager
 version: !ruby/object:Gem::Version
-  version: 0.1.8.352
+  version: 0.1.8.354
 platform: ruby
 authors:
 - piousbox
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-13 00:00:00.000000000 Z
+date: 2023-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -284,6 +284,7 @@ files:
 - app/controllers/ish_manager/email_campaign_leads_controller.rb
 - app/controllers/ish_manager/email_campaigns_controller.rb
 - app/controllers/ish_manager/email_contexts_controller.rb
+- app/controllers/ish_manager/email_messages_controller.rb
 - app/controllers/ish_manager/email_templates_controller.rb
 - app/controllers/ish_manager/email_unsubscribes_controller.rb
 - app/controllers/ish_manager/galleries_controller.rb
@@ -365,6 +366,8 @@ files:
 - app/views/ish_manager/email_contexts/index.haml
 - app/views/ish_manager/email_contexts/new.haml
 - app/views/ish_manager/email_contexts/show.haml
+- app/views/ish_manager/email_messages/index.haml
+- app/views/ish_manager/email_messages/show.haml
 - app/views/ish_manager/email_templates/_form.haml
 - app/views/ish_manager/email_templates/_form_mini.haml
 - app/views/ish_manager/email_templates/_index.haml