kaui 3.0.3 → 3.0.5

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

@@ -1,14 +1,11 @@
 <div class="search">
-
   <div class="column-block">
-
     <h1>Invoices</h1>
-
-    <table id="invoices-table" class="table table-condensed mobile-data">
+    <%= render :partial => 'multi_functions_bar' %>
+    <table id="invoices-table" class="table table-condensed mobile-data" style="width:100%">
       <thead>
       <tr>
-        <th>Number</th>
-        <% (@account.account_id.blank? ? Kaui.invoice_search_columns : Kaui.account_invoices_columns).call()[0].each do |title| %>
+        <% Kaui.account_invoices_columns.call[0].each do |title| %>
           <th><%= title %></th>
         <% end %>
       </tr>
@@ -19,30 +16,44 @@
       </tr>
       </tbody>
     </table>
-
   </div>
-
 </div>
 
+<style>
+  #invoices-table td, #invoices-table tr {
+    white-space: nowrap;
+  }
+</style>
+
 <%= javascript_tag do %>
 $(document).ready(function() {
+  var stateKey = 'DataTables_invoices-table';
+  var state = JSON.parse(localStorage.getItem(stateKey));
+  if (state) {
+    state.start = <%= @offset %>;
+    state.search = { search: "<%= @search_query %>" };
+    localStorage.setItem(stateKey, JSON.stringify(state));
+  }
+
   var table = $('#invoices-table').DataTable({
-    <% if @account.account_id.blank? %>
-        "dom": "<'row'r>t<'row'<'col-md-6'i><'col-md-6'p>>",
-        "pagingType": <% if @max_nb_records.nil? -%>"simple"<% else -%>"full_numbers"<% end -%>,
-        "language": {
-          <!-- See DefaultPaginationSqlDaoHelper.java -->
-          "info": <% if @max_nb_records.nil? -%>"Showing _START_ to _END_ of <%= number_with_delimiter(Kaui::EngineControllerUtil::SIMPLE_PAGINATION_THRESHOLD) -%>+ entries"<% else -%>"Showing _START_ to _END_ of _TOTAL_ entries"<% end -%>
-        },
-        "pageLength": <%= @limit %>,
-        "displayStart": <%= @offset %>,
-        "ajax": "<%= invoices_pagination_path(:ordering => @ordering, :format => :json) %>",
-    <% else %>
-        // No paging for per-account listings
-        "dom": "t",
-        "paging": false,
-        "ajax": "<%= invoices_pagination_path :format => :json %>",
-    <% end %>
+    "colReorder": {
+      "enable": false
+    },
+    "stateSave": true,
+    "stateSaveCallback": function(settings, data) {
+      localStorage.setItem('DataTables_invoices-table', JSON.stringify(data));
+    },
+    "stateLoadCallback": function(settings) {
+      return JSON.parse(localStorage.getItem('DataTables_invoices-table'));
+    },
+    "scrollX": true,
+    "dom": "<'row'r>t<'row'<'col-md-6'i><'col-md-6'p>>",
+    "pagingType": <% if @max_nb_records.nil? -%>"simple"<% else -%>"full_numbers"<% end -%>,
+    "language": {
+      "info": <% if @max_nb_records.nil? -%>"Showing _START_ to _END_ of <%= number_with_delimiter(Kaui::EngineControllerUtil::SIMPLE_PAGINATION_THRESHOLD) -%>+ entries"<% else -%>"Showing _START_ to _END_ of _TOTAL_ entries"<% end -%>
+    },
+    "pageLength": <%= @limit %>,
+    "displayStart": <%= @offset %>,
     <% if @search_query.blank? %>
         "ordering": false,
     <% elsif !@ordering.blank? %>
@@ -51,6 +62,20 @@ $(document).ready(function() {
     "processing": true,
     "serverSide": true,
     "search": {"search": "<%= @search_query %>"},
+    "ajax": {
+      url: "<%= invoices_pagination_path(:ordering => @ordering, :format => :json) %>",
+      dataSrc: function(json) {
+        var colOrder = table.colReorder.order();
+        var reorderedData = json.data.map(function(row) {
+          var newRow = [];
+          for (var i = 0; i < colOrder.length; i++) {
+            newRow.push(row[colOrder[i]]);
+          }
+          return newRow;
+        });
+        return reorderedData;
+      }
+    }
   });
 
   <!-- When we don't know the total number of pages, we need to hide the legend and next button manually -->

data/app/views/kaui/payments/_multi_functions_bar.html.erb

@@ -0,0 +1,323 @@
+<div class="dropdown-container">
+    <button class="btn btn-default download-button-right" type="button" id="modalDownloadButton">
+      <i class="glyphicon glyphicon-download-alt"></i>
+      <strong>Download CSV</strong>
+    </button>
+  <div class="dropdown">
+    <button class="btn btn-default dropdown-toggle toggle-button-right" type="button" id="dropdownMenu1" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
+      <i class="glyphicon glyphicon-cog"></i>
+      <strong>Edit Columns</strong>
+    </button>
+    <ul class="dropdown-menu" id="column-visibility" aria-labelledby="v">
+      <%  Kaui.account_payments_columns.call()[0].each_with_index do |title, index| %>
+          <li class="list-group-item-manual" data-id="<%= index %>">
+            <label class="label-group-item-manual">
+              <input type="checkbox" class="column-toggle" draggable="true" data-column="<%= index %>" checked> <%= title %>
+              <span class="glyphicon glyphicon-option-vertical icon-drag" aria-hidden="true"></span>
+            </label>
+          </li>
+      <% end %>
+    </ul>
+  </div>
+</div>
+
+<div class="modal fade" id="downloadCsvModal" tabindex="-1" role="dialog" aria-labelledby="downloadCsvModalLabel" aria-hidden="true">
+  <div class="modal-dialog" role="document">
+    <div class="modal-content">
+      <div class="modal-header">
+        <h3 class="modal-title" id="downloadCsvModalLabel">Download</h3>
+        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+          <span aria-hidden="true">&times;</span>
+        </button>
+      </div>
+      <div class="modal-body">
+        <form id="downloadCsvForm">
+          <div class="row">
+            <div class="col-md-6">
+              <div class="form-group">
+                <label for="startDate">Payment Date From:</label>
+                <input type="text" class="form-control" id="startDate" name="startDate">
+              </div>
+            </div>
+            <div class="col-md-6">
+              <div class="form-group">
+                <label for="endDate">To:</label>
+                <input type="text" class="form-control" id="endDate" name="endDate">
+              </div>
+            </div>
+          </div>
+          <div class="row">
+            <div class="col-md-6">
+              <div class="form-check">
+                <div>
+                  <input type="radio" id="customDate" name="download_option" value="customDate">
+                  <label for="customDate">Custom date</label>
+                </div>
+                <div>
+                  <input type="radio" id="allData" name="download_option" value="all">
+                  <label for="allData">All payments</label>
+                </div>
+                <div>
+                  <input type="radio" id="thisWeek" name="download_option" value="thisWeek">
+                  <label for="thisWeek">This week</label>
+                </div>
+                <div>
+                  <input type="radio" id="thisMonth" name="download_option" value="thisMonth">
+                  <label for="thisMonth">This month</label>
+                </div>
+                <div>
+                  <input type="radio" id="thisYear" name="download_option" value="thisYear">
+                  <label for="thisYear">This year</label>
+                </div>
+              </div>
+            </div>
+          </div>
+          <div class="row">
+            <div class="col-md-12">
+              <h5>Additional Options</h5>
+            </div>
+          </div>
+          <div class="row">
+            <div class="col-md-6">
+              <div class="form-check">
+                <input type="checkbox" class="form-check-input" id="allFields" name="allFields">
+                <label class="form-check-label" for="allFields">All fields</label>
+              </div>
+            </div>
+          </div>
+        </form>
+      </div>
+      <div class="modal-footer">
+        <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
+        <button type="button" class="btn btn-primary" id="downloadButton">Download</button>
+      </div>
+    </div>
+  </div>
+</div>
+
+<style>
+  .dropdown-menu#column-visibility {
+    max-height: 300px;
+    width: 220px;
+    overflow-y: auto;
+  }
+  
+  .dropdown-menu {
+    padding: 5px;
+  }
+
+  .dropdown-menu#column-visibility::before {
+    content: 'Drag to reorder columns';
+    display: block;
+    height: 30px;
+    text-align: center;
+    color: darkgrey;
+    padding-top: 5px;
+  }
+
+  .toggle-button-right {
+    float: right;
+    margin-bottom: 10px;
+    margin-left: 10px;
+    background-color: white;
+    color: black;
+    text-transform: none;
+    border: 1px solid #ccc;
+    padding: 8px 15px;
+  }
+
+  .download-button-right {
+    float: right;
+    margin-bottom: 10px;
+    margin-left: 10px;
+    background-color: white;
+    color: black;
+    text-transform: none;
+    border: 1px solid #ccc;
+    padding: 8px 15px;
+  }
+
+  .icon-drag {
+    float: right;
+    padding: 5px;
+  }
+
+  .dropdown-container {
+    display: flex;
+    justify-content: flex-end;
+  }
+
+  .label-group-item-manual {
+    margin: 5px;
+    width: -webkit-fill-available;
+    cursor: grab;
+  }
+  .label-group-item-manual:active {
+      cursor: grabbing;
+  }
+</style>
+
+<%= javascript_tag do %>
+$(document).ready(function() {
+  $('.dropdown-menu').on('click', 'input[type="checkbox"], label', function(event) {
+    event.stopPropagation();
+  });
+
+  $('#modalDownloadButton').click(function() {
+    $('#downloadCsvModal').modal('show');
+  });
+
+  $('#startDate, #endDate').datepicker({
+    dateFormat: 'yy-mm-dd'
+  });
+
+  $('#downloadCsvModal').on('show.bs.modal', function (e) {
+    $('#allData').prop('checked', true);
+    $('#startDate, #endDate').prop('disabled', true);
+    $('#startDate').val(null);
+    $('#endDate').val(null);
+  });
+
+  $('#allData').change(function() {
+    $('#startDate').val(null);
+    $('#endDate').val(null);
+    $('#startDate, #endDate').prop('disabled', true);
+  });
+
+  $('#thisWeek').change(function() {
+    if ($(this).is(':checked')) {
+      setDateRange("week");
+    }
+  });
+
+  $('#thisMonth').change(function() {
+    if ($(this).is(':checked')) {
+      setDateRange("month");
+    }
+  });
+
+  $('#thisYear').change(function() {
+    if ($(this).is(':checked')) {
+      setDateRange("year");
+    }
+  });
+
+  $('#customDate').change(function() {
+    if ($(this).is(':checked')) {
+      setDateRange("day");
+      $('#startDate, #endDate').prop('disabled', false);
+    }
+  });
+
+  var downloadButton = document.getElementById('downloadButton');
+  if (downloadButton) {
+    downloadButton.addEventListener('click', function() {
+      event.preventDefault();
+
+      var allFieldsChecked = document.getElementById('allFields').checked;
+      var startDate = $('#startDate').val();
+      var endDate = $('#endDate').val();
+      var downloadAll = $('#allData').is(':checked');
+      var thElements = document.querySelectorAll('#payments-table th');
+      var columnTitles = Array.from(thElements).map(function(th) {
+        return th.textContent.trim();
+      });
+      var columnsString = columnTitles.join(',')
+
+      var url = new URL("<%= download_payments_path %>", window.location.origin);
+      var params = new URLSearchParams();
+      params.append('account_id', "<%=@account.account_id%>");
+      params.append('columnsString', columnsString);
+      if (!downloadAll) {
+        params.append('startDate', startDate);
+        params.append('endDate', endDate);
+      }
+      params.append('allFieldsChecked', allFieldsChecked);
+      url.search = params.toString();
+      console.log(url.toString());
+      window.open(url.toString(), '_blank');
+    });
+  }
+
+  updateDropdownOrder();
+
+  function loadState() {
+    var state = JSON.parse(localStorage.getItem('DataTables_payments-table'));
+    return state || { columns: [], columnOrder: [] };
+  }
+
+  function updateDropdownOrder() {
+    var state = loadState();
+    var columnOrder = state.ColReorder;
+    var $list = $('#column-visibility');
+    var thElements = document.querySelectorAll('#payments-table th');
+    var $columnTitles = Array.from(thElements).map(function(th) {
+      return th.textContent.trim();
+    });
+    if (columnOrder !== undefined) {
+      $list.empty();
+      columnOrder.forEach(function(colIdx, index) {
+        var $item = $('<li>', { class: "list-group-item-manual", "data-id": index });
+        var column = state.columns[colIdx];
+        var col_name = $columnTitles[colIdx];
+        var $label = $('<label>', {
+          class: "label-group-item-manual",
+          });
+        var $checkbox = $("<input>", {
+          type: "checkbox",
+          value: colIdx,
+          checked: column.visible,
+          "data-column": colIdx,
+          class: "column-toggle"
+        });
+        $label.append($checkbox).append(" " + col_name);
+        var $icon = $("<span>", { class: "glyphicon glyphicon-option-vertical icon-drag"});
+        $label.append($icon);
+        $item.append($label);
+        $list.append($item);
+      });
+    }
+    resetDataColumn();
+    resetDataId();
+  }
+
+  $("#column-visibility").sortable({
+    axis: "y",
+    containment: "parent",
+    stop: function(event, ui) {
+      var order = $("#column-visibility").sortable('toArray', {attribute: 'data-id'});
+      reorderTableColumns(order);
+    }
+  });
+  $("#column-visibility").disableSelection();
+
+  function reorderTableColumns(order) {
+    var table = $('#payments-table').DataTable();
+    var columnIndexes = order.map(Number);
+    console.log('New column order:', columnIndexes);
+    table.colReorder.order(columnIndexes);
+    resetDataColumn();
+    resetDataId();
+  }
+
+  function resetDataId() {
+    var elements = document.querySelectorAll('.list-group-item-manual');
+    elements.forEach(function(element, index) {
+      element.setAttribute('data-id', index);
+    });
+  }
+
+  function resetDataColumn() {
+    var elements = document.querySelectorAll('.column-toggle');
+    elements.forEach(function(element, index) {
+      element.setAttribute('data-column', index);
+    });
+  }
+
+  $('.column-toggle').on('change', function() {
+    var table = $('#payments-table').DataTable();
+    var column = table.column($(this).attr('data-column'));
+    column.visible(!column.visible());
+  });
+});
+<% end %>

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

@@ -1,20 +1,14 @@
 <div class="search">
-
   <div class="column-block">
-
     <h1><%= I18n.translate('payments') %></h1>
-
-    <table id="payments-table" class="table table-condensed mobile-data">
+    <%= render :partial => 'multi_functions_bar' %>
+    <table id="payments-table" class="table table-condensed mobile-data" style="width:100%">
       <thead>
-      <tr>
-        <th><%= I18n.translate('number') %></th>
-        <th><%= I18n.translate('date') %></th>
-        <th><%= I18n.translate('auth_amount') %></th>
-        <th><%= I18n.translate('capture_amount') %></th>
-        <th><%= I18n.translate('refund_amount') %></th>
-        <th><%= I18n.translate('last_transaction_status') %></th>
-        <th><%= I18n.translate('external_key') %></th>
-      </tr>
+        <tr>
+          <% Kaui.account_payments_columns.call()[0].each do |title| %>
+            <th><%= title %></th>
+          <% end %>
+        </tr>
       </thead>
       <tbody>
       <tr>
@@ -22,34 +16,83 @@
       </tr>
       </tbody>
     </table>
-
   </div>
-
 </div>
 
+<style>
+  #payments-table td, #payments-table tr {
+    white-space: nowrap;
+  }
+</style>
+
 <%= javascript_tag do %>
 $(document).ready(function() {
+  var stateKey = 'DataTables_payments-table';
+  var state = JSON.parse(localStorage.getItem(stateKey));
+  if (state) {
+    state.start = <%= @offset %>;
+    state.search = { search: "<%= @search_query %>" };
+    localStorage.setItem(stateKey, JSON.stringify(state));
+  }
+
   var table = $('#payments-table').DataTable({
+    "colReorder": {
+      "enable": false
+    },
+    "stateSave": true,
+    "stateSaveCallback": function(settings, data) {
+      localStorage.setItem('DataTables_payments-table', JSON.stringify(data));
+    },
+    "stateLoadCallback": function(settings) {
+      return JSON.parse(localStorage.getItem('DataTables_payments-table'));
+    },
+    "scrollX": true,
     <% if @account.account_id.blank? %>
-        "dom": "<'row'r>t<'row'<'col-md-6'i><'col-md-6'p>>",
-        "pagingType": <% if @max_nb_records.nil? -%>"simple"<% else -%>"full_numbers"<% end -%>,
-        "language": {
-          <!-- See DefaultPaginationSqlDaoHelper.java -->
-          "info": <% if @max_nb_records.nil? -%>"Showing _START_ to _END_ of <%= number_with_delimiter(Kaui::EngineControllerUtil::SIMPLE_PAGINATION_THRESHOLD) -%>+ entries"<% else -%>"Showing _START_ to _END_ of _TOTAL_ entries"<% end -%>
-        },
-        "pageLength": <%= @limit %>,
-        "displayStart": <%= @offset %>,
-        "ajax": "<%= payments_pagination_path(:ordering => @ordering, :format => :json) %>",
+      "dom": "<'row'r>t<'row'<'col-md-6'i><'col-md-6'p>>",
+      "pagingType": <% if @max_nb_records.nil? -%>"simple"<% else -%>"full_numbers"<% end -%>,
+      "language": {
+        <!-- See DefaultPaginationSqlDaoHelper.java -->
+        "info": <% if @max_nb_records.nil? -%>"Showing _START_ to _END_ of <%= number_with_delimiter(Kaui::EngineControllerUtil::SIMPLE_PAGINATION_THRESHOLD) -%>+ entries"<% else -%>"Showing _START_ to _END_ of _TOTAL_ entries"<% end -%>
+      },
+      "pageLength": <%= @limit %>,
+      "displayStart": <%= @offset %>,
+      "ajax": {
+        url: "<%= payments_pagination_path(:ordering => @ordering, :format => :json) %>",
+        dataSrc: function(json) {
+          var colOrder = $('#payments-table').DataTable().colReorder.order();
+          var reorderedData = json.data.map(function(row) {
+            var newRow = [];
+            for (var i = 0; i < colOrder.length; i++) {
+              newRow.push(row[colOrder[i]]);
+            }
+            return newRow;
+          });
+          return reorderedData;
+        }
+      },
     <% else %>
-        // No paging for per-account listings
-        "dom": "t",
-        "paging": false,
-        "ajax": "<%= payments_pagination_path :format => :json %>",
+      // No paging for per-account listings
+      "dom": "t",
+      "paging": false,
+      "ajax": {
+        url: "<%= payments_pagination_path(:format => :json) %>",
+        dataSrc: function(json) {
+          var colOrder = $('#payments-table').DataTable().colReorder.order();
+          var reorderedData = json.data.map(function(row) {
+            var newRow = [];
+            for (var i = 0; i < colOrder.length; i++) {
+              newRow.push(row[colOrder[i]]);
+            }
+            return newRow;
+          });
+          return reorderedData;
+        }
+      },
     <% end %>
     <% if @search_query.blank? %>
-        "ordering": false,
+      "ordering": false,
     <% elsif !@ordering.blank? %>
-        "order": [[ 0, "<%= @ordering %>" ]],
+      "order": [[ 0, "<%= @ordering %>" ]],
     <% end %>
     "processing": true,
     "serverSide": true,

data/config/locales/en.yml

@@ -63,6 +63,9 @@ en:
       invalid_xml: "Invalid XML: %{error}"
       invalid_min_date: "Invalid min date format"
       invalid_max_date: "Invalid max date format"
+      unable_to_connect_database: "Unable to connect to the database."
+      unable_to_connect_killbill: "Unable to connect to the Kill Bill server."
+      error_communicating_killbill: "Error while communicating with the Kill Bill server."
   views:
     subscriptions:
       requested_date_for_billing_notice: <ul>

data/config/routes.rb

@@ -22,10 +22,13 @@ Kaui::Engine.routes.draw do
              controllers: { sessions: 'kaui/sessions', registrations: 'kaui/registrations' }
 
   root to: 'home#index', as: 'kaui'
+  get '/500', to: 'errors#show', code: 500
 
   scope '/accounts' do
     match '/pagination' => 'accounts#pagination', :via => :get, :as => 'accounts_pagination'
     match '/validate_external_key' => 'accounts#validate_external_key', :via => :get, :as => 'accounts_validate_external_key'
+    match '/download' => 'accounts#download', :via => :get, :as => 'download_accounts'
+    get '/export/:account_id', to: 'accounts#export_account', as: 'export_account'
 
     scope '/email_notifications' do
       match '/' => 'accounts#set_email_notifications_configuration', :via => :post, :as => 'email_notifications_configuration'
@@ -53,6 +56,7 @@ Kaui::Engine.routes.draw do
       end
       scope '/timeline' do
         match '/' => 'account_timelines#show', :via => :get, :as => 'account_timeline'
+        match '/download' => 'account_timelines#download', :via => :get, :as => 'download_account_timeline'
       end
       scope '/custom_fields' do
         match '/' => 'account_custom_fields#index', :via => :get, :as => 'account_custom_fields'
@@ -63,6 +67,7 @@ Kaui::Engine.routes.draw do
       end
       scope '/audit_logs' do
         match '/history' => 'audit_logs#history', :via => :get, :as => 'audit_logs_history'
+        match '/download' => 'audit_logs#download', :via => :get, :as => 'download_audit_logs'
       end
     end
   end
@@ -97,6 +102,7 @@ Kaui::Engine.routes.draw do
 
   scope '/invoices' do
     match '/pagination' => 'invoices#pagination', :via => :get, :as => 'invoices_pagination'
+    match '/download' => 'invoices#download', :via => :get, :as => 'download_invoices'
     match '/:id/show_html' => 'invoices#show_html', :via => :get, :as => 'show_html_invoice'
     match '/:number' => 'invoices#restful_show_by_number', :via => :get, :constraints => { number: /\d+/ }
     match '/:id' => 'invoices#restful_show', :via => :get, :as => 'invoice'
@@ -112,6 +118,7 @@ Kaui::Engine.routes.draw do
 
   scope '/payments' do
     match '/pagination' => 'payments#pagination', :via => :get, :as => 'payments_pagination'
+    match '/download' => 'payments#download', :via => :get, :as => 'download_payments'
     match '/:id' => 'payments#restful_show', :via => :get, :as => 'payment'
     match '/:id/cancel_scheduled_payment' => 'payments#cancel_scheduled_payment', :via => :delete, :as => 'payment_cancel_scheduled_payment'
   end

data/lib/kaui/error_handler.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+module Kaui
+  module ErrorHandler
+    extend ActiveSupport::Concern
+    include Kaui::EngineControllerUtil
+
+    included do
+      rescue_from(StandardError) do |error|
+        flash[:error] = "Error: #{as_string(error)}"
+        try_to_redirect_to_account_path = !params[:controller].ends_with?('accounts')
+        perform_redirect_after_error(redirect: try_to_redirect_to_account_path)
+      end
+
+      rescue_from(ActionController::ParameterMissing) do |parameter_missing_exception|
+        log_rescue_error parameter_missing_exception
+        flash[:error] = "Required parameter missing: #{parameter_missing_exception.param}"
+        perform_redirect_after_error
+      end
+
+      rescue_from(KillBillClient::API::ResponseError) do |killbill_exception|
+        flash[:error] = "Error while communicating with the Kill Bill server: #{as_string(killbill_exception)}"
+        try_to_redirect_to_account_path = !killbill_exception.is_a?(KillBillClient::API::Unauthorized) && !(killbill_exception.is_a?(KillBillClient::API::NotFound) && params[:controller].ends_with?('accounts'))
+        perform_redirect_after_error(redirect: try_to_redirect_to_account_path)
+      end
+    end
+
+    def perform_redirect_after_error(redirect: true)
+      account_id = nested_hash_value(params.permit!.to_h, :account_id)
+      if redirect && account_id.present?
+        redirect_to kaui_engine.account_path(account_id)
+      else
+        redirect_to kaui_engine.home_path
+      end
+    end
+  end
+end

data/lib/kaui/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Kaui
-  VERSION = '3.0.3'
+  VERSION = '3.0.5'
 end