wco_models 3.1.0.63 → 3.1.0.65

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 022fabea87e14814a23f90a1b42ef55f7bca33c9bb3d7f3378880979499226af
-  data.tar.gz: cfe8b62245ca4c1a855a6a4b24b7b7fec129877d9d63aca24bd2912b2b89f797
+  metadata.gz: 02fdc8bebae14b0be3eac4cb615b79dad76bc8744cb99562a186ada61d971e92
+  data.tar.gz: fb55583510689139a5a6b6edcb67cd6b329650d6fc0e3e64e1363fb442456e9f
 SHA512:
-  metadata.gz: d60322babfd64996de63d0ddee99ba32c890ef234d56abd6aa487c3b3613f8a418970fc46f8ffae5ccab177e55626247d08bb0ac8155b40ce36b35b708717b8f
-  data.tar.gz: 9a32bd30edd8e8b414cc635a31c09be17592098a672834d452b48b1e49f442aabdc6f471ea054673cb691c18c417151964f183cdbac2aa3dd6dc10160e7ca95e
+  metadata.gz: 5385f595a664d61d27ea8a99d13baa2af3fa7d7adab2c0cd77e80d24daaae35627e9893ce6ec93d1324fe9857a4a3d4287319d244f43cb71cddf88422cdac3a8
+  data.tar.gz: 45f1d42555b82d076e8e1a9c8d485bf96eef7ab05a3940eedebd1fc0a99d5a9a979640d329aeea81c1ee118472b29d40961d09715ab7a9c77b4bb2fdbd002291

data/app/assets/javascripts/wco/alerts-notices.js

@@ -0,0 +1,8 @@
+
+$(function () {
+
+  $(".close").click(function(ev) {
+    $(this).parent().slideToggle()
+  })
+
+})

data/app/assets/javascripts/wco/application.js

@@ -14,11 +14,11 @@
 //
 // require select2
 //
+//= require ./alerts-notices
 //= require ./collapse-expand
 //= require ./file_upload
 //= require ./shared
 //
-console.log('Loading wco/application.js')
 
 $(function() {
 

data/app/assets/stylesheets/wco/alerts_notices.scss

@@ -0,0 +1,14 @@
+
+.alert {
+  border: 1px solid red;
+  padding: .8em;
+  margin: 0.8em;
+  position: relative;
+}
+
+.notice {
+  border: 1px solid green;
+  padding: .8em;
+  margin: 0.8em;
+  position: relative;
+}

data/app/assets/stylesheets/wco/application.css

@@ -5,25 +5,16 @@
  *= require_tree .
 **/
 
-/* body {
-  color: red !important;
-} */
-
 .select2 {
   min-width: 200px;
-  /* width: 100%; */
-}
-
-.wco--alerts-notices {
-  border-bottom: 1px solid red;
 }
 
 .main-footer {
-  border-top: 1px solid red;
+  border-top: 2px solid #6395b9;
 }
 
 .main-header {
-  // border-bottom: 1px solid red;
+  border-bottom: 2px solid #6395b9;
 
   li {
     display: flex;

data/app/helpers/wco/application_helper.rb

@@ -26,7 +26,7 @@ module Wco::ApplicationHelper
   def pp_time date
     return nil if !date
     # return date.strftime('%l:%M%P %z')
-    return date.in_time_zone( Rails.application.config.time_zone ).strftime('%l:%M%P')
+    return date.in_time_zone( Rails.application.config.time_zone ).strftime('%l:%M%P %Z')
   end
 
   def pp_amount a

data/app/mailers/wco_email/application_mailer.rb

@@ -58,18 +58,12 @@ class WcoEmail::ApplicationMailer < ActionMailer::Base
       'utm_source'   => @ctx.tmpl.slug,
     }.map { |k, v| "#{k}=#{v}" }.join("&")
 
-    # @origin         = "https://#{Rails.application.config.action_mailer.default_url_options[:host]}"
-
     @unsubscribe_url = WcoEmail::Engine.routes.url_helpers.unsubscribes_url({
       template_id: @ctx.tmpl.id,
       lead_id:     @lead.id,
       token:       @lead.unsubscribe_token,
       host:        Rails.application.routes.default_url_options[:host],
     })
-    # renderer = Tmp6Ctl.new
-    # renderer = IshManager::ApplicationController.new
-    # renderer.send( :include, ::IshManager::ApplicationHelper )
-    # renderer.send( :request, { host: 'test-host' } )
     renderer = WcoEmail::ApplicationMailer.new
 
     renderer.instance_variable_set( :@ctx,              @ctx )
@@ -78,12 +72,10 @@ class WcoEmail::ApplicationMailer < ActionMailer::Base
     renderer.instance_variable_set( :@unsubscribe_url,  @unsubscribe_url )
     renderer.instance_variable_set( :@tmpl_config,      @tmpl_config )
 
-    # eval( @ctx.tmpl.config_exe )
-
     rendered_str = renderer.render_to_string("/wco_email/email_templates/_#{@ctx.tmpl.layout}")
-    @ctx.update({
+    @ctx.update!({
       rendered_str: rendered_str,
-      sent_at: Time.now.to_s,
+      sent_at:      Time.now.to_s,
     })
 
     mail( from:    @ctx.from_email,

data/app/models/wco_email/context.rb

@@ -70,9 +70,8 @@ class WcoEmail::Context
     where( sent_at: nil, unsubscribed_at: nil )
   end
 
-
   def self.scheduled
-    where( :send_at.lte => Time.now  )
+    where( :send_at.gte => Time.now  )
   end
 
 

data/app/models/wco_email/message.rb

@@ -100,7 +100,7 @@ class WcoEmail::Message
       WcoEmail::Context.create({
         email_template: filter.email_template,
         lead_id:        lead.id,
-        send_at:        Time.now + 22.minutes,
+        send_at:        Time.now,
       })
 
     when WcoEmail::EmailFilter::KIND_AUTORESPOND_EACT
@@ -108,7 +108,7 @@ class WcoEmail::Message
         email_action: filter.email_action,
         state:        ::Sch::STATE_ACTIVE,
         lead_id:      lead.id,
-        perform_at:   Time.now + 22.minutes,
+        perform_at:   Time.now,
       })
 
     else

data/app/views/wco/_alerts_notices.haml

@@ -1,6 +1,6 @@
 
 -# 2023-12-25 v.0.0.0
-.wco--alerts-notices.maxwidth
+.wco--alerts-notices.flexwidth
 
   - if notice&.class == String
     .notice

data/app/views/wco/_main_footer.haml

@@ -12,26 +12,21 @@
       .row
         .col-sm-4
           %ul
-            %li <b>Email:</b> #{@current_profile.email}
+            %li
+              <b>Email:</b> #{@current_profile.email}
+              = button_to 'Logout', main_app.destroy_user_session_path, :method => :delete, data: { confirm: 'Are you sure?' }
             %li= link_to 'sidekiq', '/sidekiq', target: :_blank
             %li= link_to 'Iron Warbler', '/iron_warbler'
 
+
         .col-sm-4
           %ul
             %li ~__^ &nbsp; &nbsp; v#{@version}
-            -# %li= Time.now.in_time_zone.to_s
             %li
               = pp_date Time.now
               = pp_time Time.now
-            -# <pre>#{@changelog}</pre>
 
         .col-sm-4
-          = button_to 'Logout', main_app.destroy_user_session_path, :method => :delete, data: { confirm: 'Are you sure?' }
-
-          -# .set-jwt-token
-          -#   = button_tag 'Set JWT', class: 'set-jwt-token'
-          -#   .jwt-token
-
           = form_for @current_profile, url: wco.profile_path(@current_profile), as: :profile do |f|
             .flex-row
               = f.label :per_page

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wco_models
 version: !ruby/object:Gem::Version
-  version: 3.1.0.63
+  version: 3.1.0.65
 platform: ruby
 authors:
 - Victor Pudeyev
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-13 00:00:00.000000000 Z
+date: 2024-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-s3
@@ -355,11 +355,13 @@ files:
 - app/assets/javascripts/vendor/jquery.ui.widget.js
 - app/assets/javascripts/vendor/popper-1.14.0.min.js
 - app/assets/javascripts/vendor/summernote-bs4.min.js
+- app/assets/javascripts/wco/alerts-notices.js
 - app/assets/javascripts/wco/application.js
 - app/assets/javascripts/wco/collapse-expand.js
 - app/assets/javascripts/wco/file_upload.js
 - app/assets/javascripts/wco/shared.js
 - app/assets/stylesheets/vendor/bootstrap-4.6.2.min.css
+- app/assets/stylesheets/wco/alerts_notices.scss
 - app/assets/stylesheets/wco/application.css
 - app/assets/stylesheets/wco/pagination.scss
 - app/assets/stylesheets/wco/utils.scss