killbill-client 1.0.0 → 1.1.0

data/lib/killbill_client/models/gen/payment_attributes.rb

@@ -40,6 +40,7 @@ module KillBillClient
       attribute :currency
       attribute :payment_method_id
       attribute :transactions
+      attribute :payment_attempts
       attribute :audit_logs
     end
   end

data/lib/killbill_client/models/gen/phase_attributes.rb

@@ -32,6 +32,7 @@ module KillBillClient
       attribute :prices
       attribute :fixed_prices
       attribute :duration
+      attribute :usages
     end
   end
 end

data/lib/killbill_client/models/gen/require_gen.rb

@@ -33,10 +33,15 @@ require 'killbill_client/models/gen/audit_log_attributes'
 require 'killbill_client/models/gen/stack_trace_element_attributes'
 require 'killbill_client/models/gen/billing_exception_attributes'
 require 'killbill_client/models/gen/blocking_state_attributes'
+require 'killbill_client/models/gen/bulk_base_subscription_and_add_ons_attributes'
 require 'killbill_client/models/gen/bundle_attributes'
 require 'killbill_client/models/gen/bundle_timeline_attributes'
 require 'killbill_client/models/gen/product_attributes'
 require 'killbill_client/models/gen/plan_attributes'
+require 'killbill_client/models/gen/tiered_block_attributes'
+require 'killbill_client/models/gen/limit_attributes'
+require 'killbill_client/models/gen/tier_attributes'
+require 'killbill_client/models/gen/usage_attributes'
 require 'killbill_client/models/gen/phase_attributes'
 require 'killbill_client/models/gen/price_attributes'
 require 'killbill_client/models/gen/price_list_attributes'
@@ -61,7 +66,11 @@ require 'killbill_client/models/gen/node_command_attributes'
 require 'killbill_client/models/gen/node_command_property_attributes'
 require 'killbill_client/models/gen/node_info_attributes'
 require 'killbill_client/models/gen/notification_attributes'
+require 'killbill_client/models/gen/overdue_condition_attributes'
+require 'killbill_client/models/gen/overdue_attributes'
+require 'killbill_client/models/gen/overdue_state_config_attributes'
 require 'killbill_client/models/gen/overdue_state_attributes'
+require 'killbill_client/models/gen/payment_attempt_attributes'
 require 'killbill_client/models/gen/payment_attributes'
 require 'killbill_client/models/gen/payment_method_plugin_detail_attributes'
 require 'killbill_client/models/gen/payment_method_attributes'
@@ -77,6 +86,7 @@ require 'killbill_client/models/gen/role_definition_attributes'
 require 'killbill_client/models/gen/rolled_up_unit_attributes'
 require 'killbill_client/models/gen/rolled_up_usage_attributes'
 require 'killbill_client/models/gen/session_attributes'
+require 'killbill_client/models/gen/simple_plan_attributes'
 require 'killbill_client/models/gen/subject_attributes'
 require 'killbill_client/models/gen/event_subscription_attributes'
 require 'killbill_client/models/gen/subscription_attributes'

data/lib/killbill_client/models/gen/simple_plan_attributes.rb

@@ -0,0 +1,42 @@
+#############################################################################################
+#                                                                                           #
+#                   Copyright 2010-2013 Ning, Inc.                                          #
+#                   Copyright 2014 Groupon, Inc.                                            #
+#                   Copyright 2014 The Billing Project, LLC                                 #
+#                                                                                           #
+#      The Billing Project licenses this file to you under the Apache License, version 2.0  #
+#      (the "License"); you may not use this file except in compliance with the             #
+#      License.  You may obtain a copy of the License at:                                   #
+#                                                                                           #
+#          http://www.apache.org/licenses/LICENSE-2.0                                       #
+#                                                                                           #
+#      Unless required by applicable law or agreed to in writing, software                  #
+#      distributed under the License is distributed on an "AS IS" BASIS, WITHOUT            #
+#      WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the            #
+#      License for the specific language governing permissions and limitations              #
+#      under the License.                                                                   #
+#                                                                                           #
+#############################################################################################
+
+
+#
+#                       DO NOT EDIT!!!
+#    File automatically generated by killbill-java-parser (git@github.com:killbill/killbill-java-parser.git)
+#
+
+
+module KillBillClient
+  module Model
+    class SimplePlanAttributes < Resource
+      attribute :plan_id
+      attribute :product_name
+      attribute :product_category
+      attribute :currency
+      attribute :amount
+      attribute :billing_period
+      attribute :trial_length
+      attribute :trial_time_unit
+      attribute :available_base_products
+    end
+  end
+end

data/lib/killbill_client/models/gen/subscription_attributes.rb

@@ -38,6 +38,7 @@ module KillBillClient
       attribute :billing_period
       attribute :phase_type
       attribute :price_list
+      attribute :plan_name
       attribute :state
       attribute :source_type
       attribute :cancelled_date

data/lib/killbill_client/models/gen/tier_attributes.rb

@@ -0,0 +1,37 @@
+#############################################################################################
+#                                                                                           #
+#                   Copyright 2010-2013 Ning, Inc.                                          #
+#                   Copyright 2014 Groupon, Inc.                                            #
+#                   Copyright 2014 The Billing Project, LLC                                 #
+#                                                                                           #
+#      The Billing Project licenses this file to you under the Apache License, version 2.0  #
+#      (the "License"); you may not use this file except in compliance with the             #
+#      License.  You may obtain a copy of the License at:                                   #
+#                                                                                           #
+#          http://www.apache.org/licenses/LICENSE-2.0                                       #
+#                                                                                           #
+#      Unless required by applicable law or agreed to in writing, software                  #
+#      distributed under the License is distributed on an "AS IS" BASIS, WITHOUT            #
+#      WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the            #
+#      License for the specific language governing permissions and limitations              #
+#      under the License.                                                                   #
+#                                                                                           #
+#############################################################################################
+
+
+#
+#                       DO NOT EDIT!!!
+#    File automatically generated by killbill-java-parser (git@github.com:killbill/killbill-java-parser.git)
+#
+
+
+module KillBillClient
+  module Model
+    class TierAttributes < Resource
+      attribute :tiers
+      attribute :limits
+      attribute :fixed_price
+      attribute :recurring_price
+    end
+  end
+end

data/lib/killbill_client/models/gen/tiered_block_attributes.rb

@@ -0,0 +1,37 @@
+#############################################################################################
+#                                                                                           #
+#                   Copyright 2010-2013 Ning, Inc.                                          #
+#                   Copyright 2014 Groupon, Inc.                                            #
+#                   Copyright 2014 The Billing Project, LLC                                 #
+#                                                                                           #
+#      The Billing Project licenses this file to you under the Apache License, version 2.0  #
+#      (the "License"); you may not use this file except in compliance with the             #
+#      License.  You may obtain a copy of the License at:                                   #
+#                                                                                           #
+#          http://www.apache.org/licenses/LICENSE-2.0                                       #
+#                                                                                           #
+#      Unless required by applicable law or agreed to in writing, software                  #
+#      distributed under the License is distributed on an "AS IS" BASIS, WITHOUT            #
+#      WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the            #
+#      License for the specific language governing permissions and limitations              #
+#      under the License.                                                                   #
+#                                                                                           #
+#############################################################################################
+
+
+#
+#                       DO NOT EDIT!!!
+#    File automatically generated by killbill-java-parser (git@github.com:killbill/killbill-java-parser.git)
+#
+
+
+module KillBillClient
+  module Model
+    class TieredBlockAttributes < Resource
+      attribute :unit
+      attribute :size
+      attribute :max
+      attribute :prices
+    end
+  end
+end

data/lib/killbill_client/models/gen/usage_attributes.rb

@@ -0,0 +1,35 @@
+#############################################################################################
+#                                                                                           #
+#                   Copyright 2010-2013 Ning, Inc.                                          #
+#                   Copyright 2014 Groupon, Inc.                                            #
+#                   Copyright 2014 The Billing Project, LLC                                 #
+#                                                                                           #
+#      The Billing Project licenses this file to you under the Apache License, version 2.0  #
+#      (the "License"); you may not use this file except in compliance with the             #
+#      License.  You may obtain a copy of the License at:                                   #
+#                                                                                           #
+#          http://www.apache.org/licenses/LICENSE-2.0                                       #
+#                                                                                           #
+#      Unless required by applicable law or agreed to in writing, software                  #
+#      distributed under the License is distributed on an "AS IS" BASIS, WITHOUT            #
+#      WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the            #
+#      License for the specific language governing permissions and limitations              #
+#      under the License.                                                                   #
+#                                                                                           #
+#############################################################################################
+
+
+#
+#                       DO NOT EDIT!!!
+#    File automatically generated by killbill-java-parser (git@github.com:killbill/killbill-java-parser.git)
+#
+
+
+module KillBillClient
+  module Model
+    class UsageAttributes < Resource
+      attribute :billing_period
+      attribute :tiers
+    end
+  end
+end

data/lib/killbill_client/models/invoice.rb

@@ -68,7 +68,7 @@ module KillBillClient
 
             res.refresh(options)
 
-          rescue KillBillClient::API::BadRequest => e
+          rescue KillBillClient::API::BadRequest
             # No invoice to generate : TODO parse json to verify this is indeed the case
           end
         end
@@ -94,7 +94,7 @@ module KillBillClient
 
             res.refresh(options)
 
-          rescue KillBillClient::API::NotFound => e
+          rescue KillBillClient::API::NotFound
             nil
           end
         end
@@ -126,7 +126,7 @@ module KillBillClient
                        Invoice
 
             res.refresh(options)
-          rescue KillBillClient::API::NotFound => e
+          rescue KillBillClient::API::NotFound
             nil
           end
         end
@@ -160,7 +160,7 @@ module KillBillClient
                        Invoice
 
             res.refresh(options)
-          rescue KillBillClient::API::NotFound => e
+          rescue KillBillClient::API::NotFound
             nil
           end
         end
@@ -193,7 +193,7 @@ module KillBillClient
 
             res.refresh(options)
 
-          rescue KillBillClient::API::NotFound => e
+          rescue KillBillClient::API::NotFound
             nil
           end
         end
@@ -301,9 +301,23 @@ module KillBillClient
 
       end
 
-      def payments(with_plugin_info = false, audit = 'NONE', options = {})
+      def commit(user = nil, reason = nil, comment = nil, options = {})
+
+        self.class.put "#{Invoice::KILLBILL_API_INVOICES_PREFIX}/#{invoice_id}/commitInvoice",
+                       nil,
+                       {},
+                       {
+                           :user => user,
+                           :reason => reason,
+                           :comment => comment,
+                       }.merge(options)
+
+      end
+
+      def payments(with_plugin_info = false, with_attempts = false, audit = 'NONE', options = {})
         self.class.get "#{KILLBILL_API_INVOICES_PREFIX}/#{invoice_id}/payments",
                        {
+                           :withAttempts => with_attempts,
                            :withPluginInfo => with_plugin_info,
                            :audit          => audit
                        },

data/lib/killbill_client/models/invoice_item.rb

@@ -4,10 +4,10 @@ module KillBillClient
 
       has_many :audit_logs, KillBillClient::Model::AuditLog
 
-      def create(user = nil, reason = nil, comment = nil, options = {})
+      def create(auto_commit = false, user = nil, reason = nil, comment = nil, options = {})
         created_invoice_item = self.class.post "#{Invoice::KILLBILL_API_INVOICES_PREFIX}/charges/#{account_id}",
                                                [to_hash].to_json,
-                                               {},
+                                               {:autoCommit => auto_commit},
                                                {
                                                    :user    => user,
                                                    :reason  => reason,

data/lib/killbill_client/models/invoice_payment.rb

@@ -4,12 +4,14 @@ module KillBillClient
       KILLBILL_API_INVOICE_PAYMENTS_PREFIX = "#{KILLBILL_API_PREFIX}/invoicePayments"
 
       has_many :transactions, KillBillClient::Model::Transaction
+      has_many :payment_attempts, KillBillClient::Model::PaymentAttemptAttributes
       has_many :audit_logs, KillBillClient::Model::AuditLog
 
       class << self
-        def find_by_id(payment_id, with_plugin_info = false, options = {})
+        def find_by_id(payment_id, with_plugin_info = false, with_attempts = false, options = {})
           get "#{KILLBILL_API_INVOICE_PAYMENTS_PREFIX}/#{payment_id}",
               {
+                  :withAttempts => with_attempts,
                   :withPluginInfo => with_plugin_info
               },
               options

data/lib/killbill_client/models/models.rb

@@ -20,6 +20,8 @@ require 'killbill_client/models/subscription'
 require 'killbill_client/models/bundle'
 require 'killbill_client/models/account'
 require 'killbill_client/models/invoice'
+require 'killbill_client/models/overdue_condition'
+require 'killbill_client/models/overdue_state_config'
 require 'killbill_client/models/overdue'
 require 'killbill_client/models/transaction'
 require 'killbill_client/models/combo_transaction'

data/lib/killbill_client/models/overdue.rb

@@ -1,38 +1,52 @@
 module KillBillClient
   module Model
-    class Overdue < OverdueStateAttributes
+    class Overdue < OverdueAttributes
+
+      has_many :overdue_states, KillBillClient::Model::OverdueStateConfig
 
       KILLBILL_API_OVERDUE_PREFIX = "#{KILLBILL_API_PREFIX}/overdue"
 
       class << self
-        def get_tenant_overdue_config(options = {})
+
+        def get_tenant_overdue_config(format, options = {})
 
           require_multi_tenant_options!(options, "Retrieving an overdue config is only supported in multi-tenant mode")
 
           get KILLBILL_API_OVERDUE_PREFIX,
               {},
               {
-                  :head => {'Accept' => 'application/xml'},
+                  :head => {'Accept' => "application/#{format}"},
+                  :content_type => "application/#{format}",
               }.merge(options)
         end
 
-        def upload_tenant_overdue_config(overdue_config_xml, user = nil, reason = nil, comment = nil, options = {})
+        def upload_tenant_overdue_config_xml(overdue_config_xml, user = nil, reason = nil, comment = nil, options = {})
+          upload_tenant_overdue_config('xml', overdue_config_xml, user, reason, comment, options)
+        end
+
+
+        def upload_tenant_overdue_config(format, body, user = nil, reason = nil, comment = nil, options = {})
 
           require_multi_tenant_options!(options, "Uploading an overdue config is only supported in multi-tenant mode")
 
           post KILLBILL_API_OVERDUE_PREFIX,
-               overdue_config_xml,
+               body,
                {
                },
                {
-                   :head => {'Accept' => 'application/xml'},
-                   :content_type => 'application/xml',
+                   :head => {'Accept' => "application/#{format}"},
+                   :content_type => "application/#{format}",
                    :user => user,
                    :reason => reason,
                    :comment => comment,
                }.merge(options)
-          get_tenant_overdue_config(options)
+          get_tenant_overdue_config(format, options)
         end
+
+      end
+
+      def upload_tenant_overdue_config_json(user = nil, reason = nil, comment = nil, options = {})
+        self.class.upload_tenant_overdue_config('json', to_json, user, reason, comment, options)
       end
     end
   end

data/lib/killbill_client/models/overdue_condition.rb

@@ -0,0 +1,10 @@
+module KillBillClient
+  module Model
+    class OverdueCondition < OverdueConditionAttributes
+
+      has_one :time_since_earliest_unpaid_invoice_equals_or_exceeds, KillBillClient::Model::DurationAttributes
+
+    end
+  end
+end
+

data/lib/killbill_client/models/overdue_state_config.rb

@@ -0,0 +1,10 @@
+module KillBillClient
+  module Model
+    class OverdueStateConfig < OverdueStateConfigAttributes
+
+      has_one :condition, KillBillClient::Model::OverdueCondition
+
+    end
+  end
+end
+

data/lib/killbill_client/models/payment.rb

@@ -7,23 +7,26 @@ module KillBillClient
       KILLBILL_API_PAYMENTS_PREFIX = "#{KILLBILL_API_PREFIX}/payments"
 
       has_many :transactions, KillBillClient::Model::Transaction
+      has_many :payment_attempts, KillBillClient::Model::PaymentAttemptAttributes
       has_many :audit_logs, KillBillClient::Model::AuditLog
 
       has_custom_fields KILLBILL_API_PAYMENTS_PREFIX, :payment_id
 
       class << self
-        def find_by_id(payment_id, with_plugin_info = false, options = {})
+        def find_by_id(payment_id, with_plugin_info = false, with_attempts = false, options = {})
           get "#{KILLBILL_API_PAYMENTS_PREFIX}/#{payment_id}",
               {
+                  :withAttempts => with_attempts,
                   :withPluginInfo => with_plugin_info
               },
               options
         end
 
-        def find_by_external_key(external_key, with_plugin_info = false, options = {})
+        def find_by_external_key(external_key, with_plugin_info = false, with_attempts = false, options = {})
           get "#{KILLBILL_API_PAYMENTS_PREFIX}",
               {
                   :externalKey => external_key,
+                  :withAttempts => with_attempts,
                   :withPluginInfo => with_plugin_info
               },
               options

data/lib/killbill_client/models/payment_method.rb

@@ -52,10 +52,11 @@ module KillBillClient
               }.merge(options)
         end
 
-        def destroy(payment_method_id, set_auto_pay_off = false, user = nil, reason = nil, comment = nil, options = {})
+        def destroy(payment_method_id, set_auto_pay_off = false, force_default_deletion = false, user = nil, reason = nil, comment = nil, options = {})
           delete "#{KILLBILL_API_PAYMENT_METHODS_PREFIX}/#{payment_method_id}",
                  {},
                  {
+                     :forceDefaultPmDeletion => force_default_deletion,
                      :deleteDefaultPmWithAutoPayOff => set_auto_pay_off
                  },
                  {
@@ -64,6 +65,17 @@ module KillBillClient
                      :comment => comment,
                  }.merge(options)
         end
+
+        def refresh(account_id, user = nil, reason = nil, comment = nil, options = {})
+          post "#{Account::KILLBILL_API_ACCOUNTS_PREFIX}/#{account_id}/paymentMethods/refresh",
+               nil,
+               {},
+               {
+                   :user => user,
+                   :reason => reason,
+                   :comment => comment,
+               }.merge(options)
+        end
       end
 
       def create(is_default, user = nil, reason = nil, comment = nil, options = {})
@@ -80,9 +92,6 @@ module KillBillClient
         created_pm.refresh(options)
       end
 
-      def destroy(set_auto_pay_off = false, user = nil, reason = nil, comment = nil, options = {})
-        self.class.destroy(payment_method_id, set_auto_pay_off, user, reason, comment, options)
-      end
 
       def plugin_info=(info)
         @plugin_info = PaymentMethodPluginDetailAttributes.new