diff --git a/app/controllers/agencies_controller.rb b/app/controllers/agencies_controller.rb index e4596a8..1ee854c 100644 --- a/app/controllers/agencies_controller.rb +++ b/app/controllers/agencies_controller.rb @@ -5,7 +5,7 @@ def index if params[:search] @search = Agency.search(params[:search]) else - @search = Agency.baja.search() + @search = Agency.search() end @entidads = @search.paginate :page => params[:page], :per_page =>10 respond_to do |format| @@ -26,4 +26,3 @@ def new end end - diff --git a/app/controllers/cambios_controller.rb b/app/controllers/cambios_controller.rb index 2399851..a0b96be 100644 --- a/app/controllers/cambios_controller.rb +++ b/app/controllers/cambios_controller.rb @@ -6,7 +6,7 @@ def index def new @cambio = Cambio.new - @search = Reserva.baja.search(:agency_id_eq=>0) + @search = Reserva.search(:agency_id_eq=>0) @reservas = @search.paginate :page => params[:page], :per_page =>10 end diff --git a/app/controllers/depositos_controller.rb b/app/controllers/depositos_controller.rb index 57af20e..92ce351 100644 --- a/app/controllers/depositos_controller.rb +++ b/app/controllers/depositos_controller.rb @@ -2,11 +2,11 @@ class DepositosController < InheritedResources::Base load_and_authorize_resource respond_to :html, :xml, :js, :json def index - @search = Deposito.baja.search(params[:search]) + @search = Deposito.search(params[:search]) @depositos = @search.paginate(:page=>params[:page], :per_page=>10) @depositos = @depositos.includes :entidad, :reserva => :pasajeros - @reservas_search = Reserva.baja.search() + @reservas_search = Reserva.search() @reservas = @reservas_search.paginate :page => params[:page], :per_page =>10 respond_to do |format| format.js diff --git a/app/controllers/entidads_controller.rb b/app/controllers/entidads_controller.rb index 761e550..5d4de5c 100644 --- a/app/controllers/entidads_controller.rb +++ b/app/controllers/entidads_controller.rb @@ -9,7 +9,7 @@ def index if params[:search] @search = Entidad.search(params[:search]) else - @search = Entidad.baja.search() + @search = Entidad.search() end @entidads = @search.paginate :page => params[:page], :per_page =>10 respond_to do |format| diff --git a/app/controllers/monedas_controller.rb b/app/controllers/monedas_controller.rb index 901a688..44ebe74 100644 --- a/app/controllers/monedas_controller.rb +++ b/app/controllers/monedas_controller.rb @@ -11,7 +11,7 @@ def index if params[:search] @search = Moneda.search(params[:search]) else - @search = Moneda.baja.search() + @search = Moneda.search() end @monedas = @search.paginate :page => params[:page], :per_page =>10 respond_to do |format| diff --git a/app/controllers/movimientos_controller.rb b/app/controllers/movimientos_controller.rb index 62ec505..498903e 100644 --- a/app/controllers/movimientos_controller.rb +++ b/app/controllers/movimientos_controller.rb @@ -2,11 +2,11 @@ class MovimientosController < ApplicationController load_and_authorize_resource def index - @search = Deposito.baja.search(params[:search]) + @search = Deposito.search(params[:search]) @movimientos = @search.paginate(:page=>params[:page], :per_page=>10) @movimientos = @movimientos.includes :entidad, :reserva => :pasajeros - @reservas_search = Reserva.baja.search() + @reservas_search = Reserva.search() @reservas = @reservas_search.paginate :page => params[:page], :per_page =>10 respond_to do |format| diff --git a/app/controllers/operadoras_controller.rb b/app/controllers/operadoras_controller.rb index 70c4943..bc5a8c2 100644 --- a/app/controllers/operadoras_controller.rb +++ b/app/controllers/operadoras_controller.rb @@ -5,7 +5,7 @@ def index if params[:search] @search = Operadora.search(params[:search]) else - @search = Operadora.baja.search() + @search = Operadora.search() end @entidads = @search.paginate :page => params[:page], :per_page =>10 respond_to do |format| @@ -26,4 +26,3 @@ def new end end - diff --git a/app/controllers/pagos_controller.rb b/app/controllers/pagos_controller.rb index 303822f..216020c 100644 --- a/app/controllers/pagos_controller.rb +++ b/app/controllers/pagos_controller.rb @@ -6,7 +6,7 @@ def index def new @pago = Pago.new - @search = Reserva.baja.search(:agency_id_eq=>0) + @search = Reserva.search(:agency_id_eq=>0) @reservas = @search.paginate :page => params[:page], :per_page =>10 end diff --git a/app/controllers/pasajeros_controller.rb b/app/controllers/pasajeros_controller.rb index 2677698..da44b36 100644 --- a/app/controllers/pasajeros_controller.rb +++ b/app/controllers/pasajeros_controller.rb @@ -1,26 +1,26 @@ class PasajerosController < InheritedResources::Base - + respond_to :html, :xml,:js def index if params[:search] @search = Pasajero.search(params[:search]) else - @search = Pasajero.baja.search() + @search = Pasajero.search() end @pasajeros = @search.paginate :page => params[:page], :per_page =>10 respond_to do |format| - format.js + format.js format.xml format.html format.pdf do output = PasajeroReport.new.to_pdf(@search) - send_data output, :filename => "index_report.pdf", + send_data output, :filename => "index_report.pdf", :type => "application/pdf" end end - + end - + def show if params[:doc] @pasajero = Pasajero.where(:doc =>params[:doc]).limit(1) @@ -55,6 +55,6 @@ def create else render 'pasajeros/new.js' end - end - + end + end diff --git a/app/controllers/programas_controller.rb b/app/controllers/programas_controller.rb index 3000037..b5d4d28 100644 --- a/app/controllers/programas_controller.rb +++ b/app/controllers/programas_controller.rb @@ -5,7 +5,7 @@ def index if params[:search] @search = Programa.search(params[:search]) else - @search = Programa.baja.search() + @search = Programa.search() end @programas = @search.paginate :page => params[:page], :per_page =>10 respond_to do |format| diff --git a/app/controllers/tdepositos_controller.rb b/app/controllers/tdepositos_controller.rb index d953e88..12f24af 100644 --- a/app/controllers/tdepositos_controller.rb +++ b/app/controllers/tdepositos_controller.rb @@ -5,7 +5,7 @@ def index if params[:search] @search = Tdeposito.search(params[:search]) else - @search = Tdeposito.baja.search() + @search = Tdeposito.search() end @tdepositos = @search.paginate :page => params[:page], :per_page =>10 respond_to do |format| diff --git a/app/controllers/thabitacions_controller.rb b/app/controllers/thabitacions_controller.rb index 995ab4a..2965ffb 100644 --- a/app/controllers/thabitacions_controller.rb +++ b/app/controllers/thabitacions_controller.rb @@ -5,7 +5,7 @@ def index if params[:search] @search = Thabitacion.search(params[:search]) else - @search = Thabitacion.baja.search() + @search = Thabitacion.search() end @thabitacions = @search.paginate :page => params[:page], :per_page =>10 respond_to do |format| diff --git a/app/controllers/vencidas_controller.rb b/app/controllers/vencidas_controller.rb index 48f6b67..71bc6f8 100644 --- a/app/controllers/vencidas_controller.rb +++ b/app/controllers/vencidas_controller.rb @@ -5,7 +5,7 @@ def index if params[:search] @search = r.search(params[:search]) else - @search = r.baja.search() + @search = r.search() end #quita del array las reservas que tienen pagos mayores a pago_minimo @@ -25,4 +25,3 @@ def index end end end - diff --git a/app/controllers/vouchers_controller.rb b/app/controllers/vouchers_controller.rb index ddf1154..cfa4fb6 100644 --- a/app/controllers/vouchers_controller.rb +++ b/app/controllers/vouchers_controller.rb @@ -11,7 +11,7 @@ def index if params[:search] @search = r.search(params[:search]) else - @search = r.baja.search() + @search = r.search() end @reservas = @search @@ -39,4 +39,3 @@ def bajar end end -