zydronium/internetee-registry
1
0
Fork 0
mirror of https://github.com/internetee/registry.git synced 2025-05-17 09:57:23 +02:00
Code Issues Projects Releases Packages Wiki Activity

Make date until inclusive in invoice search, registrar #2666

Browse source
This commit is contained in:
Martin Lensment 2015-07-29 11:59:35 +03:00
parent 00cfbbdc7f
commit 812daff1e5
2 changed files with 25 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

3
app/assets/javascripts/shared/general.coffee
View file

@ -22,8 +22,7 @@ $(document).on 'page:change', ->
tomorrow.setDate(today.getDate() + 1) tomorrow.setDate(today.getDate() + 1)
$('.datepicker').datepicker( $('.datepicker').datepicker(
dateFormat: "yy-mm-dd", dateFormat: "yy-mm-dd"
maxDate: tomorrow
) )
if $('.js-combobox').length if $('.js-combobox').length

31
app/controllers/registrar/invoices_controller.rb
View file

@ -6,15 +6,15 @@ class Registrar::InvoicesController < RegistrarController
def index def index
params[:q] ||= {} params[:q] ||= {}
invoices = current_user.registrar.invoices.includes(:invoice_items, :account_activity) invoices = current_user.registrar.invoices.includes(:invoice_items, :account_activity)
params[:q][:sum_cache_gteq].gsub!(',', '.') if params[:q][:sum_cache_gteq]
params[:q][:sum_cache_lteq].gsub!(',', '.') if params[:q][:sum_cache_lteq] normalize_search_parameters do
@q = invoices.search(params[:q]) @q = invoices.search(params[:q])
@q.sorts = 'id desc' if @q.sorts.empty? @q.sorts = 'id desc' if @q.sorts.empty?
@invoices = @q.result.page(params[:page]) @invoices = @q.result.page(params[:page])
end
end end
def show def show; end
end
def forward def forward
@invoice.billing_email = @invoice.buyer.billing_email @invoice.billing_email = @invoice.buyer.billing_email
@ -51,4 +51,21 @@ class Registrar::InvoicesController < RegistrarController
def set_invoice def set_invoice
@invoice = Invoice.find(params[:id]) @invoice = Invoice.find(params[:id])
end end
def normalize_search_parameters
params[:q][:sum_cache_gteq].gsub!(',', '.') if params[:q][:sum_cache_gteq]
params[:q][:sum_cache_lteq].gsub!(',', '.') if params[:q][:sum_cache_lteq]
ca_cache = params[:q][:due_date_lteq]
begin
end_time = params[:q][:due_date_lteq].try(:to_date)
params[:q][:due_date_lteq] = end_time.try(:end_of_day)
rescue
logger.warn('Invalid date')
end
yield
params[:q][:due_date_lteq] = ca_cache
end
end end