kaui 0.6.6 → 0.7.0

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

@@ -1,123 +1,115 @@
 <div class="page-header">
   <h1>Refund Payment</h1>
 </div>
-<%= form_for(@refund, :url => { :action => :create }, :html => { :class => "form-horizontal" }) do |f| %>
-
-    <%= hidden_field_tag :account_id, @account_id %>
-    <%= hidden_field_tag :payment_id, @payment_id %>
-    <%= hidden_field_tag :invoice_id, @invoice_id%>
-  <fieldset>
-    <div class="control-group">
-      <label class="control-label">Date</label>
-      <div class="controls">
-        <label class="checkbox">
-          <%= DateTime.now.to_s(:pretty) %>
-        </label>
+<%= form_for(@refund, :url => {:action => :create}, :html => {:class => "form-horizontal"}) do |f| %>
+    <%= hidden_field_tag :account_id, @account.account_id %>
+    <%= hidden_field_tag :payment_id, @payment.payment_id %>
+    <%= hidden_field_tag :invoice_id, @invoice.invoice_id %>
+    <fieldset>
+      <div class="control-group">
+        <label class="control-label">Date</label>
+        <div class="controls">
+          <label class="checkbox">
+            <%= DateTime.now.to_s(:pretty) %>
+          </label>
+        </div>
       </div>
-    </div>
-    <div class="control-group">
-      <label class="control-label">Invoice number</label>
-      <div class="controls">
-        <label class="checkbox">
+      <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">
-        <label class="checkbox">
-          <%= @account.name %><br/>
-          <%= @account.email %>
-        </label>
-      </div>
-    </div>
-    <div class="control-group">
-      <label class="control-label">Status</label>
-      <div class="controls">
-        <label class="checkbox">
-          <%= @payment.status %>
-        </label>
-      </div>
-    </div>
-    <div class="control-group">
-      <%= f.label :adjustment_type, "Adjustment Type", :class => "control-label" %>
-      <div class="controls">
-        <label class="radio">
-          <%= f.radio_button :adjustment_type, 'noInvoiceAdjustment', :checked => true %>
-              No Invoice Adjustment
-        </label>
+          </label>
+        </div>
       </div>
-      <% if can? :adjust, Kaui::Invoice %>
+      <div class="control-group">
+        <label class="control-label">Account name</label>
         <div class="controls">
-          <label class="radio">
-            <%= f.radio_button :adjustment_type, 'invoiceAdjustment' %>
-                Invoice Adjustment
+          <label class="checkbox">
+            <%= @account.name %><br/>
+            <%= @account.email %>
           </label>
         </div>
-      <% end %>
-      <% if can? :item_adjust, Kaui::Invoice %>
+      </div>
+      <div class="control-group">
+        <%= label_tag :adjustment_type, 'Adjustment Type', :class => 'control-label' %>
         <div class="controls">
           <label class="radio">
-            <%= f.radio_button :adjustment_type, 'invoiceItemAdjustment' %>
+            <%= radio_button_tag :adjustment_type, 'noInvoiceAdjustment', :checked => true %>
+            No Invoice Adjustment
+          </label>
+        </div>
+        <% if can? :adjust, Kaui::Invoice %>
+            <div class="controls">
+              <label class="radio">
+                <%= radio_button_tag :adjustment_type, 'invoiceAdjustment' %>
+                Invoice Adjustment
+              </label>
+            </div>
+        <% end %>
+        <% if can? :item_adjust, Kaui::Invoice %>
+            <div class="controls">
+              <label class="radio">
+                <%= radio_button_tag :adjustment_type, 'invoiceItemAdjustment' %>
                 Invoice Item Adjustment
+              </label>
+            </div>
+        <% end %>
+      </div>
+      <div id="invoiceItems" style="display:none">
+        <% @invoice.items.each_with_index do |ii, index| %>
+            <% if ii.amount > 0 %>
+                <div id=<%= "div_#{ii.invoice_item_id}" %> class="control-group">
+                  <label class="control-label"></label>
+
+                  <div class="controls">
+                    <input type="checkbox" id=<%= "cb_adj_#{ii.invoice_item_id}" %>>
+                    <%= "Item #{index + 1} : #{ii.description} " %>
+                    <%= text_field_tag "adjustments[#{ii.invoice_item_id}]", index, :id => "tf_adj_#{ii.invoice_item_id}", :value => ii.amount, :class => 'input-small' %>
+                  </div>
+                </div>
+            <% end %>
+        <% end %>
+      </div>
+      <div class="control-group">
+        <label class="control-label">Paid Amount</label>
+        <div class="controls">
+          <label class="checkbox">
+            <%= @payment.purchased_amount %> <%= @account.currency if @payment.purchased_amount.present? %>
           </label>
         </div>
-      <% end %>
-    </div>
-    <div id="invoiceItems" style="display:none">
-      <% @invoice.items.each_with_index do |ii, index | %>
-         <% if ii.amount > 0 and ii.subscription_id.present?  %>
-           <div id=<%= "div_#{ii.invoice_item_id}" %> class="control-group">
-               <label class="control-label"></label>
-               <div class="controls">
-                   <input type="checkbox" id=<%= "cb_adj_#{ii.invoice_item_id}" %>>
-                   <%= "Item #{index + 1} : #{ii.description} " %>
-                   <%= text_field_tag "adjustments[#{ii.invoice_item_id}]", index,  :id => "tf_adj_#{ii.invoice_item_id}" , :value => ii.amount, :class => 'input-small' %>
-               </div>
-           </div>
-         <% end %>
-      <% end %>
-    </div>
-    <div class="control-group">
-      <label class="control-label">Paid Amount</label>
-      <div class="controls">
-        <label class="checkbox">
-          <%= @payment.paid_amount %> <%= @account.currency if @payment.paid_amount.present? %>
-        </label>
       </div>
-    </div>
-    <div id="div_refund_amount" class="control-group">
-      <%= f.label :amount, "Refund amount", :class => "control-label" %>
-      <div class="controls">
-        <%= f.text_field :amount, :id => 'refund_amount', :value => @payment.paid_amount, :class => 'input-small' %>
-        <p class="help-inline"><%= @account.currency %></p>
+      <div id="div_refund_amount" class="control-group">
+        <%= label_tag :amount, 'Refund amount', :class => 'control-label' %>
+        <div class="controls">
+          <%= text_field_tag :amount, @payment.purchased_amount, :id => 'refund_amount', :class => 'input-small' %>
+          <p class="help-inline"><%= @account.currency %></p>
+        </div>
       </div>
-    </div>
-    <div class="control-group">
-      <%= label_tag :reason, "Reason", :class => "control-label" %>
-      <div class="controls">
-        <%= select_tag :reason, options_for_select(Kaui::Refund::SAMPLE_REASON_CODES) %>
+      <div class="control-group">
+        <%= label_tag :reason, "Reason", :class => "control-label" %>
+        <div class="controls">
+          <%= select_tag :reason, options_for_select(Kaui::Refund::SAMPLE_REASON_CODES) %>
+        </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>
-    <div class="control-group">
-      <%= label_tag :comment, "Comment", :class => "control-label" %>
-      <div class="controls">
-        <%= text_area_tag :comment, "", :rows => 3, :class => 'input-xlarge' %>
+      <div class="form-actions">
+        <%= button_tag "Create refund", :id => "submit", :class => "btn btn-primary" %>
+        <%= link_to 'Back', :back, :class => 'btn' %>
       </div>
-    </div>
-    <div class="form-actions">
-      <%= button_tag "Create refund", :id => "submit", :class =>"btn btn-primary" %>
-      <%= link_to 'Back', :back, :class => 'btn' %>
-    </div>
-  </fieldset>
+    </fieldset>
 <% end %>
 <%= javascript_tag do %>
 
     var textToDivId = function(textId) {
         return "div_" + textId.split("tf_adj_")[1];
     };
-    
+
     var textToCheckboxId = function(textId) {
         return "cb_adj_" + textId.split("tf_adj_")[1];
     };
@@ -125,7 +117,7 @@
     var checkboxToTextId = function(cbId) {
         return "tf_adj_" + cbId.split("cb_adj_")[1];
     };
-    
+
     var setClassForElement = function(id, newClass) {
         var currentClasses = $(id).attr('class').split(' ');
         for (var i=0; i<currentClasses.length; i++) {
@@ -144,7 +136,7 @@
     };
 
     var validateRefundAmount = function() {
-        if (Number($("#refund_amount").attr('value')) > <%= @payment.paid_amount %> ||
+        if (Number($("#refund_amount").attr('value')) > <%= @payment.purchased_amount %> ||
           Number($("#refund_amount").attr('value')) <= 0) {
           setClassForElement("#div_refund_amount", "control-group error");
           $("#submit").prop('disabled', true);
@@ -174,8 +166,8 @@
      * _ For Invoice adjustment or no adjustment, default to payment amount
      */
     var recomputeRefundAmountAndValidateAmount = function() {
-        var computedRefundAmount = <%= @payment.paid_amount %>;
-        if ($("#refund_adjustment_type_invoiceitemadjustment").is(':checked')) {
+        var computedRefundAmount = <%= @payment.purchased_amount %>;
+        if ($("#adjustment_type_invoiceItemAdjustment").is(':checked')) {
             var x = 0; $('input').filter(function() { return this.id.match(/tf_adj_/) }).each(function() {
                 var id = textToCheckboxId(this.id);
                 if ($("#" + id).is(':checked')) {
@@ -191,7 +183,7 @@
         }
         validateRefundAmount();
     };
-    
+
     /*
     * When clicking checkbox for each item, disable amount and recompute total refund amount
     */
@@ -250,11 +242,11 @@
         /*
         * Adjustment type handlers
         */
-        $("#refund_adjustment_type_noinvoiceadjustment")
+        $("#adjustment_type_noInvoiceAdjustment")
         .click(onClickWithInvoiceOrNoAdjustment);
-        $("#refund_adjustment_type_invoiceadjustment")
+        $("#adjustment_type_invoiceAdjustment")
         .click(onClickWithInvoiceOrNoAdjustment);
-        $("#refund_adjustment_type_invoiceitemadjustment")
+        $("#adjustment_type_invoiceItemAdjustment")
         .click(onClickWithInvoiceItemAdjustment);
 
         /*

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

@@ -0,0 +1,36 @@
+<%= form_for(@subscription, :html => {:class => 'form-horizontal'}) do |f| %>
+    <fieldset>
+      <%= f.hidden_field :bundle_id %>
+      <%= f.hidden_field :account_id %>
+      <%= f.hidden_field :product_category %>
+      <% if @subscription.product_category == 'ADD_ON' %>
+          <%= hidden_field_tag :base_product_name, @base_product_name %>
+          <div class="control-group">
+            <%= label_tag :plan_name, 'Available Plans:', :class => 'control-label' %>
+            <div class="controls">
+              <%= select_tag :plan_name, options_for_select(@plans) %>
+              <p class="help-block">
+                Proration on customer's invoice will be done automatically.
+              </p>
+            </div>
+          </div>
+      <% else %>
+          <div class="control-group">
+            <%= f.label :external_key, 'Bundle External Key:', :class => 'control-label' %>
+            <div class="controls">
+              <%= f.text_field :external_key, :class => 'input-xlarge', :id => 'external_key' %>
+            </div>
+          </div>
+          <div class="control-group">
+            <%= label_tag :plan_name, 'Available Plans:', :class => 'control-label' %>
+            <div class="controls">
+              <%= select_tag :plan_name, options_for_select(@plans) %>
+            </div>
+          </div>
+      <% end %>
+      <div class="form-actions">
+        <%= f.submit 'Create Subscription', :class => 'btn btn-primary' %>
+        <%= link_to 'Back', :back, :class => 'btn' %>
+      </div>
+    </fieldset>
+<% end %>

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

@@ -3,54 +3,49 @@
 </div>
 <table class="table table-condensed table-striped data-table">
   <thead>
-    <tr>
-      <th>Product category</th>
-      <th>Product name</th>
-      <th>Start date</th>
-      <th>Charged through date</th>
-      <th>Notes</th>
-      <th>Actions</th>
-    </tr>
+  <tr>
+    <th>Product category</th>
+    <th>Product name</th>
+    <th>Start date</th>
+    <th>Charged through date</th>
+    <th>Notes</th>
+    <th>Actions</th>
+  </tr>
   </thead>
   <tbody>
-    <% if subscriptions.present? && !subscriptions.nil? %>
+  <% 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? %> <%= sub.billing_period.downcase.capitalize if sub.billing_period.present? %> <% if sub.price_list.present? && sub.price_list.upcase != "DEFAULT" %> ( <%= sub.price_list.downcase.capitalize %> pricelist ) <% end %></td>
-          <td><%= format_date(sub.start_date, account.timezone).html_safe  if sub.start_date.present? %></td>
-          <td><%= format_date(sub.charged_through_date, account.timezone).html_safe if sub.charged_through_date.present? %></td>
-          <td>
-            <% if sub.cancelled_date.present? && !sub.cancelled_date.nil? %>
-              <% if Time.parse(sub.cancelled_date) > Time.now %> <%= "Pending cancellation on " %> <% else %> <%= "Canceled on " %> <% end %> <%= format_date(sub.cancelled_date, account.timezone).html_safe %>
-            <% end %>
-          </td>
-          <td>
-            <nobr>
-              <% if sub.billing_end_date.present? && Time.parse(sub.billing_end_date) > Time.now %>
-                <%= link_to "Reinstate", kaui_engine.reinstate_subscription_path(:id => sub.subscription_id), :method => :put, :class => "btn btn-mini" %>
-              <% elsif !sub.billing_end_date.present? %>
-                <%= link_to "Change", kaui_engine.edit_subscription_path(sub.subscription_id), :class => "btn btn-mini" %>
-                <div class="btn-group">
-                  <a class="btn btn-mini dropdown-toggle" data-toggle="dropdown" href="#">
-                    Cancel
-                    <span class="caret"></span>
-                  </a>
-                  <ul class="dropdown-menu">
-                    <li><%= link_to "Cancel (default policy)", kaui_engine.subscription_path(:id => sub.subscription_id, :policy => 'END_OF_TERM'), :method => :delete %></li>
-                    <li><%= link_to "Cancel at previous CTD (no proration)", kaui_engine.subscription_path(:id => sub.subscription_id, :policy => 'IMMEDIATE', :ctd => sub.charged_through_date, :billing_period => sub.billing_period), :method => :delete %></li>
-                    <li><%= link_to "Cancel immediately (generate proration)", kaui_engine.subscription_path(:id => sub.subscription_id, :policy => 'IMMEDIATE'), :method => :delete %></li>
-                    <li><%= link_to "Cancel end of term", kaui_engine.subscription_path(:id => sub.subscription_id, :policy => 'END_OF_TERM'), :method => :delete %></li>
-                  </ul>
-                </div>
-                <% if sub.product_category == 'BASE' %>
-                  <%= link_to "Add Addons", kaui_engine.new_subscription_path(:params => { :bundle_id => sub.bundle_id, :base_subscription => sub.product_name, :product_category => "ADD_ON" }), :class => "btn btn-mini" %>
-                <% end %>
+          <tr>
+            <td><%= humanized_product_category(sub) %></td>
+            <td><%= humanized_full_product_name(sub) %></td>
+            <td><%= humanized_start_date(sub, account) %></td>
+            <td><%= humanized_charged_through_date(sub, account) %></td>
+            <td><%= humanized_cancelled_date(sub, account) %></td>
+            <td>
+              <%= link_to 'Details', kaui_engine.subscription_path(:id => sub.subscription_id), :class => 'btn btn-mini' %>
+              <% if is_future_cancelled?(sub) %>
+                  <%= link_to 'Reinstate', kaui_engine.reinstate_subscription_path(:id => sub.subscription_id), :method => :put, :class => 'btn btn-mini' %>
+              <% elsif is_cancelled?(sub) %>
+                  <%= link_to 'Change', kaui_engine.edit_subscription_path(sub.subscription_id), :class => 'btn btn-mini' %>
+                  <div class="btn-group">
+                    <a class="btn btn-mini dropdown-toggle" data-toggle="dropdown" href="#">
+                      Cancel
+                      <span class="caret"></span>
+                    </a>
+                    <ul class="dropdown-menu">
+                      <li><%= link_to 'Cancel (default policy)', kaui_engine.subscription_path(:id => sub.subscription_id, :policy => 'END_OF_TERM'), :method => :delete %></li>
+                      <li><%= link_to 'Cancel at previous CTD (no proration)', kaui_engine.subscription_path(:id => sub.subscription_id, :policy => 'IMMEDIATE', :ctd => sub.charged_through_date, :billing_period => sub.billing_period), :method => :delete %></li>
+                      <li><%= link_to 'Cancel immediately (generate proration)', kaui_engine.subscription_path(:id => sub.subscription_id, :policy => 'IMMEDIATE'), :method => :delete %></li>
+                      <li><%= link_to 'Cancel end of term', kaui_engine.subscription_path(:id => sub.subscription_id, :policy => 'END_OF_TERM'), :method => :delete %></li>
+                    </ul>
+                  </div>
+                  <% if sub.product_category == 'BASE' %>
+                      <%= link_to 'Add add-ons', kaui_engine.new_subscription_path(:params => {:bundle_id => sub.bundle_id, :base_product_name => sub.product_name, :product_category => 'ADD_ON'}), :class => 'btn btn-mini' %>
+                  <% end %>
               <% end %>
-            </nobr>
-          </td>
-        </tr>
+            </td>
+          </tr>
       <% end %>
-    <% end %>
+  <% end %>
   </tbody>
 </table>

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

@@ -1,41 +1,30 @@
-<% @page_title = "Edit Subscription" %>
-<%= form_for(@subscription, :as => :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 class="control-label">Account timezone</label>
-    <div class="controls">
-      <label class="checkbox">
-        <%= @account.timezone %>
-      </label>
+<% @page_title = 'Edit Subscription' %>
+<%= form_for(@subscription, :url => subscription_path(@subscription.subscription_id), :html => {:method => :put, :class => 'form-horizontal'}) do |f| %>
+    <div class="control-group">
+      <%= label_tag :current_plan, 'Current plan:', :class => 'control-label' %>
+      <div class="controls">
+        <%= text_field_tag :current_plan, @current_plan, :class => 'input-xlarge disabled', :disabled => 'disabled' %>
+      </div>
     </div>
-  </div>
-  <div class="control-group">
-    <%= label_tag :current_plan, 'Current plan:', :class => "control-label" %>
-    <div class="controls">
-      <%= text_field_tag :current_plan, @current_plan, :class => 'input-xlarge disabled', :disabled => "disabled" %>
+    <div class="control-group">
+      <%= label_tag :plan_name, 'New plan:', :class => 'control-label' %>
+      <div class="controls">
+        <%= select_tag :plan_name, options_for_select(@plans) %>
+      </div>
     </div>
-  </div>
-  <div class="control-group">
-    <%= label_tag :plan_name, "New plan:", :class => "control-label" %>
-    <div class="controls">
-      <%= select_tag :plan_name, options_for_select(@catalog.keys, @plan_name) %>
+    <div class="control-group">
+      <%= label_tag :requested_date, 'Change Date:', :class => 'control-label' %>
+      <div class="controls">
+        <%= text_field_tag :requested_date, Date.parse(Time.now.to_s).to_s, :class => 'input-xlarge date-picker' %>
+      </div>
     </div>
-  </div>
-  <div class="control-group">
-    <%= label_tag :requested_date, 'Change Date:', :class => "control-label" %>
-    <div class="controls">
-      <%= text_field_tag :requested_date, Date.parse(Time.now.to_s).to_s, :class => 'input-xlarge date-picker' %>
+    <div class="control-group">
+      <%= label_tag :policy, 'Policy Override (leave blank for default; select an option to force plan change):', :class => 'control-label' %>
+      <div class="controls">
+        <%= select_tag :policy, options_for_select(['', 'IMMEDIATE', 'END_OF_TERM']) %>
+      </div>
     </div>
-  </div>
-  <div class="control-group">
-    <%= label_tag :policy, "Policy Override (leave blank for default; select an option to force plan change):", :class => "control-label" %>
-    <div class="controls">
-      <%= select_tag :policy, options_for_select(['', 'IMMEDIATE', 'END_OF_TERM']) %>
+    <div class="form-actions">
+      <%= f.submit 'Change', :class => 'btn btn-primary' %>
     </div>
-  </div>
-  <div class="form-actions">
-    <%= f.submit "Change", :class => 'btn btn-primary' %>
-    <%= link_to 'Back', :back, :class => 'btn' %>
-  </div>
 <% end %>

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

@@ -1,14 +1,15 @@
-<%= form_tag subscriptions_path, :class => "form-horizontal", :method => :get do %>
-  <fieldset>
-    <legend>Please enter subsciption id</legend>
-    <div class="control-group">
-      <label class="control-label" for="subscription_id">Subscription</label>
-      <div class="controls">
-        <%= text_field_tag 'subscription_id', nil, :class => "input-xlarge", :id => "subscription_id" %>
+<%= form_tag subscriptions_path, :class => 'form-horizontal', :method => :get do %>
+    <fieldset>
+      <legend>Please enter subscription id</legend>
+      <div class="control-group">
+        <label class="control-label" for="subscription_id">Subscription</label>
+
+        <div class="controls">
+          <%= text_field_tag 'subscription_id', nil, :class => 'input-xlarge', :id => 'subscription_id' %>
+        </div>
       </div>
-    </div>
-    <div class="form-actions">
-      <%= button_tag "Search", :class =>"btn btn-primary" %>
-    </div>
-  </fieldset>
+      <div class="form-actions">
+        <%= button_tag 'Search', :class => 'btn btn-primary' %>
+      </div>
+    </fieldset>
 <% end %>

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

@@ -1,49 +1,12 @@
 <div class="page-header">
-  <% if @product_category == "ADD_ON" %>
-      <h1>Add ADD_ON subscription
+  <% if @subscription.product_category == 'ADD_ON' %>
+      <h1>Add add-on subscription
         <% if @bundle.external_key %> to <%= Kaui.bundle_key_display_string.call(@bundle.external_key) %>
-        <% end %></h1>
+        <% end %>
+      </h1>
   <% else %>
-      <h1>Create new base subscription
-        <% if @account_id %> to account  <%= @account_id %>
-        <% end %></h1>
+      <h1>Create new base subscription to account <%= @subscription.account_id %></h1>
   <% end %>
 </div>
-<%= form_for(@subscription, :url => {:action => :create}, :html => {:class => "form-horizontal"}) do |f| %>
-    <fieldset>
-      <% if @product_category == "ADD_ON" %>
-          <%= f.hidden_field :bundle_id %>
-          <%= f.hidden_field :product_category %>
-          <%= hidden_field_tag :base_subscription, @base_subscription %>
-          <div class="control-group">
-            <%= label_tag :plan_name, "Available Plans:", :class => "control-label" %>
-            <div class="controls">
-              <%= select_tag :plan_name, options_for_select(@catalog.keys, @plan_name) %>
-              <p class="help-block">
-                Proration on customer's invoice will be done automatically.
-              </p>
-            </div>
-          </div>
-      <% else %>
-          <%= f.hidden_field :account_id %>
-          <%= f.hidden_field :product_category %>
-          <div class="control-group">
-            <%= label_tag :external_key, "Bundle External Key:", :class => "control-label" %>
-            <div class="controls">
-              <%= text_field_tag :external_key, params[:external_key], :class => 'input-xlarge', :id => "external_key" %>
-            </div>
-          </div>
-          <div class="control-group">
-            <%= label_tag :plan_name, "Available Plans:", :class => "control-label" %>
-            <div class="controls">
-              <%= select_tag :plan_name, options_for_select(@catalog.keys, @plan_name) %>
-            </div>
-          </div>
-      <% end %>
-      <div class="form-actions">
-        <%= f.submit 'Create Subscription', :class => 'btn btn-primary' %>
-        <%= link_to 'Back', :back, :class => 'btn' %>
-      </div>
 
-    </fieldset>
-<% end %>
+<%= render 'form' %>

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

@@ -1,26 +1,33 @@
-<% if @subscription.present? %>
-  <div class="page-header">
-    <h2>Subscription <%= @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, @account.timezone).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, @account.timezone).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, :product_category => "ADD_ON" }), :class => "btn btn-mini" %>
-<% else %>
-  <p>Subscription not found</p>
+<div class="page-header">
+  <h2>Subscription <%= @subscription.subscription_id %></h2>
+</div>
+<dl class="dl-horizontal">
+  <dt>Category</dt>
+  <dd><%= humanized_product_category(@subscription) || '&nbsp;'.html_safe %></dd>
+  <dt>Product</dt>
+  <dd><%= humanized_product_name(@subscription) || '&nbsp;'.html_safe %></dd>
+  <dt>Period</dt>
+  <dd><%= humanized_billing_period(@subscription) || '&nbsp;'.html_safe %></dd>
+  <dt>Charged through</dt>
+  <dd><%= humanized_charged_through_date(@subscription, @account) || '&nbsp;'.html_safe %>
+  <dt>Price list</dt>
+  <dd><%= humanized_price_list(@subscription) || '&nbsp;'.html_safe %></dd>
+  <dt>Start date</dt>
+  <dd><%= humanized_start_date(@subscription, @account) || '&nbsp;'.html_safe %></dd>
+  <dt>Cancelled date</dt>
+  <dd><%= humanized_cancelled_date(@subscription, @account) || '&nbsp;'.html_safe %></dd>
+  <dt>Billing start date</dt>
+  <dd><%= humanized_billing_start_date(@subscription, @account) || '&nbsp;'.html_safe %></dd>
+  <dt>Billing end date</dt>
+  <dd><%= humanized_billing_end_date(@subscription, @account) || '&nbsp;'.html_safe %></dd>
+</dl>
+<hr/>
+<% if is_future_cancelled?(@subscription) %>
+    <%= link_to 'Reinstate', kaui_engine.reinstate_subscription_path(:id => sub.subscription_id), :method => :put, :class => 'btn btn-mini' %>
+<% elsif is_cancelled?(@subscription) %>
+    <%= 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_product_name => @subscription.product_name, :product_category => 'ADD_ON'}), :class => 'btn btn-mini' %>
 <% end %>
-<%= link_to 'Back', :back, :class => 'btn' %>
+&nbsp;
+<%= link_to 'Go to bundle', kaui_engine.bundle_path(@subscription.bundle_id), :class => 'btn btn-mini' %>