killbill-client 2.2.3 → 2.3.0

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

@@ -31,9 +31,9 @@ module KillBillClient
       attribute :name
       attribute :external_message
       attribute :days_between_payment_retries
-      attribute :disable_entitlement_and_changes_blocked
-      attribute :block_changes
-      attribute :clear_state
+      attribute :is_disable_entitlement_and_changes_blocked
+      attribute :is_block_changes
+      attribute :is_clear_state
       attribute :reevaluation_interval_days
     end
   end

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

@@ -32,8 +32,8 @@ module KillBillClient
       attribute :is_clear_state
       attribute :condition
       attribute :external_message
-      attribute :block_changes
-      attribute :disable_entitlement
+      attribute :is_block_changes
+      attribute :is_disable_entitlement
       attribute :subscription_cancellation_policy
       attribute :auto_reevaluation_interval_days
     end

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

@@ -24,40 +24,7 @@
 #    File automatically generated by killbill-java-parser (git@github.com:killbill/killbill-java-parser.git)
 #
 
-
-require 'killbill_client/models/gen/tenant_attributes'
-require 'killbill_client/models/gen/subject_attributes'
-require 'killbill_client/models/gen/account_email_attributes'
-require 'killbill_client/models/gen/tag_attributes'
-require 'killbill_client/models/gen/invoice_attributes'
-require 'killbill_client/models/gen/plugin_property_attributes'
-require 'killbill_client/models/gen/account_timeline_attributes'
-require 'killbill_client/models/gen/overdue_state_attributes'
-require 'killbill_client/models/gen/user_roles_attributes'
-require 'killbill_client/models/gen/payment_method_plugin_detail_attributes'
-require 'killbill_client/models/gen/payment_method_attributes'
-require 'killbill_client/models/gen/usage_price_override_attributes'
-require 'killbill_client/models/gen/plugin_service_info_attributes'
-require 'killbill_client/models/gen/plugin_info_attributes'
-require 'killbill_client/models/gen/tag_definition_attributes'
-require 'killbill_client/models/gen/account_attributes'
-require 'killbill_client/models/gen/hosted_payment_page_form_descriptor_attributes'
-require 'killbill_client/models/gen/bulk_subscriptions_bundle_attributes'
-require 'killbill_client/models/gen/blocking_state_attributes'
-require 'killbill_client/models/gen/invoice_item_attributes'
-require 'killbill_client/models/gen/role_definition_attributes'
-require 'killbill_client/models/gen/node_command_property_attributes'
-require 'killbill_client/models/gen/invoice_payment_transaction_attributes'
-require 'killbill_client/models/gen/hosted_payment_page_billing_address_attributes'
-require 'killbill_client/models/gen/plan_detail_attributes'
-require 'killbill_client/models/gen/custom_field_attributes'
-require 'killbill_client/models/gen/tier_price_override_attributes'
-require 'killbill_client/models/gen/rolled_up_unit_attributes'
-require 'killbill_client/models/gen/rolled_up_usage_attributes'
-require 'killbill_client/models/gen/gateway_notification_attributes'
-require 'killbill_client/models/gen/event_subscription_attributes'
-require 'killbill_client/models/gen/subscription_attributes'
-require 'killbill_client/models/gen/notification_attributes'
+require 'killbill_client/models/gen/invoice_dry_run_attributes'
 require 'killbill_client/models/gen/unit_attributes'
 require 'killbill_client/models/gen/product_attributes'
 require 'killbill_client/models/gen/plan_attributes'
@@ -70,35 +37,67 @@ require 'killbill_client/models/gen/price_attributes'
 require 'killbill_client/models/gen/price_list_attributes'
 require 'killbill_client/models/gen/duration_attributes'
 require 'killbill_client/models/gen/catalog_attributes'
-require 'killbill_client/models/gen/combo_payment_transaction_attributes'
-require 'killbill_client/models/gen/bundle_attributes'
+require 'killbill_client/models/gen/payment_attributes'
+require 'killbill_client/models/gen/tag_definition_attributes'
 require 'killbill_client/models/gen/payment_transaction_attributes'
+require 'killbill_client/models/gen/bulk_subscriptions_bundle_attributes'
+require 'killbill_client/models/gen/simple_plan_attributes'
+require 'killbill_client/models/gen/node_command_attributes'
+require 'killbill_client/models/gen/hosted_payment_page_customer_attributes'
 require 'killbill_client/models/gen/invoice_email_attributes'
-require 'killbill_client/models/gen/payment_attributes'
+require 'killbill_client/models/gen/invoice_payment_attributes'
+require 'killbill_client/models/gen/stack_trace_element_attributes'
+require 'killbill_client/models/gen/billing_exception_attributes'
+require 'killbill_client/models/gen/usage_price_override_attributes'
+require 'killbill_client/models/gen/tenant_key_value_attributes'
+require 'killbill_client/models/gen/credit_attributes'
+require 'killbill_client/models/gen/account_timeline_attributes'
+require 'killbill_client/models/gen/tag_attributes'
+require 'killbill_client/models/gen/payment_attempt_attributes'
+require 'killbill_client/models/gen/notification_attributes'
+require 'killbill_client/models/gen/overdue_state_attributes'
+require 'killbill_client/models/gen/custom_field_attributes'
+require 'killbill_client/models/gen/role_definition_attributes'
+require 'killbill_client/models/gen/tier_price_override_attributes'
+require 'killbill_client/models/gen/invoice_item_attributes'
+require 'killbill_client/models/gen/plugin_property_attributes'
+require 'killbill_client/models/gen/admin_payment_attributes'
+require 'killbill_client/models/gen/event_subscription_attributes'
+require 'killbill_client/models/gen/subscription_attributes'
+require 'killbill_client/models/gen/tenant_attributes'
 require 'killbill_client/models/gen/unit_usage_record_attributes'
 require 'killbill_client/models/gen/usage_record_attributes'
 require 'killbill_client/models/gen/subscription_usage_record_attributes'
-require 'killbill_client/models/gen/overdue_attributes'
-require 'killbill_client/models/gen/stack_trace_element_attributes'
-require 'killbill_client/models/gen/billing_exception_attributes'
+require 'killbill_client/models/gen/gateway_notification_attributes'
 require 'killbill_client/models/gen/audit_log_attributes'
+require 'killbill_client/models/gen/invoice_payment_transaction_attributes'
+require 'killbill_client/models/gen/account_attributes'
+require 'killbill_client/models/gen/invoice_attributes'
+require 'killbill_client/models/gen/block_price_override_attributes'
 require 'killbill_client/models/gen/profiling_data_attributes_item'
 require 'killbill_client/models/gen/profiling_data_attributes'
-require 'killbill_client/models/gen/tenant_key_attributes'
-require 'killbill_client/models/gen/node_command_attributes'
-require 'killbill_client/models/gen/phase_price_override_attributes'
-require 'killbill_client/models/gen/session_attributes'
-require 'killbill_client/models/gen/hosted_payment_page_customer_attributes'
-require 'killbill_client/models/gen/admin_payment_attributes'
-require 'killbill_client/models/gen/bundle_timeline_attributes'
-require 'killbill_client/models/gen/invoice_dry_run_attributes'
-require 'killbill_client/models/gen/payment_attempt_attributes'
+require 'killbill_client/models/gen/combo_payment_transaction_attributes'
 require 'killbill_client/models/gen/hosted_payment_page_fields_attributes'
-require 'killbill_client/models/gen/invoice_payment_attributes'
-require 'killbill_client/models/gen/overdue_state_config_attributes'
-require 'killbill_client/models/gen/simple_plan_attributes'
+require 'killbill_client/models/gen/bundle_attributes'
 require 'killbill_client/models/gen/combo_hosted_payment_page_attributes'
-require 'killbill_client/models/gen/credit_attributes'
+require 'killbill_client/models/gen/plan_detail_attributes'
+require 'killbill_client/models/gen/overdue_attributes'
+require 'killbill_client/models/gen/user_roles_attributes'
+require 'killbill_client/models/gen/bundle_timeline_attributes'
+require 'killbill_client/models/gen/plugin_service_info_attributes'
+require 'killbill_client/models/gen/plugin_info_attributes'
+require 'killbill_client/models/gen/phase_price_override_attributes'
+require 'killbill_client/models/gen/hosted_payment_page_form_descriptor_attributes'
+require 'killbill_client/models/gen/blocking_state_attributes'
+require 'killbill_client/models/gen/overdue_state_config_attributes'
+require 'killbill_client/models/gen/node_command_property_attributes'
 require 'killbill_client/models/gen/overdue_condition_attributes'
-require 'killbill_client/models/gen/block_price_override_attributes'
+require 'killbill_client/models/gen/hosted_payment_page_billing_address_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/node_info_attributes'
+require 'killbill_client/models/gen/account_email_attributes'
+require 'killbill_client/models/gen/payment_method_plugin_detail_attributes'
+require 'killbill_client/models/gen/payment_method_attributes'
+require 'killbill_client/models/gen/subject_attributes'

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

@@ -32,7 +32,7 @@ module KillBillClient
       attribute :file_name
       attribute :line_number
       attribute :method_name
-      attribute :native_method
+      attribute :is_native_method
     end
   end
 end

data/lib/killbill_client/models/gen/{tenant_key_attributes.rb → tenant_key_value_attributes.rb}

@@ -27,7 +27,7 @@
 
 module KillBillClient
   module Model
-    class TenantKeyAttributes < Resource
+    class TenantKeyValueAttributes < Resource
       attribute :key
       attribute :values
     end

data/lib/killbill_client/models/helpers/custom_field_helper.rb

@@ -38,6 +38,27 @@ module KillBillClient
             custom_field.refresh(options)
           end
 
+          define_method('modify_custom_field') do |*args|
+
+            custom_fields = args[0]
+            user = args[1]
+            reason = args[2]
+            comment = args[3]
+            options = args[4] || {}
+
+            body         = custom_fields.is_a?(Enumerable) ? custom_fields : [custom_fields]
+            custom_field = self.class.put "#{url_prefix}/#{send(id_alias)}/customFields",
+                                           body.to_json,
+                                           {},
+                                           {
+                                               :user    => user,
+                                               :reason  => reason,
+                                               :comment => comment,
+                                           }.merge(options),
+                                           CustomField
+            custom_field.refresh(options)
+          end
+
           define_method('remove_custom_field') do |*args|
 
             custom_fields = args[0]

data/lib/killbill_client/models/helpers/tag_helper.rb

@@ -82,10 +82,8 @@ module KillBillClient
             options = args[4] || {}
 
             created_tag = self.class.post "#{url_prefix}/#{send(id_alias)}/tags",
+                                          tag_definition_ids,
                                           {},
-                                          {
-                                              :tagList => tag_definition_ids.join(',')
-                                          },
                                           {
                                               :user    => user,
                                               :reason  => reason,
@@ -106,7 +104,7 @@ module KillBillClient
             self.class.delete "#{url_prefix}/#{send(id_alias)}/tags",
                               {},
                               {
-                                  :tagList => tag_definition_ids.join(',')
+                                  :tagDef => tag_definition_ids
                               },
                               {
                                   :user    => user,

data/lib/killbill_client/models/invoice.rb

@@ -16,8 +16,17 @@ module KillBillClient
       has_tags KILLBILL_API_INVOICES_PREFIX, :invoice_id
 
       class << self
-        def find_by_id_or_number(id_or_number, with_items = true, audit = "NONE", options = {})
-          get "#{KILLBILL_API_INVOICES_PREFIX}/#{id_or_number}",
+        def find_by_id(invoice_id, with_items = true, audit = "NONE", options = {})
+          get "#{KILLBILL_API_INVOICES_PREFIX}/#{invoice_id}",
+              {
+                  :withItems => with_items,
+                  :audit     => audit
+              },
+              options
+        end
+
+        def find_by_number(number, with_items = true, audit = "NONE", options = {})
+          get "#{KILLBILL_API_INVOICES_PREFIX}/byNumber/#{number}",
               {
                   :withItems => with_items,
                   :audit     => audit
@@ -81,22 +90,19 @@ module KillBillClient
           query_map = {:accountId => account_id}
           query_map[:targetDate] = target_date if target_date != nil
 
-          begin
-            res = post "#{KILLBILL_API_DRY_RUN_INVOICES_PREFIX}",
-                       dry_run.to_json,
-                       query_map,
-                       {
-                           :user => 'trigger_invoice_dry_run',
-                           :reason => '',
-                           :comment => '',
-                       }.merge(options),
-                       Invoice
+          res = post "#{KILLBILL_API_DRY_RUN_INVOICES_PREFIX}",
+                     dry_run.to_json,
+                     query_map,
+                     {
+                         :user => 'trigger_invoice_dry_run',
+                         :reason => '',
+                         :comment => '',
+                     }.merge(options),
+                     Invoice
 
-            res.refresh(options)
 
-          rescue KillBillClient::API::NotFound
-            nil
-          end
+          nothing_to_generate?(res) ? nil : res.refresh(options)
+
         end
 
 
@@ -114,21 +120,18 @@ module KillBillClient
           dry_run.price_list_name = price_list_name
           dry_run.bundle_id = bundle_id
 
-          begin
-            res = post "#{KILLBILL_API_DRY_RUN_INVOICES_PREFIX}",
-                       dry_run.to_json,
-                       query_map,
-                       {
-                           :user    => 'create_subscription_dry_run',
-                           :reason  => '',
-                           :comment => '',
-                       }.merge(options),
-                       Invoice
+          res = post "#{KILLBILL_API_DRY_RUN_INVOICES_PREFIX}",
+                     dry_run.to_json,
+                     query_map,
+                     {
+                         :user    => 'create_subscription_dry_run',
+                         :reason  => '',
+                         :comment => '',
+                     }.merge(options),
+                     Invoice
+
+          nothing_to_generate?(res) ? nil : res.refresh(options)
 
-            res.refresh(options)
-          rescue KillBillClient::API::NotFound
-            nil
-          end
         end
 
         def change_plan_dry_run(account_id, bundle_id, subscription_id, target_date, product_name, product_category, billing_period, price_list_name,
@@ -148,21 +151,19 @@ module KillBillClient
           dry_run.bundle_id = bundle_id
           dry_run.subscription_id = subscription_id
 
-          begin
-            res = post "#{KILLBILL_API_DRY_RUN_INVOICES_PREFIX}",
-                       dry_run.to_json,
-                       query_map,
-                       {
-                           :user    => 'change_plan_dry_run',
-                           :reason  => '',
-                           :comment => '',
-                       }.merge(options),
-                       Invoice
 
-            res.refresh(options)
-          rescue KillBillClient::API::NotFound
-            nil
-          end
+          res = post "#{KILLBILL_API_DRY_RUN_INVOICES_PREFIX}",
+                     dry_run.to_json,
+                     query_map,
+                     {
+                         :user    => 'change_plan_dry_run',
+                         :reason  => '',
+                         :comment => '',
+                     }.merge(options),
+                     Invoice
+
+          nothing_to_generate?(res) ? nil : res.refresh(options)
+
         end
 
 
@@ -180,31 +181,27 @@ module KillBillClient
           dry_run.subscription_id = subscription_id
 
 
-          begin
-            res = post "#{KILLBILL_API_DRY_RUN_INVOICES_PREFIX}",
-                       dry_run.to_json,
-                       query_map,
-                       {
-                           :user    => 'cancel_subscription_dry_run',
-                           :reason  => '',
-                           :comment => '',
-                       }.merge(options),
-                       Invoice
+          res = post "#{KILLBILL_API_DRY_RUN_INVOICES_PREFIX}",
+                     dry_run.to_json,
+                     query_map,
+                     {
+                         :user    => 'cancel_subscription_dry_run',
+                         :reason  => '',
+                         :comment => '',
+                     }.merge(options),
+                     Invoice
 
-            res.refresh(options)
+          nothing_to_generate?(res) ? nil : res.refresh(options)
 
-          rescue KillBillClient::API::NotFound
-            nil
-          end
         end
 
 
-        def get_invoice_template(is_manual_pay, options = {})
+        def get_invoice_template(is_manual_pay, locale = nil, options = {})
 
           require_multi_tenant_options!(options, "Retrieving an invoice template supported in multi-tenant mode")
 
 
-          get "#{KILLBILL_API_INVOICES_PREFIX}/#{is_manual_pay ? "manualPayTemplate" : "template"}",
+          get "#{KILLBILL_API_INVOICES_PREFIX}/#{is_manual_pay ? "manualPayTemplate/#{locale}" : "template"}",
               {},
               {
                   :head => {'Accept' => 'text/html'},
@@ -229,7 +226,7 @@ module KillBillClient
                    :reason => reason,
                    :comment => comment,
                }.merge(options)
-          get_invoice_template(is_manual_pay, options)
+          get_invoice_template(is_manual_pay, nil, options)
         end
 
         def get_invoice_translation(locale, options = {})
@@ -360,7 +357,12 @@ module KillBillClient
                             :comment => comment,
                         }.merge(options)
       end
+      private
 
+      def self.nothing_to_generate?(invoice)
+        return true if invoice.nil? || invoice.response.nil?
+        invoice.response.code.to_i == 204
+      end
     end
   end
 end

data/lib/killbill_client/models/invoice_item.rb

@@ -28,10 +28,8 @@ module KillBillClient
       # DO NOT DELETE THIS METHOD
       def add_tags_from_definition_ids(tag_definition_ids, user, reason, comment, options)
         created_tag = self.class.post "#{KILLBILL_API_INVOICE_ITEMS_PREFIX}/#{invoice_item_id}/tags",
+                                      tag_definition_ids,
                                       {},
-                                      {
-                                          :tagList => tag_definition_ids.join(',')
-                                      },
                                       {
                                           :user    => user,
                                           :reason  => reason,

data/lib/killbill_client/models/invoice_payment.rb

@@ -74,6 +74,20 @@ module KillBillClient
                                  }.merge(options)
           invoice_payment.refresh(options)
         end
+
+        def complete_invoice_payment_transaction(payment_id, user, reason, comment, options)
+          invoice_payment = PaymentTransactionAttributes.new
+          invoice_payment.payment_id = payment_id
+
+          put "#{KILLBILL_API_INVOICE_PAYMENTS_PREFIX}/#{payment_id}",
+              invoice_payment.to_json,
+              {},
+              {
+                  :user => user,
+                  :reason => reason,
+                  :comment => comment
+              }.merge(options)
+        end
       end
 
       def create(external_payment = false, user = nil, reason = nil, comment = nil, options = {})
@@ -90,13 +104,15 @@ module KillBillClient
         created_invoice_payment.refresh(options)
       end
 
-      def bulk_create(external_payment = false, user = nil, reason = nil, comment = nil, options = {})
+      def bulk_create(external_payment = false, payment_method_id = nil, target_date = nil, user = nil, reason = nil, comment = nil, options = {})
         # Nothing to return (nil)
         self.class.post "#{Account::KILLBILL_API_ACCOUNTS_PREFIX}/#{account_id}/invoicePayments",
                         {},
                         {
                             :externalPayment => external_payment,
-                            :paymentAmount   => purchased_amount
+                            :paymentAmount   => purchased_amount,
+                            :paymentMethodId => payment_method_id,
+                            :targetDate => target_date
                         },
                         {
                             :user    => user,
@@ -104,7 +120,6 @@ module KillBillClient
                             :comment => comment,
                         }.merge(options)
       end
-
     end
   end
 end