kaui 0.11.0 → 0.12.0

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

@@ -1,38 +1,40 @@
-<%= form_for(@chargeback, :html => {:class => 'form-horizontal'}) do |f| %>
-    <fieldset>
-      <%= f.hidden_field :payment_id %>
-      <%= f.hidden_field :currency %>
-      <div class="control-group">
-        <%= f.label :amount, 'Chargeback amount', :class => 'control-label' %>
-        <div class="controls">
-          <%= f.text_field :amount, :id => 'chargeback_amount', :class => 'input-sm' %>
-          <p class="help-inline"><%= @chargeback.currency %></p>
-        </div>
+<%= form_for @chargeback, :url => {:action => :create}, :html => {:class => 'form-horizontal'} do |f| %>
+    <%= f.hidden_field :payment_id %>
+    <%= f.hidden_field :currency %>
+
+    <div class="form-group">
+      <%= f.label :amount, 'Amount', :class => 'col-sm-2 control-label' %>
+      <div class="col-sm-10">
+        <%= f.text_field :amount, :id => 'chargeback_amount', :class => 'form-control' %>
+        <p class="help-block">Currency: <%= @chargeback.currency %></p>
       </div>
-      <div class="control-group">
-        <%= label_tag :reason, 'Reason', :class => 'control-label' %>
-        <div class="controls">
-          <%= select_tag :reason, options_for_select(Kaui::Chargeback::SAMPLE_REASON_CODES) %>
-        </div>
+    </div>
+    <div class="form-group">
+      <%= label_tag :reason, 'Reason', :class => 'col-sm-2 control-label' %>
+      <div class="col-sm-10">
+        <%= select_tag :reason, options_for_select(Kaui::Chargeback::SAMPLE_REASON_CODES), :class => 'form-control' %>
       </div>
-      <div class="control-group">
-        <%= label_tag :cancel_all_subs, 'Cancel account subscriptions?', :class => 'control-label' %>
-        <div class="controls">
-          <label class="checkbox">
-            <%= check_box_tag :cancel_all_subs %>
-          </label>
+    </div>
+    <div class="form-group">
+      <div class="col-sm-offset-2 col-sm-10">
+        <div class="checkbox">
+          <%= label_tag :cancel_all_subs do %>
+              <%= check_box_tag :cancel_all_subs %>Cancel account subscriptions?
+          <% end %>
         </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 class="form-group">
+      <%= label_tag :comment, 'Comment', :class => 'col-sm-2 control-label' %>
+      <div class="col-sm-10">
+        <%= text_area_tag :comment, nil, :rows => 3, :class => 'form-control' %>
       </div>
-      <div class="form-actions">
-        <%= button_tag 'Apply chargeback', :class => 'btn btn-primary' %>
+    </div>
+    <div class="form-group">
+      <div class="col-sm-offset-2 col-sm-10">
+        <%= submit_tag 'Save', :class => 'btn btn-default' %>
       </div>
-    </fieldset>
+    </div>
 <% end %>
 
 <%= javascript_tag do %>

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

@@ -1,5 +1,10 @@
-<div class="page-header">
-  <h1>Apply Chargeback</h1>
-</div>
+<div class="register">
+  <div class="col-md-8 col-md-offset-2">
+
+    <div class="column-block">
+      <h1>Process chargeback</h1>
+      <%= render 'form' %>
+    </div>
 
-<%= render 'form' %>
+  </div>
+</div>

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

@@ -1,69 +1,45 @@
-<%= form_for(@charge, :url => {:action => :create}, :html => {:class => 'form-horizontal'}) do |f| %>
-    <%= f.hidden_field :account_id %>
-    <fieldset>
-      <% if @invoice.present? %>
-          <%= f.hidden_field :invoice_id %>
-          <%= f.hidden_field :currency %>
-          <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 %> <%= @invoice.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 %> <%= @invoice.currency %>
-              </label>
-            </div>
-          </div>
-      <% end %>
-      <div class="control-group">
-        <%= f.label :amount, 'Charge amount', :class => 'control-label' %>
-        <div class="controls">
-          <%= f.text_field :amount, :id => 'charge_amount', :class => 'input-sm' %>
-          <% if @invoice.present? %>
-              <p class="help-inline"><%= @invoice.currency %></p>
-          <% end %>
-        </div>
+<%= form_for @charge, :url => {:action => :create}, :html => {:class => 'form-horizontal'} do |f| %>
+    <%= f.hidden_field :invoice_id %>
+
+    <div class="form-group">
+      <%= f.label :amount, 'Amount', :class => 'col-sm-2 control-label' %>
+      <div class="col-sm-10">
+        <%= f.text_field :amount, :id => 'charge_amount', :class => 'form-control' %>
+        <% if @invoice.present? %>
+            <p class="help-block">Currency: <%= @invoice.currency %></p>
+        <% end %>
       </div>
-      <% unless @invoice.present? %>
-          <div class="control-group">
-            <%= f.label :currency, 'Currency', :class => 'control-label' %>
-            <div class="controls">
-              <%= f.select :currency, currencies, {}, :class => 'input-sm' %>
-            </div>
+    </div>
+    <% unless @invoice.present? %>
+        <div class="form-group">
+          <%= f.label :currency, 'Currency', :class => 'col-sm-2 control-label' %>
+          <div class="col-sm-10">
+            <%= f.select :currency, currencies, {}, :class => 'form-control' %>
           </div>
-      <% end %>
-      <div class="control-group">
-        <%= label_tag :comment, 'Comment', :class => 'control-label' %>
-        <div class="controls">
-          <%= text_area_tag :comment, '', :rows => 3, :class => 'input-xlarge' %>
         </div>
+    <% else %>
+        <!--https://github.com/killbill/killbill/issues/388-->
+        <%= f.hidden_field :currency %>
+    <% end %>
+    <div class="form-group">
+      <%= f.label :description, 'Description', :class => 'col-sm-2 control-label' %>
+      <div class="col-sm-10">
+        <%= f.text_area :description, :rows => 3, :class => 'form-control' %>
       </div>
-      <div class="control-group">
-        <%= f.label :description, 'Description (Viewable on the invoice that the customer will see)', :class => 'control-label' %>
-        <div class="controls">
-          <%= f.text_area :description, :rows => 3, :class => 'input-xlarge' %>
-        </div>
+    </div>
+    <div class="form-group">
+      <%= label_tag :comment, 'Comment', :class => 'col-sm-2 control-label' %>
+      <div class="col-sm-10">
+        <%= text_area_tag :comment, nil, :rows => 3, :class => 'form-control' %>
       </div>
-      <div class="form-actions">
-        <%= button_tag 'Create charge', :class => 'btn btn-primary' %>
-        <%= link_to 'Back', :back, :class => 'btn' %>
+    </div>
+    <div class="form-group">
+      <div class="col-sm-offset-2 col-sm-10">
+        <%= submit_tag 'Save', :class => 'btn btn-default' %>
       </div>
-    </fieldset>
+    </div>
 <% end %>
+
 <%= javascript_tag do %>
 $(document).ready(function() {
   $("#charge_amount").keydown(function(event) {

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

@@ -1,5 +1,10 @@
-<div class="page-header">
-  <h1>Apply Charge</h1>
-</div>
+<div class="register">
+  <div class="col-md-8 col-md-offset-2">
+
+    <div class="column-block">
+      <h1>Add new charge</h1>
+      <%= render 'form' %>
+    </div>
 
-<%= render 'form' %>
+  </div>
+</div>

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

@@ -1,69 +1,42 @@
-<%= form_for(@credit, :url => {:action => :create}, :html => {:class => 'form-horizontal'}) do |f| %>
-    <%= f.hidden_field :account_id %>
-    <fieldset>
-      <% if @invoice.present? %>
-          <%= f.hidden_field :invoice_id %>
-          <%= hidden_field_tag :currency, @invoice.currency %>
-          <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 %> <%= @invoice.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 %> <%= @invoice.currency %>
-              </label>
-            </div>
-          </div>
-      <% end %>
-      <div class="control-group">
-        <%= f.label :credit_amount, 'Credit amount', :class => 'control-label' %>
-        <div class="controls">
-          <%= f.text_field :credit_amount, :id => 'credit_amount', :class => 'input-sm' %>
-          <% if @invoice.present? %>
-              <p class="help-inline"><%= @invoice.currency %></p>
-          <% end %>
-        </div>
+<%= form_for @credit, :url => {:action => :create}, :html => {:class => 'form-horizontal'} do |f| %>
+    <%= f.hidden_field :invoice_id %>
+
+    <div class="form-group">
+      <%= f.label :credit_amount, 'Amount', :class => 'col-sm-2 control-label' %>
+      <div class="col-sm-10">
+        <%= f.text_field :credit_amount, :id => 'credit_amount', :class => 'form-control' %>
+        <% if @invoice.present? %>
+            <p class="help-block">Currency: <%= @invoice.currency %></p>
+        <% end %>
       </div>
-      <% unless @invoice.present? %>
-          <div class="control-group">
-            <%= label_tag :currency, 'Currency', :class => 'control-label' %>
-            <div class="controls">
-              <%= select_tag :currency, options_for_select(currencies, :selected => 'USD'), :class => 'input-sm' %>
-            </div>
+    </div>
+    <% unless @invoice.present? %>
+        <div class="form-group">
+          <%= f.label :currency, 'Currency', :class => 'col-sm-2 control-label' %>
+          <div class="col-sm-10">
+            <%= f.select :currency, currencies, {}, :class => 'form-control' %>
           </div>
-      <% end %>
-      <div class="control-group">
-        <%= label_tag :reason, 'Reason', :class => 'control-label' %>
-        <div class="controls">
-          <%= select_tag :reason, options_for_select(Kaui::Credit::SAMPLE_REASON_CODES) %>
         </div>
+    <% end %>
+    <div class="form-group">
+      <%= label_tag :reason, 'Reason', :class => 'col-sm-2 control-label' %>
+      <div class="col-sm-10">
+        <%= select_tag :reason, options_for_select(Kaui::Credit::SAMPLE_REASON_CODES), :class => 'form-control' %>
       </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 class="form-group">
+      <%= label_tag :comment, 'Comment', :class => 'col-sm-2 control-label' %>
+      <div class="col-sm-10">
+        <%= text_area_tag :comment, nil, :rows => 3, :class => 'form-control' %>
       </div>
-      <div class="form-actions">
-        <%= button_tag 'Create credit', :class => 'btn btn-primary' %>
-        <%= link_to 'Back', :back, :class => 'btn' %>
+    </div>
+    <div class="form-group">
+      <div class="col-sm-offset-2 col-sm-10">
+        <%= submit_tag 'Save', :class => 'btn btn-default' %>
       </div>
-    </fieldset>
+    </div>
 <% end %>
+
 <%= javascript_tag do %>
 $(document).ready(function() {
   $("#credit_amount").keydown(function(event) {

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

@@ -1,5 +1,10 @@
-<div class="page-header">
-  <h1>Apply Credit</h1>
-</div>
+<div class="register">
+  <div class="col-md-8 col-md-offset-2">
+
+    <div class="column-block">
+      <h1>Add new credit</h1>
+      <%= render 'form' %>
+    </div>
 
-<%= render 'form' %>
+  </div>
+</div>

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

@@ -0,0 +1,31 @@
+<%= form_for @custom_field, :html => {:class => 'form-horizontal'} do |f| %>
+    <div class="form-group">
+      <%= f.label :object_id, 'Object ID', :class => 'col-sm-2 control-label' %>
+      <div class="col-sm-10">
+        <%= f.text_field :object_id, :class => 'form-control' %>
+      </div>
+    </div>
+    <div class="form-group">
+      <%= f.label :object_type, 'Object type', :class => 'col-sm-2 control-label' %>
+      <div class="col-sm-10">
+        <%= f.select :object_type, [:ACCOUNT, :BUNDLE, :SUBSCRIPTION, :INVOICE, :PAYMENT], {:selected => :account}, :class => 'form-control' %>
+      </div>
+    </div>
+    <div class="form-group">
+      <%= f.label :name, 'Name', :class => 'col-sm-2 control-label' %>
+      <div class="col-sm-10">
+        <%= f.text_field :name, :class => 'form-control' %>
+      </div>
+    </div>
+    <div class="form-group">
+      <%= f.label :value, 'Value', :class => 'col-sm-2 control-label' %>
+      <div class="col-sm-10">
+        <%= f.text_field :value, :class => 'form-control' %>
+      </div>
+    </div>
+    <div class="form-group">
+      <div class="col-sm-offset-2 col-sm-10">
+        <%= submit_tag 'Save', :class => 'btn btn-default' %>
+      </div>
+    </div>
+<% end %>

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

@@ -1,28 +1,41 @@
-<h3 class="pageHeader">Custom Fields</h3>
+<div class="search">
 
-<table id="custom_fields-table" class="table table-condensed">
-  <thead>
-    <tr>
-      <th>Tag ID</th>
-      <th>Object type</th>
-      <th>Tag definition name</th>
-    </tr>
-  </thead>
-  <tbody>
-    <tr>
-      <td colspan="1" class="dataTables_empty">Loading data from server</td>
-    </tr>
-  </tbody>
-</table>
+  <div class="column-block">
+
+    <h1>Custom Fields
+      <% if can? :add, Kaui::CustomField %>
+          <%= link_to '&nbsp;<i class="fa fa-plus-square"></i>'.html_safe, new_custom_field_path %>
+      <% end %>
+    </h1>
+
+    <table id="custom_fields-table" class="table table-condensed mobile-data">
+      <thead>
+      <tr>
+        <th>Object ID</th>
+        <th>Object type</th>
+        <th>Name</th>
+        <th>Value</th>
+      </tr>
+      </thead>
+      <tbody>
+      <tr>
+        <td colspan="1" class="dataTables_empty">Loading data from server</td>
+      </tr>
+      </tbody>
+    </table>
+
+  </div>
+
+</div>
 
 <%= javascript_tag do %>
 $(document).ready(function() {
   $('#custom_fields-table').dataTable({
-    "sDom": "<'row'<'col-md-6'l><'col-md-6'f>r>t<'row'<'col-md-6'i><'col-md-6'p>>",
-    "sPaginationType": "simple_numbers",
-    "bProcessing": true,
-    "bServerSide": true,
-    "sAjaxSource": "<%= custom_fields_pagination_path :format => :json %>"
+    "dom": "<'row'<'col-md-6'l><'col-md-6'f>r>t<'row'<'col-md-6'i><'col-md-6'p>>",
+    "pagingType": "full_numbers",
+    "processing": true,
+    "serverSide": true,
+    "ajax": "<%= custom_fields_pagination_path :format => :json %>"
   });
 });
 <% end %>

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

@@ -0,0 +1,10 @@
+<div class="register">
+  <div class="col-md-8 col-md-offset-2">
+
+    <div class="column-block">
+      <h1>Add new custom field</h1>
+      <%= render 'form' %>
+    </div>
+
+  </div>
+</div>

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

@@ -1,10 +1,13 @@
-<header class='jumbotron'>
-  <h1>Welcome to Kaui!</h1>
-  <p class='lead'>Online documentation can be found at <a href='http://kill-bill.org/' target='_blank'>http://kill-bill.org/</a></p>
+<div class="home">
+  <div class="row">
+    <div class="col-md-6 col-md-offset-3 text-center">
 
-  <p>About your application&rsquo;s environment:
-    <ul>
-      <li>Kill Bill url: <%= KillBillClient.url %></li>
-    </ul>
-  </p>
-</header>
+      <%= form_tag search_path, :id => 'home_searchform', :method => 'get' do %>
+          <%= text_field_tag :q, @search_query, :id => 'search', :placeholder => 'What are you looking for?' %>
+          <%= submit_tag 'Search' %>
+      <% end %>
+
+    </div>
+  </div>
+  <span class="duck_help">You can search accounts by ID, external key, name, company or email address.</span>
+</div>

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

@@ -0,0 +1,30 @@
+<%= form_for @invoice_item, :as => :invoice_item, :url => invoice_item_path(@invoice_item.invoice_item_id), :html => {:method => :put, :class => 'form-horizontal'} do |f| %>
+    <%= f.hidden_field :invoice_id %>
+    <%= f.hidden_field :invoice_item_id %>
+    <%= f.hidden_field :account_id %>
+
+    <div class="form-group">
+      <%= f.label :amount, 'Item amount', :class => 'col-sm-2 control-label' %>
+      <div class="col-sm-10">
+        <%= f.text_field :amount, :class => 'form-control' %>
+        <p class="help-block">Currency: <%= @invoice_item.currency %></p>
+      </div>
+    </div>
+    <div class="form-group">
+      <%= label_tag :reason, 'Reason', :class => 'col-sm-2 control-label' %>
+      <div class="col-sm-10">
+        <%= select_tag :reason, options_for_select(Kaui::InvoiceItem::SAMPLE_REASON_CODES), :class => 'form-control' %>
+      </div>
+    </div>
+    <div class="form-group">
+      <%= label_tag :comment, 'Comment', :class => 'col-sm-2 control-label' %>
+      <div class="col-sm-10">
+        <%= text_area_tag :comment, nil, :rows => 3, :class => 'form-control' %>
+      </div>
+    </div>
+    <div class="form-group">
+      <div class="col-sm-offset-2 col-sm-10">
+        <%= f.submit 'Save', :class => 'btn btn-default' %>
+      </div>
+    </div>
+<% end %>

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

@@ -1,91 +1,10 @@
-<% @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 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 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 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 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 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 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 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 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 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 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 class="control-group">
-      <%= f.label :amount, 'Item amount', :class => 'control-label' %>
-      <div class="controls">
-        <%= f.text_field :amount, :class => 'input-sm' %>
-        <p class="help-inline"><%= @invoice_item.currency %></p>
-      </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>
-    </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 class="form-actions">
-      <%= f.submit 'Create adjustment', :class => 'btn btn-primary' %>
-    </div>
-<% end %>
+<div class="register">
+  <div class="col-md-8 col-md-offset-2">
+
+    <div class="column-block">
+      <h1>Adjust invoice item</h1>
+      <%= render 'edit_form' %>
+    </div>
+
+  </div>
+</div>