ish_manager 0.1.8.346 → 0.1.8.347

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

@@ -11,9 +11,11 @@
             %li <b>Role name:</b> #{@current_profile.role_name}
 
         .col-sm-4
-          \~__^
-          = @version
-          -# <pre>#{@changelog}</pre>
+          %ul
+            %li \~__^
+            %li= @version
+            %li= Time.now.to_s
+            -# <pre>#{@changelog}</pre>
 
         .col-sm-2
           = button_to 'Logout', main_app.destroy_user_session_path, :method => :delete

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

@@ -48,4 +48,6 @@
       .left
         = f.submit 'Preview'
       .right
-        -# = f.submit 'Schedule/Send'
+        = f.label :send_at
+        = f.text_field :send_at
+        = f.submit 'Schedule'

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

@@ -4,12 +4,13 @@
   %ul
     %li <b>Type:</b> #{@email_ctx.type}
     %li <b>Title:</b> #{@email_ctx.title}
-    %li <b>Template:</b> #{@email_ctx.email_template.slug}
     %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>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
@@ -23,8 +24,6 @@
             = link_to '[view]', campaign_lead_path( c_lead )
             ,
 
-      %li <b>Sent at:</b> #{@email_ctx.sent_at.strftime('%Y-%m-%d %l:%M%P')}
-
     - 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(", ") }
@@ -35,6 +34,7 @@
 
   - if @email_ctx.sent_at
     = raw @email_ctx.rendered_str
+    = @email_ctx.tmpl
 
   - else
     %iframe{ src: email_context_iframe_path(@email_ctx), width: '100%', height: '100%' }

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

@@ -38,14 +38,18 @@
             .col-sm-12
               - if notice
                 - if notice.class == Array
-                  %ul
+                  %ul.notice
                     - notice.map do |n|
-                      %li
-                        - n.map do |k,v|
-                          <b>#{k} :</b> #{v}
-                %p.notice= notice
+                      %li= n
+                - else
+                  %p.notice= notice
               - if alert
-                %p.alert= alert
+                - if alert.class == Array
+                  %ul.alert
+                    - alert.map do |n|
+                      %li= n
+                - else
+                  %p.alert= alert
         = yield
     = render 'ish_manager/application/main_footer'
     = render 'analytics' if Rails.env.production?

data/lib/tasks/office_tasks.rake

@@ -0,0 +1,27 @@
+
+def puts! a, b=''
+  puts "+++ +++ #{b}"
+  puts a.inspect
+end
+
+namespace :office do
+
+  desc "send emails"
+  task :email_worker => :environment do
+    while true do
+
+      ctxs = ::Ish::EmailContext.current.unsent
+      puts! ctxs.count, 'ctxs'
+      ctxs.map do |ctx|
+        IshManager::OfficeMailer.send_context_email( ctx[:id].to_s ).deliver_later
+        print '.'
+      end
+
+      # sleep 1.minute
+      sleep 10.seconds
+      print '^'
+
+    end
+  end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ish_manager
 version: !ruby/object:Gem::Version
-  version: 0.1.8.346
+  version: 0.1.8.347
 platform: ruby
 authors:
 - piousbox
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-12-22 00:00:00.000000000 Z
+date: 2023-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -308,6 +308,40 @@ files:
 - app/mailers/ish_manager/meeting_mailer.rb
 - app/mailers/ish_manager/office_mailer.rb
 - app/models/ish_manager/ability.rb
+- app/views/202212 Mailchimp Templates/202212 1col fixed-width.html
+- app/views/202212 Mailchimp Templates/202212 1col full-width.html
+- app/views/202212 Mailchimp Templates/202212 2col fixed-width 2.html
+- app/views/202212 Mailchimp Templates/202212 2col fixed-width.html
+- app/views/202212 Mailchimp Templates/202212 2col full-width 2.html
+- app/views/202212 Mailchimp Templates/202212 2col full-width.html
+- app/views/202212 Mailchimp Templates/202212 3col fixed-width.html
+- app/views/202212 Mailchimp Templates/202212 3col full-width.html
+- app/views/202212 Mailchimp Templates/202212 catalog various-colors-1.html
+- app/views/202212 Mailchimp Templates/202212 educate.html
+- app/views/202212 Mailchimp Templates/202212 follow up.html
+- app/views/202212 Mailchimp Templates/202212 make an announcement.html
+- app/views/202212 Mailchimp Templates/202212 sell-a-product.html
+- app/views/202212 Mailchimp Templates/202212 tell a story.html
+- app/views/202212 Mailchimp Templates/202212 theme art-newsletter.html
+- app/views/202212 Mailchimp Templates/202212 theme caribou-xmas.html
+- app/views/202212 Mailchimp Templates/202212 theme colorbox.html
+- app/views/202212 Mailchimp Templates/202212 theme competition-invitation.html
+- app/views/202212 Mailchimp Templates/202212 theme event-veerle.html
+- app/views/202212 Mailchimp Templates/202212 theme fall-colors.html
+- app/views/202212 Mailchimp Templates/202212 theme gift-giving.html
+- app/views/202212 Mailchimp Templates/202212 theme giftgiving-snowmen.html
+- app/views/202212 Mailchimp Templates/202212 theme heart-of-flowers.html
+- app/views/202212 Mailchimp Templates/202212 theme hero-card.html
+- app/views/202212 Mailchimp Templates/202212 theme hero-image.html
+- app/views/202212 Mailchimp Templates/202212 theme monthly-contest.html
+- app/views/202212 Mailchimp Templates/202212 theme multiple-event.html
+- app/views/202212 Mailchimp Templates/202212 theme postcard.html
+- app/views/202212 Mailchimp Templates/202212 theme snowy-fields.html
+- app/views/202212 Mailchimp Templates/202212 theme soft.html
+- app/views/202212 Mailchimp Templates/202212 theme sophisticated.html
+- app/views/202212 Mailchimp Templates/202212 theme subtle.html
+- app/views/202212 Mailchimp Templates/202212 theme ticket.html
+- app/views/202212 Mailchimp Templates/202212 theme whale.html
 - app/views/ish_manager/application/_analytics.html
 - app/views/ish_manager/application/_debug.haml
 - app/views/ish_manager/application/_form_errors.haml
@@ -465,6 +499,7 @@ files:
 - lib/systemd/system/watch_stocks.service
 - lib/tasks/done/migrate.rake
 - lib/tasks/ish_manager_tasks.rake
+- lib/tasks/office_tasks.rake
 homepage: http://wasya.co
 licenses:
 - MIT