kaui 0.1.6 → 0.1.7

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

@@ -57,14 +57,14 @@
     <div class="control-group">
       <%= f.label :amount, "Charge amount", :class => "control-label" %>
       <div class="controls">
-        <%= f.text_field :amount, :class => 'input-small' %>
+        <%= f.text_field :amount, :id => 'charge_amount', :class => 'input-small' %>
         <p class="help-inline"><%= @account.currency %></p>
       </div>
     </div>
     <div class="control-group">
       <%= label_tag :requested_date, 'Requested Date:', :class => "control-label" %>
       <div class="controls">
-        <%= text_field_tag :requested_date, nil, :class => 'input-xlarge date-picker' %>
+        <%= text_field_tag :requested_date, Time.now.utc.iso8601, :class => 'input-xlarge date-picker' %>
       </div>
     </div>
     <div class="control-group">
@@ -85,3 +85,10 @@
     </div>
   </fieldset>
 <% end %>
+<%= javascript_tag do %>
+  $(document).ready(function() {
+    $("#charge_amount").keydown(function(event) {
+      preventNonNumericValues(event);
+    });
+  });
+<% end %>

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

@@ -51,7 +51,7 @@
     <div class="control-group">
       <%= f.label :credit_amount, "Credit amount", :class => "control-label" %>
       <div class="controls">
-        <%= f.text_field :credit_amount, :class => 'input-small' %>
+        <%= f.text_field :credit_amount, :id => 'credit_amount', :class => 'input-small' %>
         <p class="help-inline"><%= @account.currency %></p>
       </div>
     </div>
@@ -79,3 +79,10 @@
     </div>
   </fieldset>
 <% end %>
+<%= javascript_tag do %>
+  $(document).ready(function() {
+    $("#credit_amount").keydown(function(event) {
+      preventNonNumericValues(event);
+    });
+  });
+<% end %>

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

@@ -9,9 +9,9 @@
     <dt>Target date:</dt>
     <dd><%= format_date(@invoice.target_date).html_safe %>&nbsp;</dd>
     <dt>Amount:</dt>
-    <dd><%= @invoice.amount %>&nbsp;</dd>
+    <dd><%= humanized_money_with_symbol @invoice.amount_to_money(@account.currency) %>&nbsp;</dd>
     <dt>Balance:</dt>
-    <dd><%= @invoice.balance %>&nbsp;</dd>
+    <dd><%= humanized_money_with_symbol @invoice.balance_to_money(@account.currency) %>&nbsp;</dd>
   </dl>
   <div class="page-header">
     <h3>Invoice items</h3>
@@ -58,10 +58,10 @@
           <td onClick="hightlightLinkedItems('<%= item.invoice_item_id %>', '<%= item.linked_invoice_item_id %>'); return false;"><%= format_date(item.end_date).html_safe if item.end_date %></td>
           <td onClick="hightlightLinkedItems('<%= item.invoice_item_id %>', '<%= item.linked_invoice_item_id %>'); return false;"><%= format_date(sub.charged_through_date).html_safe if sub.present? %></td>
           <td onClick="hightlightLinkedItems('<%= item.invoice_item_id %>', '<%= item.linked_invoice_item_id %>'); return false;"><%= sub.price_list.downcase.capitalize if sub.present? and sub.price_list.present? %></td>
-          <td onClick="hightlightLinkedItems('<%= item.invoice_item_id %>', '<%= item.linked_invoice_item_id %>'); return false;"><%= item.amount %>&nbsp;<%= item.currency %></td>
+          <td onClick="hightlightLinkedItems('<%= item.invoice_item_id %>', '<%= item.linked_invoice_item_id %>'); return false;"><%= humanized_money_with_symbol item.amount_to_money %></td>
           <td><%= link_to "Adjust",
                           kaui_engine.edit_invoice_item_path(item.invoice_item_id, :invoice_id => @invoice.invoice_id),
-                          :class => "btn btn-mini" %></td>
+                          :class => "btn btn-mini" if item.amount > 0 and item.subscription_id.present? %></td>
         </tr>
       <% end %>
     </tbody>

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

@@ -20,8 +20,8 @@
         <tr>
           <td><%= format_date(payment.requested_date).html_safe if payment.requested_date.present? %></td>
           <td><%= format_date(payment.effective_date).html_safe if payment.effective_date.present? %></td>
-          <td><%= payment.amount %> <%= payment.currency if payment.amount.present? %></td>
-          <td><%= payment.paid_amount %> <%= payment.currency if payment.paid_amount.present? %></td>
+          <td><%= humanized_money_with_symbol payment.amount_to_money %></td>
+          <td><%= humanized_money_with_symbol payment.paid_amount_to_money %></td>
           <td></td>
           <td><%= payment.ext_first_payment_id_ref %> <%= " / " if payment.ext_second_payment_id_ref.present? %> <%= payment.ext_second_payment_id_ref %></td>
           <td><%= payment.retry_count %></td>

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

@@ -49,10 +49,18 @@
         </div>
       </div>
     <% end %>
+    <div class="control-group">
+      <%= f.label :external, "External Payment?", :class => "control-label" %>
+      <div class="controls">
+        <label class="checkbox">
+          <%= f.check_box :external %>
+        </label>
+      </div>
+    </div>
     <div class="control-group">
       <%= f.label :amount, "Amount", :class => "control-label" %>
       <div class="controls">
-        <%= f.text_field :amount, :class => 'input-small' %>
+        <%= f.text_field :amount, :id => 'payment_amount', :class => 'input-small' %>
         <p class="help-inline"><%= @account.currency %></p>
       </div>
     </div>
@@ -74,3 +82,10 @@
     </div>
   </fieldset>
 <% end %>
+<%= javascript_tag do %>
+  $(document).ready(function() {
+    $("#payment_amount").keydown(function(event) {
+      preventNonNumericValues(event);
+    });
+  });
+<% end %>

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

@@ -65,7 +65,7 @@
     <div class="control-group">
       <%= f.label :amount, "Refund amount", :class => "control-label" %>
       <div class="controls">
-        <%= f.text_field :amount, :value => @payment.amount, :class => 'input-small' %>
+        <%= f.text_field :amount, :id => 'refund_amount', :value => @payment.amount, :class => 'input-small' %>
         <p class="help-inline"><%= @account.currency %></p>
       </div>
     </div>
@@ -87,3 +87,10 @@
     </div>
   </fieldset>
 <% end %>
+<%= javascript_tag do %>
+  $(document).ready(function() {
+    $("#refund_amount").keydown(function(event) {
+      preventNonNumericValues(event);
+    });
+  });
+<% end %>

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

@@ -30,9 +30,9 @@
           <td>
             <nobr>
               <% if sub.product_category == 'BASE' %>
-                <% if sub.canceled_date.present? %>
+                <% if sub.canceled_date.present? && Time.parse(sub.canceled_date) > Time.now %>
                   <%= link_to "Reinstate", kaui_engine.reinstate_subscription_path(:id => sub.subscription_id), :method => :put, :class => "btn btn-mini" %>                    
-                <% else %>
+                <% elsif !sub.canceled_date.present? %>
                   <%= link_to "Change", kaui_engine.edit_subscription_path(sub.subscription_id), :class => "btn btn-mini" %>
                   <%= link_to "Cancel", kaui_engine.subscription_path(:id => sub.subscription_id), :method => :delete, :class => "btn btn-mini" %>
                   <%= link_to "Add Addons", kaui_engine.new_subscription_path(:params => { :bundle_id => sub.bundle_id, :base_subscription => sub.product_name }), :class => "btn btn-mini" %>

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

@@ -25,7 +25,7 @@
   <div class="control-group">
     <%= label_tag :requested_date, 'Change Date:', :class => "control-label" %>
     <div class="controls">
-      <%= text_field_tag :requested_date, nil, :class => 'input-xlarge date-picker' %>
+      <%= text_field_tag :requested_date, Time.now.utc.iso8601, :class => 'input-xlarge date-picker' %>
     </div>
   </div>
   <div class="form-actions">

data/lib/kaui/version.rb

@@ -1,3 +1,3 @@
 module Kaui
-  VERSION = "0.1.6"
+  VERSION = "0.1.7"
 end

data/test/dummy/app/assets/javascripts/application.js

@@ -12,4 +12,5 @@
 //
 //= require jquery
 //= require jquery_ujs
+//= require validation
 //= require_tree .