kaui 0.4.9 → 0.5.0

data/Gemfile.lock

@@ -1,12 +1,12 @@
 PATH
   remote: .
   specs:
-    kaui (0.4.9)
+    kaui (0.5.0)
       cancan (~> 1.6.10)
       d3_rails (~> 3.2.8)
       devise (~> 3.0.2)
       jquery-rails (~> 3.0.4)
-      killbill-client (~> 0.4.1)
+      killbill-client (~> 0.4.2)
       money-rails (~> 0.8.1)
       rails (~> 3.2.14)
       rest-client (~> 1.6.7)
@@ -60,7 +60,7 @@ GEM
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
     json (1.8.0)
-    killbill-client (0.4.1)
+    killbill-client (0.4.2)
     mail (2.5.4)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)

data/app/controllers/kaui/credits_controller.rb

@@ -34,7 +34,7 @@ class Kaui::CreditsController < Kaui::EngineController
     credit_amount = @invoice.balance unless @invoice.nil?
 
     @credit = Kaui::Credit.new("accountId" => @account_id, "invoiceId" => @invoice_id,
-                               "creditAmount" => credit_amount, "effectiveDate" => Time.now.utc.iso8601)
+                               "creditAmount" => credit_amount, "effectiveDate" => Date.parse(Time.now.to_s).to_s)
   end
 
   def create

data/app/controllers/kaui/subscriptions_controller.rb

@@ -103,7 +103,6 @@ class Kaui::SubscriptionsController < Kaui::EngineController
   def edit
     begin
       @subscription = Kaui::KillbillHelper.get_subscription(params[:id], options_for_klient)
-
       if @subscription.present?
         @bundle = Kaui::KillbillHelper::get_bundle(@subscription.bundle_id, options_for_klient)
         @account = Kaui::KillbillHelper::get_account(@bundle.account_id, false, false, options_for_klient)
@@ -133,7 +132,7 @@ class Kaui::SubscriptionsController < Kaui::EngineController
 
         plan = catalog[params[:plan_name]]
         requested_date = params[:requested_date]
-        policy = params[:policy]
+        policy = params[:policy] unless params[:policy].empty?
 
         subscription.billing_period = plan["billingPeriod"]
         subscription.product_category = plan["productCategory"]

data/app/helpers/kaui/killbill_helper.rb

@@ -180,7 +180,7 @@ module Kaui
     end
 
     def self.get_subscription(subscription_id, options = {})
-      data = call_killbill :get, "/1.0/kb/subscriptions/#{subscription_id}", options
+      data = call_killbill :get, "/1.0/kb/entitlements/#{subscription_id}", options
       process_response(data, :single) { |json| Kaui::Subscription.new(json) }
     end
 
@@ -397,14 +397,20 @@ module Kaui
     def self.create_refund(payment_id, refund, current_user = nil, reason = nil, comment = nil, options = {})
 
       new_refund = KillBillClient::Model::Refund.new
+      new_refund.payment_id = payment_id
       new_refund.amount = refund["amount"]
       new_refund.adjusted = refund["adjusted"]
-      new_refund.adjustments = refund["adjustments"]
+      if ! refund["adjustments"].nil?
+        new_refund.adjustments = []
+        refund["adjustments"].each do |a|
+          item = KillBillClient::Model::InvoiceItemAttributes.new
+          item.invoice_item_id = a.invoice_item_id
+          item.amount = a.amount
+          new_refund.adjustments << item
+        end
+      end
       #no need to pass adjustment_type
-
-      new_refund.create(payment_id,
-                        refund,
-                        extract_created_by(current_user),
+      new_refund.create(extract_created_by(current_user),
                         extract_reason_code(reason),
                         comment,
                         options)
@@ -418,12 +424,14 @@ module Kaui
     end
 
     def self.create_chargeback(chargeback, current_user = nil, reason = nil, comment = nil, options = {})
-      chargeback_data = Kaui::Refund.camelize(chargeback.to_hash)
 
-      call_killbill :post,
-                    "/1.0/kb/chargebacks",
-                    ActiveSupport::JSON.encode(chargeback_data, :root => false),
-                    build_audit_headers(current_user, reason, comment, options)
+      new_chargeback = KillBillClient::Model::Chargeback.new
+      new_chargeback.payment_id = chargeback.payment_id
+      new_chargeback.amount = chargeback.chargeback_amount
+      new_chargeback.create(extract_created_by(current_user),
+                            extract_reason_code(reason),
+                            comment,
+                            options)
     end
 
     ############## CREDIT ##############
@@ -505,8 +513,9 @@ module Kaui
     ############## OVERDUE ##############
 
     def self.get_overdue_state_for_account(account_id, options = {})
-      data = call_killbill :get, "/1.0/kb/overdue/accounts/#{account_id}", options
-      process_response(data, :single) { |json| Kaui::OverdueState.new(json) }
+      account = KillBillClient::Model::Account.new
+      account.account_id = account_id
+      account.overdue(options)
     end
 
     ############## ANALYTICS ##############

data/app/views/kaui/account_timelines/show.html.erb

@@ -69,7 +69,7 @@
           <td><%= "INVOICE" %></td>
           <td><span class="hide" title="<%= invoice.invoice_number %>"></span>
               <%= "Amount:" %> <%= humanized_money_with_symbol Kaui::Base.to_money(invoice.amount, @account.currency) %>  (<%= @account.currency %>)<br/>
-              <%= "Balance:" %> <%= humanized_money_with_symbol Kaui::Base.to_money(invoice.amount, @account.currency) %>  (<%= @account.currency %>)<br/>
+              <%= "Balance:" %> <%= humanized_money_with_symbol Kaui::Base.to_money(invoice.balance, @account.currency) %>  (<%= @account.currency %>)<br/>
               <% if invoice.credit_adj.present? && invoice.credit_adj > 0  %>
                 <%= "Credit adjustment:" %> <%= humanized_money_with_symbol Kaui::Base.to_money(invoice.credit_adj, @account.currency) %>  (<%= @account.currency %>)<br/>
               <% end %>

data/app/views/kaui/charges/new.html.erb

@@ -64,7 +64,7 @@
     <div class="control-group">
       <%= label_tag :requested_date, 'Requested Date:', :class => "control-label" %>
       <div class="controls">
-        <%= text_field_tag :requested_date, Time.now.utc.iso8601, :class => 'input-xlarge date-picker' %>
+        <%= text_field_tag :requested_date, Date.parse(Time.now.to_s).to_s, :class => 'input-xlarge date-picker' %>
       </div>
     </div>
     <div class="control-group">

data/app/views/kaui/subscriptions/edit.html.erb

@@ -25,7 +25,7 @@
   <div class="control-group">
     <%= label_tag :requested_date, 'Change Date:', :class => "control-label" %>
     <div class="controls">
-      <%= text_field_tag :requested_date, Time.now.utc.iso8601, :class => 'input-xlarge date-picker' %>
+      <%= text_field_tag :requested_date, Date.parse(Time.now.to_s).to_s, :class => 'input-xlarge date-picker' %>
     </div>
   </div>
   <div class="control-group">

data/kaui.gemspec

@@ -27,7 +27,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'rest-client', '~> 1.6.7'
   s.add_dependency 'money-rails', '~> 0.8.1'
   s.add_dependency 'd3_rails', '~> 3.2.8'
-  s.add_dependency 'killbill-client', '~> 0.4.1'
+  s.add_dependency 'killbill-client', '~> 0.4.2'
   s.add_dependency 'devise', '~> 3.0.2'
   s.add_dependency 'cancan', '~> 1.6.10'
 

data/lib/kaui/version.rb

@@ -1,3 +1,3 @@
 module Kaui
-  VERSION = "0.4.9"
+  VERSION = "0.5.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kaui
 version: !ruby/object:Gem::Version
-  version: 0.4.9
+  version: 0.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -98,7 +98,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.4.1
+        version: 0.4.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -106,7 +106,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.4.1
+        version: 0.4.2
 - !ruby/object:Gem::Dependency
   name: devise
   requirement: !ruby/object:Gem::Requirement
@@ -435,7 +435,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 11207357591109144
+      hash: -4397666947542555501
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25