Merge pull request #2611 from bitzesty/production

Production ~> Staging sync
bitzesty · Sep 15, 2023 · 78484ea · 78484ea
2 parents a491503 + 41eb53b
commit 78484ea
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 17 deletions.
diff --git a/app/models/user.rb b/app/models/user.rb
@@ -161,7 +161,7 @@ def new_member?
   end
 
   def timeout_in
-    60.minutes
+    24.hours
   end
 
   def check_email_on_bounces!

diff --git a/app/services/utils/date.rb b/app/services/utils/date.rb
@@ -10,8 +10,9 @@ def self.within_range?(value, range)
         when ::Date, ::DateTime then value.to_date
         when ::String then ::Date.parse(value)
       end
+      min, max = range.minmax
 
-      return date.in?(range)
+      return date >= min && date <= max
     rescue
       false
     end

diff --git a/app/views/admin/figures_and_vat_returns/_form.html.slim b/app/views/admin/figures_and_vat_returns/_form.html.slim
@@ -9,9 +9,9 @@
 
     - if form.object.errors.any?
       .errors
-        .alert.alert-danger[data-controller="element-removal" role="alert"']
+        .alert.alert-danger[data-controller="element-removal" role="alert"]
           = form.object.errors.full_messages.join(", ")
-          button[type="button" class="close" data-action="click->element-removal#remove" aria-label="Close" style="font-size: 18px;"]        
+          button[type="button" class="close" data-action="click->element-removal#remove" aria-label="Close" style="font-size: 18px;"]
             span[aria-hidden="true"] &times;
 
     .attachment-link.if-js-hide