kaui 0.0.3 → 0.0.4

data/app/controllers/kaui/credits_controller.rb

@@ -1,8 +1,10 @@
 class Kaui::CreditsController < Kaui::EngineController
   def show
-    @payment_id = params[:id]
-    if @payment_id.present?
-      data = Kaui::KillbillHelper::get_credits_for_payment(@payment_id)
+    @account_id = params[:account_id]
+    @invoice_id = params[:invoice_id]
+
+    # invoice id can be nil for account level credit
+      data = Kaui::KillbillHelper::get_credits(@account_id, @invoice_id)
       if data.present?
         @credit = Kaui::Credit.new(data)
       else

data/app/controllers/kaui/invoices_controller.rb

@@ -11,6 +11,7 @@ class Kaui::InvoicesController < Kaui::EngineController
       @invoice = Kaui::KillbillHelper.get_invoice(@invoice_id)
       if @invoice.present?
         @account = Kaui::KillbillHelper.get_account(@invoice.account_id)
+        @payments = Kaui::KillbillHelper.get_payments(@invoice_id)
         @subscriptions = {}
         @bundles = {}
         if @invoice.items.present?
@@ -33,4 +34,8 @@ class Kaui::InvoicesController < Kaui::EngineController
       flash[:error] = "No id given"
     end
   end
+
+  def show_html
+    render :text => Kaui::KillbillHelper.get_invoice_html(params[:id])
+  end
 end

data/app/controllers/kaui/subscriptions_controller.rb

@@ -22,7 +22,7 @@ class Kaui::SubscriptionsController < Kaui::EngineController
     if @base_subscription.present?
       @catalog = Kaui::KillbillHelper::get_available_addons(@base_subscription)
     else
-      # TODO: call catalog to get base subscription types
+      @catalog = Kaui::KillbillHelper::get_available_base_plans()
     end
 
     @subscription = Kaui::Subscription.new("bundleId" => bundle_id)
@@ -37,7 +37,7 @@ class Kaui::SubscriptionsController < Kaui::EngineController
       @catalog = Kaui::KillbillHelper::get_available_addons(@base_subscription)
       @subscription.product_category = "ADD_ON"
     else
-      # TODO: call catalog to get base subscription types
+      @catalog = Kaui::KillbillHelper::get_available_base_plans()
       @subscription.product_category = "BASE"
     end
 
@@ -76,25 +76,36 @@ class Kaui::SubscriptionsController < Kaui::EngineController
 
   def edit
     @subscription = Kaui::KillbillHelper.get_subscription(params[:id])
-    unless @subscription.present?
+    if @subscription.present?
+      bundle_id = params[:bundle_id]
+      @bundle = Kaui::KillbillHelper::get_bundle(bundle_id)
+      @catalog = Kaui::KillbillHelper::get_available_base_plans
+      @current_plan = "#{@subscription.product_name} #{@subscription.billing_period}".humanize
+      if @subscription.price_list != "DEFAULT"
+        @current_plan += " (price list #{@subscription.price_list})"
+      end
+    else
       flash[:error] = "No subscription id given or subscription not found"
       redirect_to :back
     end
-    @products = Kaui::SAMPLE_BASE_PRODUCTS
   end
 
   def update
     if params.has_key?(:subscription) && params[:subscription].has_key?(:subscription_id)
       subscription = Kaui::KillbillHelper.get_subscription(params[:subscription][:subscription_id])
-      product_id = params[:subscription][:product_name]
-      products = Kaui::SAMPLE_BASE_PRODUCTS.select{|p| p.id == product_id}
-      unless products.empty?
-        subscription.product_name = products[0].product_name
-        subscription.billing_period = products[0].billing_period
-        subscription.start_date = params[:subscription][:start_date]
-        Kaui::KillbillHelper.update_subscription(subscription)
-      end
-      redirect_to :action => :show, :id => subscription.subscription_id
+      catalog = Kaui::KillbillHelper::get_available_base_plans
+      plan = catalog[params[:plan_name]]
+      start_date = params[:start_date]
+      subscription.billing_period = plan["billingPeriod"]
+      subscription.product_category = plan["productCategory"]
+      subscription.product_name = plan["productName"]
+      subscription.price_list = plan["priceListName"]
+      subscription.subscription_id = params[:subscription][:subscription_id]
+      # TODO: need to use entered start_date (or current date if none entered)
+
+      Kaui::KillbillHelper.update_subscription(subscription)
+
+      redirect_to :back
     else
       flash[:error] = "No subscription given"
       redirect_to :back

data/app/helpers/kaui/killbill_helper.rb

@@ -9,7 +9,11 @@ module Kaui
       response = RestClient.send(method.to_sym, url, *args)
       data = { :code => response.code }
       if response.code < 300 && response.body.present?
-        data[:json] = JSON.parse(response.body)
+        if response.headers[:content_type] =~ /application\/json.*/
+          data[:json] = JSON.parse(response.body)
+        else
+          data[:body] = response.body
+        end
       end
       # TODO: error handling
       data
@@ -208,6 +212,15 @@ module Kaui
       end
     end
 
+    def self.get_invoice_html(invoice_id)
+      begin
+        data = call_killbill :get, "/1.0/kb/invoices/#{invoice_id}/html"
+        data[:body] if data.present?
+      rescue => e
+        puts "#{$!}\n\t" + e.backtrace.join("\n\t")
+      end
+    end
+
     ############## CATALOG ##############
 
     def self.get_available_addons(base_product_name)
@@ -221,6 +234,17 @@ module Kaui
       end
     end
 
+    def self.get_available_base_plans()
+      begin
+        data = call_killbill :get, "/1.0/kb/catalog/availableBasePlans"
+        if data.has_key?(:json)
+          data[:json].inject({}) {|catalog_hash, item| catalog_hash.merge!(item["planName"] => item) }
+        end
+      rescue => e
+        puts "#{$!}\n\t" + e.backtrace.join("\n\t")
+      end
+    end
+
     ############## PAYMENT ##############
 
     # def self.get_payment_attempt(external_key, invoice_id, payment_id)

data/app/models/kaui/account.rb

@@ -15,6 +15,7 @@ class Kaui::Account < Kaui::Base
   define_attr :state
   define_attr :country
   define_attr :phone
+  has_one :bill_cycle_day, Kaui::BillCycleDay
 
   def initialize(data = {})
     super(:account_id => data['accountId'],
@@ -30,6 +31,7 @@ class Kaui::Account < Kaui::Base
           :company =>  data['company'],
           :state => data['state'],
           :country => data['country'],
-          :phone => data['phone'])
+          :phone => data['phone'],
+          :bill_cycle_day => data['billCycleDay'])
   end
 end

data/app/models/kaui/bill_cycle_day.rb

@@ -0,0 +1,9 @@
+class Kaui::BillCycleDay < Kaui::Base
+  define_attr :day_of_month_local
+  define_attr :day_of_month_utc
+
+  def initialize(data = {})
+    super(:day_of_month_local => data['dayOfMonthLocal'],
+          :day_of_month_utc => data['dayOfMonthUTC'])
+  end
+end

data/app/models/kaui/chargeback.rb

@@ -24,9 +24,15 @@ class Kaui::Chargeback < Kaui::Base
 
   define_attr :payment_id
   define_attr :chargeback_amount
+  define_attr :requested_dt
+  define_attr :effective_dt
+  define_attr :reason
 
   def initialize(data = {})
     super(:payment_id => data['paymentId'] || data['payment_id'],
-          :chargeback_amount => data['chargebackAmount'] || data['chargeback_amount'])
+          :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'])
   end
 end

data/app/models/kaui/credit.rb

@@ -1,11 +1,21 @@
 class Kaui::Credit < Kaui::Base
   SAMPLE_REASON_CODES = [ "100 - Courtesy",
-                   "101 - Billing Error",
-                   "199 - OTHER" ]
+                          "101 - Billing Error",
+                          "199 - OTHER" ]
 
   define_attr :account_id
   define_attr :invoice_id
-  define_attr :amount
+  define_attr :credit_amount
+  define_attr :requested_dt
+  define_attr :effective_dt
   define_attr :comment
   define_attr :reason
+
+  def initialize(data = {})
+    super(:account_id => data['accountId'] || data['account_id'],
+          :invoice_id => data['invoiceId'] || data['invoice_id'],
+          :credit_amount => data['creditAmount'] || data['credit_amount'],
+          :requested_dt => data['requestedDate'],
+          :effective_dt => data['effectiveDate'])
+  end
 end

data/app/models/kaui/payment.rb

@@ -15,9 +15,11 @@ class Kaui::Payment < Kaui::Base
   define_attr :status
   define_attr :bundle_keys
 
+  has_many :refunds, Kaui::Refund
+  has_many :chargebacks, Kaui::Chargeback
+
   def initialize(data = {})
-    super(
-          :account_id => data['accountId'],
+    super(:account_id => data['accountId'],
           :amount => data['amount'],
           :currency => data['currency'],
           :effective_dt => data['effectiveDate'],
@@ -29,6 +31,8 @@ class Kaui::Payment < Kaui::Base
           :requested_dt => data['requestedDate'],
           :retry_count => data['retryCount'],
           :status => data['status'],
-          :bundle_keys => data['bundleKeys'])
+          :bundle_keys => data['bundleKeys'],
+          :refunds => data['refunds'],
+          :chargebacks => data['chargebacks'])
   end
 end

data/app/models/kaui/refund.rb

@@ -7,12 +7,18 @@ class Kaui::Refund < Kaui::Base
                           "599 - OTHER" ]
 
   define_attr :refund_id
+  define_attr :payment_id
   define_attr :adjusted
   define_attr :refund_amount
+  define_attr :requested_dt
+  define_attr :effective_dt
 
   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'])
+          :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'])
   end
 end

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

@@ -14,8 +14,8 @@
 <table id="timeline-table" class="table table-condensed data-table">
   <thead>
     <tr>
-      <th class="data-table-sort-desc sort-title-string">Requested Date</th>
-      <th class="sort-title-string">Effective Date</th>
+      <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>Details</th>
@@ -38,14 +38,14 @@
           <td>
             <% if invoice.invoice_dt.present? %>
               <span class="hide" title="<%= invoice.invoice_dt %>"></span>
-              <%= format_date(invoice.invoice_dt).html_safe %>
+              <%= invoice.invoice_dt %>
             <% else %>
               [unknown]
             <% end %>
           <td>
             <% if invoice.target_dt.present? %>
               <span class="hide" title="<%= invoice.target_dt %>"></span>
-              <%= format_date(invoice.target_dt).html_safe %>
+              <%= invoice.target_dt %>
             <% else %>
               [unknown]
             <% end %>
@@ -76,7 +76,7 @@
           <td>
             <% if invoice.balance > 0 %>
               <nobr>
-                <%= link_to "External Payment",
+                <%= link_to "Credit",
                             kaui_engine.new_credit_path(:params => { :account_id => @account.account_id,
                                                                      :invoice_id => invoice.invoice_id }),
                             :class => "btn btn-mini" %>
@@ -85,6 +85,76 @@
           </td>
         </tr>
       <% end %>
+      <% @timeline.payments.each do |payment| %>
+        <% payment.refunds.each do |refund| %>
+          <% 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 %>
+              <% 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 %>
+              <% else %>
+                [unknown]
+              <% end %>
+            </td>
+            <td>
+              <% payment.bundle_keys.split(",").each do |bundle_key| %>
+                <%= link_to @bundle_names[bundle_key], Kaui.bundle_home_path.call(bundle_key) %><br/>
+              <% end %>
+            </td>
+            <td><%= "REFUND" %></td>
+            <td>
+              <%= "Adjusted:" %> <% if refund.adjusted %>yes<% else %>no<% end %><br/>
+              <%= "Payment id:" %> <%= refund.payment_id %><br/>
+              <%= "Refund Amount:" %> <%= refund.refund_amount %><br/>
+            </td>
+            <td></td>
+            <td></td>
+          </tr>
+        <% end %>
+      <% end %>
+      <% @timeline.payments.each do |payment| %>
+        <% payment.chargebacks.each do |chargeback| %>
+        <% 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 %>
+            <% 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 %>
+            <% else %>
+              [unknown]
+            <% end %>
+          </td>
+          <td>
+            <% payment.bundle_keys.split(",").each do |bundle_key| %>
+              <%= link_to @bundle_names[bundle_key], Kaui.bundle_home_path.call(bundle_key) %><br/>
+            <% end %>
+          </td>
+          <td><%= "CHARGEBACK" %></td>
+          <td>
+            <%= "Payment id:" %> <%= chargeback.payment_id %><br/>
+            <%= "Chargeback Amount:" %> <%= chargeback.chargeback_amount %><br/>
+          </td>
+          <td></td>
+          <td></td>
+        <% end %>
+      <% end %>
       <% @timeline.payments.each do |payment| %>
         <% if payment.bundle_keys.present? %>
           <% bundles = payment.bundle_keys.split(",").map {|bundle_key| @bundle_names[bundle_key] }.join(",") %>
@@ -118,13 +188,14 @@
           </td>
           <td><%= "PAYMENT" %></td>
           <td>
-            <%= "Total amount:" %> <%= payment.amount %> <%= @account.currency %><br/>
-            <%= "Paid amount:" %> <%= payment.amount %> <%= @account.currency %><br/>
-            <span <% if payment.status == 'Failed' %>class="alert-error" <% elsif payment.status == 'Success' %>class="alert-success" <% end %>>
+            <%= "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 %>>
               <%= payment.status %>
             </span>
             <br/>
             <%= "Invoice #" %> <%= link_to invoice.invoice_number, invoice_path(:id => invoice.invoice_id) %>
+          </td>
           <td></td>
           <td>
             <% if payment.payment_id.present? %>

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

@@ -6,8 +6,8 @@
     <dd><%= @account.name %>&nbsp;</dd>
     <dt>Email:</dt>
     <dd><%= @account.email %>&nbsp;</dd>
-    <dt>Billing day:</dt>
-    <dd><%= @account.billing_day %>&nbsp;</dd>
+    <dt>Bill cycle day:</dt>
+    <dd><%= @account.bill_cycle_day.day_of_month_local %> (user timezone) / <%= @account.bill_cycle_day.day_of_month_utc %> (UTC)</dd>
     <dt>Currency:</dt>
     <dd><%= @account.currency %>&nbsp;</dd>
     <dt>Timezone:</dt>

data/app/views/kaui/credits/new.html.erb

@@ -1,5 +1,5 @@
 <div class="page-header">
-  <h1>Apply External Payment</h1>
+  <h1>Apply Credit</h1>
 </div>
 <%= form_for(@credit, :url => { :action => :create }, :html => { :class => "form-horizontal" }) do |f| %>
   <%= f.hidden_field :account_id %>
@@ -13,14 +13,6 @@
         </label>
       </div>
     </div>
-    <div class="control-group">
-      <label class="control-label">Invoice number</label>
-      <div class="controls">
-        <label class="checkbox">
-            <%= @invoice.invoice_number %><br/>
-        </label>
-      </div>
-    </div>
     <div class="control-group">
       <label class="control-label">Account name</label>
       <div class="controls">
@@ -30,26 +22,36 @@
         </label>
       </div>
     </div>
-    <div class="control-group">
-      <label class="control-label">Invoice amount</label>
-      <div class="controls">
-        <label class="checkbox">
-            <%= @invoice.amount %> <%= @account.currency %>
-        </label>
+    <% if @invoice.present? %>
+      <div class="control-group">
+        <label class="control-label">Invoice number</label>
+        <div class="controls">
+          <label class="checkbox">
+              <%= @invoice.invoice_number %><br/>
+          </label>
+        </div>
       </div>
-    </div>
-    <div class="control-group">
-      <label class="control-label">Balance</label>
-      <div class="controls">
-        <label class="checkbox">
-            <%= @invoice.balance.nil? ? "0.00" : @invoice.balance %> <%= @account.currency %>
-        </label>
+      <div class="control-group">
+        <label class="control-label">Invoice amount</label>
+        <div class="controls">
+          <label class="checkbox">
+              <%= @invoice.amount %> <%= @account.currency %>
+          </label>
+        </div>
       </div>
-    </div>    
+      <div class="control-group">
+        <label class="control-label">Balance</label>
+        <div class="controls">
+          <label class="checkbox">
+              <%= @invoice.balance.nil? ? "0.00" : @invoice.balance %> <%= @account.currency %>
+          </label>
+        </div>
+      </div>
+    <% end %>
     <div class="control-group">
       <%= f.label :amount, "Credit amount", :class => "control-label" %>
       <div class="controls">
-        <%= f.text_field :amount, :value => @invoice.amount, :class => 'input-small' %>
+        <%= f.text_field :amount, :class => 'input-small' %>
         <p class="help-inline"><%= @account.currency %></p>
       </div>
     </div>
@@ -58,7 +60,7 @@
       <div class="controls">
         <%= f.select :reason, Kaui::Credit::SAMPLE_REASON_CODES %>
       </div>
-    </div>    
+    </div>
     <div class="control-group">
       <%= f.label :comment, :class => "control-label" %>
       <div class="controls">

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

@@ -1,5 +1,5 @@
 <% if @invoice.present? %>
-  <h3>Invoice number: <%= @invoice.invoice_number %></h3>
+  <h3>Invoice number: INV<%= @invoice.invoice_number %></h3>
   <dl class="dl-horizontal">
     <dt>Account Name:</dt>
     <dd><%= @account.name %>&nbsp;</dd>
@@ -49,9 +49,12 @@
     </tbody>
   </table>
   <div class="page-header">
-    <h3>Payments</h3>
+    <% if @payments.present? %>
+      <%= render :partial => "kaui/payments/payments_table" %>
+    <% end %>
   </div>
 <% else %>
   <p>Invoice not found</p>
 <% end %>
 <%= link_to 'Back', :back, :class => 'btn' %>
+<%= link_to "View customer invoice html", kaui_engine.show_html_invoice_path(@invoice.invoice_id), :class => 'btn', :target => "_blank" %>

data/app/views/kaui/payments/_payments_table.html.erb

@@ -0,0 +1,31 @@
+<div class="page-header">
+  <h3>Payments</h3>
+</div>
+<table class="table table-condensed table-striped data-table">
+  <thead>
+    <tr>
+      <th>Requested date</th>
+      <th>Effective date</th>
+      <th>Total amount</th>
+      <th>Paid amount</th>
+      <th>Payment method</th>
+      <th>Retry count</th>
+      <th>Status</th>
+    </tr>
+  </thead>
+  <tbody>
+    <% if @payments.present? %>
+      <% @payments.each do |payment| %>
+        <tr>
+          <td><%= format_date(payment.requested_dt).html_safe  if payment.requested_dt.present? %></td>
+          <td><%= format_date(payment.effective_dt).html_safe  if payment.effective_dt.present? %></td>
+          <td><%= payment.amount %> <%= @account.currency if payment.amount.present? %></td>
+          <td><%= payment.paid_amount %> <%= @account.currency if payment.paid_amount.present? %></td>
+          <td></td>
+          <td><%= payment.retry_count %></td>
+          <td><%= payment.status %></td>
+        </tr>
+      <% end %>
+    <% end %>
+  </tbody>
+</table>

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

@@ -20,8 +20,8 @@
           <td><%= sub.product_category.downcase.capitalize if sub.product_category.present? %></td>
           <td><%= sub.product_name.downcase.capitalize if sub.product_name.present? %></td>
           <td><%= sub.billing_period.downcase.capitalize if sub.billing_period.present? %></td>
-          <td><%= format_date(sub.start_date).html_safe %></td>
-          <td><%= format_date(sub.charged_through_date).html_safe %></td>
+          <td><%= format_date(sub.start_date).html_safe  if sub.start_date.present? %></td>
+          <td><%= format_date(sub.charged_through_date).html_safe if sub.charged_through_date.present? %></td>
           <td>
             <% if sub.canceled_date.present? %>
               <%= "Pending cancellation on " %> <%= format_date(sub.canceled_date).html_safe %>

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

@@ -2,21 +2,21 @@
 <%= form_for(@subscription, :url => subscription_path(@subscription.subscription_id), :html => { :method => :put, :class => "form-horizontal" }) do |f| %>
   <%= f.hidden_field :subscription_id %>
   <div class="control-group">
-    <%= label_tag 'plan', 'Current product:', :class => "control-label" %>
+    <%= label_tag :current_plan, 'Current plan:', :class => "control-label" %>
     <div class="controls">
-      <input class="input-xlarge disabled" disabled="disabled" value="<%= "#{@subscription.product_name} #{@subscription.billing_period}".humanize %>"/>
+      <%= text_field_tag :current_plan, @current_plan, :class => 'input-xlarge disabled', :disabled => "disabled" %>
     </div>
   </div>
   <div class="control-group">
-    <%= f.label :product_name, "New product:", :class => "control-label" %>
+    <%= label_tag :plan_name, "New plan:", :class => "control-label" %>
     <div class="controls">
-      <%= select :subscription, :product_name, @products.collect { |p| ["#{p.product_name} #{p.billing_period}".humanize, p.id] }, { :include_blank => true }, { :class => 'input-xlarge' } %>
+      <%= select_tag :plan_name, options_for_select(@catalog.keys, @plan_name) %>
     </div>
   </div>
   <div class="control-group">
-    <%= f.label :start_date, 'Change Date:', :class => "control-label" %>
+    <%= label_tag :start_date, 'Change Date:', :class => "control-label" %>
     <div class="controls">
-      <%= text_field :subscription, :start_date, :value => nil ,:class => 'input-xlarge date-picker' %>
+      <%= text_field_tag :start_date, nil, :class => 'input-xlarge date-picker' %>
     </div>
   </div>
   <div class="form-actions">

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

@@ -1,5 +1,5 @@
 <div class="page-header">
-  <h1>Add subscription to <%= Kaui.bundle_key_display_string.call(@bundle.external_key) %></h1>
+  <h1>Add subscription <% if @bundle.external_key %> to <%= Kaui.bundle_key_display_string.call(@bundle.external_key) %> <% end %></h1>
 </div>
 <%= form_for(@subscription, :url => { :action => :create }, :html => { :class => "form-horizontal" }) do |f| %>
   <fieldset>

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

@@ -1,21 +1,26 @@
-<div class="page-header">
-  <h2>Subscription <%= @subscription.id %></h2>
-</div>
-<dl class="dl-horizontal">
-  <dt>Category</dt>
-  <dd><%= @subscription.product_category.downcase.capitalize %></dd>
-  <dt>Product</dt>
-  <dd><%= @subscription.product_name.downcase.capitalize %></dd>
-  <dt>Period</dt>
-  <dd><%= @subscription.billing_period.downcase.capitalize %></dd>
-  <dt>Charged through</dt>
-  <dd> <%= format_date(@subscription.charged_through_date).html_safe %>
-  <dt>Price List</dt>
-  <dd><%= @subscription.price_list %></dd>
-  <dt>Start Date</dt>
-  <dd> <%= format_date(@subscription.start_date).html_safe %>
-</dl>
-<hr/>
-<%= link_to "Change", kaui_engine.edit_subscription_path(@subscription.subscription_id), :class => "btn btn-mini" %>
-<%= link_to "Cancel", kaui_engine.subscription_path(@subscription.subscription_id), :method => :delete, :confirm => "Are you sure?", :class => "btn btn-mini" %>
-<%= link_to "Add Addons", kaui_engine.new_subscription_path(:params => { :bundle_id => @subscription.bundle_id, :base_subscription => @subscription.product_name }), :class => "btn btn-mini" %>
+<% if @invoice.present? %>
+  <div class="page-header">
+    <h2>Subscription <%= @subscription.id %></h2>
+  </div>
+  <dl class="dl-horizontal">
+    <dt>Category</dt>
+    <dd><%= @subscription.product_category.downcase.capitalize if @subscription.product_category.present? %></dd>
+    <dt>Product</dt>
+    <dd><%= @subscription.product_name.downcase.capitalize if @subscription.product_name.present? %></dd>
+    <dt>Period</dt>
+    <dd><%= @subscription.billing_period.downcase.capitalize if @subscription.billing_period.present? %></dd>
+    <dt>Charged through</dt>
+    <dd> <%= format_date(@subscription.charged_through_date).html_safe if @subscription.charged_through_date.present? %>
+    <dt>Price List</dt>
+    <dd><%= @subscription.price_list %></dd>
+    <dt>Start Date</dt>
+    <dd> <%= format_date(@subscription.start_date).html_safe if @subscription.start_date.present? %>
+  </dl>
+  <hr/>
+  <%= link_to "Change", kaui_engine.edit_subscription_path(@subscription.subscription_id), :class => "btn btn-mini" %>
+  <%= link_to "Cancel", kaui_engine.subscription_path(@subscription.subscription_id), :method => :delete, :confirm => "Are you sure?", :class => "btn btn-mini" %>
+  <%= link_to "Add Addons", kaui_engine.new_subscription_path(:params => { :bundle_id => @subscription.bundle_id, :base_subscription => @subscription.product_name }), :class => "btn btn-mini" %>
+<% else %>
+  <p>Subscription not found</p>
+<% end %>
+<%= link_to 'Back', :back, :class => 'btn' %>

data/config/routes.rb

@@ -25,7 +25,11 @@ Kaui::Engine.routes.draw do
 
   resources :refunds, :only => [ :show, :create, :new ]
 
-  resources :invoices, :only => [ :index, :show ]
+  resources :invoices, :only => [ :index, :show ] do
+    member do
+      get :show_html
+    end
+  end
 
   resources :bundles, :only => [ :index, :show ]
 

data/lib/kaui/version.rb

@@ -1,3 +1,3 @@
 module Kaui
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: kaui
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 23
   prerelease: 
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Alena Dudzinskaya
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-07-23 00:00:00 Z
+date: 2012-07-24 00:00:00 Z
 dependencies: []
 
 description: Rails UI plugin for Killbill administration.
@@ -67,6 +67,7 @@ files:
 - app/models/kaui/account.rb
 - app/models/kaui/account_timeline.rb
 - app/models/kaui/base.rb
+- app/models/kaui/bill_cycle_day.rb
 - app/models/kaui/bundle.rb
 - app/models/kaui/chargeback.rb
 - app/models/kaui/credit.rb
@@ -101,6 +102,7 @@ files:
 - app/views/kaui/payment_methods/_payment_methods_table.html.erb
 - app/views/kaui/payment_methods/index.html.erb
 - app/views/kaui/payment_methods/show.html.erb
+- app/views/kaui/payments/_payments_table.html.erb
 - app/views/kaui/refunds/index.html.erb
 - app/views/kaui/refunds/new.html.erb
 - app/views/kaui/refunds/show.html.erb