kaui 0.1.0 → 0.1.2

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

@@ -9,6 +9,7 @@
       <th>Total amount</th>
       <th>Paid amount</th>
       <th>Payment method</th>
+      <th>External payment id / Secondary payment id</th>
       <th>Retry count</th>
       <th>Status</th>
     </tr>
@@ -17,13 +18,14 @@
     <% 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><%= 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></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>
-          <td><%= payment.status %></td>
+          <td><%= payment.status %> <%=  payment.gateway_error_code unless payment.status == 'SUCCESS' %> <%= payment.gateway_error_msg %></td>
         </tr>
       <% end %>
     <% end %>

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

@@ -1,9 +1,9 @@
 <div class="page-header">
-  <h1>Apply External Payment</h1>
+  <h1>Process Payment</h1>
 </div>
 <%= form_for(@payment, :url => { :action => :create }, :html => { :class => "form-horizontal" }) do |f| %>
-  <%= hidden_field_tag :account_id, @account_id %>
-  <%= hidden_field_tag :invoice_id, @invoice_id %>
+  <%= f.hidden_field :account_id %>
+  <%= hidden_field_tag :external, params[:external] %>
   <fieldset>
     <div class="control-group">
       <label class="control-label">Date</label>
@@ -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">
@@ -29,6 +21,34 @@
           <%= @account.email %>
         </label>
       </div>
+    </div>
+    <% if @invoice.present? %>
+      <%= f.hidden_field :invoice_id %>
+      <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">Invoice amount</label>
+        <div class="controls">
+          <label class="checkbox">
+              <%= @invoice.amount %> <%= @account.currency %>
+          </label>
+        </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, "Amount", :class => "control-label" %>
       <div class="controls">
@@ -49,7 +69,7 @@
       </div>
     </div>
     <div class="form-actions">
-      <%= button_tag "Create refund", :class =>"btn btn-primary" %>
+      <%= button_tag "Process Payment", :class =>"btn btn-primary" %>
       <%= link_to 'Back', :back, :class => 'btn' %>
     </div>
   </fieldset>

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

@@ -1,10 +1,10 @@
 <%= form_tag refunds_path, :class => "form-horizontal", :method => :get do %>
   <fieldset>
-    <legend>Please enter payment id</legend>
+    <legend>Please enter either a refund or payment id</legend>
     <div class="control-group">
-      <label class="control-label" for="payment_id">Refund</label>
+      <label class="control-label" for="refund_id">Refund or payment</label>
       <div class="controls">
-        <%= text_field_tag 'payment_id', nil, :class => "input-xlarge", :id => "payment_id" %>
+        <%= text_field_tag "refund_id", nil, :class => "input-xlarge", :id => "refund_id" %>
       </div>
     </div>
     <div class="form-actions">

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

@@ -42,7 +42,7 @@
       <label class="control-label">Payment method</label>
       <div class="controls">
         <label class="checkbox">
-          <%= @payment.payment_method_id %>
+          <%= @payment_method.type %> <%= @payment_method.card_type %> <%= @payment_method.mask_number %>
         </label>
       </div>
     </div>
@@ -63,9 +63,9 @@
       </div>
     </div>
     <div class="control-group">
-      <%= f.label :refund_amount, "Refund amount", :class => "control-label" %>
+      <%= f.label :amount, "Refund amount", :class => "control-label" %>
       <div class="controls">
-        <%= f.text_field :refund_amount, :value => @payment.amount, :class => 'input-small' %>
+        <%= f.text_field :amount, :value => @payment.amount, :class => 'input-small' %>
         <p class="help-inline"><%= @account.currency %></p>
       </div>
     </div>

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

@@ -1,19 +1,33 @@
-<% if @refund_info.present? %>
-  <table class="table table-striped table-bordered table-condensed">
-    <thead>
+<% if @refunds.present? and @refunds.size > 0 %>
+<div class="page-header">
+  <h2>Refunds</h2>
+</div>
+<table class="table table-condensed table-striped">
+  <thead>
+    <tr>
+      <th>Refund id</th>
+      <th>Payment id</th>
+      <th>Amount</th>
+      <th>Adjusted?</th>
+      <th>Requested date</th>
+      <th>Effective date</th>
+      <th>Adjustments</th>
+    </tr>
+  </thead>
+  <tbody>
+    <% @refunds.each do |refund| %>
       <tr>
-        <th>Attribute</th>
-        <th>Value</th>
-      </tr>
-    </thead>
-    <tbody>
-    <% @refund_info.keys.sort.each do |key| %>
-      <tr>
-        <td><%= key %></td>
-        <td><%= @refund_info[key] %></td>
+        <td><%= refund.refund_id %></td>
+        <td><%= link_to refund.payment_id, payment_path(refund.payment_id) %></td>
+        <td><%= refund.amount %>&nbsp;<%= refund.currency %></td>
+        <td><%= refund.adjusted %></td>
+        <td><%= format_date(refund.requested_date).html_safe %></td>
+        <td><%= format_date(refund.effective_date).html_safe %></td>
+        <td><%= refund.adjustments %></td>
       </tr>
     <% end %>
-  </table>
+  </tbody>
+</table>
 <% else %>
   <p>Refund info not found</p>
 <% end %>

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

@@ -2,6 +2,14 @@
 <%= form_for(@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>
+    </div>
+  </div>
   <div class="control-group">
     <%= label_tag :current_plan, 'Current plan:', :class => "control-label" %>
     <div class="controls">

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

@@ -0,0 +1,45 @@
+<%= form_for(@tag_definition) do |f| %>
+  <% if @tag_definition.errors.any? %>
+    <div class='alert alert-error'>
+      <h2><%= pluralize(@tag_definition.errors.count, 'error') %> prohibited this tag definition from being saved:</h2>
+
+      <ul>
+      <% @tag_definition.errors.full_messages.each do |msg| %>
+        <li><%= msg %></li>
+      <% end %>
+      </ul>
+    </div>
+  <% end %>
+
+  <% unless @tag_definition.new_record? %>
+    <div class='control-group'>
+      <%= f.label :id, 'Id:', :class => 'control-label' %>
+      <div class='controls'>
+        <%= f.text_field :id, :class => 'input-xlarge disabled', :readonly => true %>
+      </div>
+    </div>
+  <% end %>
+  <div class='control-group'>
+    <%= f.label :name, 'Name:', :class => 'control-label' %>
+    <div class='controls'>
+      <% unless @tag_definition.new_record? %>
+        <%= f.text_field :name, :class => 'input-large disabled', :readonly => true %>
+      <% else %>
+        <%= f.text_field :name %>
+      <% end %>
+    </div>
+  </div>
+  <div class='control-group'>
+    <%= f.label :description, 'Description:', :class => 'control-label' %>
+    <div class='controls'>
+      <%= f.text_field :description, :class => 'input-xxlarge' %>
+    </div>
+  </div>
+  <div class='form-actions'>
+    <%= f.submit @tag_definition.new_record? ? 'Create' : 'Update', :class => 'btn btn-primary' %>
+    <% unless @tag_definition.new_record? %>
+      <%= link_to 'Show', @tag_definition, :class => 'btn' %>
+    <% end %>
+    <%= link_to 'Back', :back, :class => 'btn' %>
+  </div>
+<% end %>

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

@@ -0,0 +1,3 @@
+<h2>Update tag definition</h2>
+
+<%= render 'form' %>

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

@@ -0,0 +1,34 @@
+<h2>Tag definitions</h2>
+
+<table id='invoice_table' class='table table-condensed data-table'>
+  <thead>
+    <tr>
+      <th style='width: 30%'>Id</th>
+      <th style='width: 20%'>Name</th>
+      <th style='width: 35%'>Description</th>
+      <th style='width: 5%'></th>
+      <!-- <th style='width: 5%'></th> -->
+      <th style='width: 5%'></th>
+    </tr>
+  </thead>
+  <tbody>
+    <% @tag_definitions.each do |tag_definition| %>
+      <tr>
+        <td><%= tag_definition.id %></td>
+        <td><%= tag_definition.name %></td>
+        <td><%= tag_definition.description %></td>
+        <td><%= link_to 'Show', tag_definition %></td>
+        <!-- ><td><%= link_to 'Edit', edit_tag_definition_path(tag_definition) %></td> -->
+        <td>
+          <% unless tag_definition.is_system_tag? %>
+            <%= link_to 'Destroy', tag_definition, confirm: 'Are you sure?', method: :delete %>
+          <% end %>
+        </td>
+      </tr>
+    <% end %>
+  </tbody>
+</table>
+
+<br />
+
+<%= link_to 'New Tag definition', new_tag_definition_path, :class => 'btn btn-primary' %>

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

@@ -0,0 +1,3 @@
+<h1>New tag definition</h1>
+
+<%= render 'form' %>

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

@@ -0,0 +1,12 @@
+<h2>Tag definition</h2>
+<dl class='dl-horizontal'>
+  <dt>Id:</dt>
+  <dd><%= @tag_definition.id %>&nbsp;</dd>
+  <dt>Name:</dt>
+  <dd><%= @tag_definition.name %>&nbsp;</dd>
+  <dt>Description:</dt>
+  <dd><%= @tag_definition.description %>&nbsp;</dd>
+</dl>
+
+<!-- <%= link_to 'Edit', edit_tag_definition_path(@tag_definition), :class => 'btn btn-primary' %> -->
+<%= link_to 'Back', tag_definitions_path, :class => 'btn' %>

data/app/views/kaui/tags/_tags_table.html.erb

@@ -1,10 +1,10 @@
 <dt>Tags:</dt>
 <dd>       
   <% if tags.present? %>
-    <% tags.sort.each_with_index do |tag, idx| %>
-      <span><%= tag %><% if idx < tags.length - 1 %>, <% end %></span>
+    <% tags.each_with_index do |tag, idx| %>
+      <span><%= tag.tag_definition_name %><% if idx < tags.length - 1 %>, <% end %></span>
     <% end %>
     <br/>
   <% end %>
-  <%= link_to 'Add/Remove', tags_url_or_path, :class => "btn btn-mini" %>
+  <%= link_to 'Add/Remove', tags_url_or_path, :class => 'btn btn-mini' %>
 </dd>

data/config/locales/en.yml

@@ -0,0 +1,3 @@
+en:
+  account: "Account"
+  unknown_bcd: "Unknown bill cycle day"

data/config/locales/fr.yml

@@ -0,0 +1,3 @@
+fr:
+  account: "Compte"
+  unknown_timezone: "Journée de facturation inconnue"

data/config/routes.rb

@@ -1,4 +1,6 @@
 Kaui::Engine.routes.draw do
+  resources :tag_definitions
+
   root :to => "home#index"
 
   resources :accounts, :only => [ :index, :show ] do
@@ -16,6 +18,8 @@ Kaui::Engine.routes.draw do
       post :refunds, :as => "refunds"
       post :chargebacks, :as => "chargebacks"
       post :credits, :as => "credits"
+      post :payments, :as => "payments"
+      post :charges, :as => "charges"
     end
   end
 
@@ -23,11 +27,15 @@ Kaui::Engine.routes.draw do
 
   resources :credits, :only => [ :create, :new ]
 
+  resources :charges, :only => [ :create, :new ]
+
   resources :external_payments, :only => [ :create, :new ]
 
+  resources :payments, :only => [ :create, :new, :index, :show ]
+
   resources :payment_methods, :only => [ :show, :destroy ]
 
-  resources :refunds, :only => [ :show, :create, :new ]
+  resources :refunds, :only => [ :index, :show, :create, :new ]
 
   resources :invoices, :only => [ :index, :show ] do
     member do
@@ -35,6 +43,8 @@ Kaui::Engine.routes.draw do
     end
   end
 
+  resources :invoice_items, :only => [ :index, :show, :edit, :update ]
+
   resources :bundles, :only => [ :index, :show ] do
     member do
       put :do_transfer

data/lib/kaui/version.rb

@@ -1,3 +1,3 @@
 module Kaui
-  VERSION = "0.1.0"
+  VERSION = "0.1.2"
 end

data/test/dummy/app/controllers/application_controller.rb

@@ -1,3 +1,13 @@
 class ApplicationController < ActionController::Base
   protect_from_forgery
+
+  before_filter :set_locale
+
+  def set_locale
+    I18n.locale = params[:locale] || I18n.default_locale
+  end
+
+  def current_user
+    "dummy"
+  end
 end

data/test/dummy/app/views/layouts/application.html.erb

@@ -1,14 +1,47 @@
 <!DOCTYPE html>
 <html>
-<head>
-  <title>Dummy</title>
-  <%= stylesheet_link_tag    "application", :media => "all" %>
-  <%= javascript_include_tag "application" %>
-  <%= csrf_meta_tags %>
-</head>
-<body>
-
-<%= yield %>
-
-</body>
+  <head>
+    <title>Kaui Dummy app</title>
+    <%= stylesheet_link_tag    "application", "bootstrap.v2.0.4.min.css", :media => "all" %>
+    <%= javascript_include_tag "application", "bootstrap.v2.0.4.min.js", "jquery.dataTables.v1.9.3.min.js" %>
+    <%= csrf_meta_tags %>
+  </head>
+  <body>
+    <div class="navbar">
+      <div class="navbar-inner">
+        <div class="container">
+          <ul class="nav">
+            <li <%= "class='active'" if params[:controller] == 'accounts' %>><%= link_to "Accounts", kaui_engine.accounts_path %></li>
+            <li <%= "class='active'" if params[:controller] == 'account_timelines' %>><%= link_to "Account timelines", kaui_engine.account_timelines_path %></li>
+            <li <%= "class='active'" if params[:controller] == 'bundles' %>><%= link_to "Bundles", kaui_engine.bundles_path %></li>
+            <li <%= "class='active'" if params[:controller] == 'subscriptions' %>><%= link_to "Subscriptions", kaui_engine.subscriptions_path	 %></li>
+            <li <%= "class='active'" if params[:controller] == 'chargebacks' %>><%= link_to "Chargebacks", kaui_engine.chargebacks_path %></li>
+            <li <%= "class='active'" if params[:controller] == 'credits' %>><%= link_to "Credits", kaui_engine.credits_path %></li>
+            <li <%= "class='active'" if params[:controller] == 'external_payments' %>><%= link_to "External payments", kaui_engine.external_payments_path %></li>
+            <li <%= "class='active'" if params[:controller] == 'refunds' %>><%= link_to "Refunds", kaui_engine.refunds_path %></li>
+            <li <%= "class='active'" if params[:controller] == 'invoices' %>><%= link_to "Invoices", kaui_engine.invoices_path %></li>
+            <li <%= "class='active'" if params[:controller] == 'invoice_items' %>><%= link_to "Invoice items", kaui_engine.invoice_items_path %></li>
+            <li <%= "class='active'" if params[:controller] == 'tag_definitions' %>><%= link_to "Tag definitions", kaui_engine.tag_definitions_path %></li>
+          </ul>
+        </div>
+      </div>
+    </div>
+    <div class="container">
+      <% if flash[:error] %>
+        <div class="row-fluid">
+          <div class="span12">
+            <div class="alert alert-error"><%= flash[:error] %></div>
+          </div>
+        </div>
+      <% end %>
+      <% if flash[:notice] %>
+        <div class="row-fluid">
+          <div class="span12">
+            <div class="alert alert-info"><%= flash[:notice] %></div>
+          </div>
+        </div>
+      <% end %>
+      <%= yield %>
+    </div>
+  </body>
 </html>