kaui 0.1.0 → 0.1.2

data/app/models/kaui/charge.rb

@@ -0,0 +1,14 @@
+class Kaui::Charge < Kaui::Base
+
+  define_attr :account_id
+  define_attr :invoice_id
+  define_attr :amount
+  define_attr :description
+
+  def initialize(data = {})
+    super(:account_id => data['accountId'] || data['account_id'],
+          :invoice_id => data['invoiceId'] || data['invoice_id'],
+          :amount => data['amount'],
+          :description => data['description'])
+  end
+end

data/app/models/kaui/chargeback.rb

@@ -24,18 +24,10 @@ class Kaui::Chargeback < Kaui::Base
 
   define_attr :payment_id
   define_attr :chargeback_amount
-  define_attr :requested_dt
-  define_attr :effective_dt
+  define_attr :requested_date
+  define_attr :effective_date
   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'],
-          :audit_logs => data['auditLogs'])
-  end
 end

data/app/models/kaui/event.rb

@@ -1,24 +1,13 @@
 class Kaui::Event < Kaui::Base
   define_attr :event_id
   define_attr :billing_period
-  define_attr :effective_dt
+  define_attr :effective_date
   define_attr :event_type
   define_attr :phase
   define_attr :price_list
   define_attr :product
-  define_attr :requested_dt
+  define_attr :requested_date
 
   has_many :audit_logs, Kaui::AuditLog
 
-  def initialize(data = {})
-    super(:event_id => data['eventId'],
-          :billing_period => data['billingPeriod'],
-          :effective_dt => data['effectiveDate'],
-          :event_type => data['eventType'],
-          :phase => data['phase'],
-          :price_list => data['priceList'],
-          :product => data['product'],
-          :requested_dt => data['requestedDate'],
-          :audit_logs => data['auditLogs'])
-  end
 end

data/app/models/kaui/invoice.rb

@@ -10,27 +10,26 @@ class Kaui::Invoice < Kaui::Base
   define_attr :refund_adjustment
   define_attr :credit_balance_adjustment
   define_attr :credit_adjustment
-  define_attr :invoice_dt
+  define_attr :invoice_date
   define_attr :payment_dt
-  define_attr :target_dt
+  define_attr :target_date
   define_attr :bundle_keys
 
   has_many :items, Kaui::InvoiceItem
   has_many :audit_logs, Kaui::AuditLog
 
   def initialize(data = {})
-    super(
-          :account_id => data['accountId'],
+    super(:account_id => data['accountId'],
           :amount => data['amount'],
           :balance => data['balance'],
           :credit_balance_adjustment => data['cba'],
           :credit_adjustment => data['creditAdj'],
-          :invoice_dt => data['invoiceDate'],
+          :invoice_date => data['invoiceDate'],
           :invoice_id => data['invoiceId'],
           :invoice_number => data['invoiceNumber'],
           :refund_adjustment => data['refundAdj'],
-          :target_dt => data['targetDate'],
-          :items => data['items'],
+          :target_date => data['targetDate'],
+          :items => data['items'] || [],
           :bundle_keys => data['bundleKeys'],
           :audit_logs => data['auditLogs'])
   end

data/app/models/kaui/invoice_item.rb

@@ -1,6 +1,11 @@
 require 'active_model'
 
 class Kaui::InvoiceItem < Kaui::Base
+  SAMPLE_REASON_CODES = [ "100 - Courtesy",
+                          "101 - Billing Error",
+                          "199 - OTHER" ]
+
+  define_attr :invoice_item_id
   define_attr :invoice_id
   define_attr :account_id
   define_attr :bundle_id
@@ -10,21 +15,8 @@ class Kaui::InvoiceItem < Kaui::Base
   define_attr :description
   define_attr :start_date
   define_attr :end_date
-  define_attr :amount;
-  define_attr :currency;
-
-  def initialize(data = {})
-    super(
-          :account_id => data['accountId'],
-          :amount => data['amount'],
-          :bundle_id => data['bundleId'],
-          :currency => data['currency'],
-          :description => data['description'],
-          :end_date => data['endDate'],
-          :invoice_id => data['invoiceId'],
-          :phase_name => data['phaseName'],
-          :plan_name => data['planName'],
-          :start_date => data['startDate'],
-          :subscription_id => data['subscriptionId'])
-  end
+  define_attr :amount
+  define_attr :currency
+  define_attr :linked_invoice_item_id
+  define_attr :audit_logs
 end

data/app/models/kaui/payment.rb

@@ -9,36 +9,21 @@ class Kaui::Payment < Kaui::Base
   define_attr :amount
   define_attr :currency
   define_attr :invoice_id
-  define_attr :effective_dt
+  define_attr :effective_date
   define_attr :paid_amount
   define_attr :payment_id
   define_attr :payment_method_id
   define_attr :refund_amount
-  define_attr :requested_dt
+  define_attr :requested_date
   define_attr :retry_count
   define_attr :status
   define_attr :bundle_keys
+  define_attr :ext_first_payment_id_ref
+  define_attr :ext_second_payment_id_ref
+  define_attr :gateway_error_code
+  define_attr :gateway_error_msg
 
   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'],
-          :amount => data['amount'],
-          :currency => data['currency'],
-          :effective_dt => data['effectiveDate'] || data['effective_dt'],
-          :invoice_id => data['invoiceId'] || data['invoice_id'],
-          :paid_amount => data['paidAmount'] || data['paid_amount'],
-          :payment_id => data['paymentId'] || data['payment_id'],
-          :payment_method_id => data['paymentMethodId'] || data['payment_method_id'],
-          :refund_amount => data['refundAmount'] || data['refund_amount'],
-          :requested_dt => data['requestedDate'] || data['requested_dt'],
-          :retry_count => data['retryCount'] || data['retry_count'],
-          :status => data['status'],
-          :bundle_keys => data['bundleKeys'] || data['bundle_keys'],
-          :refunds => data['refunds'],
-          :chargebacks => data['chargebacks'],
-          :audit_logs => data['auditLogs'])
-  end
 end

data/app/models/kaui/payment_method.rb

@@ -5,15 +5,8 @@ class Kaui::PaymentMethod < Kaui::Base
   define_attr :is_default
   define_attr :payment_method_id
   define_attr :plugin_name
-  has_one :plugin_info, Kaui::PluginInfo
 
-  def initialize(data = {})
-    super(:account_id => data['accountId'],
-          :is_default => data['isDefault'],
-          :payment_method_id => data['paymentMethodId'],
-          :plugin_name => data['pluginName'],
-          :plugin_info => data['pluginInfo'])
-  end
+  has_one :plugin_info, Kaui::PluginInfo
 
   def card_type
     plugin_info.property("cardType") if plugin_info.present?

data/app/models/kaui/plugin_info.rb

@@ -2,12 +2,8 @@ require 'active_model'
 
 class Kaui::PluginInfo < Kaui::Base
   define_attr :external_payment_id
-  has_many :properties, Kaui::PluginInfoProperty
 
-  def initialize(data = {})
-    super(:external_payment_id => data['externalPaymentId'],
-          :properties => data['properties'])
-  end
+  has_many :properties, Kaui::PluginInfoProperty
 
   def property(key)
     prop = properties.find { |prop| prop.key == key } unless properties.nil?

data/app/models/kaui/plugin_info_property.rb

@@ -4,10 +4,4 @@ class Kaui::PluginInfoProperty < Kaui::Base
   define_attr :key
   define_attr :value
   define_attr :is_updatable
-
-  def initialize(data = {})
-    super(:key => data['key'],
-          :value => data['value'],
-          :is_updatable => data['isUpdatable'])
-  end
 end

data/app/models/kaui/refund.rb

@@ -9,19 +9,11 @@ class Kaui::Refund < Kaui::Base
   define_attr :refund_id
   define_attr :payment_id
   define_attr :adjusted
-  define_attr :refund_amount
-  define_attr :requested_dt
-  define_attr :effective_dt
+  define_attr :amount
+  define_attr :currency
+  define_attr :requested_date
+  define_attr :effective_date
+  define_attr :adjustments
 
   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'],
-          :audit_logs => data['auditLogs'])
-  end
 end

data/app/models/kaui/tag.rb

@@ -1,7 +1,14 @@
 class Kaui::Tag < Kaui::Base
 
-  define_attr :account_id
-  define_attr :name
-  define_attr :description
+  define_attr :tag_definition_id
+  define_attr :tag_definition_name
+  define_attr :audit_logs
 
+  def is_system_tag?
+    Kaui::TagDefinition(:id => tag_definition_id).is_system_tag?
+  end
+
+  def <=>(tag)
+    @tag_definition_name <=> tag.tag_definition_name
+  end
 end

data/app/models/kaui/tag_definition.rb

@@ -0,0 +1,46 @@
+class Kaui::TagDefinition < Kaui::Base
+
+  define_attr :id
+  define_attr :name
+  define_attr :description
+
+  def self.all
+    Kaui::KillbillHelper.get_tag_definitions
+  end
+
+  def self.find(tag_definition_id)
+    Kaui::KillbillHelper.get_tag_definition(tag_definition_id)
+  end
+
+  def save
+    Kaui::KillbillHelper.create_tag_definition(self)
+    # TODO - we should return the newly created id and update the model
+    # @persisted = true
+  end
+
+  def destroy
+    Kaui::KillbillHelper.delete_tag_definition(@id)
+    @persisted = false
+  end
+
+  def is_system_tag?
+    return false unless id.present?
+    last_group = id.split('-')[4]
+
+    is_system_tag = true
+    last_group.split(//).each_with_index do |c, i|
+      unless (c == '0' and i < 11) or (c.to_i > 0 and i == 11)
+        is_system_tag = false
+        break
+      end
+    end
+    is_system_tag
+  end
+
+  def <=>(tag_definition)
+    # System tags last
+    return 1 if is_system_tag? and !tag_definition.is_system_tag?
+    return -1 if !is_system_tag? and tag_definition.is_system_tag?
+    @name <=> tag_definition.name
+  end
+end

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

@@ -1,38 +1,38 @@
-<div class="page-header">
+<div class='page-header'>
   <h1>Add/Remove Tags</h1>
 </div>
-<%= form_tag update_account_tags_path, :class => "form-horizontal" do %>
-<%= hidden_field_tag :account_id, @account.account_id %>
+<%= form_tag update_account_tags_path, :class => 'form-horizontal' do %>
+  <%= hidden_field_tag :account_id, @account.account_id %>
   <fieldset>
-    <div class="control-group">
-      <label class="control-label">Account name</label>
-      <div class="controls">
-        <label class="checkbox">
-          <%= @account.name %><br/>
+    <div class='control-group'>
+      <label class='control-label'>Account name</label>
+      <div class='controls'>
+        <label class='checkbox'>
+          <%= link_to @account.name, @account %><br/>
           <%= @account.email %>
         </label>
       </div>
     </div>
-    <div class="control-group">
-      <%= label_tag :name, "Tag", :class => "control-label" %>
-      <div class="controls">
+    <div class='control-group'>
+      <%= label_tag :name, 'Tag', :class => 'control-label' %>
+      <div class='controls'>
         <% @available_tags.each do |tag| %>
-          <label class="checkbox">
-            <%= check_box_tag "tags[]", tag.name, @tags.include?(tag.name) %>
-            <span href="#" class="tag-description" rel="tooltip" title="<%= tag.description %>"><%= tag.name %></span>
+          <label class='checkbox'>
+            <%= check_box_tag "tag_#{tag.id}", tag.name, @tag_names.include?(tag.name) %>
+            <span href='#' class='tag-description' rel='tooltip' title='<%= tag.description %>'><%= tag.name %></span>
           </label>
         <% end %>
       </div>
     </div>
 
-    <div class="form-actions">
-      <%= button_tag "Update", :class =>"btn btn-primary" %>
+    <div class='form-actions'>
+      <%= button_tag 'Update', :class =>'btn btn-primary' %>
       <%= link_to 'Back', :back, :class => 'btn' %>
     </div>
   </fieldset>
 <% end %>
 <%= javascript_tag do %>
   $(function() {
-    $(".tag-description").tooltip();
+    $('.tag-description').tooltip();
   });
 <% end %>

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

@@ -40,16 +40,16 @@
         <% end %>
         <tr title="<%= bundles %>">
           <td>
-            <% if invoice.invoice_dt.present? %>
-              <span class="hide" title="<%= invoice.invoice_dt %>"></span>
-              <%= invoice.invoice_dt %>
+            <% if invoice.invoice_date.present? %>
+              <span class="hide" title="<%= invoice.invoice_date %>"></span>
+              <%= invoice.invoice_date %>
             <% else %>
               [unknown]
             <% end %>
           <td>
-            <% if invoice.target_dt.present? %>
-              <span class="hide" title="<%= invoice.target_dt %>"></span>
-              <%= invoice.target_dt %>
+            <% if invoice.target_date.present? %>
+              <span class="hide" title="<%= invoice.target_date %>"></span>
+              <%= invoice.target_date %>
             <% else %>
               [unknown]
             <% end %>
@@ -93,11 +93,25 @@
               </nobr>
               <nobr>
                 <%= link_to "External Payment",
-                            kaui_engine.new_external_payment_path(:params => { :account_id => invoice.account_id,
-                                                                               :invoice_id => invoice.invoice_id }),
+                            kaui_engine.new_payment_path(:params => { :account_id => invoice.account_id,
+                                                                      :invoice_id => invoice.invoice_id,
+                                                                      :external => "true" }),
                             :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,
+                                                                      :external => "false" }),
+                            :class => "btn btn-mini" %>
+              </nobr>
+            <% end %>
+            <nobr>
+              <%= link_to "Charge",
+                          kaui_engine.new_charge_path(:params => { :account_id => invoice.account_id,
+                                                                   :invoice_id => invoice.invoice_id }),
+                          :class => "btn btn-mini" %>
+            </nobr>
           </td>
         </tr>
       <% end %>
@@ -106,17 +120,17 @@
           <% bundles = payment.bundle_keys.split(",").map {|bundle_key| @bundle_names[bundle_key] }.join(",") %>
           <tr title="<%= bundles %>">
             <td>
-              <% if refund.requested_dt.present? %>
-                <span class="hide" title="<%= refund.requested_dt %>"></span>
-                <%= format_date(refund.requested_dt).html_safe %>
+              <% if refund.requested_date.present? %>
+                <span class="hide" title="<%= refund.requested_date %>"></span>
+                <%= format_date(refund.requested_date).html_safe %>
               <% else %>
                 [unknown]
               <% end %>
             </td>
             <td>
-              <% if refund.requested_dt.present? %>
-                <span class="hide" title="<%= refund.requested_dt %>"></span>
-                <%= format_date(refund.requested_dt).html_safe %>
+              <% if refund.effective_date.present? %>
+                <span class="hide" title="<%= refund.effective_date %>"></span>
+                <%= format_date(refund.effective_date).html_safe %>
               <% else %>
                 [unknown]
               <% end %>
@@ -130,7 +144,7 @@
             <td>
               <%= "Adjusted:" %> <% if refund.adjusted %>yes<% else %>no<% end %><br/>
               <%= "Payment id:" %> <%= refund.payment_id %><br/>
-              <%= "Refund Amount:" %> <%= refund.refund_amount %><br/>
+              <%= "Refund Amount:" %> <%= refund.amount %><br/>
             </td>
             <td>
               <% if refund.audit_logs.present? %>
@@ -146,17 +160,17 @@
         <% bundles = payment.bundle_keys.split(",").map {|bundle_key| @bundle_names[bundle_key] }.join(",") %>
         <tr title="<%= bundles %>">
           <td>
-            <% if chargeback.effective_dt.present? %>
-              <span class="hide" title="<%= chargeback.effective_dt %>"></span>
-              <%= format_date(chargeback.effective_dt).html_safe %>
+            <% if chargeback.effective_date.present? %>
+              <span class="hide" title="<%= chargeback.effective_date %>"></span>
+              <%= format_date(chargeback.effective_date).html_safe %>
             <% else %>
               [unknown]
             <% end %>
           </td>
           <td>
-            <% if chargeback.effective_dt.present? %>
-              <span class="hide" title="<%= chargeback.effective_dt %>"></span>
-              <%= format_date(chargeback.effective_dt).html_safe %>
+            <% if chargeback.effective_date.present? %>
+              <span class="hide" title="<%= chargeback.effective_date %>"></span>
+              <%= format_date(chargeback.effective_date).html_safe %>
             <% else %>
               [unknown]
             <% end %>
@@ -190,17 +204,17 @@
         <% end %>
         <tr title="<%= bundles %>">
           <td>
-            <% if payment.requested_dt.present? %>
-              <span class="hide" title="<%= payment.requested_dt %>"></span>
-              <%= format_date(payment.requested_dt).html_safe %>
+            <% if payment.requested_date.present? %>
+              <span class="hide" title="<%= payment.requested_date %>"></span>
+              <%= format_date(payment.requested_date).html_safe %>
             <% else %>
               [unknown]
             <% end %>
           </td>
           <td>
-            <% if payment.effective_dt.present? %>
-              <span class="hide" title="<%= payment.effective_dt %>"></span>
-              <%= format_date(payment.effective_dt).html_safe %>
+            <% if payment.effective_date.present? %>
+              <span class="hide" title="<%= payment.effective_date %>"></span>
+              <%= format_date(payment.effective_date).html_safe %>
             <% else %>
               [unknown]
             <% end %>
@@ -212,7 +226,7 @@
           </td>
           <td><%= "PAYMENT" %></td>
           <td>
-            <%= "Payment id:" %> <%= payment.id %><br/>
+            <%= "Payment id:" %> <%= payment.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 %>>
@@ -222,8 +236,10 @@
             <%= "Invoice #" %> <%= link_to invoice.invoice_number, invoice_path(:id => invoice.invoice_id) %>
           </td>
           <td>
-            <% payment.audit_logs.each do |entry| %>
-              <%= entry.description unless entry.changed_by == 'PaymentRequestProcessor' %><br/>
+            <% if payment.audit_logs.present? %>
+              <% payment.audit_logs.each do |entry| %>
+                <%= entry.description unless entry.changed_by == 'PaymentRequestProcessor' %><br/>
+              <% end %>
             <% end %>
           </td>
           <td>
@@ -242,7 +258,7 @@
                 <%= 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" %>
+                                                                :class => "btn btn-mini" %>
             <% end %>
           </td>
         </tr>
@@ -252,17 +268,17 @@
           <% sub.events.each do |event| %>
             <tr title="<%= @bundle_names[bundle.external_key] %>">
               <td>
-                <% if event.requested_dt.present? %>
-                  <span class="hide" title="<%= event.requested_dt %>"></span>
-                  <%= format_date(event.requested_dt).html_safe %>
+                <% if event.requested_date.present? %>
+                  <span class="hide" title="<%= event.requested_date %>"></span>
+                  <%= format_date(event.requested_date).html_safe %>
                 <% else %>
                   [unknown]
                 <% end %>
               </td>
               <td>
-                <% if event.effective_dt.present? %>
-                  <span class="hide" title="<%= event.effective_dt %>"></span>
-                  <%= format_date(event.effective_dt).html_safe %>
+                <% if event.effective_date.present? %>
+                  <span class="hide" title="<%= event.effective_date %>"></span>
+                  <%= format_date(event.effective_date).html_safe %>
                 <% else %>
                   [unknown]
                 <% end %>
@@ -272,7 +288,13 @@
               </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> </td>
+              <td>
+                <% if event.audit_logs.present? %>
+                  <% event.audit_logs.each do |entry| %>
+                  <%= entry.description %><br/>
+                  <% end %>
+                <% end %>
+              </td>
               <td> </td>
             </tr>
           <% end %>