kaui 1.0.0 → 1.1.0

data/app/helpers/kaui/uuid_helper.rb

@@ -6,5 +6,14 @@ module Kaui
       split = uuid.split('-')
       split[0] + '-...-' + split[4]
     end
+
+    def object_id_popover(object_id, placement = 'right', title = nil)
+      content_tag(:span, truncate_uuid(object_id),
+                  id: "#{object_id}-popover", class: 'object-id-popover', title: title,
+                  data: {
+                      id: object_id,
+                      placement: placement,
+                  } )
+    end
   end
 end

data/app/models/kaui/admin.rb

@@ -15,7 +15,9 @@ class Kaui::Admin < KillBillClient::Model::Resource
                                         :minDate => options[:minDate],
                                         :maxDate => options[:maxDate]
                                     },
-                                    options
+                                    {
+                                        :accept => 'application/octet-stream'
+                                    }.merge(options)
       JSON.parse res.body
     end
 

data/app/models/kaui/admin_tenant.rb

@@ -63,19 +63,23 @@ class Kaui::AdminTenant < KillBillClient::Model::Tenant
 
         # Extract killbill key for oss plugins based on convention 'killbill-KEY'
         plugin_key = killbill_key.gsub(/killbill-/, '') if killbill_key.start_with?('killbill-')
+
         # hack:: rewrite key, to allow the ui to find the right configuration inputs
-        plugin_key = rewrite_plugin_key(plugin_key)
-        # If such key exists, lookup in plugin directory
-        plugin_repo_entry = plugin_directory[plugin_key.to_sym] unless plugin_key.nil?
-        # Extract plugin_type based on plugin_directory entry if exists
-        plugin_type = plugin_repo_entry.nil? ? :unknown : plugin_repo_entry[:type].to_sym
-
-        # Deserialize config based on type
-        if plugin_type == :ruby
+        plugin_key = rewrite_plugin_key(plugin_key) unless plugin_key.nil?
+        # If such key exists, lookup in plugin directory to see if is an official plugin
+        is_an_official_plugin = !plugin_key.nil? && !plugin_directory[plugin_key.to_sym].blank?
+        # Deserialize config based on string possible format, if exist in the official repository
+        if is_an_official_plugin && is_yaml?(e.values[0])
           yml = YAML.load(e.values[0])
           # Hash of properties
-          hsh[plugin_key] = yml[plugin_key.to_sym]
-        elsif plugin_type == :java
+          # is plugin key part of the yaml?
+          if yml[plugin_key.to_sym].blank?
+            # if not set it as raw
+            hsh[plugin_key] = {:raw_config => e.values[0]}
+          else
+            hsh[plugin_key] = yml[plugin_key.to_sym]
+          end
+        elsif is_an_official_plugin && is_kv?(e.values[0])
           # Construct hash of properties based on java properties (k1=v1\nk2=v2\n...)
           hsh[plugin_key] = e.values[0].split("\n").inject({}) do |h, p0|
             k, v = p0.split('=');
@@ -107,6 +111,7 @@ class Kaui::AdminTenant < KillBillClient::Model::Tenant
       return nil unless props.present?
       if plugin_type == 'ruby'
         require 'yaml'
+        props = reformat_plugin_config(plugin_type, props)
         hsh = {}
         hsh[plugin_key.to_sym] = {}
         props.each do |k,v|
@@ -115,6 +120,7 @@ class Kaui::AdminTenant < KillBillClient::Model::Tenant
         hsh[plugin_key.to_sym]
         hsh.to_yaml
       elsif plugin_type == 'java'
+        props = reformat_plugin_config(plugin_type, props)
         res = ""
         props.each do |k, v|
           res = "#{res}#{k.to_s}=#{v.to_s}\n"
@@ -125,6 +131,20 @@ class Kaui::AdminTenant < KillBillClient::Model::Tenant
       end
     end
 
+    def reformat_plugin_config(plugin_type, props)
+      unless props['raw_config'].blank?
+        new_props = {}
+        props['raw_config'].split("\n").each do |p|
+          line = p.split('=')
+          new_props[line[0]] = line[1].blank? ? '' : line[1].delete("\r")
+        end
+
+        return new_props
+      end
+
+      props
+    end
+
     # hack when the plugin name after killbill is not the same as the plugin key, this mainly affects ruby plugin configuration,
     # as it use the key to retrieve the configuration.
     def rewrite_plugin_key(plugin_key)
@@ -132,9 +152,37 @@ class Kaui::AdminTenant < KillBillClient::Model::Tenant
         'paypal_express'
       elsif plugin_key.start_with?('firstdata')
         'firstdata_e4'
+      elsif plugin_key.start_with?('bridge')
+        'payment_bridge'
+      elsif plugin_key.start_with?('payu-latam')
+        'payu_latam'
       else
         "#{plugin_key}"
       end
     end
+
+    # checks if string could be parse as yaml
+    def is_yaml?(candidate_string)
+      is_yaml = false
+      return is_yaml if candidate_string.blank?
+
+      begin
+        is_yaml = !!YAML::load(candidate_string)
+        is_yaml = is_yaml && YAML.load(candidate_string).instance_of?(Hash)
+      rescue
+        is_yaml = false
+      end
+
+      is_yaml
+    end
+
+    # checks if string could be parse as key value pair
+    def is_kv?(candidate_string)
+      return false if candidate_string.blank? || is_yaml?(candidate_string)
+      lines = candidate_string.split("\n")
+      return false if lines.blank?
+
+      lines.all? { |kv| kv.split('=').count >= 1 }
+    end
   end
 end

data/app/models/kaui/allowed_user.rb

@@ -30,6 +30,7 @@ module Kaui
 
     # Update the user locally and in Kill Bill (if needed)
     def update_in_kb!(password, roles, user = nil, reason = nil, comment = nil, options = {})
+
       user_role = KillBillClient::Model::UserRoles.new
       user_role.username = kb_username
 

data/app/models/kaui/catalog.rb

@@ -6,7 +6,7 @@ class Kaui::Catalog < KillBillClient::Model::Catalog
 
     def get_catalog_json(latest, requested_date, options)
 
-      catalogs = KillBillClient::Model::Catalog.get_tenant_catalog('json', requested_date, options)
+      catalogs = KillBillClient::Model::Catalog.get_tenant_catalog_json(requested_date, options)
       return catalogs.length > 0 ? catalogs[catalogs.length - 1] : nil if latest
 
       # Order by latest
@@ -38,7 +38,7 @@ class Kaui::Catalog < KillBillClient::Model::Catalog
 
     def get_catalog_xml(requested_date, options)
 
-      catalog_xml = KillBillClient::Model::Catalog.get_tenant_catalog('xml', requested_date, options)
+      catalog_xml = KillBillClient::Model::Catalog.get_tenant_catalog_xml(requested_date, options)
 
       parsed_catalog = parse_catalog_xml(catalog_xml)
 

data/app/models/kaui/credit.rb

@@ -1,5 +1,3 @@
 class Kaui::Credit < KillBillClient::Model::Credit
 
-  # See https://github.com/killbill/killbill/issues/262
-  attr_accessor :currency
 end

data/app/models/kaui/overdue.rb

@@ -14,12 +14,12 @@ class Kaui::Overdue < KillBillClient::Model::Overdue
         state.auto_reevaluation_interval_days = nil
         state.external_message = state_model["external_message"]
         state.is_clear_state = state_model["is_clear_state"].nil? ? false : state_model["is_clear_state"]
-        state.block_changes = state_model["block_changes"]
+        state.is_block_changes = state_model["is_block_changes"]
         if state_model["subscription_cancellation_policy"] == :NONE.to_s
-          state.disable_entitlement = false
+          state.is_disable_entitlement = false
           state.subscription_cancellation_policy = nil
         else
-          state.disable_entitlement = true
+          state.is_disable_entitlement = true
           state.subscription_cancellation_policy = state_model["subscription_cancellation_policy"].blank? ? :NONE : state_model["subscription_cancellation_policy"].to_s.gsub!(/POLICY_/, '')
         end
 
@@ -45,7 +45,7 @@ class Kaui::Overdue < KillBillClient::Model::Overdue
     end
 
     def get_overdue_json(options)
-      result = KillBillClient::Model::Overdue.get_tenant_overdue_config('json', options)
+      result = KillBillClient::Model::Overdue.get_tenant_overdue_config_json(options)
       class << result
         attr_accessor :has_states
       end
@@ -55,7 +55,7 @@ class Kaui::Overdue < KillBillClient::Model::Overdue
         class << state
           attr_accessor :subscription_cancellation
         end
-        if state.disable_entitlement
+        if state.is_disable_entitlement
           state.subscription_cancellation = state.subscription_cancellation_policy ? "POLICY_#{state.subscription_cancellation_policy}".to_sym : :NONE
         else
           state.subscription_cancellation = :NONE

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

@@ -7,12 +7,9 @@
     <table id="account-children-table" class="table table-condensed mobile-data">
       <thead>
       <tr>
-        <th>Name</th>
         <th>ID</th>
         <th>External key</th>
         <th>Balance</th>
-        <th>City</th>
-        <th>Country</th>
       </tr>
       </thead>
       <tbody>
@@ -41,6 +38,9 @@ $(document).ready(function() {
     "infoCallback": function( settings, start, end, max, total, pre ) {
 
         return pre.replace('TOTAL',settings.json.data.length);
+    },
+    drawCallback: function() {
+        setObjectIdPopover();
     }
   });
 });

data/app/views/kaui/accounts/_account_info.html.erb

@@ -1,4 +1,4 @@
-<div class="col-md-12">
+<div class="col-md-6 col-xs-12">
 
   <div class="column-block">
 
@@ -39,106 +39,60 @@
 
       <div class="tag-bar tag-bar-breathe">
 
-        <div class="tag-select" onclick="void(0)">
-          <span><i class="fa fa-tag"></i><i class="fa fa-caret-down"></i></span>
+        <% unless @available_tags.blank? %>
+          <div class="tag-select" onclick="void(0)">
+            <span><i class="fa fa-tag"></i><i class="fa fa-caret-down"></i></span>
 
-          <div class="tag-select-box">
-            <strong>Tag As:</strong>
-            <%= render :partial => 'kaui/account_tags/form_bar',
-                       :locals => {:account_id => @account.account_id,
-                                   :tag_names => @tags.map { |tag| tag.tag_definition_name },
-                                   :available_tags => @available_tags} %>
+            <div class="tag-select-box">
+              <strong>Tag As:</strong>
+              <%= render :partial => 'kaui/account_tags/form_bar',
+                         :locals => {:account_id => @account.account_id,
+                                     :tag_names => @tags.map { |tag| tag.tag_definition_name },
+                                     :available_tags => @available_tags} %>
+            </div>
           </div>
-        </div>
+        <% end %>
 
         <%= render :partial => 'kaui/custom_fields/list_bar',
                    :locals => {:custom_fields => @custom_fields} %>
       </div>
 
       <div class="row">
-        <div class="col-md-5">
+        <div class="col-sm-12">
           <div class="fix-position">
-            <table class="transparent">
-              <tr>
-                <th>Name</th>
-                <td><%= @account.name %></td>
-              </tr>
-              <tr>
-                <th>ID</th>
-                <td><%= @account.account_id %></td>
-              </tr>
-              <tr>
-                <th>External Key</th>
-                <td><%= @account.external_key %></td>
-              </tr>
-              <tr>
-                <th>Currency</th>
-                <td><%= @account.currency %></td>
-              </tr>
-              <tr>
-                  <th>Timezone</th>
-                  <td><%= @account.time_zone %></td>
-              </tr>
-              <tr>
-                  <th>Locale</th>
-                  <td><%= @account.locale %></td>
-              </tr>
-              <tr>
-                  <th>Notes</th>
-                  <% if @account.notes %>
-                      <td><textarea rows="3" class="form-control" readonly="true"><%= @account.notes %></textarea></td>
-                  <% else %>
-                      <td>N/A</td>
-                  <% end %>
-              </tr>
-              <%= render :partial => 'parent',
-                         :locals => {:account_parent => @account_parent} %>
-            </table>
-          </div>
+          <table class="transparent">
+            <tr>
+              <th>ID</th>
+              <td><%= @account.account_id %></td>
+            </tr>
+            <tr>
+              <th>External Key</th>
+              <td><%= @account.external_key %></td>
+            </tr>
+            <tr>
+              <th>Currency</th>
+              <td><%= @account.currency %></td>
+            </tr>
+            <tr>
+                <th>Timezone</th>
+                <td><%= @account.time_zone %></td>
+            </tr>
+            <tr>
+                <th>Locale</th>
+                <td><%= @account.locale %></td>
+            </tr>
+            <tr>
+                <th>Notes</th>
+                <% if @account.notes %>
+                    <td><textarea rows="3" class="form-control" readonly="true"><%= @account.notes %></textarea></td>
+                <% else %>
+                    <td>N/A</td>
+                <% end %>
+            </tr>
+            <%= render :partial => 'parent',
+                       :locals => {:account_parent => @account_parent} %>
+          </table>
         </div>
-        <div class="col-md-5 col-md-offset-1">
-          <div class="fix-position">
-            <table class="transparent">
-              <tr>
-                <th>Address1</th>
-                <td><%= @account.address1 %></td>
-              </tr>
-              <tr>
-                <th>Address2</th>
-                <td><%= @account.address2 %></td>
-              </tr>
-              <tr>
-                <th>City</th>
-                <td><%= @account.city %></td>
-              </tr>
-              <tr>
-                <th>State</th>
-                <td><%= @account.state %></td>
-              </tr>
-              <tr>
-                <th>Country</th>
-                <td><%= @account.country %></td>
-              </tr>
-              <tr>
-                <th>Postal Code</th>
-                <td><%= @account.postal_code %></td>
-              </tr>
-              <tr>
-                <th>Phone</th>
-                <td><%= @account.phone %></td>
-              </tr>
-              <tr>
-                <th>Company</th>
-                <td><%= @account.company %></td>
-              </tr>
-              <tr>
-                <th>Primary email</th>
-                <td><%= @account.email %></td>
-              </tr>
-              <%= render :partial => 'kaui/account_emails/account_emails_table',
-                         :locals => {:account_emails => @account_emails} %>
-            </table>
-          </div>
         </div>
       </div>
 

data/app/views/kaui/accounts/_billing_info.html.erb

@@ -1,4 +1,4 @@
-<div class="col-md-6">
+<div class="col-md-6 col-xs-12">
 
   <div class="column-block">
 
@@ -32,6 +32,7 @@
       <% end %>
 
       <div class="row">
+        <div class="col-sm-12">
           <div class="fix-position">
             <table class="transparent" <%= billing_info_margin.html_safe %>>
               <tr>
@@ -63,7 +64,7 @@
                 <td>
                   <% if @overdue_state.nil? %>
                       <span class='label'>N/A</span>
-                  <% elsif @overdue_state.clear_state %>
+                  <% elsif @overdue_state.is_clear_state %>
                       <span class='label label-success'>Good</span>
                   <% else %>
                       <span class='label label-danger'><%= @overdue_state.name %></span>
@@ -73,7 +74,7 @@
               <tr>
                 <th>Bill cycle day</th>
                 <td>
-                  <% if @account.bill_cycle_day_local %>
+                  <% if @account.bill_cycle_day_local > 0  %>
                       <span class='label'><%= @account.bill_cycle_day_local %> (user timezone)</span>
                   <% else %>
                       <span class='label'>N/A</span>
@@ -113,11 +114,13 @@
                         <div class="col-sm-3">
                           <input class="form-control" name="target_date" type="text" data-provide="datepicker" data-date-format="yyyy-mm-dd" data-date-today-highlight="true">
                         </div>
-                        <div style="width: 14.5%; float: left; padding: 0;">
-                          <%= label_tag :dry_run do %>
-                              <%= check_box_tag :dry_run, '1', true %>&nbsp;<small>Dry-run</small>
-                          <% end %>
-                        </div>
+                        <% if can? :dry_run, Kaui::Invoice %>
+                          <div style="width: 14.5%; float: left; padding: 0;">
+                            <%= label_tag :dry_run do %>
+                                <%= check_box_tag :dry_run, '1', true %>&nbsp;<small>Dry-run</small>
+                            <% end %>
+                          </div>
+                        <% end %>
                         <div class="col-xs-1" style="padding: 0;">
                           <%= button_tag '<i class="fa fa-magic"></i>'.html_safe, :class => 'btn btn-xs' %>
                         </div>
@@ -126,6 +129,7 @@
                 </div>
             <% end %>
           </div>
+        </div>
       </div>
 
     </div>

data/app/views/kaui/accounts/_parent.html.erb

@@ -2,7 +2,7 @@
   <th>Parent</th>
   <td>
     <% if account_parent.present? %>
-        <%= link_to account_parent.name, kaui_engine.account_path(@account.parent_account_id) %>
+        <%= link_to account_parent.account_id, kaui_engine.account_path(@account.parent_account_id) %>
         <% if can? :update, Kaui::Account %>
             <%= link_to '&nbsp;<i class="fa fa-times"></i>'.html_safe, kaui_engine.unlink_to_parent_path(@account.account_id), :method => :delete %>
         <% end %>&nbsp;