kaui 0.1.11 → 0.1.12

data/app/controllers/kaui/accounts_controller.rb

@@ -15,7 +15,7 @@ class Kaui::AccountsController < Kaui::EngineController
       key.strip!
 
       begin
-        @account = Kaui::KillbillHelper::get_account_by_key(key, true)
+        @account = Kaui::KillbillHelper::get_account_by_key_with_balance_and_cba(key)
       rescue URI::InvalidURIError => e
         flash[:error] = "Error while retrieving the account for #{key}: #{e.message}"
         render :action => :index and return
@@ -161,9 +161,19 @@ class Kaui::AccountsController < Kaui::EngineController
     begin
       @account = Kaui::KillbillHelper::update_email_notifications(params[:id], params[:is_notified])
       flash[:notice] = "Email preferences updated"
-      redirect_to :back
     rescue => e
       flash[:error] = "Error while switching email notifications #{invoice_id}: #{as_string(e)}"
     end
+    redirect_to :back
+  end
+
+  def pay_all_invoices
+    begin
+      @account = Kaui::KillbillHelper::pay_all_invoices(params[:id], false, current_user, params[:reason], params[:comment])
+      flash[:notice] = "Successfully triggered a payment for all unpaid invoices"
+    rescue => e
+      flash[:error] = "Error while triggering payments: #{as_string(e)}"
+    end
+    redirect_to :back
   end
 end

data/app/controllers/kaui/bundles_controller.rb

@@ -46,7 +46,7 @@ class Kaui::BundlesController < Kaui::EngineController
     key = params[:new_account_key]
     if key.present?
       begin
-        result = Kaui::KillbillHelper.get_account_by_key(key, false)
+        result = Kaui::KillbillHelper.get_account_by_key(key)
       rescue => e
         flash[:error] = "Error while retrieving account for #{key}: #{as_string(e)}"
         render :action => :index

data/app/controllers/kaui/invoice_items_controller.rb

@@ -25,6 +25,17 @@ class Kaui::InvoiceItemsController < Kaui::EngineController
     end
   end
 
+  def destroy
+    begin
+      Kaui::KillbillHelper.delete_cba(params[:account_id], params[:invoice_id], params[:id], current_user, params[:reason], params[:comment])
+      flash[:notice] = "CBA deleted"
+      redirect_to kaui_engine.invoice_path(params[:invoice_id])
+    rescue => e
+      flash[:error] = "Error while deleting the CBA: #{as_string(e)}"
+      redirect_to kaui_engine.invoice_path(params[:invoice_id])
+    end
+  end
+
   private
 
   def find_invoice_item

data/app/controllers/kaui/invoices_controller.rb

@@ -16,8 +16,11 @@ class Kaui::InvoicesController < Kaui::EngineController
 
           @subscriptions = {}
           @bundles = {}
+          @cba_items_not_deleteable = []
           if @invoice.items.present?
             @invoice.items.each do |item|
+              @cba_items_not_deleteable << item.linked_invoice_item_id if item.description =~ /account credit/ and item.amount < 0
+
               unless item.subscription_id.nil? || @subscriptions.has_key?(item.subscription_id)
                 @subscriptions[item.subscription_id] = Kaui::KillbillHelper.get_subscription(item.subscription_id)
               end

data/app/controllers/kaui/refunds_controller.rb

@@ -53,9 +53,19 @@ class Kaui::RefundsController < Kaui::EngineController
   def create
     payment_id = params[:payment_id]
     account_id = params[:account_id]
-
     refund = Kaui::Refund.new(params[:refund])
-    refund.adjusted = (refund.adjusted == "1")
+    refund.adjusted = (refund.adjustment_type != "noInvoiceAdjustment")
+    if refund.adjustment_type == "invoiceItemAdjustment"
+      refund.adjustments = []
+      params[:adjustments].each_with_index do |ii, idx|
+        h = Hash.new
+        h[:invoice_item_id] = ii[0]
+        h[:amount] = ii[1]
+        kaui_ii = Kaui::InvoiceItem.new(h)
+        puts "Got #{kaui_ii.inspect}"
+        refund.adjustments[idx] = kaui_ii
+      end
+    end
     if refund.present?
       begin
         Kaui::KillbillHelper::create_refund(params[:payment_id], refund, current_user, params[:reason], params[:comment])

data/app/controllers/kaui/subscriptions_controller.rb

@@ -157,7 +157,7 @@ class Kaui::SubscriptionsController < Kaui::EngineController
     subscription_id = params[:id]
     if subscription_id.present?
       begin
-        Kaui::KillbillHelper::delete_subscription(subscription_id, current_user)
+        Kaui::KillbillHelper::delete_subscription(subscription_id, params[:policy], current_user)
       rescue => e
         flash[:error] = "Error while reinstating subscription: #{as_string(e)}"
       end

data/app/helpers/kaui/killbill_helper.rb

@@ -39,12 +39,16 @@ module Kaui
 
     ############## ACCOUNT ##############
 
-    def self.get_account_by_key(key, with_balance)
+    def self.get_account_by_key_with_balance_and_cba(key)
+      self.get_account_by_key(key, false, true)
+    end
+
+    def self.get_account_by_key(key, with_balance = false, with_balance_and_cba = false)
       # support id (UUID) and external key search
       if key =~ /[A-Fa-f0-9]{8}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{12}/
-        Kaui::KillbillHelper.get_account(key, with_balance)
+        Kaui::KillbillHelper.get_account(key, with_balance, with_balance_and_cba)
       else
-        Kaui::KillbillHelper.get_account_by_external_key(key, with_balance)
+        Kaui::KillbillHelper.get_account_by_external_key(key, with_balance, with_balance_and_cba)
       end
     end
 
@@ -53,13 +57,13 @@ module Kaui
       process_response(data, :single) {|json| Kaui::AccountTimeline.new(json) }
     end
 
-    def self.get_account(account_id, with_balance=false)
-      data = call_killbill :get, "/1.0/kb/accounts/#{account_id}?accountWithBalance=#{with_balance}"
+    def self.get_account(account_id, with_balance = false, with_balance_and_cba = false)
+      data = call_killbill :get, "/1.0/kb/accounts/#{account_id}?accountWithBalance=#{with_balance}&accountWithBalanceAndCBA=#{with_balance_and_cba}"
       process_response(data, :single) {|json| Kaui::Account.new(json) }
     end
 
-    def self.get_account_by_external_key(external_key, with_balance=false)
-      data = call_killbill :get, "/1.0/kb/accounts?externalKey=#{external_key}&accountWithBalance=#{with_balance}"
+    def self.get_account_by_external_key(external_key, with_balance = false, with_balance_and_cba = false)
+      data = call_killbill :get, "/1.0/kb/accounts?externalKey=#{external_key}&accountWithBalance=#{with_balance}&accountWithBalanceAndCBA=#{with_balance_and_cba}"
       process_response(data, :single) {|json| Kaui::Account.new(json) }
     end
 
@@ -201,9 +205,10 @@ module Kaui
                     "X-Killbill-Comment" => "#{comment}"
     end
 
-    def self.delete_subscription(subscription_id, current_user = nil, reason = nil, comment = nil)
+    def self.delete_subscription(subscription_id, policy = nil, current_user = nil, reason = nil, comment = nil)
+      params = "?policy=#{policy}" unless policy.blank?
       call_killbill :delete,
-                    "/1.0/kb/subscriptions/#{subscription_id}",
+                    "/1.0/kb/subscriptions/#{subscription_id}#{params}",
                     "X-Killbill-CreatedBy" => current_user,
                     "X-Killbill-Reason" => "#{reason}",
                     "X-Killbill-Comment" => "#{comment}"
@@ -267,6 +272,14 @@ module Kaui
       end
     end
 
+    def self.delete_cba(account_id, invoice_id, invoice_item_id, current_user = nil, reason = nil, comment = nil)
+      call_killbill :delete,
+                    "/1.0/kb/invoices/#{invoice_id}/#{invoice_item_id}/cba?accountId=#{account_id}",
+                    "X-Killbill-CreatedBy" => current_user,
+                    "X-Killbill-Reason" => "#{reason}",
+                    "X-Killbill-Comment" => "#{comment}"
+    end
+
     ############## CATALOG ##############
 
     def self.get_full_catalog
@@ -301,11 +314,21 @@ module Kaui
       return response_data
     end
 
+    def self.pay_all_invoices(account_id, external = false, current_user = nil, reason = nil, comment = nil)
+      call_killbill :post,
+                     "/1.0/kb/invoices/payments?externalPayment=#{external}",
+                     ActiveSupport::JSON.encode({:accountId => account_id}, :root => false),
+                     :content_type => "application/json",
+                     "X-Killbill-CreatedBy" => current_user,
+                     "X-Killbill-Reason" => extract_reason_code(reason),
+                     "X-Killbill-Comment" => "#{comment}"
+    end
+
     def self.create_payment(payment, external, current_user = nil, reason = nil, comment = nil)
       payment_data = Kaui::Payment.camelize(payment.to_hash)
 
       if payment.invoice_id.present?
-        # We should use different model for POST and GEt, this seems fragile...
+        # We should use different model for POST and GET, this seems fragile...
         payment_data.delete(:external)
         payment_data.delete(:refunds)
         payment_data.delete(:chargebacks)
@@ -380,6 +403,8 @@ module Kaui
 
     def self.create_refund(payment_id, refund, current_user = nil, reason = nil, comment = nil)
       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",

data/app/models/kaui/account.rb

@@ -16,6 +16,7 @@ class Kaui::Account < Kaui::Base
   define_attr :country
   define_attr :phone
   define_attr :balance
+  define_attr :cba
   define_attr :is_notified_for_invoices
   has_one :bill_cycle_day, Kaui::BillCycleDay
 
@@ -36,6 +37,7 @@ class Kaui::Account < Kaui::Base
           :phone => data['phone'],
           :bill_cycle_day => data['billCycleDay'],
           :balance => data['accountBalance'],
+          :cba => data['accountCBA'],
           :is_notified_for_invoices => data['isNotifiedForInvoices'])
   end
 
@@ -46,4 +48,8 @@ class Kaui::Account < Kaui::Base
   def balance_to_money
     Kaui::Base.to_money(balance.abs, currency)
   end
+
+  def cba_to_money
+    Kaui::Base.to_money(cba.abs, currency)
+  end
 end

data/app/models/kaui/refund.rb

@@ -13,9 +13,10 @@ class Kaui::Refund < Kaui::Base
   define_attr :currency
   define_attr :requested_date
   define_attr :effective_date
-  define_attr :adjustments
+  define_attr :adjustment_type
 
   has_many :audit_logs, Kaui::AuditLog
+  has_many :adjustments, Kaui::InvoiceItem
 
   def amount_to_money
     Kaui::Base.to_money(amount, currency)

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

@@ -15,13 +15,13 @@
   </div>
 </form>
 <hr/>
-<table id="timeline-table" class="table table-condensed data-table">
+<table id="timeline-table" class="table table-condensed">
   <thead>
     <tr>
-      <th class="sort-title-string">Requested Date</th>
-      <th class="data-table-sort-desc sort-title-string">Effective Date</th>
+      <th>Requested Date</th>
+      <th>Effective Date</th>
       <th>Bundle Name</th>
-      <th class="data-table-sort-desc">Event Type</th>
+      <th>Event Type</th>
       <th>Details</th>
       <th>Reason Code / Comments</th>
       <th>Actions</th>
@@ -41,14 +41,12 @@
         <tr title="<%= bundles %>">
           <td>
             <% if invoice.invoice_date.present? %>
-              <span class="hide" title="<%= invoice.invoice_date %>"></span>
               <%= invoice.invoice_date %>
             <% else %>
               [unknown]
             <% end %>
           <td>
             <% if invoice.target_date.present? %>
-              <span class="hide" title="<%= invoice.target_date %>"></span>
               <%= invoice.target_date %>
             <% else %>
               [unknown]
@@ -62,7 +60,8 @@
             <% end %>
           </td>
           <td><%= "INVOICE" %></td>
-          <td><%= "Amount:" %> <%= humanized_money_with_symbol invoice.amount_to_money(@account.currency) %><br/>
+          <td><span class="hide" title="<%= invoice.invoice_number %>"></span>
+              <%= "Amount:" %> <%= humanized_money_with_symbol invoice.amount_to_money(@account.currency) %><br/>
               <%= "Balance:" %> <%= humanized_money_with_symbol invoice.balance_to_money(@account.currency) %><br/>
               <% if invoice.credit_adjustment.present? && invoice.credit_adjustment > 0  %>
                 <%= "Credit adjustment:" %> <%= humanized_money_with_symbol invoice.credit_adjustment_to_money(@account.currency) %><br/>
@@ -84,20 +83,18 @@
             <% end %>
           </td>
           <td>
-            <% if invoice.balance > 0 %>
-              <nobr>
-                <%= link_to "Credit",
-                            kaui_engine.new_credit_path(:params => { :account_id => invoice.account_id,
-                                                                     :invoice_id => invoice.invoice_id }),
-                            :class => "btn btn-mini" %>
-              </nobr>
-              <nobr>
-                <%= link_to "Payment",
-                            kaui_engine.new_payment_path(:params => { :account_id => invoice.account_id,
-                                                                      :invoice_id => invoice.invoice_id }),
-                            :class => "btn btn-mini" %>
-              </nobr>
-            <% end %>
+            <nobr>
+              <%= link_to "Payment",
+                          kaui_engine.new_payment_path(:params => { :account_id => invoice.account_id,
+                                                                    :invoice_id => invoice.invoice_id }),
+                          :class => "btn btn-mini #{"disabled" unless invoice.balance > 0}" %>
+            </nobr>
+            <nobr>
+              <%= link_to "Credit",
+                          kaui_engine.new_credit_path(:params => { :account_id => invoice.account_id,
+                                                                   :invoice_id => invoice.invoice_id }),
+                          :class => "btn btn-mini" %>
+            </nobr>
             <nobr>
               <%= link_to "Charge",
                           kaui_engine.new_charge_path(:params => { :account_id => invoice.account_id,
@@ -113,7 +110,6 @@
           <tr title="<%= bundles %>">
             <td>
               <% if refund.requested_date.present? %>
-                <span class="hide" title="<%= refund.requested_date %>"></span>
                 <%= format_date(refund.requested_date).html_safe %>
               <% else %>
                 [unknown]
@@ -121,7 +117,6 @@
             </td>
             <td>
               <% if refund.effective_date.present? %>
-                <span class="hide" title="<%= refund.effective_date %>"></span>
                 <%= format_date(refund.effective_date).html_safe %>
               <% else %>
                 [unknown]
@@ -153,7 +148,6 @@
         <tr title="<%= bundles %>">
           <td>
             <% if chargeback.effective_date.present? %>
-              <span class="hide" title="<%= chargeback.effective_date %>"></span>
               <%= format_date(chargeback.effective_date).html_safe %>
             <% else %>
               [unknown]
@@ -161,7 +155,6 @@
           </td>
           <td>
             <% if chargeback.effective_date.present? %>
-              <span class="hide" title="<%= chargeback.effective_date %>"></span>
               <%= format_date(chargeback.effective_date).html_safe %>
             <% else %>
               [unknown]
@@ -197,7 +190,6 @@
         <tr title="<%= bundles %>">
           <td>
             <% if payment.requested_date.present? %>
-              <span class="hide" title="<%= payment.requested_date %>"></span>
               <%= format_date(payment.requested_date).html_safe %>
             <% else %>
               [unknown]
@@ -205,7 +197,6 @@
           </td>
           <td>
             <% if payment.effective_date.present? %>
-              <span class="hide" title="<%= payment.effective_date %>"></span>
               <%= format_date(payment.effective_date).html_safe %>
             <% else %>
               [unknown]
@@ -218,6 +209,7 @@
           </td>
           <td><%= "PAYMENT" %></td>
           <td>
+            <span class="hide" title="<%= invoice.invoice_number %>"></span>
             <%= "Payment id:" %> <%= payment.payment_id %><br/>
             <%= "Total amount:" %> <%= humanized_money_with_symbol payment.amount_to_money %><br/>
             <%= "Paid amount:" %> <%= humanized_money_with_symbol payment.paid_amount_to_money %><br/>
@@ -235,23 +227,18 @@
             <% end %>
           </td>
           <td>
-            <% if payment.payment_id.present? %>
-              <nobr>
-                <%= link_to 'Refund', kaui_engine.new_refund_path(:params => { :payment_id => payment.payment_id,
-                                                                               :account_id => @account.account_id,
-                                                                               :invoice_id => payment.invoice_id }),
-                                                                  :class => "btn btn-mini" %>
-                <%= link_to 'Chargeback', kaui_engine.new_chargeback_path(:params => { :payment_id => payment.payment_id,
-                                                                                       :account_id => @account.account_id,
-                                                                                       :invoice_id => payment.invoice_id }),
-                                                                          :class => "btn btn-mini" %>
-              </nobr>
-              <% elsif invoice.balance > 0 %>
-                <%= link_to 'Pay', kaui_engine.new_payment_path(:params => { :payment_id => payment.payment_id,
+            <nobr>
+              <%= link_to 'Refund', kaui_engine.new_refund_path(:params => { :payment_id => payment.payment_id,
                                                                              :account_id => @account.account_id,
                                                                              :invoice_id => payment.invoice_id }),
-                                                                :class => "btn btn-mini" %>
-            <% end %>
+                                                                :class => "btn btn-mini #{"disabled" unless payment.payment_id.present?}" %>
+            </nobr>
+            <nobr>
+              <%= link_to 'Chargeback', kaui_engine.new_chargeback_path(:params => { :payment_id => payment.payment_id,
+                                                                                     :account_id => @account.account_id,
+                                                                                     :invoice_id => payment.invoice_id }),
+                                                                        :class => "btn btn-mini #{"disabled" unless payment.payment_id.present?}" %>
+            </nobr>
           </td>
         </tr>
       <% end %>
@@ -263,7 +250,6 @@
             <tr title="<%= @bundle_names[bundle.external_key] %>">
               <td>
                 <% if event.requested_date.present? %>
-                  <span class="hide" title="<%= event.requested_date %>"></span>
                   <%= format_date(event.requested_date).html_safe %>
                 <% else %>
                   [unknown]
@@ -271,7 +257,6 @@
               </td>
               <td>
                 <% if event.effective_date.present? %>
-                  <span class="hide" title="<%= event.effective_date %>"></span>
                   <%= format_date(event.effective_date).html_safe %>
                 <% else %>
                   [unknown]
@@ -281,7 +266,7 @@
                 <%= link_to @bundle_names[bundle.external_key], Kaui.bundle_home_path.call(bundle.external_key) %><br/>
               </td>
               <td><%= event.event_type %></td>
-              <td><%= event.product %> <%= event.billing_period == 'NO_BILLING_PERIOD' || event.billing_period.nil? ? "" : event.billing_period.downcase.capitalize %> <%= event.phase.downcase.capitalize if event.phase.present? %></td>
+              <td><span class="hide" title="<%= sub.product_category %>"></span><%= event.product %> <%= event.billing_period == 'NO_BILLING_PERIOD' || event.billing_period.nil? ? "" : event.billing_period.downcase.capitalize %> <%= event.phase.downcase.capitalize if event.phase.present? %></td>
               <td>
                 <% if event.audit_logs.present? %>
                   <% event.audit_logs.each do |entry| %>
@@ -301,10 +286,74 @@
   <%= link_to 'Back', :back, :class => 'btn' %>
 </div>
 <%= javascript_tag do %>
+  function disableLinks() {
+    $('a.btn.disabled').click(function (e) {
+      e.preventDefault();
+    });
+  }
+
+  eventsOrder = ["CREATE", "PHASE", "CHANGE", "CANCEL", "INVOICE", "PAYMENT", "REFUND", "CHARGEBACK"];
+
+  jQuery.fn.dataTableExt.oSort['timeline-event-asc']  = function(e1,e2) {
+    var x = eventsOrder.indexOf(e1);
+    var y = eventsOrder.indexOf(e2);
+    return ((x < y) ? -1 : ((x > y) ?  1 : 0));
+  };
+
+  jQuery.fn.dataTableExt.oSort['timeline-event-desc'] = function(e1,e2) {
+    var x = eventsOrder.indexOf(e1);
+    var y = eventsOrder.indexOf(e2);
+    return ((x < y) ?  1 : ((x > y) ? -1 : 0));
+  };
+
+  function extractTitleAttributeFromText(txt) {
+    // Ugly - better way of doing this?
+    var matches = txt.match(/title="\w+"/g);
+    if (matches == null || matches.size == 0) {
+      return null;
+    }
+    return matches[0].split('=')[1];
+  }
+
+  jQuery.fn.dataTableExt.oSort['timeline-details-asc']  = function(e1,e2) {
+    var x = extractTitleAttributeFromText(e1);
+    var y = extractTitleAttributeFromText(e2);
+    return ((x < y) ? -1 : ((x > y) ?  1 : 0));
+  };
+
+  jQuery.fn.dataTableExt.oSort['timeline-details-desc'] = function(e1,e2) {
+    var x = extractTitleAttributeFromText(e1);
+    var y = extractTitleAttributeFromText(e2);
+    return ((x < y) ?  1 : ((x > y) ? -1 : 0));
+  };
+
+  function initTable() {
+    return $("#timeline-table").dataTable({
+       "sDom": "<'row-fluid'<'span6'l><'span6'f>r>t<'row-fluid'<'span6'i><'span6'p>>",
+       "sPaginationType": "bootstrap",
+       "oLanguage": {
+         "sLengthMenu": "_MENU_ records per page"
+       },
+       "iDisplayLength": 100,
+       "bRetrieve": true,
+       // Force a predictive order for event types, invoices and payments
+       "aaSortingFixed": [[1, 'desc'], [4, 'desc'], [3, 'desc']],
+       "aoColumns": [
+           { "sType": 'date' },
+           { "sType": 'date' },
+           null,
+           { "sType": 'timeline-event' },
+           { "sType": 'timeline-details' },
+           null,
+           null
+       ]
+    });
+  }
+
   function filterBundles() {
     var bundle = $("#bundles").val();
-    var dataTable = $("#timeline-table").dataTable();
 
+    var dataTable = initTable();
     $(dataTable.fnGetNodes()).each(function() {
       var tr = $(this);
       if (bundle == "" || tr.attr("title").split(",").indexOf(bundle) >= 0) {
@@ -316,7 +365,16 @@
     });
     dataTable.fnDraw();
   }
+
   $(document).ready(function() {
+    disableLinks();
+    // When going through the pages of the table, disable links as needed
+    $('#timeline-table').bind('draw', function (e) {
+      disableLinks();
+    });
+
+    initTable();
+
     $("#bundles").change(filterBundles);
     filterBundles();
   });