khipu-rails 0.0.1 → 1.3.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: afe86cd2381326f7498e3e3d18705bd590601c65
+  data.tar.gz: 9e15f6290e3c8ab8d6da845d7a120576dca1b029
+SHA512:
+  metadata.gz: 31339a0a406d849fef4be7669f9f5207f00f4597848def1c786e3ce5de483104bed8593453be89e5de3f005db3409f9c001621d862147560d6536df7db972e6e
+  data.tar.gz: eba94c9ac2b82464460ae4052f4cfa650fbb8433ddc5f3841513343d05746f20d38470da3a946a88c65968d79d332930c9477c1b0f0ecae5faf64f8122d24628

data/README.md

@@ -1,6 +1,7 @@
 # KhipuRails
 
-[Khipu](https://khipu.com/home) is a service that facilitates web billing and collection in Chile.
+[Khipu](https://khipu.com/home) is a service that facilitates web billing and collection in **Chile**.
+
 It handles very elegantly bank transfers and allows to generate bills in batches.
 It offers an API for developers to create via POST new charges.
 
@@ -11,13 +12,38 @@ Add to your Gemfile and run the `bundle` command to install it.
 gem 'khipu-rails'
 ```
 
-Create an initializer with the following code.
+If you want to work with the gem in development, you can allways use the git repository.
 ```ruby
-KhipuRails::Config.user_id = ID
-KhipuRails::Config.api_key = API KEY
+gem 'khipu-rails', :git => "http://github.com/Janther/khipu-rails"
 ```
 
-*ID and API KEY can be found [here](https://khipu.com/merchant/profile#instant-notification-data)*
+## Configuration v0.0.2
+Version 0.0.2 will have a configure method much more flexible and powerfull
+```ruby
+KhipuRails.configure do |config|
+  ##
+  # Use receivers to set one or more receivers to the gem.
+  # #add_receiver has 3 parameters, receiver_id, receiver_key, and receiver_mode(:dev|:pro) 
+  ##
+  config.add_receiver "receiver1_id", "receiver1_key", :dev
+  config.add_receiver "receiver2_id", "receiver2_key", :pro
+                      ...
+
+  ##
+  # Use button_images to set one or more urls for the custom button images you might have.
+  # Khipu's images are already registered.
+  # Each button image is key/value pair
+  # The same as with the receivers registration, use this method as a shortcut for long urls on your view.
+  ##
+  config.button_images.merge! :shortcut => "url"
+
+  ##
+  # The hash defaults can also be modified, giving you control of the default values the helper khipu_button uses.
+  ##
+  config.button_defaults.merge! :variable_name => variable_value
+end
+```
+*receiver_id and receiver_key can be found [here](https://khipu.com/merchant/profile#instant-notification-data)*
 
 # Features
 
@@ -64,18 +90,38 @@ Options:
 
 **200x75**: ![200x75 Button](https://s3.amazonaws.com/static.khipu.com/buttons/200x75.png)
 
-# TODO:
-
-## Validation of payment notifications
+## Validation of payment notifications *(Waiting for Khipu to release developer accounts.)*
 
 If you provide an URL for Khipu to deliver [notifications](https://khipu.com/page/api#notification-instantanea) on succesfull payments, this gem provides a validation method to prevent forgery of notifications.
 
 ### khipu_validation
 
-**khipu_validation params, local_validation = false**
+**KhipuRails::NotificationValidator.is_valid? notification, mode = :local**
+
+* **notification**: The POST params delivered by Khipu.
+* **mode**: Whether the validation should be done at the **[:local](https://khipu.com/page/api#validacion-local)** or by **[:webservice](https://khipu.com/page/api#validacion-web-service)**.
+
+# TODO:
+
+## New Features
+
+### khipu_button v2
+**khipu_button subject, amount, options = {}, &block**
+
+Options:
+* **:hash_url**: if provided the hash won't be generated by default and upon submit, it will be requested.
+* **:form_options**: html options for the form.
+* **:button_options**: html options for the button.
+
+Block
+&block: If a block is given the helper will render it within the form. This can be usefull for further customization of the form.
+
+**If the block contains a submit input, a button or an image input, it won't render the image input provided by the helper.**
+
+### khipu_hash
+**khipu_hash options = {}**
 
-* **params**: The POST params delivered by Khipu.
-* **local_validation**: Wether the validation should be done at the [local machine](https://khipu.com/page/api#validacion-local) or by [Khipu's API](https://khipu.com/page/api#validacion-web-service).
+Generator of the Khipu hash made public so you can include it in an action when **:hash_url** is given to the form.
 
 ## Contributing
 

data/app/controllers/khipu_rails/application_controller.rb

@@ -0,0 +1,5 @@
+module KhipuRails
+  class ApplicationController < ActionController::Base
+    protect_from_forgery
+  end
+end

data/app/controllers/khipu_rails/khipu_controller.rb

@@ -0,0 +1,23 @@
+module KhipuRails
+  class KhipuController < KhipuRails::ApplicationController
+    def notification
+      @notification = {
+        api_version:            params[:api_version],
+        receiver_id:            params[:receiver_id],
+        notification_id:        params[:notification_id],
+        subject:                params[:subject],
+        amount:                 params[:amount],
+        currency:               params[:currency],
+        transaction_id:         params[:transaction_id],
+        payer_email:            params[:payer_email],
+        custom:                 params[:custom],
+        notification_signature: params[:notification_signature]
+      }
+
+      valid = KhipuRails::NotificationValidator.is_valid?(@notification, :webservice)
+      # if valid
+      # else
+      # end
+    end
+  end
+end

data/app/views/khipu_rails/khipu/notification.html

@@ -0,0 +1,2 @@
+<h1>Gracias khipu.</h1>
+<small>Powered by khipu-rails</small>

data/app/views/layouts/khipu_rails/application.html.erb

@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta charset='utf-8'>
+  <title>Khipu-Rails</title>
+</head>
+<body>
+<%= yield %>
+</body>
+</html>

data/config/khipu.pem.cer

@@ -0,0 +1,81 @@
+-----BEGIN CERTIFICATE-----
+MIIFuDCCBSGgAwIBAgIQHCWU8WfzVpZq9iYPMgYpVzANBgkqhkiG9w0BAQUFADCB
+0DEUMBIGA1UEChMLRS1TaWduIFMuQS4xHzAdBgNVBAsTFlZlcmlTaWduIFRydXN0
+IE5ldHdvcmsxODA2BgNVBAsTL1Rlcm1zIG9mIHVzZSBhdCBodHRwczovL3d3dy5l
+LXNpZ24uY2wvcnBhIChjKTA1MTwwOgYDVQQDEzNFLVNpZ24gU0MgQ2xhc3MgMiBD
+b25zdW1lciBJbmRpdmlkdWFsIFN1YnNjcmliZXIgQ0ExHzAdBgkqhkiG9w0BCQEW
+EGUtc2lnbkBlLXNpZ24uY2wwHhcNMTIxMTA3MDAwMDAwWhcNMTMxMTA3MjM1OTU5
+WjCCAQgxMDAuBgNVBAsTJ1Rlcm1zIG9mIHVzZSBhdCB3d3cuZS1zaWduLmNsL3Jw
+YSBDKDA0KTElMCMGA1UECxMcQXV0aGVudGljYXRlZCBieSBFLVNpZ24gUy5BLjEn
+MCUGA1UECxMeTWVtYmVyLCBWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMRswGQYDVQQL
+ExJEaWdpdGFsIElEIENsYXNzIDIxGDAWBgNVBAsUD1JVVCAtIDkxMjM4NDUtNDEl
+MCMGA1UEAxMcUm9iZXJ0byBBbmRyZXMgT3Bhem8gR2F6bXVyaTEmMCQGCSqGSIb3
+DQEJARYXcm9iZXJ0by5vcGF6b0BraGlwdS5jb20wggEiMA0GCSqGSIb3DQEBAQUA
+A4IBDwAwggEKAoIBAQC4xI/f6C/5V/KsIAQY3G2ExoqIb8NoM7czRw9UNdx/OEiL
+QJfqJjx1gVkcZxHqcWT6DENuf7H2LyYvzXOfeQgN5Zw8FCdIxjoF00AOIf3YDLdG
+0IXoiRuZWPh9JkbGyl/tSd/fJWSh12GQAUE0m0YYMNHGiNPqiZ3jJEUgNWKjfO2D
+xMqTGrujDnA3qF/2SiBrWRj5XyZCIYumrHWKGQnvmd6uaH4SOyaPc1Jl8byqfzg6
+GlHX2hWyVJ2Tc+GHxAiSm8RzUfSAfgCbUm+/8gX0uDlGA7dqaa9FIZh7RWBdN4Nn
+Dd9XHEOtXnBVL6mFzut57eAwEHz+a6tv2E2yy/GJAgMBAAGjggHSMIIBzjAiBgNV
+HREEGzAZoBcGCCsGAQQBwQEBoAsWCTkxMjM4NDUtNDAJBgNVHRMEAjAAMAsGA1Ud
+DwQEAwIFoDCBmQYDVR0gBIGRMIGOMIGLBgtghkgBhvhFAQcXAjB8MDEGCCsGAQUF
+BwIBFiVodHRwczovL3d3dy5lLXNpZ24uY2wvcmVwb3NpdG9yaW8uaHRtMEcGCCsG
+AQUFBwICMDsaOUNlcnRpZmljYWRvIHBhcmEgdXNvIFRyaWJ1dGFyaW8sIENvbWVy
+Y2lvLCBQYWdvcyB5IE90cm9zLjAjBgNVHRIEHDAaoBgGCCsGAQQBwQECoAwWCjk5
+NTUxNzQwLUswTQYDVR0fBEYwRDBCoECgPoY8aHR0cDovL29uc2l0ZWNybC52ZXJp
+c2lnbi5jb20vRVNpZ25TQUNTQ0NsYXNzMi9MYXRlc3RDUkwuY3JsMDsGCCsGAQUF
+BwEBBC8wLTArBggrBgEFBQcwAYYfaHR0cDovL29uc2l0ZS1vY3NwLnZlcmlzaWdu
+LmNvbTAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwQwEQYJYIZIAYb4QgEB
+BAQDAgeAMBEGCmCGSAGG+EUBBgkEAwEB/zANBgkqhkiG9w0BAQUFAAOBgQAFiXQz
+K9TrKWkJH3is2H/QI8gynHQV71kvmSUnRgPk5TdXzd6EDhbaQMC3pCdwhpKKUfFo
+0Ky8wtkagE8jdCRkpDfGpnhINfJZW9HH3gKe2zFckynPZcV5fsVM1tQzWQNBPaFf
+scJQlyZrC17dCDWkJ2op67BRjp97skB1SUWtRw==
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIDAzCCAmwCEQC5L2DMiJ+hekYJuFtwbIqvMA0GCSqGSIb3DQEBBQUAMIHBMQsw
+CQYDVQQGEwJVUzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xPDA6BgNVBAsTM0Ns
+YXNzIDIgUHVibGljIFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgLSBH
+MjE6MDgGA1UECxMxKGMpIDE5OTggVmVyaVNpZ24sIEluYy4gLSBGb3IgYXV0aG9y
+aXplZCB1c2Ugb25seTEfMB0GA1UECxMWVmVyaVNpZ24gVHJ1c3QgTmV0d29yazAe
+Fw05ODA1MTgwMDAwMDBaFw0yODA4MDEyMzU5NTlaMIHBMQswCQYDVQQGEwJVUzEX
+MBUGA1UEChMOVmVyaVNpZ24sIEluYy4xPDA6BgNVBAsTM0NsYXNzIDIgUHVibGlj
+IFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgLSBHMjE6MDgGA1UECxMx
+KGMpIDE5OTggVmVyaVNpZ24sIEluYy4gLSBGb3IgYXV0aG9yaXplZCB1c2Ugb25s
+eTEfMB0GA1UECxMWVmVyaVNpZ24gVHJ1c3QgTmV0d29yazCBnzANBgkqhkiG9w0B
+AQEFAAOBjQAwgYkCgYEAp4gBIXQs5xoD8JjhlzwPIQjxnNuX6Zr8wgQGE75fUsjM
+HiwSViy4AWkszJkfrbCWrnkE8hM5wXuYuggs6MKEEyyqaekJ9MepAqRCwiNPStjw
+DqL7MWzJ5m+ZJwf15vRMeJ5t60aG+rmGyVTyssSv1EYcWskVMP8NbPUtDm3Of3cC
+AwEAATANBgkqhkiG9w0BAQUFAAOBgQByLvl/0fFx+8Se9sVeUYpAmLho+Jscg9ji
+nb3/7aHmZuovCfTK1+qlK5X2JGCGTUQug6XELaDTrnhpb3LabK4I8GOSN+a7xDAX
+rXfMSTWqz9iP0b63GJZHc2pUIjRkLbYWm1lbtFFZOrMLFPQS32eg9K0yZF6xRnIn
+jBJ7xUS0rg==
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIE+TCCBGKgAwIBAgIQKin05rwB5h97p8C1gITJ/TANBgkqhkiG9w0BAQUFADCB
+wTELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMTwwOgYDVQQL
+EzNDbGFzcyAyIFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5
+IC0gRzIxOjA4BgNVBAsTMShjKSAxOTk4IFZlcmlTaWduLCBJbmMuIC0gRm9yIGF1
+dGhvcml6ZWQgdXNlIG9ubHkxHzAdBgNVBAsTFlZlcmlTaWduIFRydXN0IE5ldHdv
+cmswHhcNMDUwMTI2MDAwMDAwWhcNMTMxMjMxMjM1OTU5WjCB0DEUMBIGA1UEChML
+RS1TaWduIFMuQS4xHzAdBgNVBAsTFlZlcmlTaWduIFRydXN0IE5ldHdvcmsxODA2
+BgNVBAsTL1Rlcm1zIG9mIHVzZSBhdCBodHRwczovL3d3dy5lLXNpZ24uY2wvcnBh
+IChjKTA1MTwwOgYDVQQDEzNFLVNpZ24gU0MgQ2xhc3MgMiBDb25zdW1lciBJbmRp
+dmlkdWFsIFN1YnNjcmliZXIgQ0ExHzAdBgkqhkiG9w0BCQEWEGUtc2lnbkBlLXNp
+Z24uY2wwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAMbSfBEWnvbhoREERJlU
+5SxH409463pkSrLlnGkgKBbt6shef4TWJoIKaPzpaXtU9Fly43U12MBPU4otfGkU
+IDiaXnQY6yqVhJvTQg6NChYztY4XFvZAoHiJzFrD795YNXtoYA37u0KwbjRg35GC
+cGuAwRUzq+khug6u4Ygt8VVnAgMBAAGjggHfMIIB2zAPBgNVHRMECDAGAQH/AgEA
+MEEGA1UdIAQ6MDgwNgYLYIZIAYb4RQEHFwIwJzAlBggrBgEFBQcCARYZaHR0cHM6
+Ly93d3cuZS1zaWduLmNsL3JwYTA0BgNVHR8ELTArMCmgJ6AlhiNodHRwOi8vY3Js
+LnZlcmlzaWduLmNvbS9wY2EyLWcyLmNybDALBgNVHQ8EBAMCAQYwEQYJYIZIAYb4
+QgEBBAQDAgEGMCUGA1UdEQQeMBykGjAYMRYwFAYDVQQDEw1BZmZpbGlhdGUxLTE1
+MB0GA1UdDgQWBBSkk4EtStpWTpY7+B+Rgdeh8j2GrzCB6AYDVR0jBIHgMIHdoYHH
+pIHEMIHBMQswCQYDVQQGEwJVUzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xPDA6
+BgNVBAsTM0NsYXNzIDIgUHVibGljIFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRo
+b3JpdHkgLSBHMjE6MDgGA1UECxMxKGMpIDE5OTggVmVyaVNpZ24sIEluYy4gLSBG
+b3IgYXV0aG9yaXplZCB1c2Ugb25seTEfMB0GA1UECxMWVmVyaVNpZ24gVHJ1c3Qg
+TmV0d29ya4IRALkvYMyIn6F6Rgm4W3Bsiq8wDQYJKoZIhvcNAQEFBQADgYEAaeuM
+S20zHfi83LtoyvH+nr54DcblrQWdrHj3MfyEOFEDsHiAgFtaHXqW9U0zKDpxt76b
+Dx9MA2Gy/fU6BKal52yjMOAC8VOh+mT5Nd7zBwrKHddeftCvYTEGNabgfXyIpVVV
+y/nIVbLsBOJjQDS1y/LR7GldVSqyX0W1yZYGwoo=
+-----END CERTIFICATE-----

data/config/khipu_dev.pem.cer

@@ -0,0 +1,22 @@
+-----BEGIN CERTIFICATE-----
+MIIDszCCApsCBFA88VcwDQYJKoZIhvcNAQEFBQAwgZ0xIDAeBgkqhkiG9w0BCQEW
+EXJvYmVydG9Acm9wYXpvLmNsMQswCQYDVQQGEwJDTDERMA8GA1UECAwIU2FudGlh
+Z28xCzAJBgNVBAcMAlJNMRIwEAYDVQQKDAlLaGlwdS5jb20xGDAWBgNVBAsMD0dl
+cmVudGUgR2VuZXJhbDEeMBwGA1UEAwwVUm9iZXJ0byBPcGF6byBHYXptdXJpMB4X
+DTEyMDgyODE2MjcwM1oXDTEzMDgyODE2MjcwM1owgZ0xIDAeBgkqhkiG9w0BCQEW
+EXJvYmVydG9Acm9wYXpvLmNsMQswCQYDVQQGEwJDTDERMA8GA1UECAwIU2FudGlh
+Z28xCzAJBgNVBAcMAlJNMRIwEAYDVQQKDAlLaGlwdS5jb20xGDAWBgNVBAsMD0dl
+cmVudGUgR2VuZXJhbDEeMBwGA1UEAwwVUm9iZXJ0byBPcGF6byBHYXptdXJpMIIB
+IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAk+0IYrfbAPSRSX8u3+js786J
+QTMXGS52LUFHOKXokQbqfcbPs9qwBDr4NeRbM3GQ8CRLLM9PKenHbd93ErpY4GDC
+CWZPU9RA4nFgJa/pJzFEf74dR0tQOnEdEDwCdlAp7EkVFIUnweSDG0QG9Dedvn/J
+tlHMRM0NXQSq6NxFPzjTyK4/J5g86V9LPEt6h+TpQACKxGxKa9cDdt6n8wDhskwV
+V6xiwkq+j+tNh5+DIdKstceG8UulgdpgTt9r7kr9FVwL1L3ugJ4zK1fGYbTwPQRu
+H9C0y7vZ/Mjm/osv9BAm0r57ywVgPU6af2yrTMhMkuCkMrIq4qW0XDiCTiso8QID
+AQABMA0GCSqGSIb3DQEBBQUAA4IBAQCO6do2tYvE5/nLYnPXQbpUhhJLvZbJd+Nl
+jLUlju2yzgNLFA3g19t9uKxKRG497//WdxHoa3lAPnY8IO+DgKp5dOMcKLopz+AX
+jsElzCQxcPNqlYwGQgEDDm9q0WXs1Dg22y0Af1oR5Lx9XR1xWsw4z/6YEDUJRa7D
+fAUIip+ocbMykuUvnrNU/wUDRv8VbsIoMr+1CK3pKACSUuB8ZhYfRUjgHEXKh4O5
+I/hKy49jGW/9i5GOTEGGzOvHm2CIrpBPFWfKSJLjvLtYWbBuCyKK5+FsP4wuN8Rv
+yLM1MDg00bd5M5MmTA1FFNGiGUqpfo7z+kcqRFOJqWm7bmaDvZVJ
+-----END CERTIFICATE-----

data/config/routes.rb

@@ -0,0 +1,3 @@
+KhipuRails::Engine.routes.draw do
+  post '/khipu_notification' => 'khipu#notification'
+end

data/khipu-rails.gemspec

@@ -8,8 +8,8 @@ Gem::Specification.new do |gem|
   gem.version       = KhipuRails::VERSION
   gem.authors       = ["Klaus Hott Vidal"]
   gem.email         = ["klahott@gmail.com"]
-  gem.description   = %q{This gem provides a rails wrapper for the khipu api.}
-  gem.summary       = %q{This gem provides a rails wrapper for the khipu api.}
+  gem.description   = %q{This gem provides an ActionView helper that creates a form following Khipu's documentation.}
+  gem.summary       = %q{Wrapper for the Khipu api.}
   gem.homepage      = %q{https://github.com/janther/khipu-rails}
 
   gem.files         = `git ls-files`.split($/)
@@ -17,9 +17,11 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.add_dependency "rails", "~> 3.1.10"
+  gem.add_dependency "rails", ">= 3.1"
+  gem.add_dependency "jquery-rails"
+  gem.add_dependency "nokogiri"
+  gem.add_dependency "httpclient"
 
   gem.add_development_dependency "rspec-rails"
-  gem.add_development_dependency "nokogiri"
   gem.add_development_dependency "capybara", "~> 1.1.2"
 end

data/lib/khipu-rails.rb

@@ -1,7 +1,9 @@
 # encoding: utf-8
 require "khipu_rails"
 require "khipu_rails/version"
+require "khipu_rails/receiver"
 require "khipu_rails/config"
 require "khipu_rails/button_helper"
+require "khipu_rails/notification_validator"
 
 ActionView::Base.send :include, KhipuRails::ButtonHelper

data/lib/khipu_rails.rb

@@ -1,2 +1,61 @@
+# encoding: utf-8
 module KhipuRails
-end
+  extend self
+
+  def configure
+    yield config
+  end
+
+  def config
+    @config ||= Config.default
+  end
+
+  attr_writer :config
+
+  def khipu_hash options = {}
+    options.reverse_merge! KhipuRails.config.button_defaults
+
+    receiver = load_receiver options
+    OpenSSL::HMAC.hexdigest('sha256', receiver.key, raw_hash(options, receiver))
+  end
+
+  def raw_hash options = {}, receiver = load_receiver(options)
+    options.reverse_merge! KhipuRails.config.button_defaults
+
+    raw = [
+      "receiver_id=#{receiver.id}",
+      "subject=#{options[:subject]}",
+      "body=#{options[:body]}",
+      "amount=#{options[:amount]}",
+      "payer_email=#{options[:payer_email]}",
+      "bank_id=#{options[:bank_id]}",
+      "expires_date=#{options[:expires_date]}",
+      "transaction_id=#{options[:transaction_id]}",
+      "custom=#{options[:custom]}",
+      "notify_url=#{options[:notify_url]}",
+      "return_url=#{options[:return_url]}",
+      "cancel_url=#{options[:cancel_url]}",
+      "picture_url=#{options[:picture_url]}"
+    ].join('&')
+
+    raw
+  end
+
+  def root
+    File.expand_path '../..', __FILE__
+  end
+
+  private
+
+  def load_receiver options
+    if options[:receiver_id].present?
+      if options[:secret].present?
+        KhipuRails::Receiver.new options[:receiver_id], options[:secret]
+      else
+        KhipuRails.config.receivers.find{|r| r.id == options[:receiver_id]}
+      end
+    else
+      KhipuRails.config.receivers.first
+    end
+  end
+end

data/lib/khipu_rails/button_helper.rb

@@ -3,55 +3,66 @@ module KhipuRails
   module ButtonHelper
     def khipu_button subject, amount, options = {}
       options.reverse_merge! body:           '',
+                             payer_email:    '',
+                             bank_id:        '',
+                             expires_date:   '',
+                             notify_url:     '',
                              return_url:     '',
                              cancel_url:     '',
                              transaction_id: '',
-                             payer_email:    '',
                              picture_url:    '',
                              custom:         '',
-                             button_image:   '50x25',                    #Default Button Image
-                             receiver_id:    KhipuRails::Config.user_id, #Loads user id from configuration
-                             secret:         KhipuRails::Config.api_key  #Loads api key from configuration
+                             button_image:   '50x25',                             #Default Button Image
+                             receiver_id:    KhipuRails.config.receivers.first.id #Loads first receiver from configuration by default
 
-      options[:subject] = subject #Adds the subject param to the options for khipu_hash
-      options[:amount]  = amount  #Adds the amount param to the options for khipu_hash
+      button_image = KhipuRails.config.button_images()[options[:button_image]] || options[:button_image]
 
-      button_image = KhipuRails::Config.khipu_images()[options[:button_image]] || options[:button_image]
-
-      form_tag 'https://khipu.com/payment/api/createPaymentPage', authenticity_token: false do
-        [].tap do |i|
-          i << hidden_field_tag(:receiver_id, options[:receiver_id])
+      form_tag 'https://khipu.com/api/1.3/createPaymentPage', authenticity_token: false do
+        fields = [].tap do |i|
+          i << hidden_field_tag(:receiver_id,    options[:receiver_id])
           i << hidden_field_tag(:subject, subject)
-          i << hidden_field_tag(:body, options[:body])
-          i << hidden_field_tag(:amount, amount)
-          i << hidden_field_tag(:return_url, options[:return_url])
-          i << hidden_field_tag(:cancel_url, options[:cancel_url])
-          i << hidden_field_tag(:custom, options[:custom])
+          i << hidden_field_tag(:body,           options[:body])
+          i << hidden_field_tag(:amount,  amount)
+          i << hidden_field_tag(:payer_email,    options[:payer_email])
+          i << hidden_field_tag(:bank_id,        options[:bank_id])
+          i << hidden_field_tag(:expires_date,   options[:expires_date])
           i << hidden_field_tag(:transaction_id, options[:transaction_id])
-          i << hidden_field_tag(:payer_email, options[:payer_email])
-          i << hidden_field_tag(:picture_url, options[:picture_url])
-          i << hidden_field_tag(:hash, khipu_hash(options))
+          i << hidden_field_tag(:custom,         options[:custom])
+          i << hidden_field_tag(:notify_url,     options[:notify_url])
+          i << hidden_field_tag(:return_url,     options[:return_url])
+          i << hidden_field_tag(:cancel_url,     options[:cancel_url])
+          i << hidden_field_tag(:picture_url,    options[:picture_url])
+        end.join.html_safe
+
+        ng = Nokogiri::HTML.parse fields
+
+        hash_fields = {
+          receiver_id:    get_value(ng, :receiver_id),
+          subject:        get_value(ng, :subject),
+          body:           get_value(ng, :body),
+          amount:         get_value(ng, :amount),
+          payer_email:    get_value(ng, :payer_email),
+          bank_id:        get_value(ng, :bank_id),
+          expires_date:   get_value(ng, :expires_date),
+          transaction_id: get_value(ng, :transaction_id),
+          custom:         get_value(ng, :custom),
+          notify_url:     get_value(ng, :notify_url),
+          return_url:     get_value(ng, :return_url),
+          cancel_url:     get_value(ng, :cancel_url),
+          picture_url:    get_value(ng, :picture_url),
+          secret:         options[:secret]
+        }
+
+        [fields].tap do |i|
+          i << hidden_field_tag(:hash, KhipuRails.khipu_hash(hash_fields))
           i << image_submit_tag(button_image, name: :submit)
         end.join.html_safe
       end
     end
 
     private
-    def khipu_hash options = {}
-      raw = [
-        "receiver_id=#{options[:receiver_id]}",
-        "subject=#{options[:subject]}",
-        "body=#{options[:body]}",
-        "amount=#{options[:amount]}",
-        "return_url=#{options[:return_url]}",
-        "cancel_url=#{options[:cancel_url]}",
-        "custom=#{options[:custom]}",
-        "transaction_id=#{options[:transaction_id]}",
-        "picture_url=#{options[:picture_url]}",
-        "payer_email=#{options[:payer_email]}",
-        "secret=#{options[:secret]}"
-      ].join('&')
-      Digest::SHA1.hexdigest raw
+    def get_value inputs, attribute
+      inputs.css("input[name=#{attribute}]").attribute('value').value
     end
   end
 end