tramway-event 1.9.25 → 1.9.25.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 23b8602b08fac64e7da272703bf4c1736f8b92b237d74e4449d1f09e4b183746
-  data.tar.gz: 5e18c8beb8894f1583dc55e2f1cb7e8e634aa3273c3c7ff80382f0dda93af38a
+  metadata.gz: 937ff3b06d9ea3497845040968ef84d1087ac7edef7564bdc6c6a7bbef421cd6
+  data.tar.gz: e9c50108c1ce22dc8096e4d381a95765636e3d0de584ac2e2fcda6f811a9aacf
 SHA512:
-  metadata.gz: d53b02a1a97ef8caf98133f4d80f9c73b59ee21112ae99c5bafceee7856b3d0a355827a42ce6086cfc23fe1b83d58dfdd37ca02097aa8c1e8050b9736652331c
-  data.tar.gz: 5fbcecc075ee3b6f1b6e4c49831071ed75090d10cdcb3a8d240c78d13e4e6b830068302eb33ad37e879657296b6229b096647956f49e361575f853aa4675065c
+  metadata.gz: c0626430f816e7e5a4c43556b7f41645edbdab4c5492729ddda40531d3de2c4b30617bb4c496c504250da68177447c2605bed7045278e8667f31ed6beeaa2b90
+  data.tar.gz: 48d9d68033b0306522cdeff49ef103d9dd8615ad8022f02413a283673cf56930d297c0278cc6c16d5307362f4b383168879857d9c7b292cd429bb2499af3e4b4

data/app/decorators/tramway/event/event_decorator.rb

@@ -60,6 +60,8 @@ class Tramway::Event::EventDecorator < ::Tramway::Core::ApplicationDecorator
   end
 
   def duration(begin_date: object.begin_date, end_date: object.end_date)
+    return unless begin_date.present? || end_date.present?
+
     if begin_date.to_date == end_date.to_date
       I18n.l(begin_date, format: '%d %B %Y').to_s
     elsif begin_date.month == end_date.month

data/app/decorators/tramway/event/events/show/event_decorator.rb

@@ -25,6 +25,8 @@ class Tramway::Event::Events::Show::EventDecorator < ::Tramway::Core::Applicatio
   end
 
   def duration
+    return unless object.begin_date.present? || object.end_date.present?
+
     if object.begin_date.to_date == object.end_date.to_date
       I18n.l(object.begin_date, format: '%d %B %Y').to_s
     elsif object.begin_date.month == object.end_date.month

data/app/models/tramway/event/event.rb

@@ -20,8 +20,9 @@ class Tramway::Event::Event < ::Tramway::Event::ApplicationRecord
   def request_collecting_state
     return :not_initialized unless request_collecting_begin_date.present? || request_collecting_end_date.present?
     return :will_begin_soon if request_collecting_begin_date > DateTime.now
-    return :is_over if request_collecting_end_date < DateTime.now
+    return :is_over if request_collecting_end_date.present? && request_collecting_end_date < DateTime.now
     return :are_being_right_now if request_collecting_begin_date&.past? && request_collecting_end_date&.future?
+    return :are_being_right_now if request_collecting_begin_date < DateTime.now && !request_collecting_end_date.present?
   end
 
   include ::Tramway::Partner::Scopes if defined? ::Tramway::Partner

data/lib/tramway/event/version.rb

@@ -2,6 +2,6 @@
 
 module Tramway
   module Event
-    VERSION = '1.9.25'
+    VERSION = '1.9.25.1'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tramway-event
 version: !ruby/object:Gem::Version
-  version: 1.9.25
+  version: 1.9.25.1
 platform: ruby
 authors:
 - Pavel Kalashnikov