wco_models 3.1.0.62 → 3.1.0.64

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ef2b8e4bef23e27158ed837b1aea47e139f21d1e5465a94f850acb62d843765b
-  data.tar.gz: 7209dcbe82884748e25f90ec28e3e99ac002838086c492a7a6c4de025d087ca3
+  metadata.gz: 8ce47664d92d06b21e041449c5aeb596b55bad9f380dfbf8e34361fd2d549bdb
+  data.tar.gz: 80728ff93a9d6f89820ca2ef4257d8fa62244ebdc0a5fc872a0d28758100dc78
 SHA512:
-  metadata.gz: 5d26f9a04b158184b51a29af4192185657af21b0911dcb7a839396178b07b17d10ed4513a56aec82e1cfbac1ae27cee017e942ab66ee3a592ba3b846959e9ceb
-  data.tar.gz: 69d0d4188dc22faa92e30f95434388aeacf261ce6bfd4db23ac047b340b1c0d187cca33b3114b8ddda832c0e76d18185b08adbc61ec4102ed21367f5781e43fa
+  metadata.gz: b2d62471c373c7d89933be5afeb0e406917cc61c690c19064184d93fe9bd9fa99a0acd58eaff09400e6a1fa9a85bf4803aa08f762cc50c9d52e24244bf29b333
+  data.tar.gz: 4faf4a69f74c8b1b1487978b6b377dd6c2413261e818241d5a736d5d23e657fc82df95f97a125ada9e89a002f535d99a37157c65b31e5afb13886006f98cb0ba

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/models/wco_email/message.rb

@@ -90,7 +90,7 @@ class WcoEmail::Message
     when WcoEmail::EmailFilter::KIND_ADD_TAG
       conv.tags.push filter.tag
       if filter.tag == Wco::Tag.trash
-        conv.tags.remove Wco::Tag.inbox
+        conv.tags -= [ Wco::Tag.inbox ]
       end
 
     when WcoEmail::EmailFilter::KIND_REMOVE_TAG
@@ -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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wco_models
 version: !ruby/object:Gem::Version
-  version: 3.1.0.62
+  version: 3.1.0.64
 platform: ruby
 authors:
 - Victor Pudeyev
@@ -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