paynow_sdk 0.1.7 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8a620eb8816c6184a6a9f102dfd2cf8c4731fab78a225146d0a817a1d3761d55
-  data.tar.gz: ca14f270a980615ac6a11a3391a1e86c17f9dd47f40d9d67a54b1060ef98033f
+  metadata.gz: efdbc907da2dc69ea4101875b49b7cfa00fdca200014522d11627a2ba4ca7457
+  data.tar.gz: 4949deb2d18941a0979c33df19e3659286d1e4044f7a516bf320e1ca4ad24ebf
 SHA512:
-  metadata.gz: b93b5059f65572ba247f9f8768e5860ca2cb40009ad7c12f416c280937c6253badaef8dfaba3e276fc56c2e4857cecef3292a8eccc563eb791229bf4f33f4511
-  data.tar.gz: 65302174ce78ebb20bbcfe293117b4ca336b0f1fe6032750e1d9a3c3b736db6dd4aea7e17db5f05f27b3cbfb11e77e313af33eaf2eb2473a43d475955972fc43
+  metadata.gz: '0974c6ca229bb78ffc76d36ef69c5fe4653f6217addf4151c975e98c6ae119093dc683286c3884e8c8fd3a7558fe86af91ae8883f5e6d6548e01dec1e80a63dd'
+  data.tar.gz: 6acf4442269516ce8c257f3478bf856ea876b3ca485185cc8a5be26a5dfcb6415dcaf99f6adbaef29a028cda51ab45d12d09fdfef05ab73ae9e569f7954a606b

data/Gemfile

@@ -7,3 +7,4 @@ gem "rake", "~> 12.0"
 gem "minitest", "~> 5.0"
 gem "minitest-reporters", "~> 1.4", ">= 1.4.2"
 gem "httparty"
+gem "rest-client", "~> 2.1"

data/Gemfile.lock

@@ -1,13 +1,18 @@
 PATH
   remote: .
   specs:
-    paynow_sdk (0.1.7)
+    paynow_sdk (0.1.9)
 
 GEM
   remote: https://rubygems.org/
   specs:
     ansi (1.5.0)
     builder (3.2.4)
+    domain_name (0.5.20190701)
+      unf (>= 0.0.5, < 1.0.0)
+    http-accept (1.7.0)
+    http-cookie (1.0.3)
+      domain_name (~> 0.5)
     httparty (0.18.1)
       mime-types (~> 3.0)
       multi_xml (>= 0.5.2)
@@ -21,8 +26,17 @@ GEM
       minitest (>= 5.0)
       ruby-progressbar
     multi_xml (0.6.0)
+    netrc (0.11.0)
     rake (12.3.3)
+    rest-client (2.1.0)
+      http-accept (>= 1.7.0, < 2.0)
+      http-cookie (>= 1.0.2, < 2.0)
+      mime-types (>= 1.16, < 4.0)
+      netrc (~> 0.8)
     ruby-progressbar (1.10.1)
+    unf (0.1.4)
+      unf_ext
+    unf_ext (0.0.7.7)
 
 PLATFORMS
   ruby
@@ -33,6 +47,7 @@ DEPENDENCIES
   minitest-reporters (~> 1.4, >= 1.4.2)
   paynow_sdk!
   rake (~> 12.0)
+  rest-client (~> 2.1)
 
 BUNDLED WITH
    2.1.4

data/lib/paynow_sdk.rb

@@ -1,38 +1,44 @@
 require "paynow_sdk/version"
-require "httparty"
 require "cgi"
 require "digest"
+require "httparty"
+require "uri"
+require "rest-client"
 
 #throws error when hash from Paynow does not match locally generated hash
 
-class HashMismatch < StandardError
+class HashMismatchException < Exception
   def initialize(message)
     super(message)
   end
 end
 
-# status of the transaction
-
 class StatusResponse
-  attr_accessor :paid, :status, :amount, :reference, :paynow_reference, :hash.to_s
+  @@paid = true
+  @@status = ""
+  @@amount = Float
+  @@reference = ""
+  @@paynow_reference = ""
+  @@hash = ""
+
+  def __status_update(data)
+    return "Not implemented"
+  end
 
   def initialize(data, update)
-    @data = data
-    @update = update
     if update
-      self.status_update(data)
+      __status_update(data)
     else
       @status = data["status"].downcase
-      @paid = self.status == "paid"
-
+      @paid = @status == "paid"
       if data.include?("amount")
         @amount = data["amount"].to_f
       end
       if data.include?("reference")
-        @reference = data["reference"].to_s
+        @reference = data["reference"]
       end
-      if data.include?("paynow_reference")
-        @paynow_reference = data["paynow_reference"].to_s
+      if data.include?("paynowreference")
+        @paynow_reference = data["paynowreference"]
       end
       if data.include?("hash")
         @hash = data["hash"]
@@ -40,38 +46,118 @@ class StatusResponse
     end
   end
 
-  def self.status_update(data)
-    "Not Implemented"
-  end
-end
+  def self.paid; @@paid; end
+  def self.paid=(val); @@paid = val; end
 
-#response from paynow during transaction
+  def paid; @paid = @@paid if @paid.nil?; @paid; end
+  def paid=(val); @paid = val; end
 
-class InitialResponse
-  attr_accessor :success, :has_redirect, :hash, :redirect_url, :error, :poll_url
+  def self.status; @@status; end
+  def self.status=(val); @@status = val; end
 
-  def initialize(data)
-    @data = data
+  def status; @status = @@status if @status.nil?; @status; end
+  def status=(val); @status = val; end
+
+  def self.amount; @@amount; end
+  def self.amount=(val); @@amount = val; end
+
+  def amount; @amount = @@amount if @amount.nil?; @amount; end
+  def amount=(val); @amount = val; end
+
+  def self.reference; @@reference; end
+  def self.reference=(val); @@reference = val; end
+
+  def reference; @reference = @@reference if @reference.nil?; @reference; end
+  def reference=(val); @reference = val; end
 
+  def self.paynow_reference; @@paynow_reference; end
+  def self.paynow_reference=(val); @@paynow_reference = val; end
+
+  def paynow_reference; @paynow_reference = @@paynow_reference if @paynow_reference.nil?; @paynow_reference; end
+  def paynow_reference=(val); @paynow_reference = val; end
+
+  def self.hash; @@hash; end
+  def self.hash=(val); @@hash = val; end
+
+  def hash; @hash = @@hash if @hash.nil?; @hash; end
+  def hash=(val); @hash = val; end
+end
+
+class InitResponse
+  @@success = true
+  @@instructions = ""
+  @@has_redirect = true
+  @@hash = ""
+  @@redirect_url = ""
+  @@error = ""
+  @@poll_url = ""
+
+  def initialize(data)
     @status = data["status"]
     @success = data["status"].downcase != "error"
-    @has_redirect = data["browserurl"]
-    @hash = data["hash"]
-
-    if !success
+    @has_redirect = data.include?("browserurl")
+    @hash = data.include?("hash")
+    if !@success
       @poll_url = data["pollurl"]
+    end
+    if !@success
       @error = data["error"]
     end
-    if !has_redirect
+    if @has_redirect
       @redirect_url = data["browserurl"]
     end
+    if data.include?("instructions")
+      @instruction = data["instructions"]
+    end
   end
-end
 
-#Create a transaction
+  def self.success; @@success; end
+  def self.success=(val); @@success = val; end
+
+  def success; @success = @@success if @success.nil?; @success; end
+  def success=(val); @success = val; end
+
+  def self.instructions; @@instructions; end
+  def self.instructions=(val); @@instructions = val; end
+
+  def instructions; @instructions = @@instructions if @instructions.nil?; @instructions; end
+  def instructions=(val); @instructions = val; end
+
+  def self.has_redirect; @@has_redirect; end
+  def self.has_redirect=(val); @@has_redirect = val; end
+
+  def has_redirect; @has_redirect = @@has_redirect if @has_redirect.nil?; @has_redirect; end
+  def has_redirect=(val); @has_redirect = val; end
+
+  def self.hash; @@hash; end
+  def self.hash=(val); @@hash = val; end
+
+  def hash; @hash = @@hash if @hash.nil?; @hash; end
+  def hash=(val); @hash = val; end
+
+  def self.redirect_url; @@redirect_url; end
+  def self.redirect_url=(val); @@redirect_url = val; end
+
+  def redirect_url; @redirect_url = @@redirect_url if @redirect_url.nil?; @redirect_url; end
+  def redirect_url=(val); @redirect_url = val; end
+
+  def self.error; @@error; end
+  def self.error=(val); @@error = val; end
+
+  def error; @error = @@error if @error.nil?; @error; end
+  def error=(val); @error = val; end
+
+  def self.poll_url; @@poll_url; end
+  def self.poll_url=(val); @@poll_url = val; end
+
+  def poll_url; @poll_url = @@poll_url if @poll_url.nil?; @poll_url; end
+  def poll_url=(val); @poll_url = val; end
+end
 
 class Payment
-  attr_accessor :items, :auth_email, :reference
+  @@reference = ""
+  @@items = []
+  @@auth_email = ""
 
   def initialize(reference, auth_email)
     @reference = reference
@@ -81,27 +167,51 @@ class Payment
   def add(title, amount)
     @items = []
     @items.push([title, amount])
+    self
   end
 
   def total
-    @total = 0.0
-    @items.map do |item|
-      @total += item[1]
-      @total
+    total = 0.0
+    for item in @items
+      total += item[1].to_f
     end
+    total
   end
 
   def info
-    @ticket = ""
-    @items.each do |item|
-      @ticket += item[0] + ", "
-      @ticket
+    out = ""
+    for item in @items
+      out += item[0] + ", "
     end
+    out
   end
+
+  def self.reference; @@reference; end
+  def self.reference=(val); @@reference = val; end
+
+  def reference; @reference = @@reference if @reference.nil?; @reference; end
+  def reference=(val); @reference = val; end
+
+  def self.items; @@items; end
+  def self.items=(val); @@items = val; end
+
+  def items; @items = @@items if @items.nil?; @items; end
+  def items=(val); @items = val; end
+
+  def self.auth_email; @@auth_email; end
+  def self.auth_email=(val); @@auth_email = val; end
+
+  def auth_email; @auth_email = @@auth_email if @auth_email.nil?; @auth_email; end
+  def auth_email=(val); @auth_email = val; end
 end
 
 class Paynow
-  attr_accessor :integration_id, :integration_key, :return_url, :result_url
+  @@url_initiate_transaction = "https://www.paynow.co.zw/interface/initiatetransaction/"
+  @@url_initiate_mobile_transaction = "https://www.paynow.co.zw/interface/remotetransaction/"
+  @@integration_id = ""
+  @@integration_key = ""
+  @@return_url = ""
+  @@result_url = ""
 
   def initialize(integration_id, integration_key, return_url, result_url)
     @integration_id = integration_id
@@ -110,8 +220,12 @@ class Paynow
     @result_url = result_url
   end
 
-  def self.result_url(url)
-    result_url = url
+  def set_result_url(url)
+    @result_url = url
+  end
+
+  def set_return_url(url)
+    @return_url = url
   end
 
   def create_payment(reference, auth_email)
@@ -119,135 +233,145 @@ class Paynow
   end
 
   def send(payment)
-    paying(payment)
+    init(payment)
   end
 
-  # def send_mobile(payment, phone, method)
-  #   paying_mobile(payment, phone, method)
-  # end
+  def send_mobile(payment, phone, method)
+    init_mobile(payment, phone, method)
+  end
 
   def process_status_update(data)
-    return StatusResponse(data)
+    StatusResponse.new(data, true)
   end
 
-  #send the payment body to the paynow api through httparty
-  def paying(payment)
-    # if payment.total <= 0
-    #   raise "Transaction total cannot be less than 1"
-    # end
-    url_initiate_transaction = "https://www.paynow.co.zw/interface/initiatetransaction"
+  # def qs_to_hash(querystring)
+  #   keyvals = querystring.split("&").inject({}) do |result, q|
+  #     k, v = q.split("=")
+  #     if !v.nil?
+  #       result.merge({ k => v })
+  #     elsif !result.key?(k)
+  #       result.merge({ k => true })
+  #     else
+  #       result
+  #     end
+  #   end
+  #   keyvals
+  # end
 
+  def init(payment)
+    if payment.total <= 0
+      raise TypeError, "Transaction total cannot be less than 1"
+    end
     data = build(payment)
-    @response = HTTParty.post(url_initiate_transaction, data)
-    @response_object = @response.parsed_response
 
-    # if @response_object.status == "error"
-    #   InitalResponse.new(@response_object)
-    # end
-    # if !verify_hash(@response_object, integration_key)
-    #   HashMismatchException("Hashes do not match")
+    response = RestClient.post("https://www.paynow.co.zw/interface/initiatetransaction/", data)
+    response_object = rebuild_response(response)
+
+    if response_object["status"].to_s.downcase == "error"
+      InitResponse.new(response_object)
+    end
+    # if !verify_hash(response_object, @integration_key)
+    #   raise HashMismatchException, "Hashes do not match"
     # end
-    InitialResponse.new(@response_object)
+    InitResponse.new(response_object)
   end
 
-  # def paying_mobile(payment, phone, method)
-  #   # if payment.total <= 0
-  #   #   raise "Transaction total cannot be less than 1"
-  #   # end
-
-  #   # if !payment.auth_email || payment.auth_email.length <= 0
-  #   #   raise "Auth email is required for mobile transactions. You can pass the auth email as the "
-  #   #   "second parameter in the create_payment method call"
-  #   # end
-  #   url_initiate_mobile_transaction = "https://www.paynow.co.zw/interface/remotetransaction"
-
-  #   data = build(payment, phone, method)
-
-  #   @response = HTTParty.post(url_initiate_mobile_transaction, data).to_json
-  #   @response_object = rebuild_response(response.parsed_response)
-
-  #   if response_object["status"].to_s == "error"
-  #     InitalResponse.new(response_object)
+  # def init_mobile(payment, phone, method)
+  #   if payment.total <= 0
+  #     raise TypeError, "Transaction total cannot be less than 1"
+  #   end
+  #   if is_bool(!payment.auth_email || payment.auth_email.size <= 0)
+  #     raise TypeError, "Auth email is required for mobile transactions. You can pass the auth email as the second parameter in the create_payment method call"
   #   end
-  #   if !verify_hash(response_object, integration_key)
-  #     raise HashMismatchException("Hashes do not match")
+  #   data = build_mobile(payment, phone, method)
+  #   response = HTTParty.post(@url_initiate_mobile_transaction, data)
+  #   response_object = rebuild_response(response)
+  #   if response_object["status"].to_s.downcase == "error"
+  #     InitResponse.new(response_object)
   #   end
-  #   InitalResponse.new(response_object)
+  #   if is_bool(!verify_hash(response_object, @integration_key))
+  #     raise HashMismatchException, "Hashes do not match"
+  #   end
+  #   InitResponse.new(response_object)
   # end
 
   def check_transaction_status(poll_url)
-    @response = HTTParty.post(poll_url, data)
-    @response_object = response.parsed_response
-
-    StatusResponse.new(@response_object)
+    response = HTTParty.post(poll_url, data: {})
+    response_object = rebuild_response(response)
+    StatusResponse.new(response_object, false)
   end
 
   def build(payment)
-    body = {
-      "id": @integration_id.to_s,
-      "resulturl": result_url,
-      "returnurl": return_url,
-      "reference": payment.reference,
-      "amount": payment.total,
-      "additionalinfo": payment.info,
-      "authemail": payment.auth_email,
-      "status": "Message",
-    }
-
-    #1 join all values into one long string
-    body.each do |key, value|
-      body[key] = %q[value].to_s
-    end
-
-    # 2 Add integration key to the string
-    body["hash"] = ahash(body, integration_key)
-
+    body = { "resulturl": @result_url, "returnurl": @return_url, "reference": payment.reference, "amount": payment.total, "id": @integration_id, "additionalinfo": payment.info, "authemail": payment.auth_email || "", "status": "Message" }
+    joined = body.values.join.to_s
+    add_key = joined += @integration_key
+    body["hash"] = createdhash(add_key)
+    body = URI.encode_www_form(body)
     body
   end
 
-  # def build_mobile(payment, phone, method)
-  #   body = {
-  #     "resulturl": @result_url,
-  #     "returnurl": @return_url,
-  #     "reference": payment.reference,
-  #     "amount": payment.total,
-  #     "id": @integration_id,
-  #     "additionalinfo": payment.info,
-  #     "authemail": payment.auth_email || "",
-  #     "phone": phone,
-  #     "method": method,
-  #     "status": "Message",
-  #   }
-
-  #   body.each do |key, value|
-  #     if key == "authemail"
-  #       next
-  #     end
+  def build_mobile(payment, phone, method)
+    body = { "resulturl": @result_url, "returnurl": @return_url, "reference": payment.reference, "amount": payment.total, "id": @integration_id, "additionalinfo": payment.info, "authemail": payment.auth_email, "phone": phone, "method": method, "status": "Message" }
+    joined = body.values.join.to_s
+    add_key = joined += @integration_key
+    body["hash"] = createdhash(add_key)
+    body = URI.encode_www_form(body)
+    body
+  end
 
-  #     body[key] = %q[value].to_s
-  #   end
+  def createdhash(out)
+    Digest::SHA2.new(512).hexdigest(out).upcase
+  end
 
-  #   body["hash"] = ahash(body, integration_key)
-  #   body
+  #verify the hash send to paynow is equal to the hash from paynow
+  # def verify_hash(response)
+  #   # if !response.include?("hash")
+  #   #   raise TypeError, "Response from Paynow does not contain a hash"
+  #   # end
+  #   old_hash = response["hash"]
+  #   new_hash = createdhash(response)
+  #   old_hash == new_hash
   # end
 
-  # Encrypt the string from body with sha512 and convert to uppercase
-
-  def ahash(body, integration_key)
-    @out = body.values.to_s
-    @out += integration_key.downcase
+  #  rebuild a response from paynow into hash like the we send
 
-    Digest::SHA2.new(512).hexdigest(@out).upcase
+  def rebuild_response(response)
+    URI.decode_www_form(response).to_h
   end
 
-  # def verify_hash(response, integration_key)
-  #   if "hash" != response
-  #     raise "Response from Paynow does not contain a hash"
-  #   end
+  def self.url_initiate_transaction; @@url_initiate_transaction; end
+  def self.url_initiate_transaction=(val); @@url_initiate_transaction = val; end
 
-  #   old_hash = response["hash"]
-  #   new_hash = ahash(response, integration_key)
+  def url_initiate_transaction; @url_initiate_transaction = @@url_initiate_transaction if @url_initiate_transaction.nil?; @url_initiate_transaction; end
+  def url_initiate_transaction=(val); @url_initiate_transaction = val; end
 
-  #   old_hash == new_hash
-  # end
+  def self.url_initiate_mobile_transaction; @@url_initiate_mobile_transaction; end
+  def self.url_initiate_mobile_transaction=(val); @@url_initiate_mobile_transaction = val; end
+
+  def url_initiate_mobile_transaction; @url_initiate_mobile_transaction = @@url_initiate_mobile_transaction if @url_initiate_mobile_transaction.nil?; @url_initiate_mobile_transaction; end
+  def url_initiate_mobile_transaction=(val); @url_initiate_mobile_transaction = val; end
+
+  def self.integration_id; @@integration_id; end
+  def self.integration_id=(val); @@integration_id = val; end
+
+  def integration_id; @integration_id = @@integration_id if @integration_id.nil?; @integration_id; end
+  def integration_id=(val); @integration_id = val; end
+
+  def self.integration_key; @@integration_key; end
+  def self.integration_key=(val); @@integration_key = val; end
+
+  def integration_key; @integration_key = @@integration_key if @integration_key.nil?; @integration_key; end
+  def integration_key=(val); @integration_key = val; end
+
+  def self.return_url; @@return_url; end
+  def self.return_url=(val); @@return_url = val; end
+
+  def return_url; @return_url = @@return_url if @return_url.nil?; @return_url; end
+  def return_url=(val); @return_url = val; end
+
+  def self.result_url; @@result_url; end
+  def self.result_url=(val); @@result_url = val; end
+
+  def result_url; @result_url = @@result_url if @result_url.nil?; @result_url; end
+  def result_url=(val); @result_url = val; end
 end