kaui 0.16.2 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a923f6331603867ff6a37998ee73e2d4a16dadf3
-  data.tar.gz: a2a8c31f3eb0eb667dc9a2399f2c4ed1a85bf79a
+  metadata.gz: e87e62224a7eee3e9ee134db6f88824cbe6efdbf
+  data.tar.gz: 1f762a4df672efbaee3182d0eca916405cf057cc
 SHA512:
-  metadata.gz: df9c817add8adfc78f8ae46b2dc0b34a815b661a23fc23b5da456dad46576c4fa7dab47f4ee11c0c0021cfe4b7d85d0d616b2b9f6cc669743ec567ca9305ab69
-  data.tar.gz: a565252fa7a573b4715dbcd42f83e26145c14533bed9ae8a92cb5c8116565359c3092ed9441c4509a2c95c17e0c13856c0b91c5e7d641bbc225cb1abde966664
+  metadata.gz: 38bdfc7f29ad2711fec6a566ac962cbb2d0ecdadf60754522a0c786f4446433c71191dbabb40f9a80f8220da7c07da694e9f10077f2d6248030c1ab70d08b4d6
+  data.tar.gz: d5fbd8de69aeeef43f4690e3ad84dff02c89dbe7215bb95b87dbd451915f88f5bf73a4a25499b186376b089b0afad5fc1c80e738fc89e24610102ecb47d61199

data/README.md

@@ -11,12 +11,12 @@ Kill Bill compatibility
 | 0.14.y       | 0.16.z            |
 | 0.15.y       | 0.18.z (Rails 4)  |
 | 0.16.y       | 0.18.z (Rails 5)  |
-
+| 1.x.y        | 0.19.z            |
 
 Dependencies
 ------------
 
-Ruby 2.2.2+ or JRuby 9.1.9.0+ required.
+Ruby 2.4.2+ or JRuby 9.1.14.0+ required.
 
 Running Kaui locally
 ---------------------

data/app/assets/javascripts/application.js

@@ -13,5 +13,5 @@
 //= require twitter/bootstrap
 //= require bootstrap-datepicker
 //= require kaui/bootstrap-tweaks
-//= require kaui/validation
+//= require mustache
 //= require kaui/kaui

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

@@ -183,4 +183,81 @@ jQuery(document).ready(function ($) {
         }
     }
 
-})
+    // Restrict numeric input for a text field
+    // Using "constraint validation API" to restrict input
+    $("input[type=number]").keydown(function(event) {
+        $(this).data('oldData', $(this).val());
+    }).keyup(function(event) {
+        if (event.currentTarget.validity.badInput) {
+            $(this).val($(this).data('oldData'));
+        }
+    });
+
+    // this will register a global ajax error for all jquery ajax requests (not including DataTable)
+    $( document ).ajaxError(function( event, jqxhr, settings, thrownError ) {
+        if (jqxhr.status == 0) {
+            return;
+        }
+        
+        var message = 'Request Status: ' + jqxhr.status + ' Status Text: ' + jqxhr.statusText + ' ' + jqxhr.responseText;
+
+        if (jqxhr.status == 200) {
+            message = thrownError.message == undefined ? thrownError : thrownError.message;
+        }
+        ajaxAlert(message);
+    });
+
+    // 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);
+    })
+
+});
+
+// global function used to show a error message that occurs on a Ajax call
+function ajaxAlert(message) {
+    // 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);
+    messageBox.show();
+    messageBox.find("button").click(function(){
+        ajaxCloseAlert(messageBox);
+    });
+}
+
+function ajaxCloseAlert(messageBox) {
+    var messageBox = messageBox || $("#ajaxAlert");
+    messageBox.find("#ajaxErrorMessage").text('');
+    messageBox.hide();
+}
+
+// global helper function to validate if a variable is null or empty or undefined
+function isNullOrUndefined(value) {
+    if (value == undefined || value == null) {
+        return true;
+    }
+    return false;
+}
+
+function isBlank(value) {
+    if (isNullOrUndefined(value)) {
+        return true;
+    }
+
+    if (jQuery.type(value) === "string" && value.trim().length == 0) {
+        return true;
+    } else if (jQuery.type(value) === "array" && value.length == 0) {
+        return true;
+    } else if (jQuery.type(value) === "object" && jQuery.isEmptyObject(value)) {
+        return true;
+    } else {
+        return false;
+    }
+}

data/app/assets/stylesheets/bootstrap_and_overrides.css.less

@@ -37,3 +37,8 @@
 //
 // Example:
 // @link-color: #ff0000;
+
+// popover max width
+.popover {
+  max-width: 350px;
+}

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

@@ -17,4 +17,24 @@ h1 span.account-child-label{
   background-color: transparent;
   color: #2a6496;
 
+}
+
+.title-nav-area {
+  .container {
+    p {
+      padding-left: 20px;
+      padding-right: 20px;
+    }
+
+    a {
+      max-width: 125px;
+      min-width: 90px;
+      padding: 12px 12px;
+      text-align: center;
+    }
+
+    span.label-danger {
+      margin: 8px;
+    }
+  }
 }

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

@@ -0,0 +1,38 @@
+#showHistoryModal
+{
+  #templatesPlaceHolder
+  {
+    display: flex;
+
+    .panel {
+      margin-left: 5px;
+
+      .panel-heading {
+        white-space: nowrap;
+      }
+    }
+
+    .list-group-item {
+      padding: 5px;
+      min-height: 32px;
+      overflow-x: hidden;
+      white-space: nowrap;
+    }
+
+    #templateFieldsPlaceHolder {
+      .list-group-item {
+        span {
+          text-transform: capitalize;
+          font-weight: bold;
+        }
+      }
+    }
+
+    #templatePlaceHolder
+    {
+      display: flex;
+      overflow-x: auto;
+    }
+
+  }
+}

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

@@ -530,3 +530,106 @@ hr.breathe {
     margin-top: 45px;
     margin-bottom: 45px;
 }
+
+form[id^="new_tag_definition"] {
+  div:first-of-type {
+    margin-bottom: 0;
+  }
+
+  #object_types {
+    div {
+      margin-bottom: 15px;
+
+      .tag-definition-add-link {
+        padding-right: 0;
+      }
+
+      .tag-definition-select {
+        display: inline-block;
+        width: calc(~"100% - 25px");
+      }
+    }
+  }
+}
+
+/* The switch - the box around the slider */
+.switch {
+  position: relative;
+  display: inline-block;
+  width: 36px;
+  height: 20px;
+
+
+  /* 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: 16px;
+    width: 16px;
+    left: 2px;
+    bottom: 2px;
+    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(16px);
+  -ms-transform: translateX(16px);
+  transform: translateX(16px);
+}
+
+/* Rounded sliders */
+.slider.round {
+  border-radius: 26px;
+}
+
+.slider.round:before {
+  border-radius: 50%;
+}
+
+.ui-helper-hidden-accessible {
+  display: none;
+}
+
+.autocomplete-allowed-user, .autocomplete-override {
+    list-style: none;
+    padding-left: 10px;
+}
+
+.plugin-suggestion{
+  white-space: nowrap;
+}
+
+.toggle-container{
+  padding-right: 0;
+  width: 55px;
+}
+
+.toggle-label {
+  text-align: left !important;
+}

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

@@ -23,6 +23,25 @@
         }
     }
 
+    table.table-colored-rows {
+        tr.insert {
+            background-color: #dff0d8;
+        }
+        tr.update {
+            background-color: #fcf8e3;
+        }
+        tr.delete {
+            background-color: #f2dede;
+        }
+
+        th, td {
+
+            &:first-of-type {
+                padding-left: 20px;
+            }
+        }
+    }
+
     tr.disabled {
         background-color: #f5f5f5;
     }

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

@@ -16,4 +16,6 @@
 @import "datatable.less";
 
 @import "account.less";
-@import "overdue.less";
+@import "overdue.less";
+
+@import "audit.less";

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

@@ -2,4 +2,19 @@ table tr.expired {
     td {
         color: #cccccc;
     }
+}
+
+#cancel_subscription_by_date_modal {
+  .modal-footer {
+    text-align: left;
+    padding-bottom: 0;
+
+    .alert {
+      margin-bottom: 0;
+
+      .label-default {
+        color: white;
+      }
+    }
+  }
 }

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

@@ -169,7 +169,36 @@
             position: relative;
         }
         .tag-select-box {
-            width: 170px;
+          word-break: keep-all;
+          white-space: nowrap;
         }
     }
 }
+
+.inline-row-tag-bar{
+    padding-left: 10px !important;
+
+    .tag-bar {
+
+      .tag-select {
+        span {
+          padding: 5px;
+          border-right: none;
+
+          i {
+            margin: 0 3px;
+            font-size: 12px;
+
+            &.fa-tag {
+              font-size: 12px;
+            }
+          }
+        }
+      }
+      .tag-select-box {
+        label {
+          white-space: nowrap;
+        }
+      }
+    }
+}

data/app/controllers/kaui/account_custom_fields_controller.rb

@@ -0,0 +1,24 @@
+class Kaui::AccountCustomFieldsController < Kaui::EngineController
+
+  def index
+    cached_options_for_klient = options_for_klient
+    account = Kaui::Account::find_by_id_or_key(params.require(:account_id), true, true, cached_options_for_klient)
+    custom_fields = account.all_custom_fields(nil, 'NONE', cached_options_for_klient)
+
+
+    formatter = lambda do |custom_field|
+      url_for_object = view_context.url_for_object(custom_field.object_id, custom_field.object_type)
+      [
+          url_for_object ? view_context.link_to(custom_field.object_id, url_for_object) : custom_field.object_id,
+          custom_field.object_type,
+          custom_field.name,
+          custom_field.value
+      ]
+    end
+    @custom_fields_json = []
+    custom_fields.each { |page| @custom_fields_json << formatter.call(page) }
+
+    @custom_fields_json = @custom_fields_json.to_json
+  end
+
+end

data/app/controllers/kaui/account_tags_controller.rb

@@ -1,5 +1,26 @@
 class Kaui::AccountTagsController < Kaui::EngineController
 
+  def index
+    cached_options_for_klient = options_for_klient
+    account = Kaui::Account::find_by_id_or_key(params.require(:account_id), true, true, cached_options_for_klient)
+    tags = account.all_tags(nil, false, 'NONE', cached_options_for_klient)
+
+
+    formatter = lambda do |tag|
+      url_for_object = view_context.url_for_object(tag.object_id, tag.object_type)
+      [
+          tag.tag_id,
+          url_for_object ? view_context.link_to(tag.object_id, url_for_object) : tag.object_id,
+          tag.object_type,
+          tag.tag_definition_name
+      ]
+    end
+    @tags_json = []
+    tags.each { |page| @tags_json << formatter.call(page) }
+
+    @tags_json = @tags_json.to_json
+  end
+
   def edit
     @account_id = params.require(:account_id)
 

data/app/controllers/kaui/accounts_controller.rb

@@ -38,8 +38,13 @@ class Kaui::AccountsController < Kaui::EngineController
     end
 
     formatter = lambda do |account|
+      child_label = ''
+      unless account.parent_account_id.nil?
+        child_label = account.parent_account_id.nil? ? '' : view_context.content_tag(:span, 'Child', class: ['label', 'label-info', 'account-child-label'])
+      end
+
       [
-          account.parent_account_id.nil? ? 0 : 1,
+          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),
           account.external_key,
@@ -125,7 +130,7 @@ class Kaui::AccountsController < Kaui::EngineController
     @payment_methods = wait(fetch_payment_methods_with_details).map { |pm_f| pm_f.execute }.map { |pm_f| wait(pm_f) }.reject { |pm| pm.nil? }
     @available_tags = wait(fetch_available_tags)
     @children = wait(fetch_children)
-    @account_parent = wait(fetch_parent) unless @account.parent_account_id.nil?
+    @account_parent = @account.parent_account_id.nil? ? nil : wait(fetch_parent)
     @email_notification_configuration = wait(fetch_email_notification_configuration) if is_email_notifications_plugin_available
 
     @last_transaction_by_payment_method_id = {}
@@ -142,6 +147,27 @@ class Kaui::AccountsController < Kaui::EngineController
     params.permit!
   end
 
+  def destroy
+    account_id = params.require(:account_id)
+    options = params[:options] || []
+
+    cancel_subscriptions = options.include?('cancel_all_subscriptions')
+    writeoff_unpaid_invoices = options.include?('writeoff_unpaid_invoices')
+    item_adjust_unpaid_invoices = options.include?('item_adjust_unpaid_invoices')
+    cached_options_for_klient = options_for_klient
+
+    begin
+      @account = Kaui::Account::find_by_id_or_key(account_id, false, false, cached_options_for_klient)
+      @account.close(cancel_subscriptions, writeoff_unpaid_invoices, item_adjust_unpaid_invoices, current_user.kb_username, nil, nil, cached_options_for_klient );
+
+      flash[:notice] = "Account #{account_id} successfully closed"
+    rescue => e
+      flash[:error] = "Error while closing account: #{as_string(e)}"
+    end
+
+    redirect_to account_path(account_id)
+  end
+
   def trigger_invoice
     account_id = params.require(:account_id)
     target_date = params[:target_date].presence
@@ -171,8 +197,10 @@ class Kaui::AccountsController < Kaui::EngineController
 
   # Fetched asynchronously, as it takes time. This also helps with enforcing permissions.
   def next_invoice_date
-    next_invoice = Kaui::Invoice.trigger_invoice_dry_run(params.require(:account_id), nil, true, options_for_klient)
-    render :json => next_invoice ? next_invoice.target_date.to_json : nil
+    json_response do
+      next_invoice = Kaui::Invoice.trigger_invoice_dry_run(params.require(:account_id), nil, true, options_for_klient)
+      next_invoice ? next_invoice.target_date.to_json : nil
+    end
   end
 
   def edit
@@ -211,15 +239,16 @@ class Kaui::AccountsController < Kaui::EngineController
   end
 
   def validate_external_key
-    external_key = params.require(:external_key)
+    json_response do
+      external_key = params.require(:external_key)
 
-    begin
-      account = Kaui::Account::find_by_external_key(external_key, false, false, options_for_klient)
-    rescue KillBillClient::API::NotFound
-      account = nil
+      begin
+        account = Kaui::Account::find_by_external_key(external_key, false, false, options_for_klient)
+      rescue KillBillClient::API::NotFound
+        account = nil
+      end
+      {:is_found => !account.nil?}
     end
-    render json: {:is_found => !account.nil?}
-
   end
 
   def link_to_parent
@@ -283,10 +312,8 @@ class Kaui::AccountsController < Kaui::EngineController
   end
 
   def events_to_consider
-    data = Kenui::EmailNotificationService.get_events_to_consider(options_for_klient)
-
-    respond_to do |format|
-      format.json { render json: { data: data} }
+    json_response do
+      { data: Kenui::EmailNotificationService.get_events_to_consider(options_for_klient) }
     end
   end
 
@@ -297,7 +324,7 @@ class Kaui::AccountsController < Kaui::EngineController
 
       is_available = Kenui::EmailNotificationService.email_notification_plugin_available?(options_for_klient).first
       return is_available, is_available ? nil : error_message
-    rescue => e
+    rescue
       return false, error_message
     end