worldpay 1.0.5 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e92644d37cb8da4444775fd15e0baa0499324e37
-  data.tar.gz: 05d4eb59966c00ca06031043c3afe56f398a2454
+  metadata.gz: 035b83919e61de6a530c882706c513391dd2fa9a
+  data.tar.gz: 8d4c3e3d0226219f72464e4305ac3495dc9e8143
 SHA512:
-  metadata.gz: 4d768380d5dd922350c15793d05d91e0c8aaf38fe19f44a6617c6a76b9627301cdf4e4987e408b37c47e0c0ef5438cf941c48b161d59e35396535839e6933558
-  data.tar.gz: 027ffd22c1f2ab8e4af06c5891c12f53bc0439cf2a3b875e48d89b2fd7b5855aea6457e64740af1ca5643dd0acd2c3f18542e4e5614c4f042787455ea8a23391
+  metadata.gz: 97ac464d180ba7b8963f54f1081f24039cb3832fce88b97e5532f0dc134ef63419680fc9c23344867d2b5c87aae057ca969dabc73d3719b363975911dabd219b
+  data.tar.gz: 9ed4b54692604b6b5c21f7f44cf25ebc597fcdd3fe9df24eb992a0cfd2c1da56e9189ce7e75442fb4568aa15b25044343f1064bafe67b005c2a03f6d28ce6e32

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    worldpay (1.0.4)
+    worldpay (1.0.6)
 
 GEM
   remote: https://rubygems.org/

data/lib/worldpay.rb

@@ -14,7 +14,9 @@ class Worldpay
   @errors = {}
   @raise_errors = true
 
-  @version = '1.0.5'
+  @version = '1.0.6'
+
+  @orderTypes = ['ECOM','MOTO','RECURRING']
 
 
   def initialize(service_key='', timeout=3, raise_errors=true)
@@ -47,6 +49,9 @@ class Worldpay
           },
           'notificationPost' => 'Notification Error: Not a post',
           'notificationUnknown' => 'Notification Error: Cannot be processed',
+          'capture' => {
+              'ordercode' => 'No order code entered'
+          },
           'refund' => {
               'ordercode' => 'No order code entered'
           },
@@ -80,13 +85,6 @@ class Worldpay
   def onError(error, message=false, code=nil, httpStatusCode=nil, description=nil, customCode=nil)
 
 
-
-=begin
-    if (message)
-      message = ' - '+message
-    end
-=end
-
     if (@raise_errors)
       raise message.to_s
     else
@@ -134,7 +132,7 @@ class Worldpay
     self.checkOrderInput(order)
 
     defaults = {
-        'orderType' => 'ECOM',
+        'orderType' => 'ECOM',  #Order Type: ECOM/MOTO/RECURRING
         'customerIdentifiers' => nil,
         'billingAddress' => nil
     }
@@ -151,7 +149,8 @@ class Worldpay
         'is3DSOrder' => order['3DS'],
         'currencyCode' => order['currencyCode'],
         'name' => order['name'],
-        'orderType' => order['orderType'],
+        'orderType' => order['orderType'] && @orderTypes ? (@orderTypes.include?(order['orderType']) ? order['orderType'] : 'ECOM') : 'ECOM',
+        'authorizeOnly' => order['authoriseOnly'] ? true : false,
         'billingAddress' => order['billingAddress'],
         'customerOrderCode' => order['customerOrderCode'],
         'customerIdentifiers' => order['customerIdentifiers']
@@ -197,6 +196,33 @@ class Worldpay
       end
   end
 
+  #Capture Authorized Worldpay Order
+  def captureAuthorisedOrder(orderCode=false, amount=false)
+    if (orderCode || orderCode.is_a?(String))
+      #
+    else
+      onError('ip', @errors['capture']['ordercode'])
+    end
+
+    if (amount && amount.is_a?(Integer))
+      json = {'captureAmount'=>amount}.to_json
+    end
+
+    sendRequest('orders/'+orderCode+'/capture', (json||false))
+  end
+
+  #Cancel Authorized Worldpay Order
+  def cancelAuthorisedOrder(orderCode=false)
+    if (orderCode || orderCode.is_a?(String))
+      #
+    else
+      onError('ip', @errors['capture']['ordercode'])
+    end
+
+    sendRequest('orders/'+orderCode, false, false, 'DELETE')
+  end
+
+
   #Refund Worldpay order
   def refundOrder(orderCode=false, amount=false)
     if (orderCode==false || orderCode!=orderCode.to_s)
@@ -224,8 +250,12 @@ class Worldpay
       request = Net::HTTP::Get.new('/v1/'+action)
     elsif (method=="PUT")
       request = Net::HTTP::Put.new('/v1/'+action)
+    elsif (method=="DELETE")
+      request = Net::HTTP::Delete.new('/v1/'+action)
     end
 
+    # ? request = Net::HTTP::Put.new('/v1/'+action)
+
     net.use_ssl = true
     net.verify_mode = @disable_ssl ? OpenSSL::SSL::VERIFY_NONE : OpenSSL::SSL::VERIFY_PEER
 
@@ -247,8 +277,6 @@ class Worldpay
     response = net.start do |http|
       http.request(request)
     end
-    #puts response.code
-    #puts response.read_body
 
     return {
         "code"=>response.code,

data/worldpay.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "worldpay"
-  spec.version       = "1.0.5"
+  spec.version       = "1.0.6"
   spec.authors       = ["Andrew Odendaal, Paul Beckford"]
   spec.email         = ["andrew.odendaal@worldpay.com"]
   spec.summary       = %q{online.worldpay.com ruby lib.}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: worldpay
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
 platform: ruby
 authors:
 - Andrew Odendaal, Paul Beckford
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-09 00:00:00.000000000 Z
+date: 2015-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -63,6 +63,7 @@ files:
 - worldpay-1.0.2.gem
 - worldpay-1.0.3.gem
 - worldpay-1.0.4.gem
+- worldpay-1.0.5.gem
 - worldpay.gemspec
 homepage: https://online.worldpay.com
 licenses: