kaui 0.16.2 → 1.0.0

data/app/helpers/kaui/plugin_helper.rb

@@ -0,0 +1,58 @@
+module Kaui
+  module PluginHelper
+    # including plugin that are installed
+    def plugin_repository
+      plugins = []
+      plugin_repository = Kaui::AdminTenant::get_plugin_repository
+      installed_plugins = installed_plugins()
+
+      plugin_repository.each_pair do |key, info|
+        found_plugin = installed_plugins.reject! { |p| p.plugin_key.eql?(key.to_s) }
+        plugins << {
+            plugin_key: plugin_key(key.to_s, info),
+            plugin_name: plugin_name(key.to_s, info),
+            plugin_type: info[:type],
+            installed: !found_plugin.nil?
+        }
+      end
+
+      installed_plugins.each do |plugin|
+        plugins << {
+            plugin_key: plugin.plugin_key,
+            plugin_name: plugin.plugin_name,
+            plugin_type: nil,
+            installed: true
+        }
+      end
+
+      plugins.sort! { |a,b| a[:plugin_key] <=> b[:plugin_key] && b[:installed].to_s <=> a[:installed].to_s }
+      plugins
+    end
+
+    private
+
+      def plugin_name(key, info)
+        if info[:artifact_id].nil?
+          "killbill-#{key}"
+        else
+          "killbill-#{info[:artifact_id].gsub('killbill-','').gsub('-plugin','')}"
+        end
+      end
+
+      def plugin_key(key, info)
+        # hack:: replace paypal key with paypal_express, to set configuration and allow the ui to find the right configuration inputs
+        if key.eql?('paypal')
+          'paypal_express'
+        else
+          "#{key}"
+        end
+      end
+
+      def installed_plugins
+        nodes_info = KillBillClient::Model::NodesInfo.nodes_info(Kaui.current_tenant_user_options(current_user, session)) || []
+        plugins_info = nodes_info.first.plugins_info || []
+
+        plugins_info.select { |plugin| !plugin.version.nil?}
+      end
+  end
+end

data/app/helpers/kaui/subscription_helper.rb

@@ -99,12 +99,7 @@ module Kaui
       if !sub.present? or !sub.cancelled_date.present? or !account.present? or !account.time_zone.present?
         nil
       else
-        cancelled_date = format_date(sub.cancelled_date, account.time_zone).html_safe
-        if Time.parse(sub.cancelled_date) > current_time(account.time_zone)
-          'Pending cancellation on ' + cancelled_date
-        else
-          'Canceled on ' + cancelled_date
-        end
+        "Entitlement date: #{format_date(sub.cancelled_date, account.time_zone)}"
       end
     end
 
@@ -120,10 +115,17 @@ module Kaui
       if !sub.present? or !sub.billing_end_date.present? or !account.present? or !account.time_zone.present?
         nil
       else
-        format_date(sub.billing_end_date, account.time_zone).html_safe
+        "Billing date: #{format_date(sub.billing_end_date, account.time_zone)}"
       end
     end
 
+    def humanized_subscription_cancelled_information(sub, account)
+      if !sub.present? or !sub.cancelled_date.present? or !account.present? or !account.time_zone.present?
+        nil
+      else
+        "#{humanized_subscription_cancelled_date(sub, account)}<br/>#{humanized_subscription_billing_end_date(sub, account)}".html_safe
+      end
+    end
 
     def humanized_time_unit(time_unit)
       time_unit.downcase.capitalize

data/app/models/kaui/admin_tenant.rb

@@ -63,6 +63,8 @@ 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
@@ -88,11 +90,11 @@ class Kaui::AdminTenant < KillBillClient::Model::Tenant
       end
 
       # Serialize the whole thing a as string of the form:
-      # plugin_key1::key1=value1,key2=value2,..;plugin_key2::...
+      # plugin_key1::key1=value1|key2=value2|..;plugin_key2::...
       tenant_config.map do |plugin_key, props|
         serialized_props = props.inject("") do |s, (k, v)|
           e="#{k.to_s}=#{v.to_s}";
-          s == "" ? s="#{e}" : s="#{s},#{e}";
+          s == "" ? s="#{e}" : s="#{s}|#{e}";
           s
         end
         "#{plugin_key}::#{serialized_props}"
@@ -101,16 +103,16 @@ class Kaui::AdminTenant < KillBillClient::Model::Tenant
     end
 
 
-    def format_plugin_config(plugin_name, plugin_type, props)
+    def format_plugin_config(plugin_key, plugin_type, props)
       return nil unless props.present?
       if plugin_type == 'ruby'
         require 'yaml'
         hsh = {}
-        hsh[plugin_name.to_sym] = {}
+        hsh[plugin_key.to_sym] = {}
         props.each do |k,v|
-          hsh[plugin_name.to_sym][k.to_sym] = v.to_sym
+          hsh[plugin_key.to_sym][k.to_sym] = v.to_sym
         end
-        hsh[plugin_name.to_sym]
+        hsh[plugin_key.to_sym]
         hsh.to_yaml
       elsif plugin_type == 'java'
         res = ""
@@ -122,5 +124,17 @@ class Kaui::AdminTenant < KillBillClient::Model::Tenant
         props['raw_config']
       end
     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)
+      if plugin_key.start_with?('paypal')
+        'paypal_express'
+      elsif plugin_key.start_with?('firstdata')
+        'firstdata_e4'
+      else
+        "#{plugin_key}"
+      end
+    end
   end
 end

data/app/models/kaui/catalog.rb

@@ -4,9 +4,9 @@ class Kaui::Catalog < KillBillClient::Model::Catalog
 
   class << self
 
-    def get_catalog_json(latest, options)
+    def get_catalog_json(latest, requested_date, options)
 
-      catalogs = KillBillClient::Model::Catalog.get_tenant_catalog('json', nil, 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
@@ -36,9 +36,9 @@ class Kaui::Catalog < KillBillClient::Model::Catalog
     end
 
 
-    def get_catalog_xml(options)
+    def get_catalog_xml(requested_date, options)
 
-      catalog_xml = KillBillClient::Model::Catalog.get_tenant_catalog('xml', nil, options)
+      catalog_xml = KillBillClient::Model::Catalog.get_tenant_catalog('xml', requested_date, options)
 
       parsed_catalog = parse_catalog_xml(catalog_xml)
 

data/app/models/kaui/tag.rb

@@ -9,7 +9,7 @@ class Kaui::Tag < KillBillClient::Model::Tag
   end
 
   class << self
-    [:account, :bundle].each do |model|
+    [:account, :bundle, :subscription].each do |model|
       define_method "all_for_#{model.to_s}" do |model_id, included_deleted, audit, options|
         instance = Kaui.const_get(model.to_s.camelize).new("#{model.to_s}_id".to_sym => model_id)
         instance.tags(included_deleted, audit, options)

data/app/models/kaui/tag_definition.rb

@@ -23,7 +23,7 @@ class Kaui::TagDefinition < KillBillClient::Model::TagDefinition
 
   ALL_OBJECT_TYPES.each do |object_type|
     define_singleton_method "all_for_#{object_type.downcase}" do |options_for_klient|
-      (self.all('NONE', options_for_klient).delete_if { |tag_definition| !tag_definition.applicable_object_types.include? object_type }).sort
+      (self.all('NONE', options_for_klient).delete_if { |tag_definition| !tag_definition.applicable_object_types.include? object_type || tag_definition.is_control_tag }).sort
     end
   end
 

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

@@ -0,0 +1,35 @@
+<div class="search">
+
+  <div class="column-block">
+
+    <h1>Custom Fields</h1>
+    <input type="hidden" id="custom-fields" value="<%= @custom_fields_json %>">
+    <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() {
+        var customFields = JSON.parse($("#custom-fields").val());
+        $('#custom_fields-table').DataTable({
+            "dom": "<'row'<'col-md-6'l><'col-md-6'f>r>t<'row'<'col-md-6'i><'col-md-6'p>>",
+            data: customFields
+        });
+    });
+<% end %>

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

@@ -0,0 +1,35 @@
+<div class="search">
+
+  <div class="column-block">
+
+    <h1>Tags</h1>
+    <input type="hidden" id="tags" value="<%= @tags_json %>">
+    <table id="tags-table" class="table table-condensed mobile-data">
+      <thead>
+      <tr>
+        <th>Tag ID</th>
+        <th>Object 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>
+
+</div>
+
+<%= javascript_tag do %>
+    $(document).ready(function() {
+        var tags = JSON.parse($("#tags").val());
+        $('#tags-table').DataTable({
+            "dom": "<'row'<'col-md-6'l><'col-md-6'f>r>t<'row'<'col-md-6'i><'col-md-6'p>>",
+            data: tags
+        });
+    });
+<% end %>

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

@@ -13,6 +13,11 @@
                       kaui_engine.account_children_path(@account.account_id),
                       :class => 'btn btn-xs' %>
       <% end %>
+      <% if can_close_account? && !account_closed? %>
+        <%= link_to('<i class="fa fa-times"></i>Close'.html_safe, '#closeAccountModal',
+                    :class => 'btn btn-xs text-danger',
+                    data: {toggle: 'modal', name: @account.name || '(not set)', account_id: @account.account_id}) %>
+      <% end %>
       <% unless @account.parent_account_id.nil? %>
           <span class="label label-info account-child-label">Child</span>
       <% end %>

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

@@ -33,7 +33,7 @@
 
       <div class="row">
           <div class="fix-position">
-            <table class="transparent">
+            <table class="transparent" <%= billing_info_margin.html_safe %>>
               <tr>
                 <th>Account balance</th>
                 <td>

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

@@ -0,0 +1,98 @@
+<div class="modal fade" id="closeAccountModal" tabindex="-1" role="dialog">
+  <div class="modal-dialog" role="document">
+    <div class="modal-content column-block">
+      <div>
+        <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+        <h1 class="modal-title">Close account</h1>
+      </div>
+      <div class="modal-body">
+        <%= form_for :close, :url =>  '' , :method => :delete, :html => {:class => 'form-horizontal', :id => 'account-close-form'} do |f| %>
+            <div class='form-group'>
+              <%= f.label :name, 'Name', :class => 'col-sm-4 control-label' %>
+              <div class="col-sm-8">
+                <%= f.text_field :name, :class => 'form-control', :readonly => true %>
+              </div>
+            </div>
+            <div class='form-group'>
+              <%= f.label :account_id, 'Account id', :class => 'col-sm-4 control-label' %>
+              <div class="col-sm-8">
+                <%= f.text_field :account_id, :class => 'form-control', :readonly => true %>
+              </div>
+            </div>
+            <div class="form-group">
+              <div class="col-sm-offset-4 col-sm-8">
+                <div class="row">
+                  <div class="col-sm-3">
+                    <label class="switch">
+                      <input name="options[]" id="cancelAllSubscriptions" type="checkbox" value="cancel_all_subscriptions">
+                      <span class="slider round"></span>
+                    </label>
+                  </div>
+                  <label class="col-sm-8 capitalize">Cancel all subscriptions.</label>
+                </div>
+              </div>
+            </div>
+            <div class="form-group">
+              <div class="col-sm-offset-4 col-sm-8">
+                <div class="row">
+                  <div class="col-sm-3">
+                    <label class="switch">
+                      <input name="options[]" id="writeoffUnpaidInvoices" type="checkbox" value="writeoff_unpaid_invoices">
+                      <span class="slider round"></span>
+                    </label>
+                  </div>
+                  <label class="col-sm-8 capitalize">Write off unpaid invoices.</label>
+                </div>
+              </div>
+            </div>
+            <div class="form-group">
+              <div class="col-sm-offset-4 col-sm-8">
+                <div class="row">
+                  <div class="col-sm-3">
+                    <label class="switch">
+                      <input name="options[]" id="itemAdjustUnpaidInvoices" type="checkbox" value="item_adjust_unpaid_invoices">
+                      <span class="slider round"></span>
+                    </label>
+                  </div>
+                  <label class="col-sm-8 capitalize">Item adjust unpaid invoices.</label>
+                </div>
+              </div>
+            </div>
+
+            <div class="form-group">
+              <div class="col-sm-offset-4 col-sm-8">
+                <%= submit_tag 'Close', :class => 'btn btn-danger' %>
+              </div>
+            </div>
+        <% end %>
+      </div>
+    </div><!-- /.modal-content -->
+  </div><!-- /.modal-dialog -->
+</div><!-- /.modal -->
+
+<%= javascript_tag do %>
+    $(document).ready(function() {
+
+        $('#closeAccountModal').on('show.bs.modal', function (e) {
+            $("#close_account_id").val(e.relatedTarget.dataset['accountId']);
+            $("#close_name").val(e.relatedTarget.dataset['name']);
+
+            // reset toggles
+            var options = $("#closeAccountModal").find('input[type="checkbox"]');
+            $.each( options, function( index, elem ) {
+                $(elem).prop('checked',false);
+            });
+
+            $("#account-close-form").attr("action", Routes.kaui_engine_account_path(e.relatedTarget.dataset['accountId']));
+
+        });
+
+        $('#writeoffUnpaidInvoices').change(function(){
+            $("#itemAdjustUnpaidInvoices").prop("checked",!$(this).prop("checked"));
+        });
+
+        $('#itemAdjustUnpaidInvoices').change(function(){
+            $("#writeoffUnpaidInvoices").prop("checked",!$(this).prop("checked"));
+        });
+    });
+<% end %>

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

@@ -49,13 +49,6 @@ $(document).ready(function() {
     "serverSide": true,
     "search": {"search": "<%= @search_query %>"},
     "ajax": "<%= accounts_pagination_path(:ordering => @ordering, :format => :json) %>",
-    "rowCallback": function( row, data, index ) {
-      if ( data[0] == 1 ) {
-        $('td:eq(0)', row).html( '<span class="label label-info account-child-label">Child</span>' );
-      }else{
-        $('td:eq(0)', row).html('')
-      }
-    },
     "columnDefs": [
     { "orderable": false, "targets": 0, "createdCell": function (td, cellData, rowData, row, col) {
         $(td).css('padding-left', '20px');

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

@@ -10,6 +10,10 @@
   <%= render :partial => 'kenui/email_notifications/configure_events_modal' %>
 <% end %>
 
+<% if can_close_account? %>
+  <%= render :partial => 'close_account_modal' %>
+<% end %>
+
 <%= javascript_tag do %>
   function disableLinks() {
     $('a.btn.disabled').click(function (e) {

data/app/views/kaui/admin_tenants/_add_allowed_user_modal.html.erb

@@ -0,0 +1,64 @@
+<div class="modal fade" id="addAllowedUserModal" tabindex="-1" role="dialog">
+  <div class="modal-dialog" role="document">
+    <div class="modal-content column-block">
+      <div>
+        <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+        <h1 class="modal-title">Add allowed user</h1>
+      </div>
+      <div class="modal-body">
+        <%= form_for :allowed_user, :url =>  add_allowed_user_path, :method => :put, :html => {:class => 'form-horizontal', :id => 'tenantAllowedUserForm'} do |f| %>
+            <div class='form-group'>
+              <%= f.label :kb_username, 'User name', :class => 'col-sm-4 control-label' %>
+              <div class="col-sm-8">
+                <%= f.text_field :kb_username, :class => 'form-control', :required => true %>
+              </div>
+            </div>
+            <input type="hidden" name="tenant_id" value="<%= @tenant.id %>" />
+            <div class="form-group">
+              <div class="col-sm-offset-4 col-sm-10">
+                <%= submit_tag 'Add', :class => 'btn btn-default' %>
+              </div>
+            </div>
+        <% end %>
+      </div>
+    </div><!-- /.modal-content -->
+  </div><!-- /.modal-dialog -->
+</div><!-- /.modal -->
+
+<%= javascript_tag do %>
+    $(document).ready(function() {
+        function loadAllowedUser() {
+            $.ajax(
+            {
+                url: Routes.kaui_engine_admin_tenant_allowed_users_path(),
+                type: "GET",
+                dataType: "json",
+                data: {tenant_id: <%= @tenant.id %>},
+                success: function(data) {
+                    var availableAllowedUser = [];
+                    for (var i=0; i < data.length ; i++) {
+                        availableAllowedUser.push(data[i].kb_username);
+                    }
+
+                    $( "#allowed_user_kb_username" ).autocomplete({
+                        source: availableAllowedUser,
+                        appendTo: "#tenantAllowedUserForm",
+                        classes: {
+                            "ui-autocomplete": "autocomplete-allowed-user"
+                        },
+                    });
+
+                }
+            });
+        }
+
+        $('#addAllowedUserModal').on('show.bs.modal', function (e) {
+            // reset field
+            $( "#allowed_user_kb_username" ).val('');
+
+        });
+
+        loadAllowedUser();
+
+    });
+<% end %>