dm_event 4.2.3.6 → 4.2.3.7

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (9) hide show
  1. checksums.yaml +4 -4
  2. data/app/controllers/dm_event/payments_controller.rb +2 -2
  3. data/app/controllers/dm_event/registrations_controller.rb +2 -2
  4. data/app/models/payment.rb +1 -1
  5. data/app/models/registration.rb +1 -1
  6. data/app/views/dm_event/payments/_registrations_paypal_standard.html.erb +5 -4
  7. data/app/views/dm_event/payments/_registrations_sofort.html.erb +2 -1
  8. data/lib/dm_event/engine.rb +1 -0
  9. metadata +24 -10
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: d5c0e10ded2a5bc675e7094687c9e0d3f20d967c
4
- data.tar.gz: d686a889fa2613f4602949ea9dcd5749c780ced5
3
+ metadata.gz: 57f388c2d6b4152ff22a84e86a3df44415fa30ca
4
+ data.tar.gz: a13f645184e781bcdf147b3a3804e04a7d5ca3e5
5
5
  SHA512:
6
- metadata.gz: 4030f7f4b4281a4ac529ffbafab3768187049f7b6eb6bd613c76bae68a445824954aa80ed5ca0f11a2d88bd22b1403caea335ec21cc2423745d7660f49ac1d9f
7
- data.tar.gz: 8911e4af5b147f41970100fdeac3d869657f126da523d4dbc7f6227b46c035a276b6c1fac063be135494b6894f674bcafa0e5dc565facc5b30f206558a31e55f
6
+ metadata.gz: c70ec0a6052d729da14d8a4b910518428aa5bf88e077769643f4d89a7f8a4e72a7af662374302a9dd42a87db1653c043da6c775c036934a802bc5de5046faa2b
7
+ data.tar.gz: c1236295bd244ffde04d220d2d4f7d6f6462aaa96460747b291e7efda46cfb9941a91cc9ee63359ab8b842692e82802185ff6111102b4e90ab84bfb2cbeeae08
data/app/controllers/dm_event/payments_controller.rb CHANGED
@@ -1,7 +1,7 @@
1
- ActionView::Base.send(:include, ActiveMerchant::Billing::Integrations::ActionViewHelper)
1
+ ActionView::Base.send(:include, OffsitePayments::ActionViewHelper)
2
2
 
3
3
  class DmEvent::PaymentsController < DmEvent::ApplicationController
4
- include ActiveMerchant::Billing::Integrations
4
+ include OffsitePayments::Integrations
5
5
 
6
6
  protect_from_forgery :except => [:paypal_ipn, :sofort_ipn]
7
7
 
data/app/controllers/dm_event/registrations_controller.rb CHANGED
@@ -1,8 +1,8 @@
1
- ActionView::Base.send(:include, ActiveMerchant::Billing::Integrations::ActionViewHelper)
1
+ ActionView::Base.send(:include, OffsitePayments::ActionViewHelper)
2
2
 
3
3
  class DmEvent::RegistrationsController < DmEvent::ApplicationController
4
4
  include DmEvent::PermittedParams
5
- include ActiveMerchant::Billing::Integrations
5
+ include OffsitePayments::Integrations
6
6
  include DmCore::UrlHelper
7
7
  include DmCore::LiquidHelper
8
8
 
data/app/models/payment.rb CHANGED
@@ -1,7 +1,7 @@
1
1
  # Handle payment related logic
2
2
  #------------------------------------------------------------------------------
3
3
  class Payment
4
- include ActiveMerchant::Billing::Integrations
4
+ include OffsitePayments::Integrations
5
5
 
6
6
  # Handle Payment notification logic
7
7
  #------------------------------------------------------------------------------
data/app/models/registration.rb CHANGED
@@ -7,7 +7,7 @@ class Registration < ActiveRecord::Base
7
7
  include DmEvent::Concerns::RegistrationStateMachine
8
8
  include DmEvent::Concerns::RegistrationStateEmail
9
9
  include DmCore::Concerns::HasCustomFields
10
- include ActiveMerchant::Billing::Integrations
10
+ include OffsitePayments::Integrations
11
11
 
12
12
  self.table_name = 'ems_registrations'
13
13
 
data/app/views/dm_event/payments/_registrations_paypal_standard.html.erb CHANGED
@@ -1,6 +1,7 @@
1
+ <% byebug %>
1
2
  <% payment_service_for @registration.receipt_code, current_account.preferred_paypal_merchant_id,
2
- amount: @registration.make_payment_now_amount,
3
- currency: @registration.payment_owed.currency.iso_code,
3
+ amount: @registration.make_payment_now_amount.to_f,
4
+ currency: @registration.make_payment_now_amount.currency.iso_code,
4
5
  service: :paypal do |service|
5
6
  service.customer :first_name => @registration.first_name,
6
7
  :last_name => @registration.last_name,
@@ -16,8 +17,8 @@
16
17
 
17
18
  <!-- display payment summary here -->
18
19
  <% if locale == :de %>
19
- <%= image_submit_tag "https://www.paypal.com/de_DE/DE/i/btn/btn_xpressCheckout.gif" %>
20
+ <%= image_submit_tag "https://www.paypalobjects.com/webstatic/en_US/i/btn/png/gold-pill-paypal-34px.png" %>
20
21
  <% else %>
21
- <%= image_submit_tag "https://www.paypal.com/en_US/i/btn/btn_xpressCheckout.gif" %>
22
+ <%= image_submit_tag "https://www.paypalobjects.com/webstatic/en_US/i/btn/png/gold-pill-paypal-34px.png" %>
22
23
  <% end %>
23
24
  <% end %>
data/app/views/dm_event/payments/_registrations_sofort.html.erb CHANGED
@@ -1,9 +1,10 @@
1
+ <% byebug %>
1
2
  <% payment_service_for @registration.receipt_code, current_account.preferred_sofort_user_id,
2
3
  credential2: current_account.preferred_sofort_project_id,
3
4
  credential3: current_account.preferred_sofort_project_password,
4
5
  credential4: '', #--- notification password
5
6
  amount: @registration.make_payment_now_amount,
6
- currency: @registration.payment_owed.currency.iso_code,
7
+ currency: @registration.make_payment_now_amount.currency.iso_code,
7
8
  service: :directebanking do |service|
8
9
  service.item_name @registration.workshop.title
9
10
  service.description @registration.workshop.title
data/lib/dm_event/engine.rb CHANGED
@@ -1,5 +1,6 @@
1
1
  require 'dm_core'
2
2
  require 'activemerchant'
3
+ require 'offsite_payments'
3
4
 
4
5
  module DmEvent
5
6
  class Engine < ::Rails::Engine
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: dm_event
3
3
  version: !ruby/object:Gem::Version
4
- version: 4.2.3.6
4
+ version: 4.2.3.7
5
5
  platform: ruby
6
6
  authors:
7
7
  - Brett Walker
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2017-01-17 00:00:00.000000000 Z
11
+ date: 2017-01-22 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: dm_core
@@ -16,42 +16,56 @@ dependencies:
16
16
  requirements:
17
17
  - - '='
18
18
  - !ruby/object:Gem::Version
19
- version: 4.2.3.6
19
+ version: 4.2.3.7
20
20
  type: :runtime
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
24
  - - '='
25
25
  - !ruby/object:Gem::Version
26
- version: 4.2.3.6
26
+ version: 4.2.3.7
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: dm_cms
29
29
  requirement: !ruby/object:Gem::Requirement
30
30
  requirements:
31
31
  - - '='
32
32
  - !ruby/object:Gem::Version
33
- version: 4.2.3.6
33
+ version: 4.2.3.7
34
34
  type: :runtime
35
35
  prerelease: false
36
36
  version_requirements: !ruby/object:Gem::Requirement
37
37
  requirements:
38
38
  - - '='
39
39
  - !ruby/object:Gem::Version
40
- version: 4.2.3.6
40
+ version: 4.2.3.7
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: activemerchant
43
43
  requirement: !ruby/object:Gem::Requirement
44
44
  requirements:
45
- - - '='
45
+ - - "~>"
46
46
  - !ruby/object:Gem::Version
47
- version: 1.43.3
47
+ version: 1.62.0
48
48
  type: :runtime
49
49
  prerelease: false
50
50
  version_requirements: !ruby/object:Gem::Requirement
51
51
  requirements:
52
- - - '='
52
+ - - "~>"
53
+ - !ruby/object:Gem::Version
54
+ version: 1.62.0
55
+ - !ruby/object:Gem::Dependency
56
+ name: offsite_payments
57
+ requirement: !ruby/object:Gem::Requirement
58
+ requirements:
59
+ - - "~>"
60
+ - !ruby/object:Gem::Version
61
+ version: '2.2'
62
+ type: :runtime
63
+ prerelease: false
64
+ version_requirements: !ruby/object:Gem::Requirement
65
+ requirements:
66
+ - - "~>"
53
67
  - !ruby/object:Gem::Version
54
- version: 1.43.3
68
+ version: '2.2'
55
69
  description: Part of MokshaCms, Event Management Engine
56
70
  email:
57
71
  - github@digitalmoksha.com