kaui 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e87e62224a7eee3e9ee134db6f88824cbe6efdbf
-  data.tar.gz: 1f762a4df672efbaee3182d0eca916405cf057cc
+  metadata.gz: '0651238ca5895ad6646d03a02d6aea566789aecf'
+  data.tar.gz: 5f69d3a6033391e3fe1ee08e6a195a44475c33db
 SHA512:
-  metadata.gz: 38bdfc7f29ad2711fec6a566ac962cbb2d0ecdadf60754522a0c786f4446433c71191dbabb40f9a80f8220da7c07da694e9f10077f2d6248030c1ab70d08b4d6
-  data.tar.gz: d5fbd8de69aeeef43f4690e3ad84dff02c89dbe7215bb95b87dbd451915f88f5bf73a4a25499b186376b089b0afad5fc1c80e738fc89e24610102ecb47d61199
+  metadata.gz: eb800c76bba3c7073b21418059ec15614e3e6ba65c33e61101630d4a8ffaebf289dfe92296fcfbe72dbd87a66cef1fa2442302eaa405402024afbc9b27abd5c9
+  data.tar.gz: 89cbb200e3eabc97fe3c4475603a1906d83ab0c19baad61926b696a77cf58e7b3e83061fa39edb372bf9205e78caf312232fa72f376d695b636130634e6c3e48

data/app/assets/javascripts/kaui/kaui.js

@@ -198,43 +198,72 @@ jQuery(document).ready(function ($) {
         if (jqxhr.status == 0) {
             return;
         }
-        
-        var message = 'Request Status: ' + jqxhr.status + ' Status Text: ' + jqxhr.statusText + ' ' + jqxhr.responseText;
+
+        var message = 'Request Status: ' + jqxhr.status + ', Status Text: ' + jqxhr.statusText + ': ' + getMessageFromResponse(jqxhr);
 
         if (jqxhr.status == 200) {
             message = thrownError.message == undefined ? thrownError : thrownError.message;
         }
-        ajaxAlert(message);
+        ajaxErrorAlert(message);
     });
 
+    function getMessageFromResponse(jqxhr) {
+        if (isBlank(jqxhr.responseJSON)) {
+            return jqxhr.responseText;
+        }
+
+        if (!isBlank(jqxhr.responseJSON.error)) {
+            return jqxhr.responseJSON.error;
+        }
+
+        return jqxhr.responseText;
+    }
+
     // this will prevent DataTable to show an alert message box when an error occurs
     $.fn.dataTable.ext.errMode = 'none';
     // this will try to register a DataTable error event to all tables, and if an error occurs will display the error on screen
     $( document ).find(".table").on('error.dt', function ( e, settings, techNote, message ) {
-        ajaxAlert('An error has been reported by DataTables: ' + message);
-    })
+        ajaxErrorAlert('An error has been reported by DataTables: ' + message);
+    });
 
+    setObjectIdPopover();
 });
 
-// global function used to show a error message that occurs on a Ajax call
-function ajaxAlert(message) {
+
+// global function used to show an error message that occurs on a Ajax call, if timeout is passed the box will disappear when the time is up.
+function ajaxErrorAlert(message, timeout) {
+    ajaxAlert("ajaxErrorAlert", message, timeout);
+}
+
+// global function used to show an information message.
+function ajaxInfoAlert(message, timeout) {
+    ajaxAlert("ajaxInfoAlert", message, timeout);
+}
+
+// if timeout is passed the box will disappear when the time is up.
+function ajaxAlert(alert_element_id, message, timeout) {
     // do not show ajax alert if there is already an server alert
     var serverAlertStatus = $(".server-alert").css("display");
     if (serverAlertStatus != undefined && serverAlertStatus != "none") {
         return;
     }
 
-    var messageBox = $("#ajaxAlert");
-    messageBox.find("#ajaxErrorMessage").text(message);
+    var messageBox = $("#" + alert_element_id);
+    messageBox.find("#" + alert_element_id + "Message").text(message);
     messageBox.show();
     messageBox.find("button").click(function(){
         ajaxCloseAlert(messageBox);
     });
+
+    //if timeout is passed the box will disappear when the time is up
+    if (!isBlank(timeout)) {
+        setTimeout(function(){ ajaxCloseAlert()}, timeout);
+    }
 }
 
 function ajaxCloseAlert(messageBox) {
-    var messageBox = messageBox || $("#ajaxAlert");
-    messageBox.find("#ajaxErrorMessage").text('');
+    var messageBox = messageBox || $(".ajaxAlert");
+    messageBox.find(".ajaxAlertMessage").text('');
     messageBox.hide();
 }
 
@@ -261,3 +290,81 @@ function isBlank(value) {
         return false;
     }
 }
+
+// this function set popover for all tags that have class object-id-popover
+// attributes:
+//      data-id = content of the popover,object id; required
+//      title = title of the popover; not required
+//      id = (must be {{id}}-popover) used to close popover when the copy image is clicked; if present; if not present a timeout of 5s will apply; not required
+function setObjectIdPopover(){
+    $(".object-id-popover").each(function(idx, e){
+        $(this).popover('destroy');
+        $(this).off("shown.bs.popover");
+        $(this).data("index", idx);
+
+        $(this).popover({
+            html: true,
+            content: function() {
+                var template = '<div class="{{id}}-content" >' +
+                    '{{id}}&emsp;<i id="{{id}}-copy" class="fa fa-clipboard copy-icon" aria-hidden="true"></i> ' +
+                    '<input id="{{id}}-placeholder" class="form-control hidden"> ' +
+                    '</div>';
+
+                var popover_html = Mustache.render( template , { id: $(this).data("id") });
+                return popover_html;
+            },
+            container: 'body',
+            trigger: 'hover',
+            delay: { "show": 100, "hide": 4000 }
+        });
+
+        $(this).on("show.bs.popover", function(e) {
+            var currentPopoverIndex = $(this).data('index');
+            $(".object-id-popover").each(function(idx, e){
+                var index = $(this).data('index');
+
+                if (currentPopoverIndex != index) {
+                    $(this).popover('hide');
+                }
+            });
+        });
+
+        $(this).on("shown.bs.popover", function(e) {
+            var objectId = $(this).data('id');
+            var copyIdImg = $("#" + objectId + "-copy");
+
+            copyIdImg.data("popover",$(this).attr("id"));
+            copyIdImg.click(function(e){
+                var id = ($(this).attr("id")).replace('-copy','');
+                var placeholder = $("#" + objectId + "-placeholder");
+                var popover = $("#" + copyIdImg.data("popover"));
+                placeholder.val(id);
+                placeholder.removeClass("hidden");
+                placeholder.select();
+
+                document.execCommand("Copy");
+                placeholder.addClass("hidden");
+                ajaxInfoAlert("Id [" + id + "] was copied into the clipboard!", 4000);
+
+                if (!isBlank(popover)) {
+                    popover.popover('hide');
+                }
+
+            });
+
+        });
+
+    });
+
+    // close all object id popover on modal show
+    $(".modal").on('show.bs.modal',function(e){
+        $(".object-id-popover").each(function(idx, e) {
+            $(this).popover('destroy');
+        });
+    });
+
+    // check if object id must be restored
+    $(".modal").on('hide.bs.modal',function(e){
+        setObjectIdPopover();
+    });
+}

data/app/assets/stylesheets/kaui/common.less

@@ -382,7 +382,7 @@ table.subtitle {
 }
 
 .fix-position {
-    padding-left: 45px;
+    padding-left: 20px;
 
     @media (@phone) {
         padding-left: 15px;
@@ -553,6 +553,61 @@ form[id^="new_tag_definition"] {
 }
 
 /* The switch - the box around the slider */
+.switch-half-container {
+  padding-top: 9px !important;
+}
+
+.switch-half {
+  position: relative;
+  display: inline-block;
+  margin-bottom: 0;
+  width: 20px;
+  height: 12px;
+
+
+  /* Hide default HTML checkbox */
+  input {display:none;}
+
+  /* The slider */
+  .slider {
+    position: absolute;
+    cursor: pointer;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    background-color: #ccc;
+    -webkit-transition: .4s;
+    transition: .4s;
+  }
+
+  .slider:before {
+    position: absolute;
+    content: "";
+    height: 10px;
+    width: 10px;
+    left: 1px;
+    bottom: 1px;
+    background-color: white;
+    -webkit-transition: .4s;
+    transition: .4s;
+  }
+
+  input:checked + .slider {
+    background-color: #00919d;
+  }
+
+  input:focus + .slider {
+    box-shadow: 0 0 1px #2196F3;
+  }
+
+  input:checked + .slider:before {
+    -webkit-transform: translateX(8px);
+    -ms-transform: translateX(8px);
+    transform: translateX(8px);
+  }
+}
+
 .switch {
   position: relative;
   display: inline-block;
@@ -595,12 +650,12 @@ form[id^="new_tag_definition"] {
   input:focus + .slider {
     box-shadow: 0 0 1px #2196F3;
   }
-}
 
-input:checked + .slider:before {
-  -webkit-transform: translateX(16px);
-  -ms-transform: translateX(16px);
-  transform: translateX(16px);
+  input:checked + .slider:before {
+    -webkit-transform: translateX(16px);
+    -ms-transform: translateX(16px);
+    transform: translateX(16px);
+  }
 }
 
 /* Rounded sliders */
@@ -632,4 +687,34 @@ input:checked + .slider:before {
 
 .toggle-label {
   text-align: left !important;
+}
+
+.spinner {
+  padding-top: 3.5px;
+  width: 40px;
+  color: #00919d;
+  display: none;
+}
+
+.footer-notice {
+  .modal-footer {
+    text-align: left;
+    padding-bottom: 0;
+
+    .alert {
+      margin-bottom: 0;
+
+      .label-default {
+        color: white;
+      }
+    }
+  }
+}
+
+.copy-icon {
+  cursor: pointer;
+}
+
+.switch-tenant-active {
+    color: #00919d;
 }

data/app/assets/stylesheets/kaui/payment.less

@@ -10,6 +10,7 @@
 
 .payment-details {
     padding-bottom: 0;
+    padding-left: 45px;
 
     table.transparent {
         margin-bottom: 0;

data/app/controllers/kaui/account_children_controller.rb

@@ -34,12 +34,9 @@ class Kaui::AccountChildrenController < Kaui::EngineController
 
     formatter = lambda do |account_child|
       [
-          view_context.link_to(account_child.name || '(not set)', account_path(account_child.account_id)),
-          view_context.truncate_uuid(account_child.account_id),
+          view_context.link_to(account_child.account_id, account_path(account_child.account_id)),
           account_child.external_key,
           view_context.humanized_money_with_symbol(account_child.balance_to_money),
-          account_child.city,
-          account_child.country
       ]
     end
 

data/app/controllers/kaui/accounts_controller.rb

@@ -45,12 +45,9 @@ class Kaui::AccountsController < Kaui::EngineController
 
       [
           child_label,
-          view_context.link_to(account.name || '(not set)', view_context.url_for(:action => :show, :account_id => account.account_id)),
-          view_context.truncate_uuid(account.account_id),
+          view_context.link_to(account.account_id, view_context.url_for(:action => :show, :account_id => account.account_id)),
           account.external_key,
-          view_context.humanized_money_with_symbol(account.balance_to_money),
-          account.city,
-          account.country
+          view_context.humanized_money_with_symbol(account.balance_to_money)
       ]
     end
 
@@ -171,7 +168,7 @@ class Kaui::AccountsController < Kaui::EngineController
   def trigger_invoice
     account_id = params.require(:account_id)
     target_date = params[:target_date].presence
-    dry_run = params[:dry_run] == '1'
+    dry_run = params[:dry_run].nil? ? false : params[:dry_run] == '1'
 
     invoice = nil
     begin
@@ -233,7 +230,7 @@ class Kaui::AccountsController < Kaui::EngineController
   def pay_all_invoices
     payment = Kaui::InvoicePayment.new(:account_id => params.require(:account_id))
 
-    payment.bulk_create(params[:is_external_payment] == 'true', current_user.kb_username, params[:reason], params[:comment], options_for_klient)
+    payment.bulk_create(params[:is_external_payment] == 'true', nil, nil, current_user.kb_username, params[:reason], params[:comment], options_for_klient)
 
     redirect_to account_path(payment.account_id), :notice => 'Successfully triggered a payment for all unpaid invoices'
   end

data/app/controllers/kaui/admin_allowed_users_controller.rb

@@ -8,14 +8,17 @@ class Kaui::AdminAllowedUsersController < Kaui::EngineController
 
   def new
     @allowed_user = Kaui::AllowedUser.new
+    @is_killbill_managed = true
+
     @roles = []
   end
 
   def create
+    @is_killbill_managed = nil
     @allowed_user = Kaui::AllowedUser.new(allowed_user_params)
 
     existing_user = Kaui::AllowedUser.find_by_kb_username(@allowed_user.kb_username)
-    if existing_user
+    unless existing_user.blank?
       flash[:error] = "User with name #{@allowed_user.kb_username} already exists!"
       @roles = roles_for_user(existing_user)
       render :new and return
@@ -24,10 +27,12 @@ class Kaui::AdminAllowedUsersController < Kaui::EngineController
         # Create locally only
         @allowed_user.save!
       else
-        roles = params[:roles].split(',')
-
-        # Create locally and in KB
-        @allowed_user.create_in_kb!(params.require(:password), roles, current_user.kb_username, params[:reason], params[:comment], options_for_klient)
+        @allowed_user.create_in_kb!(params.require(:password) ,
+                                  params[:roles].blank? ? [] : params[:roles].split(','),
+                                  current_user.kb_username,
+                                  params[:reason],
+                                  params[:comment],
+                                  options_for_klient)
       end
 
       redirect_to kaui_engine.admin_allowed_user_path(@allowed_user.id), :notice => 'User was successfully configured'
@@ -46,6 +51,7 @@ class Kaui::AdminAllowedUsersController < Kaui::EngineController
 
   def edit
     @allowed_user = Kaui::AllowedUser.find(params.require(:id))
+    @is_killbill_managed = killbill_managed?(@allowed_user, options_for_klient)
 
     @roles = roles_for_user(@allowed_user)
   end
@@ -56,7 +62,7 @@ class Kaui::AdminAllowedUsersController < Kaui::EngineController
     @allowed_user.description = params[:allowed_user][:description].presence
 
     @allowed_user.update_in_kb!(params[:password].presence,
-                                params[:roles].presence.split(','),
+                                params[:roles].blank? ? nil : params[:roles].split(','),
                                 current_user.kb_username,
                                 params[:reason],
                                 params[:comment],
@@ -103,6 +109,17 @@ class Kaui::AdminAllowedUsersController < Kaui::EngineController
 
   private
 
+  # this will check if the user is managed by killbill (not managed externally or internally by a shiro config file).
+  def killbill_managed?(allowed_user, options = {})
+    begin
+      Kaui::UserRole.find_roles_by_username(allowed_user.kb_username, options)
+    rescue KillBillClient::API::ClientError => _
+      return false
+    end
+
+    return true
+  end
+
   def allowed_user_params
     allowed_user = params.require(:allowed_user)
     allowed_user.require(:kb_username)
@@ -110,6 +127,6 @@ class Kaui::AdminAllowedUsersController < Kaui::EngineController
   end
 
   def roles_for_user(allowed_user)
-    Kaui::UserRole.find_roles_by_username(allowed_user.kb_username, options_for_klient).map(&:presence).compact || []
+    Kaui::UserRole.find_roles_by_username(allowed_user.kb_username, options_for_klient).map(&:presence).compact rescue []
   end
 end

data/app/controllers/kaui/admin_tenants_controller.rb

@@ -233,7 +233,7 @@ class Kaui::AdminTenantsController < Kaui::EngineController
     view_form_model['states'] = view_form_model['states'].values unless view_form_model['states'].blank?
 
     overdue = Kaui::Overdue::from_overdue_form_model(view_form_model)
-    overdue.upload_tenant_overdue_config_json(options[:username], nil, comment, options)
+    Kaui::Overdue::upload_tenant_overdue_config_json(overdue.to_json,options[:username], nil, comment, options)
     redirect_to admin_tenant_path(current_tenant.id), :notice => 'Overdue config was successfully added '
   end
 
@@ -314,11 +314,16 @@ class Kaui::AdminTenantsController < Kaui::EngineController
     plugin_type = params[:plugin_type]
     plugin_key = params[:plugin_key]
 
-    plugin_config = Kaui::AdminTenant.format_plugin_config(plugin_key, plugin_type, plugin_properties)
+    if plugin_properties.blank?
+      flash[:error] = 'Plugin properties cannot be blank'
+    else
+      plugin_config = Kaui::AdminTenant.format_plugin_config(plugin_key, plugin_type, plugin_properties)
 
-    Kaui::AdminTenant.upload_tenant_plugin_config(plugin_name, plugin_config, options[:username], nil, comment, options)
+      Kaui::AdminTenant.upload_tenant_plugin_config(plugin_name, plugin_config, options[:username], nil, comment, options)
+      flash[:notice] = 'Config for plugin was successfully uploaded'
+    end
 
-    redirect_to admin_tenant_path(current_tenant.id), :notice => 'Config for plugin was successfully uploaded'
+    redirect_to admin_tenant_path(current_tenant.id)
   end
 
   def remove_allowed_user
@@ -367,23 +372,15 @@ class Kaui::AdminTenantsController < Kaui::EngineController
   end
 
   def display_catalog_xml
-    current_tenant = safely_find_tenant_by_id(params[:id])
-    effective_date = params.require(:effective_date)
-
-    options = tenant_options_for_client
-    options[:api_key] = current_tenant.api_key
-    options[:api_secret] = current_tenant.api_secret
-
-    response = Kaui::Catalog.get_catalog_xml(effective_date, options) rescue response = {}
-
-    catalog_xml = {}
-    unless response.nil? && response.size > 0
-      catalog_xml = response[0][:xml]
-    end
-
+    catalog_xml = fetch_catalog_xml(params[:id], params.require(:effective_date))
     render xml: catalog_xml
   end
 
+  def download_catalog_xml
+    effective_date = params.require(:effective_date)
+    catalog_xml = fetch_catalog_xml(params[:id], effective_date)
+    send_data catalog_xml, filename: "catalog_#{effective_date}.xml", type: :xml
+  end
 
   def display_overdue_xml
     render xml: params.require(:xml)
@@ -440,6 +437,17 @@ class Kaui::AdminTenantsController < Kaui::EngineController
     end
   end
 
+  def switch_tenant
+    tenant = Kaui::Tenant.find_by_kb_tenant_id(params.require(:kb_tenant_id))
+
+    # Select the tenant, see TenantsController
+    session[:kb_tenant_id] = tenant.kb_tenant_id
+    session[:kb_tenant_name] = tenant.name
+    session[:tenant_id] = tenant.id
+
+    redirect_to admin_tenant_path(tenant.id), :notice => "Tenant was switched to #{tenant.name}"
+  end
+
   private
 
 
@@ -483,10 +491,10 @@ class Kaui::AdminTenantsController < Kaui::EngineController
 
     plugin_repository.each do |plugin|
       return plugin, [] if plugin[:plugin_name] == entered_plugin_name || plugin[:plugin_key] == entered_plugin_name
-
-      splitted_plugin_name = split_camel_dash_underscore_space(plugin[:plugin_name])
       weight = { :plugin_name => plugin[:plugin_name], :plugin_key => plugin[:plugin_key],
                  :plugin_type => plugin[:plugin_type], :installed => plugin[:installed], :worth_weight => 0.0 }
+
+      splitted_plugin_name = split_camel_dash_underscore_space(plugin[:plugin_name])
       splitted_entered_plugin_name.each do |entered|
         if splitted_plugin_name.include?(entered)
           weight[:worth_weight] = weight[:worth_weight] + 1.0
@@ -498,7 +506,23 @@ class Kaui::AdminTenantsController < Kaui::EngineController
             break
           end
         end
+
+        # perform a plugin key search, if weight is zero
+        next unless weight[:worth_weight] == 0
+        splitted_plugin_key = split_camel_dash_underscore_space(plugin[:plugin_key])
+
+        if splitted_plugin_key.include?(entered)
+          weight[:worth_weight] = weight[:worth_weight] + 1.0
+        end
+
+        splitted_plugin_key.each do |splitted|
+          if entered.chars.all? { |ch| splitted.include?(ch) }
+            weight[:worth_weight] = weight[:worth_weight] + worth_of_non_words
+            break
+          end
+        end
       end
+
       weights << weight if weight[:worth_weight] > 0
 
     end
@@ -506,4 +530,19 @@ class Kaui::AdminTenantsController < Kaui::EngineController
     weights.sort! { |a,b| b[:worth_weight] <=> a[:worth_weight] } if weights.size > 1
     return nil, weights
   end
+
+  def fetch_catalog_xml(tenant_id, effective_date)
+    current_tenant = safely_find_tenant_by_id(tenant_id)
+
+    options = tenant_options_for_client
+    options[:api_key] = current_tenant.api_key
+    options[:api_secret] = current_tenant.api_secret
+
+    response = Kaui::Catalog.get_catalog_xml(effective_date, options) rescue response = {}
+
+    catalog_xml = {}
+    catalog_xml = response[0][:xml] unless response.blank?
+
+    catalog_xml
+  end
 end