kaui 0.0.9 → 0.1.0

data/app/controllers/kaui/subscriptions_controller.rb

@@ -101,7 +101,7 @@ class Kaui::SubscriptionsController < Kaui::EngineController
       subscription.billing_period = plan["billingPeriod"]
       subscription.product_category = plan["productCategory"]
       subscription.product_name = plan["productName"]
-      subscription.price_list = plan["priceListName"]
+      subscription.price_list = params[:subscription][:price_list]
       subscription.subscription_id = params[:subscription][:subscription_id]
       # TODO: need to use entered start_date (or current date if none entered)
 

data/app/helpers/kaui/killbill_helper.rb

@@ -37,7 +37,7 @@ module Kaui
 
     def self.get_account_timeline(account_id)
       begin
-        data = call_killbill :get, "/1.0/kb/accounts/#{account_id}/timeline"
+        data = call_killbill :get, "/1.0/kb/accounts/#{account_id}/timeline?audit=true"
         process_response(data, :single) {|json| Kaui::AccountTimeline.new(json) }
       rescue => e
         puts "#{$!}\n\t" + e.backtrace.join("\n\t")
@@ -103,10 +103,10 @@ module Kaui
       end
     end
 
-    def self.transfer_bundle(bundle_id, new_account_id, current_user = nil, reason = nil, comment = nil)
+    def self.transfer_bundle(bundle_id, new_account_id, cancel_immediately = false, transfer_addons = true, current_user = nil, reason = nil, comment = nil)
       begin
         data = call_killbill :put,
-                             "/1.0/kb/bundles/#{bundle_id}",
+                             "/1.0/kb/bundles/#{bundle_id}?cancelImmediately=#{cancel_immediately}&transferAddOn=#{transfer_addons}",
                              ActiveSupport::JSON.encode("accountId" => new_account_id),
                              :content_type => :json,
                              "X-Killbill-CreatedBy" => current_user,

data/app/models/kaui/audit_log.rb

@@ -0,0 +1,28 @@
+require 'active_model'
+
+class Kaui::AuditLog < Kaui::Base
+  define_attr :change_date
+  define_attr :change_type
+  define_attr :changed_by
+  define_attr :comments
+  define_attr :reason_code
+
+  def initialize(data = {})
+    super(:change_date => data['changeDate'],
+          :change_type => data['changeType'],
+          :changed_by => data['changedBy'],
+          :comments => data['comments'],
+          :reason_code => data['reasonCode'])
+  end
+
+  def description
+    changed_str = "Performed by #{changed_by} on #{ActionController::Base.helpers.format_date(change_date)}"
+    if reason_code.blank? && comments.blank?
+      changed_str
+    elsif reason_code.blank?
+      "#{changed_str}: #{comments}"
+    else
+      "#{changed_str} (#{reason_code} #{comments})"
+    end
+  end
+end

data/app/models/kaui/bundle.rb

@@ -4,12 +4,15 @@ class Kaui::Bundle < Kaui::Base
   define_attr :account_id
   define_attr :external_key
   define_attr :bundle_id
+
   has_many :subscriptions, Kaui::Subscription
+  has_many :audit_logs, Kaui::AuditLog
 
   def initialize(data = {})
     super(:external_key => data['externalKey'],
           :bundle_id => data['bundleId'],
           :account_id => data['accountId'],
-          :subscriptions => data['subscriptions'])
+          :subscriptions => data['subscriptions'],
+          :audit_logs => data['auditLogs'])
   end
 end

data/app/models/kaui/chargeback.rb

@@ -28,11 +28,14 @@ class Kaui::Chargeback < Kaui::Base
   define_attr :effective_dt
   define_attr :reason
 
+  has_many :audit_logs, Kaui::AuditLog
+
   def initialize(data = {})
     super(:payment_id => data['paymentId'] || data['payment_id'],
           :chargeback_amount => data['chargebackAmount'] || data['chargeback_amount'],
           :requested_dt => data['requestedDate'] || data['requested_date'] || data['requested_dt'],
           :effective_dt => data['effectiveDate'] || data['effective_date'] || data['effective_dt'],
-          :reason => data['reason'])
+          :reason => data['reason'],
+          :audit_logs => data['auditLogs'])
   end
 end

data/app/models/kaui/event.rb

@@ -8,6 +8,8 @@ class Kaui::Event < Kaui::Base
   define_attr :product
   define_attr :requested_dt
 
+  has_many :audit_logs, Kaui::AuditLog
+
   def initialize(data = {})
     super(:event_id => data['eventId'],
           :billing_period => data['billingPeriod'],
@@ -16,6 +18,7 @@ class Kaui::Event < Kaui::Base
           :phase => data['phase'],
           :price_list => data['priceList'],
           :product => data['product'],
-          :requested_dt => data['requestedDate'])
+          :requested_dt => data['requestedDate'],
+          :audit_logs => data['auditLogs'])
   end
 end

data/app/models/kaui/invoice.rb

@@ -14,7 +14,9 @@ class Kaui::Invoice < Kaui::Base
   define_attr :payment_dt
   define_attr :target_dt
   define_attr :bundle_keys
+
   has_many :items, Kaui::InvoiceItem
+  has_many :audit_logs, Kaui::AuditLog
 
   def initialize(data = {})
     super(
@@ -29,6 +31,7 @@ class Kaui::Invoice < Kaui::Base
           :refund_adjustment => data['refundAdj'],
           :target_dt => data['targetDate'],
           :items => data['items'],
-          :bundle_keys => data['bundleKeys'])
+          :bundle_keys => data['bundleKeys'],
+          :audit_logs => data['auditLogs'])
   end
 end

data/app/models/kaui/payment.rb

@@ -21,6 +21,7 @@ class Kaui::Payment < Kaui::Base
 
   has_many :refunds, Kaui::Refund
   has_many :chargebacks, Kaui::Chargeback
+  has_many :audit_logs, Kaui::AuditLog
 
   def initialize(data = {})
     super(:account_id => data['accountId'] || data['account_id'],
@@ -37,6 +38,7 @@ class Kaui::Payment < Kaui::Base
           :status => data['status'],
           :bundle_keys => data['bundleKeys'] || data['bundle_keys'],
           :refunds => data['refunds'],
-          :chargebacks => data['chargebacks'])
+          :chargebacks => data['chargebacks'],
+          :audit_logs => data['auditLogs'])
   end
 end

data/app/models/kaui/refund.rb

@@ -13,12 +13,15 @@ class Kaui::Refund < Kaui::Base
   define_attr :requested_dt
   define_attr :effective_dt
 
+  has_many :audit_logs, Kaui::AuditLog
+
   def initialize(data = {})
     super(:refund_id => data['refundId'] || data['refund_id'],
           :payment_id => data['paymentId'] || data['payment_id'],
           :adjusted => data['adjusted'],
           :refund_amount => data['refundAmount'] || data['refund_amount'],
           :requested_dt => data['requestedDate'] || data['requested_date'] || data['requested_dt'],
-          :effective_dt => data['effectiveDate'] || data['effective_date'] || data['effective_dt'])
+          :effective_dt => data['effectiveDate'] || data['effective_date'] || data['effective_dt'],
+          :audit_logs => data['auditLogs'])
   end
 end

data/app/models/kaui/subscription.rb

@@ -8,6 +8,7 @@ class Kaui::Subscription < Kaui::Base
   define_attr :price_list
   define_attr :start_date
   define_attr :canceled_date
+
   has_many :events, Kaui::Event
 
   def initialize(data = {})

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

@@ -76,7 +76,13 @@
               <%= "Invoice #" %>
               <%= link_to invoice.invoice_number, invoice_path(:id => invoice.invoice_id) %>
           </td>
-          <td></td>
+          <td>
+            <% if invoice_stub.audit_logs.present? %>
+              <% invoice_stub.audit_logs.each do |entry| %>
+                <%= entry.description unless entry.changed_by == 'Transition' %><br/>
+              <% end %>
+            <% end %>
+          </td>
           <td>
             <% if invoice.balance > 0 %>
               <nobr>
@@ -126,7 +132,11 @@
               <%= "Payment id:" %> <%= refund.payment_id %><br/>
               <%= "Refund Amount:" %> <%= refund.refund_amount %><br/>
             </td>
-            <td></td>
+            <td>
+              <% if refund.audit_logs.present? %>
+              <%= refund.audit_logs[0].description %><br/>
+              <% end %>
+            </td>
             <td></td>
           </tr>
         <% end %>
@@ -161,7 +171,11 @@
             <%= "Payment id:" %> <%= chargeback.payment_id %><br/>
             <%= "Chargeback Amount:" %> <%= chargeback.chargeback_amount %><br/>
           </td>
-          <td></td>
+          <td>
+            <% if chargeback.audit_logs.present? %>
+              <%= chargeback.audit_logs[0].description %><br/>
+            <% end %>
+          </td>
           <td></td>
         <% end %>
       <% end %>
@@ -198,6 +212,7 @@
           </td>
           <td><%= "PAYMENT" %></td>
           <td>
+            <%= "Payment id:" %> <%= payment.id %><br/>
             <%= "Total amount:" %> <%= payment.amount %> <%= @account.currency if payment.amount.present? %><br/>
             <%= "Paid amount:" %> <%= payment.paid_amount %> <%= @account.currency %><br/>
             <span <% if payment.status == 'FAILED' %>class="alert-error" <% elsif payment.status == 'SUCCESS' %>class="alert-success" <% end %>>
@@ -206,7 +221,11 @@
             <br/>
             <%= "Invoice #" %> <%= link_to invoice.invoice_number, invoice_path(:id => invoice.invoice_id) %>
           </td>
-          <td></td>
+          <td>
+            <% payment.audit_logs.each do |entry| %>
+              <%= entry.description unless entry.changed_by == 'PaymentRequestProcessor' %><br/>
+            <% end %>
+          </td>
           <td>
             <% if payment.payment_id.present? %>
               <nobr>
@@ -220,9 +239,9 @@
                                                                           :class => "btn btn-mini" %>
               </nobr>
               <% elsif invoice.balance > 0 %>
-                <%= link_to 'Pay', kaui_engine.new_chargeback_path(:params => { :payment_id => payment.payment_id,
-                                                                                :account_id => @account.account_id,
-                                                                                :invoice_id => payment.invoice_id }),
+                <%= link_to 'Pay', kaui_engine.new_payment_path(:params => { :payment_id => payment.payment_id,
+                                                                             :account_id => @account.account_id,
+                                                                             :invoice_id => payment.invoice_id }),
                                                                    :class => "btn btn-mini" %>
             <% end %>
           </td>

data/app/views/kaui/bundles/transfer.html.erb

@@ -16,6 +16,12 @@
       <%= text_field_tag :new_account_key, nil, :class => "input-xlarge" %>
     </div>
   </div>
+  <div class="control-group">
+    <%= label_tag :comment, "Comment", :class => "control-label" %>
+    <div class="controls">
+      <%= text_area_tag :comment, "", :rows => 3, :class => 'input-xlarge' %>
+    </div>
+  </div>
   <div class="form-actions">
     <%= submit_tag "Change", :class => 'btn btn-primary' %>
     <%= link_to 'Back', :back, :class => 'btn' %>

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

@@ -1,6 +1,7 @@
 <% @page_title = "Edit Subscription" %>
 <%= form_for(@subscription, :url => subscription_path(@subscription.subscription_id), :html => { :method => :put, :class => "form-horizontal" }) do |f| %>
   <%= f.hidden_field :subscription_id %>
+  <%= f.hidden_field :price_list %>
   <div class="control-group">
     <%= label_tag :current_plan, 'Current plan:', :class => "control-label" %>
     <div class="controls">

data/lib/kaui/version.rb

@@ -1,3 +1,3 @@
 module Kaui
-  VERSION = "0.0.9"
+  VERSION = "0.1.0"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: kaui
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 27
   prerelease: 
   segments: 
   - 0
+  - 1
   - 0
-  - 9
-  version: 0.0.9
+  version: 0.1.0
 platform: ruby
 authors: 
 - Alena Dudzinskaya
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-08-06 00:00:00 Z
+date: 2012-08-10 00:00:00 Z
 dependencies: []
 
 description: Rails UI plugin for Killbill administration.
@@ -67,6 +67,7 @@ files:
 - app/helpers/kaui/killbill_helper.rb
 - app/models/kaui/account.rb
 - app/models/kaui/account_timeline.rb
+- app/models/kaui/audit_log.rb
 - app/models/kaui/base.rb
 - app/models/kaui/bill_cycle_day.rb
 - app/models/kaui/bundle.rb