kaui 0.6.6 → 0.7.0

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

@@ -1,92 +1,91 @@
-<% @page_title = "Create invoice item adjustment" %>
-<%= form_for(@invoice_item, :url => invoice_item_path(@invoice_item.invoice_item_id), :html => { :method => :put, :class => "form-horizontal" }) do |f| %>
-  <div class="control-group">
-    <%= f.label :invoice_item_id, "Id:", :class => "control-label" %>
-    <div class="controls">
-      <%= f.text_field :invoice_item_id, :class => "input-xlarge disabled", :readonly => true %>
+<% @page_title = 'Create invoice item adjustment' %>
+<%= form_for(@invoice_item, :as => :invoice_item, :url => invoice_item_path(@invoice_item.invoice_item_id), :html => {:method => :put, :class => 'form-horizontal'}) do |f| %>
+    <div class="control-group">
+      <%= f.label :invoice_item_id, 'Id:', :class => 'control-label' %>
+      <div class="controls">
+        <%= f.text_field :invoice_item_id, :class => 'input-xlarge disabled', :readonly => true %>
+      </div>
     </div>
-  </div>
-  <div class="control-group">
-    <%= f.label :invoice_id, "Invoice id:", :class => "control-label" %>
-    <div class="controls">
-      <%= f.text_field :invoice_id, :class => "input-xlarge disabled", :readonly => true %>
+    <div class="control-group">
+      <%= f.label :invoice_id, 'Invoice id:', :class => 'control-label' %>
+      <div class="controls">
+        <%= f.text_field :invoice_id, :class => 'input-xlarge disabled', :readonly => true %>
+      </div>
     </div>
-  </div>
-  <div class="control-group">
-    <%= f.label :account_id, "Account id:", :class => "control-label" %>
-    <div class="controls">
-      <%= f.text_field :account_id, :class => "input-xlarge disabled", :readonly => true %>
+    <div class="control-group">
+      <%= f.label :account_id, 'Account id:', :class => 'control-label' %>
+      <div class="controls">
+        <%= f.text_field :account_id, :class => 'input-xlarge disabled', :readonly => true %>
+      </div>
     </div>
-  </div>
-  <div class="control-group">
-    <%= f.label :bundle_id, "Bundle id:", :class => "control-label" %>
-    <div class="controls">
-      <%= f.text_field :bundle_id, :class => "input-xlarge disabled", :readonly => true %>
+    <div class="control-group">
+      <%= f.label :bundle_id, 'Bundle id:', :class => 'control-label' %>
+      <div class="controls">
+        <%= f.text_field :bundle_id, :class => 'input-xlarge disabled', :readonly => true %>
+      </div>
     </div>
-  </div>
-  <div class="control-group">
-    <%= f.label :subscription_id, "Subscription id:", :class => "control-label" %>
-    <div class="controls">
-      <%= f.text_field :subscription_id, :class => "input-xlarge disabled", :readonly => true %>
+    <div class="control-group">
+      <%= f.label :subscription_id, 'Subscription id:', :class => 'control-label' %>
+      <div class="controls">
+        <%= f.text_field :subscription_id, :class => 'input-xlarge disabled', :readonly => true %>
+      </div>
     </div>
-  </div>
-  <div class="control-group">
-    <%= f.label :plan_name, "Plan name:", :class => "control-label" %>
-    <div class="controls">
-      <%= f.text_field :plan_name, :class => "input-xlarge disabled", :readonly => true %>
+    <div class="control-group">
+      <%= f.label :plan_name, 'Plan name:', :class => 'control-label' %>
+      <div class="controls">
+        <%= f.text_field :plan_name, :class => 'input-xlarge disabled', :readonly => true %>
+      </div>
     </div>
-  </div>
-  <div class="control-group">
-    <%= f.label :phase_name, "Phase name:", :class => "control-label" %>
-    <div class="controls">
-      <%= f.text_field :phase_name, :class => "input-xlarge disabled", :readonly => true %>
+    <div class="control-group">
+      <%= f.label :phase_name, 'Phase name:', :class => 'control-label' %>
+      <div class="controls">
+        <%= f.text_field :phase_name, :class => 'input-xlarge disabled', :readonly => true %>
+      </div>
     </div>
-  </div>
-  <div class="control-group">
-    <%= f.label :description, "Description:", :class => "control-label" %>
-    <div class="controls">
-      <%= f.text_field :description, :class => "input-xlarge disabled", :readonly => true %>
+    <div class="control-group">
+      <%= f.label :description, 'Description:', :class => 'control-label' %>
+      <div class="controls">
+        <%= f.text_field :description, :class => 'input-xlarge disabled', :readonly => true %>
+      </div>
     </div>
-  </div>
-  <div class="control-group">
-    <%= f.label :start_date, "Start date:", :class => "control-label" %>
-    <div class="controls">
-      <%= f.text_field :start_date, :class => "input-xlarge disabled", :readonly => true %>
+    <div class="control-group">
+      <%= f.label :start_date, 'Start date:', :class => 'control-label' %>
+      <div class="controls">
+        <%= f.text_field :start_date, :class => 'input-xlarge disabled', :readonly => true %>
+      </div>
     </div>
-  </div>
-  <div class="control-group">
-    <%= f.label :end_date, "End date:", :class => "control-label" %>
-    <div class="controls">
-      <%= f.text_field :end_date, :class => "input-xlarge disabled", :readonly => true %>
+    <div class="control-group">
+      <%= f.label :end_date, 'End date:', :class => 'control-label' %>
+      <div class="controls">
+        <%= f.text_field :end_date, :class => 'input-xlarge disabled', :readonly => true %>
+      </div>
     </div>
-  </div>
-  <div class="control-group">
-    <%= f.label :currency, "Currency:", :class => "control-label" %>
-    <div class="controls">
-      <%= f.text_field :currency, :class => "input-xlarge disabled", :readonly => true %>
+    <div class="control-group">
+      <%= f.label :currency, 'Currency:', :class => 'control-label' %>
+      <div class="controls">
+        <%= f.text_field :currency, :class => 'input-xlarge disabled', :readonly => true %>
+      </div>
     </div>
-  </div>
-  <div class="control-group">
-    <%= f.label :amount, "Item amount", :class => "control-label" %>
-    <div class="controls">
-      <%= f.text_field :amount, :class => "input-small" %>
-      <p class="help-inline"><%= @invoice_item.currency %></p>
+    <div class="control-group">
+      <%= f.label :amount, 'Item amount', :class => 'control-label' %>
+      <div class="controls">
+        <%= f.text_field :amount, :class => 'input-small' %>
+        <p class="help-inline"><%= @invoice_item.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::InvoiceItem::SAMPLE_REASON_CODES) %>
+    <div class="control-group">
+      <%= label_tag :reason, 'Reason', :class => 'control-label' %>
+      <div class="controls">
+        <%= select_tag :reason, options_for_select(Kaui::InvoiceItem::SAMPLE_REASON_CODES) %>
+      </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="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="form-actions">
-    <%= f.submit "Update", :class => "btn btn-primary" %>
-    <%= link_to "Back", :back, :class => "btn" %>
-  </div>
-<% end %>
+    <div class="form-actions">
+      <%= f.submit 'Create adjustment', :class => 'btn btn-primary' %>
+    </div>
+<% end %>

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

@@ -9,9 +9,9 @@
     <dt>Target date:</dt>
     <dd><%= @invoice.target_date.html_safe %>&nbsp;</dd>
     <dt>Amount:</dt>
-    <dd><%= humanized_money_with_symbol Kaui::Base.to_money(@invoice.amount, @account.currency) %> (<%= @account.currency %>)&nbsp;</dd>
+    <dd><%= humanized_money_with_symbol @invoice.amount_to_money %> (<%= @account.currency %>)&nbsp;</dd>
     <dt>Balance:</dt>
-    <dd><%= humanized_money_with_symbol Kaui::Base.to_money(@invoice.balance, @account.currency) %> (<%= @account.currency %>)&nbsp;</dd>
+    <dd><%= humanized_money_with_symbol @invoice.balance_to_money %> (<%= @account.currency %>)&nbsp;</dd>
   </dl>
   <div class="page-header">
     <h3>Invoice items</h3>
@@ -59,7 +59,7 @@
           <td onClick="hightlightLinkedItems('<%= item.invoice_item_id %>', '<%= item.linked_invoice_item_id %>'); return false;"><%= 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, @account.timezone).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;"><%= humanized_money_with_symbol Kaui::Base.to_money(item.amount, item.currency) %> (<%= item.currency %>)</td>
+          <td onClick="hightlightLinkedItems('<%= item.invoice_item_id %>', '<%= item.linked_invoice_item_id %>'); return false;"><%= humanized_money_with_symbol Kaui::InvoiceItem.amount_to_money(item) %> (<%= item.currency %>)</td>
           <td onClick="hightlightLinkedItems('<%= item.invoice_item_id %>', '<%= item.linked_invoice_item_id %>'); return false;"><%= item.audit_logs.map {|log| log.comments}.compact.join('<br/>') if item.audit_logs.present? %></td>
           <td>
             <% if can? :item_adjust, Kaui::Invoice %>
@@ -86,13 +86,6 @@
       <%= render :partial => "kaui/payments/payments_table" %>
     <% end %>
   </div>
-
-  <div class="page-header">
-    <% if @payments.present? %>
-      <%= render :partial => "kaui/refunds/refunds_table" %>
-    <% end %>
-  </div>
-
 <% else %>
   <p>Invoice not found</p>
 <% end %>

data/app/views/kaui/layouts/kaui_application.html.erb

@@ -16,11 +16,9 @@
             <li <%= "class='active'" if params[:controller] == 'payments' %>><%= link_to "Payments", kaui_engine.payments_path %></li>
             <li <%= "class='active'" if params[:controller] == 'payment_methods' %>><%= link_to "Payment methods", kaui_engine.payment_methods_path %></li>
             <li <%= "class='active'" if params[:controller] == 'invoices' %>><%= link_to "Invoices", kaui_engine.invoices_path %></li>
-            <li <%= "class='active'" if params[:controller] == 'refunds' %>><%= link_to "Refunds", kaui_engine.refunds_path %></li>
             <li <%= "class='active'" if params[:controller] == 'tag_definitions' %>><%= link_to "Tag definitions", kaui_engine.tag_definitions_path %></li>
             <li <%= "class='active'" if params[:controller] == 'tags' %>><%= link_to "Tags", kaui_engine.tags_path %></li>
             <li <%= "class='active'" if params[:controller] == 'custom_fields' %>><%= link_to "Custom Fields", kaui_engine.custom_fields_path %></li>
-            <li <%= "class='active'" if params[:controller] == 'analytics' %>><%= link_to "Analytics", kaui_engine.analytics_path %></li>
           </ul>
           <ul class="nav pull-right">
             <% if user_signed_in? -%>

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

@@ -0,0 +1,30 @@
+<%= form_for @payment_method, :html => {:class => 'form-horizontal'} do |f| %>
+    <fieldset>
+      <%= f.hidden_field :account_id %>
+      <div class="control-group">
+        <%= f.label :external_key, 'External key *', :class => 'control-label' %>
+        <div class="controls">
+          <%= f.text_field :external_key, :class => 'input-small', :required => true %>
+        </div>
+      </div>
+      <div class="control-group">
+        <%= f.label :plugin_name, 'Plugin name *', :class => 'control-label' %>
+        <div class="controls">
+          <%= f.text_field :plugin_name, :class => 'input-small', :required => true %>
+        </div>
+      </div>
+      <div id="creditcard">
+        <%= render :partial => 'new_creditcard_payment_method' %>
+      </div>
+      <div class="control-group">
+        <%= f.label :is_default, 'Default payment method?', :class => 'control-label' %>
+        <div class="controls">
+          <%= f.check_box :is_default, :class => 'input-small' %>
+        </div>
+      </div>
+
+      <div class="form-actions">
+        <%= button_tag 'Create payment method', :class => 'btn btn-primary' %>
+      </div>
+    </fieldset>
+<% end %>

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

@@ -1,60 +1,61 @@
 <div class="control-group">
-  <%= label_tag :card_type, "Card Type", :class => "control-label" %>
+  <%= label_tag :card_type, 'Card Type', :class => 'control-label' %>
   <div class="controls">
     <%= text_field_tag :card_type, @card_type, :class => 'input-small' %>
   </div>
 </div>
 <div class="control-group">
-  <%= label_tag :card_holder_name, "Name of card holder", :class => "control-label" %>
+  <%= label_tag :card_holder_name, 'Name of card holder', :class => 'control-label' %>
   <div class="controls">
-    <%= text_field_tag :card_holder_name, @card_holder_name, :class => "input-xlarge" %>
+    <%= text_field_tag :card_holder_name, @card_holder_name, :class => 'input-xlarge' %>
   </div>
 </div>
 <div class="control-group">
   <label class="control-label">Expiration date</label>
+
   <div class="controls">
-    <%= text_field_tag :expiration_year, @expiration_year, :class => "input-small", :placeholder => "Year" %>&nbsp;<%= text_field_tag :expiration_month, @expiration_month, :class => "input-small", :placeholder => "Month" %>
+    <%= text_field_tag :expiration_year, @expiration_year, :class => 'input-small', :placeholder => 'Year' %>&nbsp;<%= text_field_tag :expiration_month, @expiration_month, :class => 'input-small', :placeholder => 'Month' %>
   </div>
 </div>
 <div class="control-group">
-  <%= label_tag :credit_card_number, "Credit card number", :class => "control-label" %>
+  <%= label_tag :credit_card_number, 'Credit card number', :class => 'control-label' %>
   <div class="controls">
-    <%= text_field_tag :credit_card_number, @credit_card_number, :class => "input-xlarge" %>
+    <%= text_field_tag :credit_card_number, @credit_card_number, :class => 'input-xlarge' %>
   </div>
 </div>
 <div class="control-group">
-  <%= label_tag :address1, "Adress 1", :class => "control-label" %>
+  <%= label_tag :address1, 'Address 1', :class => 'control-label' %>
   <div class="controls">
-    <%= text_field_tag :address1, @address1, :class => "input-xlarge" %>
+    <%= text_field_tag :address1, @address1, :class => 'input-xlarge' %>
   </div>
 </div>
 <div class="control-group">
-  <%= label_tag :address2, "Adress 2", :class => "control-label" %>
+  <%= label_tag :address2, 'Address 2', :class => 'control-label' %>
   <div class="controls">
-    <%= text_field_tag :address2, @address2, :class => "input-xlarge" %>
+    <%= text_field_tag :address2, @address2, :class => 'input-xlarge' %>
   </div>
 </div>
 <div class="control-group">
-  <%= label_tag :city, "City", :class => "control-label" %>
+  <%= label_tag :city, 'City', :class => 'control-label' %>
   <div class="controls">
-    <%= text_field_tag :city, @city, :class => "input-xlarge" %>
+    <%= text_field_tag :city, @city, :class => 'input-xlarge' %>
   </div>
 </div>
 <div class="control-group">
-  <%= label_tag :postal_code, "ZIP code", :class => "control-label" %>
+  <%= label_tag :postal_code, 'ZIP code', :class => 'control-label' %>
   <div class="controls">
-    <%= text_field_tag :postal_code, @postal_code, :class => "input-xlarge" %>
+    <%= text_field_tag :postal_code, @postal_code, :class => 'input-xlarge' %>
   </div>
 </div>
 <div class="control-group">
-  <%= label_tag :state, "State", :class => "control-label" %>
+  <%= label_tag :state, 'State', :class => 'control-label' %>
   <div class="controls">
-    <%= text_field_tag :state, @state, :class => "input-xlarge" %>
+    <%= text_field_tag :state, @state, :class => 'input-xlarge' %>
   </div>
 </div>
 <div class="control-group">
-  <%= label_tag :country, "Country", :class => "control-label" %>
+  <%= label_tag :country, 'Country', :class => 'control-label' %>
   <div class="controls">
-    <%= text_field_tag :country, @country, :class => "input-xlarge" %>
+    <%= text_field_tag :country, @country, :class => 'input-xlarge' %>
   </div>
 </div>

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

@@ -32,17 +32,20 @@
               <% if payment_method.is_default %>
                   <i class="icon-ok"></i>
               <% else %>
-                  <%= link_to "Make Default", kaui_engine.set_default_payment_method_account_path(payment_method.account_id, :params => {:payment_method_id => payment_method.payment_method_id}), :method => :put, :confirm => "Are you sure you want to make this payment method default?", :class => "btn btn-mini" %>
+                  <%= link_to 'Make Default', kaui_engine.set_default_payment_method_account_path(payment_method.account_id, :params => {:payment_method_id => payment_method.payment_method_id}), :method => :put, :confirm => 'Are you sure you want to make this payment method default?', :class => 'btn btn-mini' %>
               <% end %>
             </td>
             <td>
               <% if payment_method.is_default %>
-                  <%= link_to "Delete", kaui_engine.payment_method_path(payment_method.payment_method_id, :params => {:set_auto_pay_off => "true"}), :method => :delete, :confirm => "Are you sure you want to delete this payment method?", :class => "btn btn-mini" %>
+                  <%= link_to 'Delete', kaui_engine.payment_method_path(payment_method.payment_method_id, :params => {:set_auto_pay_off => 'true'}), :method => :delete, :confirm => 'Are you sure you want to delete this payment method?', :class => 'btn btn-mini' %>
               <% else %>
-                  <%= link_to "Delete", kaui_engine.payment_method_path(payment_method.payment_method_id), :method => :delete, :confirm => "Are you sure you want to delete this payment method?", :class => "btn btn-mini" %>
+                  <%= link_to 'Delete', kaui_engine.payment_method_path(payment_method.payment_method_id), :method => :delete, :confirm => 'Are you sure you want to delete this payment method?', :class => 'btn btn-mini' %>
+              <% end %>
+              <% %w(AUTHORIZE PURCHASE CREDIT).each do |transaction_type| %>
+                  <%= link_to transaction_type, kaui_engine.new_transaction_path(:account_id        => payment_method.account_id,
+                                                                                 :payment_method_id => payment_method.payment_method_id,
+                                                                                 :transaction_type  => transaction_type), :class => 'btn btn-mini' %>
               <% end %>
-              <%= link_to "Details", kaui_engine.payment_method_path(payment_method.payment_method_id), :class => "btn btn-mini" %>
-              <%= link_to "Go to Account", kaui_engine.account_path(payment_method.account_id), :class => "btn btn-mini", :target => '_blank' %>
             </td>
           </tr>
       <% end %>

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

@@ -1,17 +1,17 @@
 <table id="paymentMethods-table" class="table table-condensed">
   <thead>
-    <tr>
-      <th>Account ID</th>
-      <th>External ID</th>
-      <th>Type</th>
-      <th>CC name</th>
-      <th>CC last 4</th>
-    </tr>
+  <tr>
+    <th>Payment Method ID</th>
+    <th>Account ID</th>
+    <th>External ID</th>
+    <th>CC name</th>
+    <th>CC last 4</th>
+  </tr>
   </thead>
   <tbody>
-    <tr>
-      <td colspan="1" class="dataTables_empty">Loading data from server</td>
-    </tr>
+  <tr>
+    <td colspan="1" class="dataTables_empty">Loading data from server</td>
+  </tr>
   </tbody>
 </table>
 

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

@@ -1,23 +1,5 @@
 <div class="page-header">
   <h1>Add Payment Method</h1>
 </div>
-<%= form_tag do_add_payment_method_account_path(@account.account_id), :class => "form-horizontal" do %>
-  <fieldset>
-    <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 id="creditcard">
-      <%= render :partial => "kaui/payment_methods/new_creditcard_payment_method" %>
-    </div>
-    <div class="form-actions">
-      <%= button_tag "Create payment method", :class =>"btn btn-primary" %>
-      <%= link_to 'Back', :back, :class => 'btn' %>
-    </div>
-  </fieldset>
-<% end %>
+
+<%= render 'form' %>

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

@@ -1,2 +1,3 @@
 <%= render :partial => 'payment_methods_table', :locals => {:payment_methods => @payment_methods} %>
-<%= link_to 'Back', :back, :class => 'btn' %>
+
+<%= link_to 'Go to Account', kaui_engine.account_path(@payment_methods.first.account_id), :class => 'btn', :target => '_blank' %>

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

@@ -3,31 +3,39 @@
 </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>External payment id / Secondary payment id</th>
-      <th>Retry count</th>
-      <th>Status</th>
-    </tr>
+  <tr>
+    <th>Effective date</th>
+    <th>Transaction type</th>
+    <th>Amount</th>
+    <th>Payment method</th>
+    <th>First / Second reference id</th>
+    <th>Status</th>
+    <th>Gateway message</th>
+  </tr>
   </thead>
   <tbody>
-    <% if @payments.present? %>
+  <% if @payments.present? %>
       <% @payments.each do |payment| %>
-        <tr>
-          <td><%= format_date(payment.requested_date, @account.timezone).html_safe if payment.requested_date.present? %></td>
-          <td><%= format_date(payment.effective_date, @account.timezone).html_safe if payment.effective_date.present? %></td>
-          <td><%= humanized_money_with_symbol payment.amount_to_money %> (<%= payment.currency %>)</td>
-          <td><%= humanized_money_with_symbol payment.paid_amount_to_money %> (<%= payment.currency %>)</td>
-          <td><%= "#{@payment_methods[payment.payment_id].plugin_info.type} #{@payment_methods[payment.payment_id].plugin_info.cc_type} #{@payment_methods[payment.payment_id].plugin_info.cc_last4}" if @payment_methods.present? and @payment_methods[payment.payment_id].present? and @payment_methods[payment.payment_id].plugin_info.present? %></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 %> <%=  payment.gateway_error_code unless payment.status == 'SUCCESS' %> <%= payment.gateway_error_msg %></td>
-        </tr>
+          <% payment.transactions.each do |transaction| %>
+              <tr>
+                <td><%= format_date(transaction.effective_date, @account.time_zone).html_safe if transaction.effective_date.present? %></td>
+                <td><%= transaction.transaction_type %></td>
+                <td><% if transaction.amount.present? %><%= humanized_money_with_symbol Kaui::Transaction.amount_to_money(transaction) %>
+                  (<%= transaction.currency %>)<% end %>
+                </td>
+                <td><%= link_to truncate_uuid(@payment_methods[transaction.payment_id].payment_method_id), kaui_engine.payment_method_path(@payment_methods[transaction.payment_id].payment_method_id) if @payment_methods.present? and @payment_methods[transaction.payment_id].present? %></td>
+                <td><%= transaction.first_payment_reference_id %> <%= " / " if transaction.second_payment_reference_id.present? %> <%= transaction.second_payment_reference_id %></td>
+                <td>
+                  <span
+                  <% if transaction.status != 'SUCCESS' %>class='alert-error'
+                  <% else %>class='alert-success' <% end %>>
+                  <%= transaction.status %> <%= transaction.gateway_error_code unless transaction.status == 'SUCCESS' %> <%= transaction.gateway_error_msg %>
+                  </span>
+                </td>
+                <td><%= transaction.gateway_error_msg %></td>
+              </tr>
+          <% end %>
       <% end %>
-    <% end %>
+  <% end %>
   </tbody>
 </table>

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

@@ -5,7 +5,7 @@
       <th>Payment number</th>
       <th>Date</th>
       <th>Amount</th>
-      <th>Status</th>
+      <th>Refund amount</th>
     </tr>
   </thead>
   <tbody>

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

@@ -23,7 +23,7 @@
       </div>
     </div>
     <% if @invoice.present? %>
-      <%= f.hidden_field :invoice_id %>
+      <%= f.hidden_field :target_invoice_id %>
       <div class="control-group">
         <label class="control-label">Invoice number</label>
         <div class="controls">
@@ -51,18 +51,18 @@
     <% end %>
     <% if can? :external_payment, Kaui::Payment %>
       <div class="control-group">
-        <%= f.label :external, "External Payment?", :class => "control-label" %>
+        <%= label_tag :external, "External Payment?", :class => "control-label" %>
         <div class="controls">
           <label class="checkbox">
-            <%= f.check_box :external %>
+            <%= check_box_tag :external %>
           </label>
         </div>
       </div>
     <% end %>
     <div class="control-group">
-      <%= f.label :amount, "Amount", :class => "control-label" %>
+      <%= f.label :purchased_amount, "Amount", :class => "control-label" %>
       <div class="controls">
-        <%= f.text_field :amount, :id => 'payment_amount', :class => 'input-small' %>
+        <%= f.text_field :purchased_amount, :id => 'payment_amount', :class => 'input-small' %>
         <p class="help-inline"><%= @account.currency %></p>
       </div>
     </div>

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

@@ -0,0 +1,3 @@
+<%= render :partial => 'kaui/payments/payments_table' %>
+
+<%= link_to 'Go to Account', kaui_engine.account_path(@payments.first.account_id), :class => 'btn', :target => '_blank' %>