ish_manager 0.1.8.403 → 0.1.8.404

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8a3b2381f54eb7b66d392fbaa4051bd78ee53f1ad8b455f8a55db82a0c9fca62
-  data.tar.gz: 65a33aebdf8b15526dee6e37f62824b304f2a0672eef3e55ebd866dd072d5fe8
+  metadata.gz: 7b0e695973583101608da564e5460f74838147a078b52a29cab8c1aab34e9534
+  data.tar.gz: 16a23aa8e36df3e4ecee24a754516026017e40b9cc3f45e7a6b5cc81862d02e4
 SHA512:
-  metadata.gz: a7284a7a74330a4878a4b2136e17aa3c8ac47079fcbb36fb758c7c8b8252bbcc84eb66c578789971af86bad0fa2b39568285d72024be5185fb7f632c01d5beaa
-  data.tar.gz: 047b94313ffef19b69373fdc99d918d9c4f9c4ab76e87d75256e086a8d0e9b12a0c891eb02bc259c32a8edb5bbc6b870733fc485b8cee2765300c58b147c9075
+  metadata.gz: 1cca17f65defbd1073a29f7fc5a6269864651083aaf6fdf1b5b2aeb63b432cb08e347d4e60c6b374405d25a4fae98414434fafc3490ca242e18e1b22740dd4e5
+  data.tar.gz: 2ca8c6173c2317cd453fef7b4c6057db8f0858d1b2b9ffa315e3aa5b86a00eea6c5ce5f0714ca05bc414b618a5483874e95386aaadfb7b5e19c528b4424edaff

data/app/helpers/ish_manager/application_helper.rb

@@ -30,10 +30,6 @@ module IshManager
     #   "/manager/email_contexts/for_lead/#{lead.id.to_s}"
     # end
 
-    def pretty_date input
-      return input.strftime("%Y-%m-%d")
-    end
-
     def pp_errors errors
       return errors
     end
@@ -53,6 +49,12 @@ module IshManager
       date&.strftime('%Y-%m-%d')
     end
     def pp_date a; pretty_date a; end
+    def pp_datetime date
+      date&.strftime('%Y-%m-%d %l:%M%P %z')
+    end
+    def pp_time date
+      date&.strftime('%l:%M%P %z')
+    end
 
     def pp_amount a
       return '-' if !a

data/app/mailers/ish_manager/application_mailer.rb

@@ -12,7 +12,7 @@ module IshManager
       @gallery_path   = IshManager::Engine.routes.url_helpers.gallery_path(@gallery.slug)
       mail( :to => '314658@gmail.com',
             :bcc => profiles.map { |p| p.email },
-            :subject => 'You got new shared galleries on pi manager' ).deliver
+            :subject => 'You got new shared galleries on pi manager' )
     end
 
     def option_alert option
@@ -32,7 +32,7 @@ module IshManager
     end
 
     def test_email
-      mail( to: 'piousbox@gmail.com', subject: "Test email at #{Time.now}" )
+      mail( to: DEFAULT_RECIPIENT, subject: "Test email at #{Time.now}" )
     end
 
   end

data/app/mailers/ish_manager/office_mailer.rb

@@ -54,8 +54,9 @@ class IshManager::OfficeMailer < IshManager::ApplicationMailer
       template_name: template )
   end
 
+  ## 2023-04-02 _vp_ Continue.
   def send_context_email ctx_id
-    @ctx = ::Ish::EmailContext.find ctx_id
+    @ctx = Ctx.find ctx_id
     ac   = ActionController::Base.new
     ac.instance_variable_set( :@ctx, @ctx )
 
@@ -69,18 +70,3 @@ class IshManager::OfficeMailer < IshManager::ApplicationMailer
   end
 
 end
-
-
-## 2022-11-10 _vp_ backup
-# 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

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

@@ -3,6 +3,7 @@
   Debug
 .application--debug
   %ul.browser-default
+    %li= link_to 'sidekiq', '/sidekiq', target: :_blank
     %li= params.inspect
     %li Cached? #{Rails.application.config.action_controller.perform_caching} :: Cache key: #{@cache_key.inspect}
     %li= "Env: #{Rails.env}"

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

@@ -44,7 +44,9 @@
               = link_to email_context_path(ctx) do
                 = ctx.subject ? ctx.subject : "t| #{ctx.tmpl.subject}"
             %td= ctx.email_template.slug
-            %td= pp_date ctx.send_at
+            %td.send_at
+              .a= pp_date ctx.send_at
+              .a= pp_time ctx.send_at
             %td= pp_date ctx.sent_at
 
 

data/lib/tasks/office_tasks.rake

@@ -1,9 +1,4 @@
 
-def puts! a, b=''
-  puts "+++ +++ #{b}"
-  puts a.inspect
-end
-
 namespace :office do
 
   desc 'scheduled email actions, rolling perform'
@@ -11,34 +6,10 @@ namespace :office do
     while true do
 
       Sch.active.where({ :perform_at.lte => Time.now }).each do |sch|
-        sch.update_attributes({ state: Sch::STATE_INACTIVE })
 
-        # send now
-        ctx = Ctx.new({
-          email_template_id: sch.act.tmpl.id,
-          lead_id: sch.lead.id,
-          send_at: Time.now,
-          subject: sch.act.tmpl.subject,
-          from_email: sch.act.tmpl.from_email,
-          scheduled_email_action_id: sch.act.id,
-        })
-        ctx.save!
-
-        # 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: next_act.id,
-          })
-          next_sch.perform_at = next_at
-          next_sch.state      = Sch::STATE_ACTIVE
-          next_sch.save!
-        end
+        sch.send_and_roll
 
         print '+'
-
       end
 
       # sleep 1.minute
@@ -47,13 +18,15 @@ namespace :office do
     end
   end
 
+  ## 2023-04-02 _vp_ Continue.
   desc "send emails"
-  task email_worker: :environment do
+  task ctxs: :environment do
     while true do
 
       ctxs = ::Ish::EmailContext.scheduled.notsent
       ctxs.map do |ctx|
-        IshManager::OfficeMailer.send_context_email( ctx[:id].to_s ).deliver_later
+        out = IshManager::OfficeMailer.send_context_email( ctx[:id].to_s )
+        Rails.env.production? ? out.deliver_later : out.deliver_now
         print '^'
       end
 

data/lib/tasks-done/migrate.rake

@@ -30,5 +30,25 @@ namespace :migrate do
     end
   end
 
+  desc "every user needs a user_profile"
+  task :generate_user_profiles => :environment do
+    User.all.map do |u|
+      unless u.profile
+        p = ::Ish::UserProfile.new :email => u.email, :user => u, :role_name => :guy
+        u.profile = p
+        u.save && p.save && print('.')
+      end
+    end
+    puts 'OK'
+  end
+
+  desc 'assign my creator_profile to Gameui::Marker where missing'
+  task :gameui_markers_creator_profile => :environment do
+    ms = Gameui::Marker.where( creator_profile_id: nil )
+    profile = User.find_by( email: 'piousbox@gmail.com' ).profile
+    ms.update_all( creator_profile_id: profile.id )
+  end
+
+
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ish_manager
 version: !ruby/object:Gem::Version
-  version: 0.1.8.403
+  version: 0.1.8.404
 platform: ruby
 authors:
 - piousbox
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-04-01 00:00:00.000000000 Z
+date: 2023-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -598,7 +598,6 @@ files:
 - lib/systemd/system/stockwatcher.service
 - 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:

data/lib/tasks/ish_manager_tasks.rake

@@ -1,29 +0,0 @@
-
-def puts! a, b=''
-  puts "+++ +++ #{b}"
-  puts a.inspect
-end
-
-namespace :ish_manager do
-
-  desc "every user needs a user_profile"
-  task :generate_user_profiles => :environment do
-    User.all.map do |u|
-      unless u.profile
-        p = ::Ish::UserProfile.new :email => u.email, :user => u, :role_name => :guy
-        u.profile = p
-        u.save && p.save && print('.')
-      end
-    end
-    puts 'OK'
-  end
-
-  desc 'assign my creator_profile to Gameui::Marker where missing'
-  task :gameui_markers_creator_profile => :environment do
-    ms = Gameui::Marker.where( creator_profile_id: nil )
-    profile = User.find_by( email: 'piousbox@gmail.com' ).profile
-    ms.update_all( creator_profile_id: profile.id )
-  end
-
-
-end