kaui 0.4.8 → 0.4.9

data/Gemfile.lock

@@ -1,12 +1,12 @@
 PATH
   remote: .
   specs:
-    kaui (0.4.8)
+    kaui (0.4.9)
       cancan (~> 1.6.10)
       d3_rails (~> 3.2.8)
       devise (~> 3.0.2)
       jquery-rails (~> 3.0.4)
-      killbill-client (~> 0.3.6)
+      killbill-client (~> 0.4.1)
       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.3.6)
+    killbill-client (0.4.1)
     mail (2.5.4)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)

data/app/controllers/kaui/refunds_controller.rb

@@ -66,10 +66,12 @@ class Kaui::RefundsController < Kaui::EngineController
 
   def create
     invoice = Kaui::KillbillHelper::get_invoice(params[:invoice_id], true, "NONE", options_for_klient)
-    refund = Kaui::Refund.new(params[:refund])
-    refund.adjusted = (refund.adjustment_type != "noInvoiceAdjustment")
-    if refund.adjustment_type == "invoiceItemAdjustment"
-      refund.adjustments = []
+    refund = {}
+    refund.merge! params[:refund]
+    refund["adjusted"] = (refund["adjustment_type"] != "noInvoiceAdjustment")
+
+    if refund["adjustment_type"] == "invoiceItemAdjustment"
+      refund["adjustments"] = []
       params[:adjustments].each_with_index do |ii, idx|
         original_item = find_original_item(invoice.items, ii[0])
         h = Hash.new
@@ -79,7 +81,7 @@ class Kaui::RefundsController < Kaui::EngineController
         h[:amount] = (ii[1].to_f == original_item.amount) ? nil : ii[1]
         kaui_ii = Kaui::InvoiceItem.new(h)
         puts "Got #{kaui_ii.inspect}"
-        refund.adjustments[idx] = kaui_ii
+        refund["adjustments"][idx] = kaui_ii
       end
     end
     if refund.present?

data/app/helpers/kaui/killbill_helper.rb

@@ -186,7 +186,7 @@ module Kaui
 
     def self.create_subscription(subscription, current_user = nil, reason = nil, comment = nil, options = {})
 
-      entitlement = KillBillClient::Model::EntitlementNoEvents.new
+      entitlement = KillBillClient::Model::Subscription.new
       entitlement.account_id = subscription.account_id
       entitlement.bundle_id = subscription.bundle_id
       entitlement.external_key = subscription.external_key
@@ -202,7 +202,7 @@ module Kaui
     def self.update_subscription(subscription, requested_date = nil, policy = nil, current_user = nil, reason = nil, comment = nil, options = {})
 
       requested_date = requested_date.to_s unless requested_date.blank?
-      entitlement = KillBillClient::Model::EntitlementNoEvents.new
+      entitlement = KillBillClient::Model::Subscription.new
       entitlement.subscription_id = subscription.subscription_id
       entitlement.change_plan({:productName => subscription.product_name, :billingPeriod => subscription.billing_period, :priceList => subscription.price_list},
                               extract_created_by(current_user), extract_reason_code(reason), comment, requested_date, policy, false, options)
@@ -210,7 +210,7 @@ module Kaui
 
     def self.delete_subscription(subscription_id, current_user = nil, reason = nil, comment = nil,  policy = nil, options = {})
 
-      entitlement = KillBillClient::Model::EntitlementNoEvents.new
+      entitlement = KillBillClient::Model::Subscription.new
       entitlement.subscription_id = subscription_id
       # We are using same entitlement/billing policy here for now
       entitlement.cancel(extract_created_by(current_user), extract_reason_code(reason), comment, nil, policy, policy, true, options)
@@ -387,24 +387,27 @@ module Kaui
     ############## REFUND ##############
 
     def self.get_refund(refund_id, options = {})
-      data = call_killbill :get, "/1.0/kb/refunds/#{refund_id}", options
-      process_response(data, :single) { |json| Kaui::Refund.new(json) }
+      KillBillClient::Model::Refund.find_by_id refund_id, options
     end
 
     def self.get_refunds_for_payment(payment_id, options = {})
-      data = call_killbill :get, "/1.0/kb/payments/#{payment_id}/refunds", options
-      process_response(data, :multiple) { |json| Kaui::Refund.new(json) }
+      KillBillClient::Model::Refund.find_all_by_payment_id payment_id, options
     end
 
     def self.create_refund(payment_id, refund, current_user = nil, reason = nil, comment = nil, options = {})
-      refund_data = Kaui::Refund.camelize(refund.to_hash)
-      # We don't want to pass adjustment_type
-      refund_data.delete(:adjustmentType)
 
-      call_killbill :post,
-                    "/1.0/kb/payments/#{payment_id}/refunds",
-                    ActiveSupport::JSON.encode(refund_data, :root => false),
-                    build_audit_headers(current_user, reason, comment, options)
+      new_refund = KillBillClient::Model::Refund.new
+      new_refund.amount = refund["amount"]
+      new_refund.adjusted = refund["adjusted"]
+      new_refund.adjustments = refund["adjustments"]
+      #no need to pass adjustment_type
+
+      new_refund.create(payment_id,
+                        refund,
+                        extract_created_by(current_user),
+                        extract_reason_code(reason),
+                        comment,
+                        options)
     end
 
     ############## CHARGEBACK ##############

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

@@ -179,7 +179,7 @@
           <td><%= "CHARGEBACK" %></td>
           <td>
             <%= "Payment id:" %> <%= chargeback.payment_id %><br/>
-            <%= "Chargeback Amount:" %> <%= humanized_money_with_symbol Kaui::Base.to_money(chargeback.chargeback_amount, payment.currency) %> (<%= payment.currency %>)<br/>
+            <%= "Chargeback Amount:" %> <%= humanized_money_with_symbol Kaui::Base.to_money(chargeback.amount, payment.currency) %> (<%= payment.currency %>)<br/>
           </td>
           <td>
             <% if chargeback.audit_logs.present? %>

data/app/views/kaui/refunds/_refunds_table.html.erb

@@ -19,7 +19,7 @@
         <tr>
           <td><%= format_date(refund.requested_date, @account.timezone).html_safe if refund.requested_date.present? %></td>
           <td><%= format_date(refund.effective_date, @account.timezone).html_safe if refund.effective_date.present? %></td>
-          <td><%= humanized_money_with_symbol refund.amount_to_money %> (<%= refund.currency %>)</td>
+          <td><%= humanized_money_with_symbol Kaui::Base.to_money(refund.amount, refund.currency) %> (<%= refund.currency %>)</td>
           <td><%= refund.adjusted %></td>
           <td><%= link_to refund.refund_id, refund_path(refund.refund_id) %></td>
           <td><%= refund.payment_id %></td>

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.3.6'
+  s.add_dependency 'killbill-client', '~> 0.4.1'
   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.8"
+  VERSION = "0.4.9"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kaui
 version: !ruby/object:Gem::Version
-  version: 0.4.8
+  version: 0.4.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-10 00:00:00.000000000 Z
+date: 2013-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -98,7 +98,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.3.6
+        version: 0.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -106,7 +106,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.3.6
+        version: 0.4.1
 - !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: 2214569211670130331
+      hash: 11207357591109144
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25