killbill-paypal-express 1.0.15 → 1.0.16

data/VERSION

@@ -1 +1 @@
-1.0.15
+1.0.16

data/db/ddl.sql

@@ -8,7 +8,9 @@ CREATE TABLE `paypal_express_payment_methods` (
   `is_deleted` tinyint(1) NOT NULL DEFAULT '0',
   `created_at` datetime NOT NULL,
   `updated_at` datetime NOT NULL,
-  PRIMARY KEY (`id`)
+  PRIMARY KEY (`id`),
+  KEY `index_paypal_express_payment_methods_on_kb_account_id` (`kb_account_id`),
+  KEY `index_paypal_express_payment_methods_on_kb_payment_method_id` (`kb_payment_method_id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 CREATE TABLE `paypal_express_transactions` (
@@ -20,7 +22,8 @@ CREATE TABLE `paypal_express_transactions` (
   `amount_in_cents` int(11) NOT NULL,
   `created_at` datetime NOT NULL,
   `updated_at` datetime NOT NULL,
-  PRIMARY KEY (`id`)
+  PRIMARY KEY (`id`),
+  KEY `index_paypal_express_transactions_on_kb_payment_id` (`kb_payment_id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 CREATE TABLE `paypal_express_responses` (
@@ -80,4 +83,5 @@ CREATE TABLE `paypal_express_responses` (
   `created_at` datetime NOT NULL,
   `updated_at` datetime NOT NULL,
   PRIMARY KEY (`id`)
+  KEY `index_paypal_express_responses_on_token_and_api_call` (`token`, `api_call`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;

data/db/schema.rb

@@ -12,6 +12,9 @@ ActiveRecord::Schema.define(:version => 20130311153635) do
     t.datetime "updated_at",              :null => false
   end
 
+  add_index(:paypal_express_payment_methods, :kb_account_id)
+  add_index(:paypal_express_payment_methods, :kb_payment_method_id)
+
   create_table "paypal_express_transactions", :force => true do |t|
     t.integer  "paypal_express_response_id", :null => false
     t.string   "api_call",                   :null => false
@@ -22,6 +25,8 @@ ActiveRecord::Schema.define(:version => 20130311153635) do
     t.datetime "updated_at",                 :null => false
   end
 
+  add_index(:paypal_express_transactions, :kb_payment_id)
+
   create_table "paypal_express_responses", :force => true do |t|
     t.string   "api_call",        :null => false
     t.string   "kb_payment_id"
@@ -78,4 +83,6 @@ ActiveRecord::Schema.define(:version => 20130311153635) do
     t.datetime "created_at",        :null => false
     t.datetime "updated_at",        :null => false
   end
-end
+
+  add_index(:paypal_express_responses, [:token, :api_call])
+end

data/lib/paypal_express/models/paypal_express_payment_method.rb

@@ -39,6 +39,23 @@ module Killbill::PaypalExpress
       properties << Killbill::Plugin::Model::PaymentMethodKVInfo.new(false, 'baid', paypal_express_baid)
       properties << Killbill::Plugin::Model::PaymentMethodKVInfo.new(false, 'token', paypal_express_token)
 
+      # We're pretty much guaranteed to have a (single) entry for details_for, since it was called during add_payment_method
+      details_for = PaypalExpressResponse.find_all_by_api_call_and_token('details_for', paypal_express_token).last
+      unless details_for.nil?
+        properties << Killbill::Plugin::Model::PaymentMethodKVInfo.new(false, 'payerName', details_for.payer_name)
+        properties << Killbill::Plugin::Model::PaymentMethodKVInfo.new(false, 'payerEmail', details_for.payer_email)
+        properties << Killbill::Plugin::Model::PaymentMethodKVInfo.new(false, 'payerCountry', details_for.payer_country)
+        properties << Killbill::Plugin::Model::PaymentMethodKVInfo.new(false, 'contactPhone', details_for.contact_phone)
+        properties << Killbill::Plugin::Model::PaymentMethodKVInfo.new(false, 'shipToAddressName', details_for.ship_to_address_name)
+        properties << Killbill::Plugin::Model::PaymentMethodKVInfo.new(false, 'shipToAddressCompany', details_for.ship_to_address_company)
+        properties << Killbill::Plugin::Model::PaymentMethodKVInfo.new(false, 'shipToAddressAddress1', details_for.ship_to_address_address1)
+        properties << Killbill::Plugin::Model::PaymentMethodKVInfo.new(false, 'shipToAddressAddress2', details_for.ship_to_address_address2)
+        properties << Killbill::Plugin::Model::PaymentMethodKVInfo.new(false, 'shipToAddressCity', details_for.ship_to_address_city)
+        properties << Killbill::Plugin::Model::PaymentMethodKVInfo.new(false, 'shipToAddressState', details_for.ship_to_address_state)
+        properties << Killbill::Plugin::Model::PaymentMethodKVInfo.new(false, 'shipToAddressCountry', details_for.ship_to_address_country)
+        properties << Killbill::Plugin::Model::PaymentMethodKVInfo.new(false, 'shipToAddressZip', details_for.ship_to_address_zip)
+      end
+
       Killbill::Plugin::Model::PaymentMethodPlugin.new(external_payment_method_id,
                                                        is_default,
                                                        properties,

data/pom.xml

@@ -25,7 +25,7 @@
     <groupId>com.ning.killbill.ruby</groupId>
     <artifactId>paypal-express-plugin</artifactId>
     <packaging>pom</packaging>
-    <version>1.0.15</version>
+    <version>1.0.16</version>
     <name>paypal-express-plugin</name>
     <url>http://github.com/killbill/killbill-paypal-express-plugin</url>
     <description>Plugin for accessing paypal as a payment gateway</description>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: killbill-paypal-express
 version: !ruby/object:Gem::Version
-  version: 1.0.15
+  version: 1.0.16
   prerelease:
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-06-04 00:00:00.000000000 Z
+date: 2013-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: killbill