This commit is contained in:
yarzar_code
2020-01-12 20:07:28 +06:30
parent 314cc507a3
commit dff2c69627
89 changed files with 492 additions and 469 deletions

View File

@@ -6,9 +6,9 @@ class Transactions::SurveysController < ApplicationController
to = params[:to]
if filter.nil? && from.nil? && to.nil?
@surveys = Survey.where("shop_code='#{@shop.shop_code}'")
@surveys = Survey.all
else
@surveys = Survey.search(filter,from,to).where("shop_code='#{@shop.shop_code}'")
@surveys = Survey.search(filter,from,to)
end
@filter = filter