tramway-event 1.9.30 → 1.9.31

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ccbba9d4e213e01b03e1d8b447d3ecc7c999dc13e32b5902c76bc1a6422bba39
-  data.tar.gz: 1ac5580d257ffa32f36ca9bab2e28ac85fa9ae5a0c29bfaef4d8bc163b6a1ca2
+  metadata.gz: 5934677a7693e129263e003d40fb0c32a5b192ca2473ce970ab8204cf4c11222
+  data.tar.gz: 5fb809b1cf2495b2a6cb6230cbcebf975c0f87f1535cc7c66ed958eb5d0d5b3f
 SHA512:
-  metadata.gz: 73bd1a360e798f16ed21c4708fcb411b3a207a2e67fb220a0ec234ce7f317b8966f40ec2a12bbb5a3858f975f443217d2e80d867e2d2b6c835a54548c2d0f20a
-  data.tar.gz: 1d7e7c7a06dbd0fd4a0531d7eb959619591a6bd5213fa22a171eb922393cfa2e8aa34528b8a4882957ca89146edf66aa0ea70126b2646ba1a5032ea09a245a80
+  metadata.gz: 82a328caebddab43227e1f8908b091312f41914676ecb859ec5b6ecaa6010ced39f8f1afc38f869894a16cecaa36cc10e38edf326fd65efb9ff74781215b7aa5
+  data.tar.gz: 9185026a5b04a10c4efd9aed97b09d18210205e7199ae388105300e1a524547b49d09b9eeb2bec6fce242b71224d24fc8175fe483abab94fa555d45cee1a4df9

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

@@ -47,4 +47,11 @@ class Tramway::Event::Events::Show::EventDecorator < ::Tramway::Core::Applicatio
   end
 
   alias tagline duration
+
+  def responsible_person
+    {
+      phone: (object.creator.phone if object.creator&.phone&.present?),
+      email: (object.creator.email if object.creator&.email&.present?)
+    }
+  end
 end

data/app/views/tramway/event/events/_show_page.html.haml

@@ -7,9 +7,9 @@
     %hr/
     %p.mb-0
       По всем вопросам обращайтесь по телефону
-      = tel_tag @application.phone
+      = tel_tag @event.responsible_person[:phone] || @application.phone
       или пишите на email
-      = mail_to @application.email
+      = mail_to @event.responsible_person[:email] || @application.email
 - if params[:flash] == 'error'
   .alert.alert-danger{ role: "alert" }
     %button.close{"aria-label" => "Close", "data-dismiss" => "alert", type: "button"}
@@ -19,9 +19,9 @@
     %hr/
     %p.mb-0
       Если ошибка повторяется или не отображается, обращайтесь по телефону
-      = tel_tag @application.phone
+      = tel_tag @event.responsible_person[:phone] || @application.phone
       или пишите на email
-      = mail_to @application.email
+      = mail_to @event.responsible_person[:email] || @application.email
 - if request.path == ::Tramway::Event::Engine.routes.url_helpers.event_path(event.id)
   = render 'tramway/landing/blocks/templates/full_page', block: event, buttons: [OpenStruct.new(title: t('.registration'), anchor: '#registration')]
   - content_for :main_image do

data/lib/tramway/event/version.rb

@@ -2,6 +2,6 @@
 
 module Tramway
   module Event
-    VERSION = '1.9.30'
+    VERSION = '1.9.31'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tramway-event
 version: !ruby/object:Gem::Version
-  version: 1.9.30
+  version: 1.9.31
 platform: ruby
 authors:
 - Pavel Kalashnikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-17 00:00:00.000000000 Z
+date: 2020-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: configus