worldpay 1.2.4 → 1.2.5

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 (5) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile.lock +4 -1
  3. data/lib/worldpay.rb +25 -21
  4. data/worldpay.gemspec +1 -1
  5. metadata +3 -3
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: fdb0f6d6c3a30481ce7ca296bd0b90d799305317
4
- data.tar.gz: 2a35f1520229c6196c003a63cfabf6ef37aeebe6
3
+ metadata.gz: f54d051071ef4a3f0eef7902fbd9dcac77fc688f
4
+ data.tar.gz: abd4d0254bc251ae68fcef997cf9957ee8380cb0
5
5
  SHA512:
6
- metadata.gz: 417feeace4bef62242bdffd7466fc0bec33d8a645a4549a755c69b0159d1a3a80904c73cc5c82873b7e1c054152342d9a9eb816665f6adfd92e26bb213b73574
7
- data.tar.gz: cfaa07493776a6399b10b547131da451fb5c0b37d103dd7565f299344222b9847e7a4b9226328c991ae8c487ec059944fc74bca63d76462731b916d1fc3f4349
6
+ metadata.gz: 6c85a42894901cb5f84dab3b44d999edf8d7cd91655b9c5cf7ac71c1438031139291519ba6071508c076273d8d57db07b8f9ef599b8ffea19346bebc507b6d69
7
+ data.tar.gz: 58d769887ebdc34bddad1f2ebe8b42591d86ec87ac1897c9b8e0cced240ab420660ccad2dd3ecb106c687dd457d76cb7baf2e4bde4ae5bdacccda4fb351078ab
data/Gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- worldpay (1.0.6)
4
+ worldpay (1.2.5)
5
5
 
6
6
  GEM
7
7
  remote: https://rubygems.org/
@@ -15,3 +15,6 @@ DEPENDENCIES
15
15
  bundler (~> 1.6)
16
16
  rake
17
17
  worldpay!
18
+
19
+ BUNDLED WITH
20
+ 1.11.0
data/lib/worldpay.rb CHANGED
@@ -16,7 +16,7 @@ class Worldpay
16
16
 
17
17
  @version = '1.2.3'
18
18
 
19
- @orderTypes = ['ECOM','MOTO','RECURRING']
19
+ @orderTypes = ['ECOM','MOTO','RECURRING','APM']
20
20
 
21
21
 
22
22
  def initialize(service_key='', timeout=3, raise_errors=true)
@@ -82,7 +82,6 @@ class Worldpay
82
82
  #ERRORS
83
83
  def onError(error, message=false, code=nil, httpStatusCode=nil, description=nil, customCode=nil)
84
84
 
85
-
86
85
  if (@raise_errors)
87
86
  raise message.to_s
88
87
  else
@@ -138,28 +137,33 @@ class Worldpay
138
137
  cost_cents = fmt.split('.').join('')
139
138
 
140
139
  request = {
141
- 'token' => order['token'],
142
- 'orderDescription' => order['orderDescription'],
143
- 'amount' => cost_cents,
144
- 'is3DSOrder' => order['3DS'],
145
- 'currencyCode' => order['currencyCode'],
146
- 'name' => order['name'],
147
- 'orderType' => order['orderType'] && @orderTypes ? (@orderTypes.include?(order['orderType']) ? order['orderType'] : 'ECOM') : 'ECOM',
148
- 'authorizeOnly' => (!!order['authorizeOnly'] || !!order['authoriseOnly']) || false,
149
- 'billingAddress' => order['billingAddress'],
150
- 'deliveryAddress' => order['deliveryAddress'],
151
- 'customerOrderCode' => order['customerOrderCode'],
152
- 'customerIdentifiers' => order['customerIdentifiers']
140
+ 'token' => order['token'],
141
+ 'orderDescription' => order['orderDescription'],
142
+ 'amount' => cost_cents,
143
+ 'is3DSOrder' => order['3DS'],
144
+ 'currencyCode' => order['currencyCode'],
145
+ 'siteCode' => order['siteCode'],
146
+ 'settlementCurrency' => order['settlementCurrency'],
147
+ 'name' => order['name'],
148
+ 'orderType' => ['ECOM','MOTO','RECURRING','APM'].include?(order['orderType']) ? order['orderType'] : 'ECOM',
149
+ 'authorizeOnly' => (!!order['authorizeOnly'] || !!order['authoriseOnly']) || false,
150
+ 'billingAddress' => order['billingAddress'],
151
+ 'deliveryAddress' => order['deliveryAddress'],
152
+ 'customerOrderCode' => order['customerOrderCode'],
153
+ 'customerIdentifiers' => order['customerIdentifiers'],
154
+ 'statementNarrative' => order['statementNarrative'],
155
+ 'orderCodePrefix' => order['orderCodePrefix'],
156
+ 'orderCodeSuffix' => order['orderCodeSuffix']
153
157
  }
154
158
 
155
159
  if(request['is3DSOrder'] == true)
156
- threeDsInfo = {
157
- 'shopperIpAddress' => order['shopperIpAddress'],
158
- 'shopperSessionId' => order['shopperSessionId'],
159
- 'shopperUserAgent' => order['shopperUserAgent'],
160
- 'shopperAcceptHeader' => order['shopperAcceptHeader']
161
- }
162
- request.merge!(threeDsInfo)
160
+ threeDsInfo = {
161
+ 'shopperIpAddress' => order['shopperIpAddress'],
162
+ 'shopperSessionId' => order['shopperSessionId'],
163
+ 'shopperUserAgent' => order['shopperUserAgent'],
164
+ 'shopperAcceptHeader' => order['shopperAcceptHeader']
165
+ }
166
+ request.merge!(threeDsInfo)
163
167
  end
164
168
 
165
169
  response = sendRequest('orders', request.to_json, true)
data/worldpay.gemspec CHANGED
@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
4
4
 
5
5
  Gem::Specification.new do |spec|
6
6
  spec.name = "worldpay"
7
- spec.version = "1.2.4"
7
+ spec.version = "1.2.5"
8
8
  spec.authors = ["Andrew Odendaal, Paul Beckford"]
9
9
  spec.email = ["andrew.odendaal@worldpay.com"]
10
10
  spec.summary = %q{online.worldpay.com ruby lib.}
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: worldpay
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.2.4
4
+ version: 1.2.5
5
5
  platform: ruby
6
6
  authors:
7
7
  - Andrew Odendaal, Paul Beckford
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2016-06-20 00:00:00.000000000 Z
11
+ date: 2016-11-11 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bundler
@@ -76,7 +76,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
76
76
  version: '0'
77
77
  requirements: []
78
78
  rubyforge_project:
79
- rubygems_version: 2.2.2
79
+ rubygems_version: 2.4.8
80
80
  signing_key:
81
81
  specification_version: 4
82
82
  summary: online.worldpay.com ruby lib.