dm_event 4.2.3.8 → 4.2.3.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9e451bd4b6c9cf4b420c6436da7cb08a6cfeb2cc
-  data.tar.gz: cd2e866a2922a43647d5696ca0a38e61831b32fc
+  metadata.gz: 50ee380a43e4231ee26191c9edecd36e94077ca4
+  data.tar.gz: 677c278beb2cdb58b07d4bbc00fda6be0a866d9c
 SHA512:
-  metadata.gz: 7ff6a3f8a3489f5fb1d47b51e24f92124759550a83a16c29b37a1171120c1dc93d8ef3aa67a1848e09a5de0d1c8ee14c50f0f8382160bd888ece4860797ecc4c
-  data.tar.gz: 8b868747595f52821e6764a4ccaaed927c139b2f657c7ffe2a3e632907c95118b6877619256f33a6e69860ff82a1365e9b2bf637eb7d9ca46f3f25d830c74baf
+  metadata.gz: cfd2f1c4484d9203f4f3ed30bc0cdc83a264bf3cfe56a8fdf92d621694235b5000f6720f13f09c9376b9dfaaa6a1b7a72fb425f3daf81306b3d79c8e31d03dc4
+  data.tar.gz: d9645329c548bdb3bfe832418f94df627792486d7b5e7bbc64b2db414b8e13b085c7478ea5b430c25aa6dbc2b75b75e6ff1f5d206e7d7b045918ae55641a4200

data/app/controllers/dm_event/registrations_controller.rb

@@ -73,6 +73,10 @@ class DmEvent::RegistrationsController < DmEvent::ApplicationController
         redirect_to main_app.root_url and return
       end
     end
+    
+    if @registration.balance_owed.zero?
+      render :payment_complete and return
+    end
   end
   
   # Success page for a registration.  Look up the uuid and display success.

data/app/views/dm_event/registrations/payment_complete.html.erb

@@ -0,0 +1,15 @@
+<div class="receipt_section">
+  <h2><%= I18n.t('ems.ticket_payment_complete') %></h2>
+  <div class="ticket">
+    <h3><%= @registration.workshop.title %></h3>
+    <ul>
+      <li><span class="header"><%= I18n.t('ems.ticket_receipt_attendee') %></span><%=h @registration.full_name %></li>
+      <li><span class="header"><%= I18n.t('ems.ticket_receipt_ticket_number') %></span><%=h @registration.receipt_code %></li>
+      <% if @registration.workshop_price %>
+        <li><span class="header"><%= I18n.t('ems.ticket_receipt_price') %></span><%= humanized_money_with_symbol @registration.price %></li>
+      <% end %>
+    </table>
+  </div>
+
+  <%= markdown(@receipt_content, :safe => false) %>
+</div>

data/config/locales/ems.cs.yml

@@ -19,6 +19,7 @@ cs:
     ticket_payment_link_text: Způsoby platby
     ticket_payment_reminder_subject: "Připomínka úhrady kurzovného: %{value}"
     ticket_if_already_paid: "Tento e-mail byl automaticky generovaný a odeslaný naším systémem. Pokud jste výše uvedenou částku již dříve zaplatil/a, nebo se domníváte, že tato připomínka není oprávněná, zašlete prosím e-mail na %{value}. Pokud jste platbu provedli v posledních třech dnech, můžete tuto připomínku ignorovat."
+    ticket_payment_complete: Vaše platba byla dokončena!
     registration_receipt_title: Potvrzení o rezervaci
     registration_email: E-mail
     registration_first_name: Křestní jméno

data/config/locales/ems.de.yml

@@ -19,6 +19,7 @@ de:
     ticket_payment_link_text: Jetzt bezahlen
     ticket_payment_reminder_subject: "Zahlungserinnerung: %{value}"
     ticket_if_already_paid: "Diese Email wird automatisch von unserem Buchungssystem generiert und versendet. Falls Du den Betrag bereits überwiesen hast, oder der Meinung bist, dass die Zahlungserinnerung unbegründet ist, setze Dich bitte per Email an %{value} mit uns in Verbindung. Sollte sich diese Erinnerung mit einer Zahlung in den letzten drei Tagen überschnitten haben, ignoriere sie bitte."
+    ticket_payment_complete: Ihre Zahlung ist komplett!
     registration_receipt_title: Anmeldebestätigung
     registration_email: E-Mail
     registration_first_name: Vorname

data/config/locales/ems.en.yml

@@ -19,6 +19,7 @@ en:
     ticket_payment_link_text: Make Payment
     ticket_payment_reminder_subject: "Payment Reminder: %{value}"
     ticket_if_already_paid: "This email is automatically generated and sent by our system. If you have already paid the amount, or believe that the reminder is incorrect, please send an email to %{value}. If you have made a payment in the last three days, please ignore this reminder."
+    ticket_payment_complete: Your payment is complete!
     registration_receipt_title: Reservation Receipt
     registration_email: Email
     registration_first_name: First Name

data/config/locales/ems.fi.yml

@@ -19,6 +19,7 @@ fi:
     ticket_payment_link_text: Maksa
     ticket_payment_reminder_subject: "Maksumuistutus: %{value}"
     ticket_if_already_paid: "Tämä sähköpostiosoite on automaattisesti luotu ja lähetetty järjestelmämme. Jos olet jo maksanut määrän eli uskovat, että muistutus on virheellinen, lähetä sähköpostia osoitteeseen %{value}. Jos olet tehnyt maksun viimeisen kolmen päivän, jätä tämä muistutus."
+    ticket_payment_complete: Maksu on suoritettu!
     registration_receipt_title: Varauksen vastaanottaminen
     registration_email: Sähköposti
     registration_first_name: Etunimi

data/config/locales/ems.ja.yml

@@ -19,6 +19,7 @@ ja:
     ticket_payment_link_text: Make Payment
     ticket_payment_reminder_subject: "Payment Reminder: %{value}"
     ticket_if_already_paid: "This email is automatically generated and sent by our system. If you have already paid the amount, or believe that the reminder is incorrect, please send an email to %{value}. If you have made a payment in the last three days, please ignore this reminder."
+    ticket_payment_complete: お支払いが完了しました!
     registration_receipt_title: 予約受理
     registration_email: Eメール
     registration_first_name: 名

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dm_event
 version: !ruby/object:Gem::Version
-  version: 4.2.3.8
+  version: 4.2.3.9
 platform: ruby
 authors:
 - Brett Walker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-22 00:00:00.000000000 Z
+date: 2017-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dm_core
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.3.8
+        version: 4.2.3.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.3.8
+        version: 4.2.3.9
 - !ruby/object:Gem::Dependency
   name: dm_cms
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.3.8
+        version: 4.2.3.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.3.8
+        version: 4.2.3.9
 - !ruby/object:Gem::Dependency
   name: activemerchant
   requirement: !ruby/object:Gem::Requirement
@@ -266,6 +266,7 @@ files:
 - app/views/dm_event/registrations/choose_payment.html.erb
 - app/views/dm_event/registrations/closed.html.erb
 - app/views/dm_event/registrations/new.html.erb
+- app/views/dm_event/registrations/payment_complete.html.erb
 - app/views/dm_event/registrations/success.html.erb
 - app/views/layouts/email_templates/dm_event_email_layout.html.erb
 - app/views/layouts/email_templates/dm_event_email_layout.text.erb