killbill-litle 1.10.0 → 2.0.0

data/NEWS

@@ -1,3 +1,6 @@
+2.0.0
+    Initial release for Kill Bill 0.14.x
+
 1.10.0
     Update to latest killbill
     Change groupId to org.kill-bill.billing.plugin.ruby

data/README.md

@@ -1,125 +1,85 @@
-[![Build Status](https://travis-ci.org/killbill/killbill-litle-plugin.png)](https://travis-ci.org/killbill/killbill-litle-plugin)
-[![Code Climate](https://codeclimate.com/github/killbill/killbill-litle-plugin.png)](https://codeclimate.com/github/killbill/killbill-litle-plugin)
-
 killbill-litle-plugin
 =====================
 
-Plugin to use Litle & Co. as a gateway.
+Plugin to use [Litle & Co.](https://www.litle.com/) as a gateway.
 
 Release builds are available on [Maven Central](http://search.maven.org/#search%7Cga%7C1%7Cg%3A%22org.kill-bill.billing.plugin.ruby%22%20AND%20a%3A%22litle-plugin%22) with coordinates `org.kill-bill.billing.plugin.ruby:litle-plugin`.
 
+Kill Bill compatibility
+-----------------------
+
+| Plugin version | Kill Bill version |
+| -------------: | ----------------: |
+| 2.x.y          | 0.14.z            |
+
 Requirements
 ------------
 
-The plugin needs a database. The latest version of the schema can be found here: https://raw.github.com/killbill/killbill-litle-plugin/master/db/ddl.sql.
+The plugin needs a database. The latest version of the schema can be found [here](https://github.com/killbill/killbill-litle-plugin/blob/master/db/ddl.sql).
+
+Configuration
+-------------
+
+```
+curl -v \
+     -X POST \
+     -u admin:password \
+     -H 'X-Killbill-ApiKey: bob' \
+     -H 'X-Killbill-ApiSecret: lazar' \
+     -H 'X-Killbill-CreatedBy: admin' \
+     -H 'Content-Type: text/plain' \
+     -d ':litle:
+  - :account_id: USD
+    :merchant_id: "your-merchant-id-USD"
+    :username: "your-username"
+    :password: "your-password"
+    :secure_page_url: "litle-secure-page-url"
+    :paypage_id: "your-paypage-id-USD"
+  - :account_id: EUR
+    :merchant_id: "your-merchant-id-EUR"
+    :username: "your-username"
+    :password: "your-password"
+    :secure_page_url: "litle-secure-page-url"
+    :paypage_id: "your-paypage-id-EUR"' \
+     http://127.0.0.1:8080/1.0/kb/tenants/uploadPluginConfig/killbill-litle
+```
+
+To go to production, create a `litle.yml` configuration file under `/var/tmp/bundles/plugins/ruby/killbill-litle/x.y.z/` containing the following:
+
+```
+:litle:
+  :test: false
+```
 
 Usage
 -----
 
-Go to http://$HOST:8080/plugins/killbill-litle?kb_account_id=13d26090-b8d7-11e2-9e96-0800200c9a66 and enter your credit card information.
+You would typically implement [Litle PayPage](https://www.litle.com/images/uploads/Paypage.pdf) to tokenize credit cards. 
 
-Then, save the token in Kill Bill (only `paypageRegistrationId` is required in the properties):
+After receiving the token from Litle, call:
 
 ```
 curl -v \
      -X POST \
-     -H "Content-Type: application/json" \
-     -H "X-Killbill-CreatedBy: Web server" \
-     -H "X-Killbill-Reason: New account" \
-     --data-binary '{
+     -u admin:password \
+     -H 'X-Killbill-ApiKey: bob' \
+     -H 'X-Killbill-ApiSecret: lazar' \
+     -H 'X-Killbill-CreatedBy: admin' \
+     -H 'Content-Type: application/json' \
+     -d '{
        "pluginName": "killbill-litle",
        "pluginInfo": {
-         "properties": [
-           {
-             "key": "paypageRegistrationId",
-             "value": "t3GER3BP3JHLASZe"
-           },
-           {
-             "key": "ccFirstName",
-             "value": "John"
-           },
-           {
-             "key": "ccLastName",
-             "value": "Doe"
-           },
-           {
-             "key": "ccType",
-             "value": "VISA"
-           },
-           {
-             "key": "ccExpMonth",
-             "value": 12
-           },
-           {
-             "key": "ccExpYear",
-             "value": 2015
-           },
-           {
-             "key": "ccLast4",
-             "value": 1234
-           },
-           {
-             "key": "address1",
-             "value": "5, oakriu road"
-           },
-           {
-             "key": "address2",
-             "value": "apt. 298"
-           },
-           {
-             "key": "city",
-             "value": "Gdio Foia"
-           },
-           {
-             "key": "state",
-             "value": "FL"
-           },
-           {
-             "key": "zip",
-             "value": "49302"
-           },
-           {
-             "key": "country",
-             "value": "IFP"
-           }
-         ]
+         "properties": [{
+           "key": "paypageRegistrationId",
+           "value": "t3GER3BP3JHLASZe"
+         }]
        }
      }' \
-     "http://$HOST:8080/1.0/kb/accounts/13d26090-b8d7-11e2-9e96-0800200c9a66/paymentMethods?isDefault=true"
+     "http://127.0.0.1:8080/1.0/kb/accounts/2a55045a-ce1d-4344-942d-b825536328f9/paymentMethods?isDefault=true"
 ```
 
-Configuration
--------------
-
-The plugin expects a `litle.yml` configuration file containing the following:
+An example implementation is exposed at:
 
 ```
-:litle:
-  :merchant_id:
-    :USD: 'your-merchant-id-USD'  
-    :EUR: 'your-merchant-id-EURO'
-  :password: 'your-password'
-  :username: 'your-username'
-  # Optional, if you are using PayPage
-  :secure_page_url: 'litle-secure-page-url'
-  :paypage_id:
-    :USD: 'litle-paypage-id-USD'
-    :EUR: 'litle-paypage-id-EURO'
-  :log_file: '/var/tmp/litle.log'
-  # Switch to false for production
-  :test: true
-
-:database:
-  :adapter: 'sqlite3'
-  :database: 'test.db'
-# For MySQL
-#  :adapter: 'jdbc'
-#  :username: 'your-username'
-#  :password: 'your-password'
-#  :driver: 'com.mysql.jdbc.Driver'
-#  :url: 'jdbc:mysql://127.0.0.1:3306/your-database'
+http://127.0.0.1:8080/plugins/killbill-litle/form?kb_account_id=2a55045a-ce1d-4344-942d-b825536328f9&kb_tenant_id=a86d9fd1-718d-4178-a9eb-46c61aa2548f
 ```
-
-By default, the plugin will look at the plugin directory root (where `killbill.properties` is located) to find this file.
-Alternatively, set the Kill Bill system property `-Dorg.killbill.billing.osgi.bundles.jruby.conf.dir=/my/directory` to specify another location.
-

data/Rakefile

@@ -7,14 +7,14 @@ Bundler::GemHelper.install_tasks
 # Install test tasks
 require 'rspec/core/rake_task'
 namespace :test do
-  desc "Run RSpec tests"
+  desc 'Run RSpec tests'
   RSpec::Core::RakeTask.new do |task|
     task.name = 'spec'
     task.pattern = './spec/*/*_spec.rb'
   end
 
   namespace :remote do
-    desc "Run RSpec remote tests"
+    desc 'Run RSpec remote tests'
     RSpec::Core::RakeTask.new do |task|
       task.name = 'spec'
       task.pattern = './spec/*/remote/*_spec.rb'

data/VERSION

@@ -1 +1 @@
-1.10.0
+2.0.0

data/config.ru

@@ -1,4 +1,4 @@
 require 'litle'
-require 'litle/config/application'
+require 'litle/application'
 
 run Sinatra::Application

data/db/ddl.sql

@@ -1,14 +1,19 @@
 CREATE TABLE `litle_payment_methods` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
-  `kb_account_id` varchar(255) NOT NULL,
   `kb_payment_method_id` varchar(255) DEFAULT NULL,
-  `litle_token` varchar(255) NOT NULL,
+  `token` varchar(255) DEFAULT NULL,
   `cc_first_name` varchar(255) DEFAULT NULL,
   `cc_last_name` varchar(255) DEFAULT NULL,
   `cc_type` varchar(255) DEFAULT NULL,
-  `cc_exp_month` int(11) DEFAULT NULL,
-  `cc_exp_year` int(11) DEFAULT NULL,
-  `cc_last_4` int(11) DEFAULT NULL,
+  `cc_exp_month` varchar(255) DEFAULT NULL,
+  `cc_exp_year` varchar(255) DEFAULT NULL,
+  `cc_number` varchar(255) DEFAULT NULL,
+  `cc_last_4` varchar(255) DEFAULT NULL,
+  `cc_start_month` varchar(255) DEFAULT NULL,
+  `cc_start_year` varchar(255) DEFAULT NULL,
+  `cc_issue_number` varchar(255) DEFAULT NULL,
+  `cc_verification_value` varchar(255) DEFAULT NULL,
+  `cc_track_data` varchar(255) DEFAULT NULL,
   `address1` varchar(255) DEFAULT NULL,
   `address2` varchar(255) DEFAULT NULL,
   `city` varchar(255) DEFAULT NULL,
@@ -18,6 +23,8 @@ CREATE TABLE `litle_payment_methods` (
   `is_deleted` tinyint(1) NOT NULL DEFAULT '0',
   `created_at` datetime NOT NULL,
   `updated_at` datetime NOT NULL,
+  `kb_account_id` varchar(255) DEFAULT NULL,
+  `kb_tenant_id` varchar(255) DEFAULT NULL,
   PRIMARY KEY (`id`),
   KEY `index_litle_payment_methods_on_kb_account_id` (`kb_account_id`),
   KEY `index_litle_payment_methods_on_kb_payment_method_id` (`kb_payment_method_id`)
@@ -28,11 +35,16 @@ CREATE TABLE `litle_transactions` (
   `litle_response_id` int(11) NOT NULL,
   `api_call` varchar(255) NOT NULL,
   `kb_payment_id` varchar(255) NOT NULL,
-  `litle_txn_id` varchar(255) NOT NULL,
-  `amount_in_cents` int(11) NOT NULL,
-  `currency` char(3) NOT NULL,
+  `kb_payment_transaction_id` varchar(255) NOT NULL,
+  `transaction_type` varchar(255) NOT NULL,
+  `payment_processor_account_id` varchar(255) DEFAULT NULL,
+  `txn_id` varchar(255) DEFAULT NULL,
+  `amount_in_cents` int(11) DEFAULT NULL,
+  `currency` varchar(255) DEFAULT NULL,
   `created_at` datetime NOT NULL,
   `updated_at` datetime NOT NULL,
+  `kb_account_id` varchar(255) NOT NULL,
+  `kb_tenant_id` varchar(255) NOT NULL,
   PRIMARY KEY (`id`),
   KEY `index_litle_transactions_on_kb_payment_id` (`kb_payment_id`)
 ) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin;
@@ -41,23 +53,20 @@ CREATE TABLE `litle_responses` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `api_call` varchar(255) NOT NULL,
   `kb_payment_id` varchar(255) DEFAULT NULL,
+  `kb_payment_transaction_id` varchar(255) DEFAULT NULL,
+  `transaction_type` varchar(255) DEFAULT NULL,
+  `payment_processor_account_id` varchar(255) DEFAULT NULL,
   `message` varchar(255) DEFAULT NULL,
   `authorization` varchar(255) DEFAULT NULL,
   `fraud_review` tinyint(1) DEFAULT NULL,
   `test` tinyint(1) DEFAULT NULL,
-  `params_litleonelineresponse_message` varchar(255) DEFAULT NULL,
-  `params_litleonelineresponse_response` varchar(255) DEFAULT NULL,
-  `params_litleonelineresponse_version` varchar(255) DEFAULT NULL,
-  `params_litleonelineresponse_xmlns` varchar(255) DEFAULT NULL,
-  `params_litleonelineresponse_saleresponse_customer_id` varchar(255) DEFAULT NULL,
-  `params_litleonelineresponse_saleresponse_id` varchar(255) DEFAULT NULL,
-  `params_litleonelineresponse_saleresponse_report_group` varchar(255) DEFAULT NULL,
-  `params_litleonelineresponse_saleresponse_litle_txn_id` varchar(255) DEFAULT NULL,
-  `params_litleonelineresponse_saleresponse_order_id` varchar(255) DEFAULT NULL,
-  `params_litleonelineresponse_saleresponse_response` varchar(255) DEFAULT NULL,
-  `params_litleonelineresponse_saleresponse_response_time` varchar(255) DEFAULT NULL,
-  `params_litleonelineresponse_saleresponse_message` varchar(255) DEFAULT NULL,
-  `params_litleonelineresponse_saleresponse_auth_code` varchar(255) DEFAULT NULL,
+  `params_litle_txn_id` varchar(255) DEFAULT NULL,
+  `params_order_id` varchar(255) DEFAULT NULL,
+  `params_litle_token` varchar(255) DEFAULT NULL,
+  `params_auth_code` varchar(255) DEFAULT NULL,
+  `params_response` varchar(255) DEFAULT NULL,
+  `params_response_time` varchar(255) DEFAULT NULL,
+  `params_message` varchar(255) DEFAULT NULL,
   `avs_result_code` varchar(255) DEFAULT NULL,
   `avs_result_message` varchar(255) DEFAULT NULL,
   `avs_result_street_match` varchar(255) DEFAULT NULL,
@@ -67,5 +76,7 @@ CREATE TABLE `litle_responses` (
   `success` tinyint(1) DEFAULT NULL,
   `created_at` datetime NOT NULL,
   `updated_at` datetime NOT NULL,
+  `kb_account_id` varchar(255) DEFAULT NULL,
+  `kb_tenant_id` varchar(255) DEFAULT NULL,
   PRIMARY KEY (`id`)
 ) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin;

data/db/schema.rb

@@ -1,63 +1,73 @@
 require 'active_record'
 
-ActiveRecord::Schema.define(:version => 20130311153635) do
+ActiveRecord::Schema.define(:version => 20140410153635) do
   create_table "litle_payment_methods", :force => true do |t|
-    t.string   "kb_account_id",          :null => false
-    t.string   "kb_payment_method_id"    # NULL before Killbill knows about it
-    t.string   "litle_token",            :null => false
+    t.string   "kb_payment_method_id"      # NULL before Kill Bill knows about it
+    t.string   "token"                     # litle id
     t.string   "cc_first_name"
     t.string   "cc_last_name"
     t.string   "cc_type"
-    t.integer  "cc_exp_month"
-    t.integer  "cc_exp_year"
-    t.integer  "cc_last_4"
+    t.string   "cc_exp_month"
+    t.string   "cc_exp_year"
+    t.string   "cc_number"
+    t.string   "cc_last_4"
+    t.string   "cc_start_month"
+    t.string   "cc_start_year"
+    t.string   "cc_issue_number"
+    t.string   "cc_verification_value"
+    t.string   "cc_track_data"
     t.string   "address1"
     t.string   "address2"
     t.string   "city"
     t.string   "state"
     t.string   "zip"
     t.string   "country"
-    t.boolean  "is_deleted",             :null => false, :default => false
-    t.datetime "created_at",             :null => false
-    t.datetime "updated_at",             :null => false
+    t.boolean  "is_deleted",               :null => false, :default => false
+    t.datetime "created_at",               :null => false
+    t.datetime "updated_at",               :null => false
+    t.string   "kb_account_id"
+    t.string   "kb_tenant_id"
   end
 
   add_index(:litle_payment_methods, :kb_account_id)
   add_index(:litle_payment_methods, :kb_payment_method_id)
 
   create_table "litle_transactions", :force => true do |t|
-    t.integer  "litle_response_id", :null => false
-    t.string   "api_call",          :null => false
-    t.string   "kb_payment_id",     :null => false
-    t.string   "litle_txn_id",      :null => false
-    t.integer  "amount_in_cents",   :null => false
-    t.string  "currency",           :null => false
-    t.datetime "created_at",        :null => false
-    t.datetime "updated_at",        :null => false
+    t.integer  "litle_response_id",  :null => false
+    t.string   "api_call",                       :null => false
+    t.string   "kb_payment_id",                  :null => false
+    t.string   "kb_payment_transaction_id",      :null => false
+    t.string   "transaction_type",               :null => false
+    t.string   "payment_processor_account_id"
+    t.string   "txn_id"                          # litle transaction id
+    # Both null for void
+    t.integer  "amount_in_cents"
+    t.string   "currency"
+    t.datetime "created_at",                     :null => false
+    t.datetime "updated_at",                     :null => false
+    t.string   "kb_account_id",                  :null => false
+    t.string   "kb_tenant_id",                   :null => false
   end
 
   add_index(:litle_transactions, :kb_payment_id)
 
   create_table "litle_responses", :force => true do |t|
-    t.string   "api_call",        :null => false
+    t.string   "api_call",          :null => false
     t.string   "kb_payment_id"
+    t.string   "kb_payment_transaction_id"
+    t.string   "transaction_type"
+    t.string   "payment_processor_account_id"
     t.string   "message"
     t.string   "authorization"
     t.boolean  "fraud_review"
     t.boolean  "test"
-    t.string   "params_litleonelineresponse_message"
-    t.string   "params_litleonelineresponse_response"
-    t.string   "params_litleonelineresponse_version"
-    t.string   "params_litleonelineresponse_xmlns"
-    t.string   "params_litleonelineresponse_saleresponse_customer_id"
-    t.string   "params_litleonelineresponse_saleresponse_id"
-    t.string   "params_litleonelineresponse_saleresponse_report_group"
-    t.string   "params_litleonelineresponse_saleresponse_litle_txn_id"
-    t.string   "params_litleonelineresponse_saleresponse_order_id"
-    t.string   "params_litleonelineresponse_saleresponse_response"
-    t.string   "params_litleonelineresponse_saleresponse_response_time"
-    t.string   "params_litleonelineresponse_saleresponse_message"
-    t.string   "params_litleonelineresponse_saleresponse_auth_code"
+    t.string   "params_litle_txn_id"
+    t.string   "params_order_id"
+    t.string   "params_litle_token"
+    t.string   "params_auth_code"
+    t.string   "params_response"
+    t.string   "params_response_time"
+    t.string   "params_message"
     t.string   "avs_result_code"
     t.string   "avs_result_message"
     t.string   "avs_result_street_match"
@@ -67,5 +77,7 @@ ActiveRecord::Schema.define(:version => 20130311153635) do
     t.boolean  "success"
     t.datetime "created_at",        :null => false
     t.datetime "updated_at",        :null => false
+    t.string   "kb_account_id"
+    t.string   "kb_tenant_id"
   end
 end

data/killbill-litle.gemspec

@@ -12,36 +12,40 @@ Gem::Specification.new do |s|
 
   s.author   = 'Kill Bill core team'
   s.email    = 'killbilling-users@googlegroups.com'
-  s.homepage = 'http://kill-bill.org'
+  s.homepage = 'http://killbill.io'
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.bindir        = 'bin'
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  s.require_paths = ["lib"]
+  s.executables   = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
+  s.require_paths = ['lib']
 
   s.rdoc_options << '--exclude' << '.'
 
-  s.add_dependency 'killbill', '~> 3.0.0'
-  s.add_dependency 'activemerchant', '~> 1.36.0'
-  s.add_dependency 'activerecord', '~> 3.2.1'
-  s.add_dependency 'money', '~> 6.0.0'
+  s.add_dependency 'killbill', '~> 4.0.0'
+
   s.add_dependency 'sinatra', '~> 1.3.4'
-  # LitleOnline gem dependencies
-  s.add_dependency 'LitleOnline', '~> 8.16.0'
-  s.add_dependency 'xml-mapping', '~> 0.9.1'
-  s.add_dependency 'xml-object', '~> 0.9.93'
+  s.add_dependency 'thread_safe', '~> 0.3.4'
+  s.add_dependency 'activerecord', '~> 4.1.0'
   if defined?(JRUBY_VERSION)
-    s.add_dependency 'activerecord-jdbcmysql-adapter', '~> 1.2.9'
+    s.add_dependency 'activerecord-bogacs', '~> 0.3'
+    s.add_dependency 'activerecord-jdbc-adapter', '~> 1.3'
     # Required to avoid errors like java.lang.NoClassDefFoundError: org/bouncycastle/asn1/DERBoolean
-    s.add_dependency 'jruby-openssl', '~> 0.9.4'
+    s.add_dependency 'jruby-openssl', '~> 0.9.6'
   end
-
-  s.add_development_dependency 'jbundler', '~> 0.4.1'
+  s.add_dependency 'actionpack', '~> 4.1.0'
+  s.add_dependency 'actionview', '~> 4.1.0'
+  s.add_dependency 'activemerchant', '~> 1.48.0'
+  s.add_dependency 'offsite_payments', '~> 2.1.0'
+  s.add_dependency 'monetize', '~> 1.1.0'
+  s.add_dependency 'money', '~> 6.5.1'
+
+  s.add_development_dependency 'jbundler', '~> 0.4.3'
   s.add_development_dependency 'rake', '>= 10.0.0'
   s.add_development_dependency 'rspec', '~> 2.12.0'
   if defined?(JRUBY_VERSION)
-    s.add_development_dependency 'activerecord-jdbcsqlite3-adapter', '~> 1.2.6'
+    s.add_development_dependency 'jdbc-sqlite3', '~> 3.7'
+    s.add_development_dependency 'jdbc-mariadb', '~> 1.1'
   else
     s.add_development_dependency 'sqlite3', '~> 1.3.7'
   end