kaui 0.0.5 → 0.0.6

data/app/controllers/kaui/accounts_controller.rb

@@ -19,12 +19,7 @@ class Kaui::AccountsController < Kaui::EngineController
       end
 
       if @account.present?
-        # TODO: add when payment methods are implemented
-        # @payment_methods = Kaui::KillbillHelper.get_payment_methods(@account_id)
-        # unless @payment_methods.is_a?(Array)
-        #   flash[:error] = "No payment methods for account #{@account_id}"
-        #   redirect_to :action => :index
-        # end
+        @payment_methods = Kaui::KillbillHelper.get_payment_methods(@account_id)
       else
         flash[:error] = "Account #{@account_id} not found"
         redirect_to :action => :index
@@ -49,16 +44,15 @@ class Kaui::AccountsController < Kaui::EngineController
   end
 
   def set_default_payment_method
-    @external_key = params[:id]
+    @account_id = params[:id]
     # TODO
     redirect_to :back
   end
 
   def delete_payment_method
-    @external_key = params[:id]
     @payment_method_id = params[:payment_method_id]
-    if @external_key.present? && @payment_method_id.present?
-      Kaui::KillbillHelper::delete_payment_method(@external_key, @payment_method_id)
+    if @payment_method_id.present?
+      Kaui::KillbillHelper::delete_payment_method(@payment_method_id)
     else
       flash[:notice] = "No id given"
     end

data/app/helpers/kaui/date_helper.rb

@@ -2,8 +2,8 @@ module Kaui
   module DateHelper
     def format_date(date)
       # TODO: make timezone configurable
-      parsed_date = DateTime.parse(date).in_time_zone("Pacific Time (US & Canada)")
-      parsed_date.to_s(:pretty) + " " + (parsed_date.dst? ? "PDT" : "PST")
+      parsed_date = DateTime.parse(date).in_time_zone(ActiveSupport::TimeZone::ZONES_MAP["Pacific Time (US & Canada)"])
+      parsed_date.to_s(:date_only)
     end
   end
 end

data/app/helpers/kaui/killbill_helper.rb

@@ -297,7 +297,7 @@ module Kaui
     def self.delete_payment_method(account_id, payment_method_id, current_user = nil, reason = nil, comment = nil)
       begin
         call_killbill :delete,
-                      "/1.0/accounts/#{account_id}/paymentMethods/#{payment_method_id}",
+                      "/1.0/kb/accounts/#{account_id}/paymentMethods/#{payment_method_id}",
                       "X-Killbill-CreatedBy" => current_user,
                       "X-Killbill-Reason" => "#{reason}",
                       "X-Killbill-Comment" => "#{comment}"
@@ -308,7 +308,7 @@ module Kaui
 
     def self.get_payment_methods(account_id)
       begin
-        data = call_killbill :get, "/1.0/accounts/#{account_id}/paymentMethods"
+        data = call_killbill :get, "/1.0/kb/accounts/#{account_id}/paymentMethods?withPluginInfo=true"
         process_response(data, :multiple) {|json| Kaui::PaymentMethod.new(json) }
       rescue => e
         puts "#{$!}\n\t" + e.backtrace.join("\n\t")

data/app/models/kaui/payment_method.rb

@@ -0,0 +1,45 @@
+require 'active_model'
+
+class Kaui::PaymentMethod < Kaui::Base
+  define_attr :account_id
+  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
+
+  def card_type
+    plugin_info.property("cardType") if plugin_info.present?
+  end
+
+  def type
+    plugin_info.property("type") if plugin_info.present?
+  end
+
+  def mask_number
+    plugin_info.property("maskNumber") if plugin_info.present?
+  end
+
+  def card_holder_name
+    plugin_info.property("cardHolderName") if plugin_info.present?
+  end
+
+  def expiration_dt
+    plugin_info.property("expirationDate") if plugin_info.present?
+  end
+
+  def baid
+    plugin_info.property("baid") if plugin_info.present?
+  end
+
+  def email
+    plugin_info.property("email") if plugin_info.present?
+  end
+end

data/app/models/kaui/plugin_info.rb

@@ -0,0 +1,16 @@
+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
+
+  def property(key)
+    prop = properties.find { |prop| prop.key == key } unless properties.nil?
+    prop.value unless prop.nil?
+  end
+end

data/app/models/kaui/plugin_info_property.rb

@@ -0,0 +1,13 @@
+require 'active_model'
+
+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/views/kaui/account_timelines/show.html.erb

@@ -17,7 +17,7 @@
       <th class="sort-title-string">Requested Date</th>
       <th class="data-table-sort-desc sort-title-string">Effective Date</th>
       <th>Bundle Name</th>
-      <th>Event Type</th>
+      <th class="data-table-sort-desc">Event Type</th>
       <th>Details</th>
       <th>Reason Code / Comments</th>
       <th>Actions</th>

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

@@ -29,10 +29,12 @@
     <%= render :partial => "kaui/tags/tags_table",
                :locals => { :tags => @tags, :tags_url_or_path => kaui_engine.edit_account_tags_path(:params => { :account_id => @account.account_id }) } %>
   </dl>
+  <% if @subscriptions.present? %>
+    <%= render :partial => "kaui/subscriptions/subscriptions_table", :locals => { :subscriptions => @subscriptions } %>
+  <% end %>
   <% if @payment_methods.present? %>
-    <%= render :partial => "kaui/subscriptions/subscriptions_table" %>
+    <%= render :partial => "kaui/payment_methods/payment_methods_table", :locals => { :payment_methods => @payment_methods } %>
   <% end %>
-
 <% else %>
   <p>Account not found</p>
 <% end %>

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

@@ -6,7 +6,7 @@
     <dt>Bundle key:</dt>
     <dd><%= @bundle.external_key %>&nbsp;</dd>
   <% if @subscriptions.present? %>
-    <%= render :partial => "kaui/subscriptions/subscriptions_table" %>
+    <%= render :partial => "kaui/subscriptions/subscriptions_table", :locals => { :subscriptions => @subscriptions } %>
   <% end %>
 <% else %>
   <p>Bundle not found</p>

data/app/views/kaui/payment_methods/_payment_methods_table.html.erb

@@ -4,31 +4,30 @@
 <table class="table table-condensed table-striped">
   <thead>
     <tr>
+      <th>Type</th>
       <th>Card Type</th>
+      <th>Account Name</th>
       <th>Mask Number / Baid</th>
       <th>Expiration Date</th>
       <th>Default Method</th>
       <th>Actions</th>
-    </tr>   
+    </tr>
   </thead>
   <tbody>
-  <% if @payment_methods.present? %>
-    <% @payment_methods.each do |payment_method| %>
+  <% if payment_methods.present? && !payment_methods.nil? %>
+    <% payment_methods.each do |payment_method| %>
       <tr>
-        <td><%= payment_method["cardType"] %></a></td>
-        <td><%= payment_method["maskNumber"] %></td>
-        <td><%= payment_method["expirationDate"] %></td>
+        <td><%= payment_method.type %></a></td>
+        <td><%= payment_method.card_type %></a></td>
+        <td><%= payment_method.card_holder_name %><%= payment_method.email %></a></td>
+        <td><%= payment_method.mask_number %><%= payment_method.baid %></td>
+        <td><%= payment_method.expiration_dt %></td>
         <td>
-          <% if payment_method['defaultMethod'] %>
+          <% if payment_method.is_default %>
             <i class="icon-ok"></i>
-          <% else %>
-            <%= link_to "Make Default", kaui_engine.set_default_payment_method_account_path(:id => @account_id, :params => { :payment_method_id => payment_method['id'] }), :method => "PUT", :confirm => "Are you sure ?", :class => "btn btn-mini" %>
           <% end %>
-        </td>        
+        </td>
         <td>
-          <% unless payment_method['defaultMethod'] %>
-            <%= link_to "Delete", kaui_engine.delete_payment_method_account_path(:id => @account_id, :params => { :payment_method_id => payment_method['id'] }), :method => "DELETE", :confirm => "Are you sure ?", :class => "btn btn-mini" %>
-          <% end %>
         </td>
       </tr>
     <% end %>

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

@@ -14,8 +14,8 @@
     </tr>
   </thead>
   <tbody>
-    <% if @subscriptions.present? && !@subscriptions.nil? %>
-      <% @subscriptions.each do |sub| %>
+    <% if subscriptions.present? && !subscriptions.nil? %>
+      <% subscriptions.each do |sub| %>
         <tr>
           <td><%= sub.product_category.downcase.capitalize if sub.product_category.present? %></td>
           <td><%= sub.product_name.downcase.capitalize if sub.product_name.present? %></td>

data/config/initializers/time_formats.rb

@@ -1,2 +1,4 @@
 Time::DATE_FORMATS[:pretty] = "%b %d %Y at %H:%M"
-Date::DATE_FORMATS[:pretty] = "%b %d %Y at %H:%M"
+Date::DATE_FORMATS[:pretty] = "%b %d %Y at %H:%M"
+Time::DATE_FORMATS[:date_only] = "%Y-%m-%d"
+Date::DATE_FORMATS[:date_only] = "%Y-%m-%d"

data/lib/kaui/version.rb

@@ -1,3 +1,3 @@
 module Kaui
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: kaui
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: 
   segments: 
   - 0
   - 0
-  - 5
-  version: 0.0.5
+  - 6
+  version: 0.0.6
 platform: ruby
 authors: 
 - Alena Dudzinskaya
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-07-24 00:00:00 Z
+date: 2012-07-26 00:00:00 Z
 dependencies: []
 
 description: Rails UI plugin for Killbill administration.
@@ -76,6 +76,9 @@ files:
 - app/models/kaui/invoice_item.rb
 - app/models/kaui/payment.rb
 - app/models/kaui/payment_attempt.rb
+- app/models/kaui/payment_method.rb
+- app/models/kaui/plugin_info.rb
+- app/models/kaui/plugin_info_property.rb
 - app/models/kaui/product.rb
 - app/models/kaui/refund.rb
 - app/models/kaui/subscription.rb