diff --git a/app/controllers/kaui/accounts_controller.rb b/app/controllers/kaui/accounts_controller.rb index 7d196305..3ea15aba 100644 --- a/app/controllers/kaui/accounts_controller.rb +++ b/app/controllers/kaui/accounts_controller.rb @@ -49,9 +49,15 @@ def pagination end def download - columns = params.require(:columnsString).split(',').map { |attr| attr.split.join('_').downcase } start_date = params[:startDate] end_date = params[:endDate] + all_fields_checked = params[:allFieldsChecked] == 'true' + + columns = if all_fields_checked + KillBillClient::Model::AccountAttributes.instance_variable_get('@json_attributes') + else + params.require(:columnsString).split(',').map { |attr| attr.split.join('_').downcase } + end start_date = begin Date.parse(start_date) rescue StandardError diff --git a/app/controllers/kaui/invoices_controller.rb b/app/controllers/kaui/invoices_controller.rb index ac931640..674c5c1c 100644 --- a/app/controllers/kaui/invoices_controller.rb +++ b/app/controllers/kaui/invoices_controller.rb @@ -17,7 +17,13 @@ def download account_id = params[:account_id] start_date = params[:startDate] end_date = params[:endDate] - columns = params.require(:columnsString).split(',').map { |attr| attr.split.join('_').downcase } + all_fields_checked = params[:allFieldsChecked] == 'true' + columns = if all_fields_checked + KillBillClient::Model::InvoiceAttributes.instance_variable_get('@json_attributes') - Kaui::Invoice::TABLE_IGNORE_COLUMNS + else + params.require(:columnsString).split(',').map { |attr| attr.split.join('_').downcase } + end + kb_params = {} kb_params[:startDate] = Date.parse(start_date).strftime('%Y-%m-%d') if start_date kb_params[:endDate] = Date.parse(end_date).strftime('%Y-%m-%d') if end_date @@ -55,32 +61,27 @@ def pagination end account_id = (params[:search] || {})[:value] - if account_id.blank? - # Don't show amount and balance, and they will not be populated - data_extractor = lambda do |invoice, column| - [ - invoice.invoice_number.to_i, - invoice.invoice_date - ][column] - end - formatter = lambda do |invoice| - row = [view_context.link_to(invoice.invoice_number, view_context.url_for(controller: :invoices, action: :show, account_id: invoice.account_id, id: invoice.invoice_id))] - row += Kaui.invoice_search_columns.call(invoice, view_context, cached_options_for_klient)[1] - row - end - else - data_extractor = lambda do |invoice, column| - [ - invoice.invoice_number.to_i, - invoice.invoice_date, - invoice.amount, - invoice.balance, - invoice.status - ][column] - end - formatter = lambda do |invoice| - Kaui.account_invoices_columns.call(invoice, view_context)[1] - end + data_extractor = if account_id.blank? + lambda do |invoice, column| + [ + invoice.invoice_number.to_i, + invoice.invoice_date + ][column] + end + else + lambda do |invoice, column| + [ + invoice.invoice_number.to_i, + invoice.invoice_date, + invoice.amount, + invoice.balance, + invoice.status + ][column] + end + end + + formatter = lambda do |invoice| + Kaui.account_invoices_columns.call(invoice, view_context)[1] end paginate searcher, data_extractor, formatter diff --git a/app/controllers/kaui/payments_controller.rb b/app/controllers/kaui/payments_controller.rb index 3c61c796..c85a72f5 100644 --- a/app/controllers/kaui/payments_controller.rb +++ b/app/controllers/kaui/payments_controller.rb @@ -18,7 +18,13 @@ def download account_id = params[:account_id] start_date = params[:startDate] end_date = params[:endDate] - columns = params.require(:columnsString).split(',').map { |attr| attr.split.join('_').downcase } + all_fields_checked = params[:allFieldsChecked] == 'true' + columns = if all_fields_checked + KillBillClient::Model::PaymentAttributes.instance_variable_get('@json_attributes') - %w[transactions audit_logs] + else + params.require(:columnsString).split(',').map { |attr| attr.split.join('_').downcase } + end + kb_params = {} kb_params[:startDate] = Date.parse(start_date).strftime('%Y-%m-%d') if start_date kb_params[:endDate] = Date.parse(end_date).strftime('%Y-%m-%d') if end_date @@ -28,11 +34,12 @@ def download else payments = Kaui::Payment.list_or_search(nil, 0, MAXIMUM_NUMBER_OF_RECORDS_DOWNLOAD, options_for_klient.merge(params: kb_params)) end + payments.each do |payment| created_date = nil payment.transactions.each do |transaction| transaction_date = Date.parse(transaction.effective_date) - created_date = transaction_date if created_date.nil? || (transaction_date < created_date) + created_date ||= transaction_date if transaction_date < created_date end payment.payment_date = created_date end @@ -41,6 +48,8 @@ def download csv << columns payments.each do |payment| + next if start_date && end_date && (payment.payment_date < Date.parse(start_date) || payment.payment_date > Date.parse(end_date)) + data = columns.map do |attr| case attr when 'payment_number' diff --git a/app/models/kaui/invoice.rb b/app/models/kaui/invoice.rb index ac1f291b..3ca5eabd 100644 --- a/app/models/kaui/invoice.rb +++ b/app/models/kaui/invoice.rb @@ -2,6 +2,8 @@ module Kaui class Invoice < KillBillClient::Model::Invoice + TABLE_IGNORE_COLUMNS = %w[amount balance credit_adj refund_adj items is_parent_invoice parent_invoice_id parent_account_id].freeze + def self.build_from_raw_invoice(raw_invoice) result = Kaui::Invoice.new KillBillClient::Model::InvoiceAttributes.instance_variable_get('@json_attributes').each do |attr| diff --git a/app/views/kaui/account_timelines/_multi_functions_bar.html.erb b/app/views/kaui/account_timelines/_multi_functions_bar.html.erb index ec47e9e8..0d7634c2 100644 --- a/app/views/kaui/account_timelines/_multi_functions_bar.html.erb +++ b/app/views/kaui/account_timelines/_multi_functions_bar.html.erb @@ -9,7 +9,7 @@
- + @@ -19,13 +19,13 @@
- +
- +
@@ -39,7 +39,7 @@
- +
@@ -98,13 +98,15 @@ $(document).ready(function() { }); $('#downloadCsvModal').on('show.bs.modal', function (e) { - $('#customDate').prop('checked', true); - $('#startDate, #endDate').prop('disabled', false); + $('#allData').prop('checked', true); + $('#startDate, #endDate').prop('disabled', true); $('#startDate').val(null); $('#endDate').val(null); }); $('#allData').change(function() { + $('#startDate').val(null); + $('#endDate').val(null); var isChecked = $(this).is(':checked'); $('#startDate, #endDate').prop('disabled', true); }); @@ -113,7 +115,11 @@ $(document).ready(function() { var currentDate = new Date(); var startDate, endDate; - if (option === "week") { + if (option === "day") { + startDate = new Date(); + endDate = new Date(); + endDate.setDate(endDate.getDate() + 1); + } else if (option === "week") { startDate = new Date(currentDate.setDate(currentDate.getDate() - currentDate.getDay() + 1)); currentDate = new Date(); endDate = new Date(currentDate.setDate(currentDate.getDate() - currentDate.getDay() + 7)); @@ -152,10 +158,10 @@ $(document).ready(function() { }); $('#customDate').change(function() { - var isChecked = $(this).is(':checked'); - $('#startDate, #endDate').prop('disabled', false); - $('#startDate').val(null); - $('#endDate').val(null); + if ($(this).is(':checked')) { + setDateRange("day"); + $('#startDate, #endDate').prop('disabled', false); + } }); var downloadButton = document.getElementById('downloadButton'); diff --git a/app/views/kaui/accounts/_multi_functions_bar.html.erb b/app/views/kaui/accounts/_multi_functions_bar.html.erb index 0500801c..6919f114 100644 --- a/app/views/kaui/accounts/_multi_functions_bar.html.erb +++ b/app/views/kaui/accounts/_multi_functions_bar.html.erb @@ -25,7 +25,7 @@
- + @@ -35,13 +35,13 @@
- +
- +
@@ -54,8 +54,8 @@
- - + +
@@ -72,6 +72,19 @@
+
+
+
Additional Options
+
+
+
+
+
+ + +
+
+
@@ -150,13 +163,13 @@ $(document).ready(function() { }); $('#downloadCsvModal').on('show.bs.modal', function (e) { - $('#allAccounts').prop('checked', true); + $('#allData').prop('checked', true); $('#startDate, #endDate').prop('disabled', true); $('#startDate').val(null); $('#endDate').val(null); }); - $('#allAccounts').change(function() { + $('#allData').change(function() { var isChecked = $(this).is(':checked'); $('#startDate, #endDate').prop('disabled', true); }); @@ -165,7 +178,11 @@ $(document).ready(function() { var currentDate = new Date(); var startDate, endDate; - if (option === "week") { + if (option === "day") { + startDate = new Date(); + endDate = new Date(); + endDate.setDate(endDate.getDate() + 1); + } else if (option === "week") { startDate = new Date(currentDate.setDate(currentDate.getDate() - currentDate.getDay() + 1)); currentDate = new Date(); endDate = new Date(currentDate.setDate(currentDate.getDate() - currentDate.getDay() + 7)); @@ -204,32 +221,37 @@ $(document).ready(function() { }); $('#customDate').change(function() { - var isChecked = $(this).is(':checked'); - $('#startDate, #endDate').prop('disabled', false); - $('#startDate').val(null); - $('#endDate').val(null); + if ($(this).is(':checked')) { + setDateRange("day"); + $('#startDate, #endDate').prop('disabled', false); + } }); var downloadButton = document.getElementById('downloadButton'); if (downloadButton) { downloadButton.addEventListener('click', function() { - event.preventDefault(); // Prevent the default form submission if the button is a submit type + event.preventDefault(); - // Retrieve the values and checked state + var allFieldsChecked = document.getElementById('allFields').checked; var startDate = $('#startDate').val(); var endDate = $('#endDate').val(); - var downloadAll = $('#allAccounts').is(':checked'); + var downloadAll = $('#allData').is(':checked'); var thElements = document.querySelectorAll('#accounts-table th'); var columnTitles = Array.from(thElements).map(function(th) { return th.textContent.trim(); }); - var columnsString = columnTitles.join(',') - if (downloadAll) { - window.open("<%= download_accounts_path %>?columnsString="+columnsString, '_blank'); - } else { - window.open("<%= download_accounts_path %>?columnsString="+columnsString+"&startDate="+startDate+"&endDate="+endDate, '_blank'); + var url = new URL("<%= download_accounts_path %>", window.location.origin); + var params = new URLSearchParams(); + 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'); }); } diff --git a/app/views/kaui/audit_logs/_multi_functions_bar.html.erb b/app/views/kaui/audit_logs/_multi_functions_bar.html.erb index ea6e53ab..993254cb 100644 --- a/app/views/kaui/audit_logs/_multi_functions_bar.html.erb +++ b/app/views/kaui/audit_logs/_multi_functions_bar.html.erb @@ -9,7 +9,7 @@
- + @@ -19,13 +19,13 @@
- +
- +
@@ -133,13 +133,15 @@ $(document).ready(function() { }); $('#downloadCsvModal').on('show.bs.modal', function (e) { - $('#customDate').prop('checked', true); - $('#startDate, #endDate').prop('disabled', false); + $('#allData').prop('checked', true); + $('#startDate, #endDate').prop('disabled', true); $('#startDate').val(null); $('#endDate').val(null); }); $('#allData').change(function() { + $('#startDate').val(null); + $('#endDate').val(null); var isChecked = $(this).is(':checked'); $('#startDate, #endDate').prop('disabled', true); }); @@ -148,7 +150,11 @@ $(document).ready(function() { var currentDate = new Date(); var startDate, endDate; - if (option === "week") { + if (option === "day") { + startDate = new Date(); + endDate = new Date(); + endDate.setDate(endDate.getDate() + 1); + } else if (option === "week") { startDate = new Date(currentDate.setDate(currentDate.getDate() - currentDate.getDay() + 1)); currentDate = new Date(); endDate = new Date(currentDate.setDate(currentDate.getDate() - currentDate.getDay() + 7)); @@ -187,10 +193,10 @@ $(document).ready(function() { }); $('#customDate').change(function() { - var isChecked = $(this).is(':checked'); - $('#startDate, #endDate').prop('disabled', false); - $('#startDate').val(null); - $('#endDate').val(null); + if ($(this).is(':checked')) { + setDateRange("day"); + $('#startDate, #endDate').prop('disabled', false); + } }); var downloadButton = document.getElementById('downloadButton'); diff --git a/app/views/kaui/invoices/_multi_functions_bar.html.erb b/app/views/kaui/invoices/_multi_functions_bar.html.erb index 6a5144d2..b7abd8e0 100644 --- a/app/views/kaui/invoices/_multi_functions_bar.html.erb +++ b/app/views/kaui/invoices/_multi_functions_bar.html.erb @@ -1,17 +1,15 @@
- <% unless @account.account_id.blank? %> - - <% end %> +