tramway-event 1.9.25 → 1.9.25.1
Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 937ff3b06d9ea3497845040968ef84d1087ac7edef7564bdc6c6a7bbef421cd6
|
4
|
+
data.tar.gz: e9c50108c1ce22dc8096e4d381a95765636e3d0de584ac2e2fcda6f811a9aacf
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: c0626430f816e7e5a4c43556b7f41645edbdab4c5492729ddda40531d3de2c4b30617bb4c496c504250da68177447c2605bed7045278e8667f31ed6beeaa2b90
|
7
|
+
data.tar.gz: 48d9d68033b0306522cdeff49ef103d9dd8615ad8022f02413a283673cf56930d297c0278cc6c16d5307362f4b383168879857d9c7b292cd429bb2499af3e4b4
|
@@ -60,6 +60,8 @@ class Tramway::Event::EventDecorator < ::Tramway::Core::ApplicationDecorator
|
|
60
60
|
end
|
61
61
|
|
62
62
|
def duration(begin_date: object.begin_date, end_date: object.end_date)
|
63
|
+
return unless begin_date.present? || end_date.present?
|
64
|
+
|
63
65
|
if begin_date.to_date == end_date.to_date
|
64
66
|
I18n.l(begin_date, format: '%d %B %Y').to_s
|
65
67
|
elsif begin_date.month == end_date.month
|
@@ -25,6 +25,8 @@ class Tramway::Event::Events::Show::EventDecorator < ::Tramway::Core::Applicatio
|
|
25
25
|
end
|
26
26
|
|
27
27
|
def duration
|
28
|
+
return unless object.begin_date.present? || object.end_date.present?
|
29
|
+
|
28
30
|
if object.begin_date.to_date == object.end_date.to_date
|
29
31
|
I18n.l(object.begin_date, format: '%d %B %Y').to_s
|
30
32
|
elsif object.begin_date.month == object.end_date.month
|
@@ -20,8 +20,9 @@ class Tramway::Event::Event < ::Tramway::Event::ApplicationRecord
|
|
20
20
|
def request_collecting_state
|
21
21
|
return :not_initialized unless request_collecting_begin_date.present? || request_collecting_end_date.present?
|
22
22
|
return :will_begin_soon if request_collecting_begin_date > DateTime.now
|
23
|
-
return :is_over if request_collecting_end_date < DateTime.now
|
23
|
+
return :is_over if request_collecting_end_date.present? && request_collecting_end_date < DateTime.now
|
24
24
|
return :are_being_right_now if request_collecting_begin_date&.past? && request_collecting_end_date&.future?
|
25
|
+
return :are_being_right_now if request_collecting_begin_date < DateTime.now && !request_collecting_end_date.present?
|
25
26
|
end
|
26
27
|
|
27
28
|
include ::Tramway::Partner::Scopes if defined? ::Tramway::Partner
|