finished report for all
This commit is contained in:
@@ -34,12 +34,10 @@ class BaseReportController < ActionController::Base
|
||||
to = params[:to]
|
||||
day_ref = Time.now.utc.getlocal
|
||||
|
||||
if params[:report_type] == "daily_sale" || params[:report_type] == "sale_item"
|
||||
if from.present? && to.present?
|
||||
|
||||
if from != "" && to != ""
|
||||
|
||||
f_date = DateTime.parse(params[:from])
|
||||
t_date = DateTime.parse(params[:to])
|
||||
f_date = DateTime.parse(from)
|
||||
t_date = DateTime.parse(to)
|
||||
f_time = Time.mktime(f_date.year,f_date.month,f_date.day,f_date.hour,f_date.min,f_date.sec)
|
||||
t_time = Time.mktime(t_date.year,t_date.month,t_date.day,t_date.hour,t_date.min,t_date.sec)
|
||||
from = f_time.beginning_of_day.utc.getlocal
|
||||
@@ -83,59 +81,6 @@ class BaseReportController < ActionController::Base
|
||||
to = (day_ref - 1.year).end_of_year.utc
|
||||
end
|
||||
end
|
||||
else # end daily sale report
|
||||
if period_type.to_i == 1
|
||||
|
||||
if params[:from] != "" && params[:to] !=""
|
||||
|
||||
f_date = DateTime.parse(params[:from])
|
||||
t_date = DateTime.parse(params[:to])
|
||||
f_time = Time.mktime(f_date.year,f_date.month,f_date.day,f_date.hour,f_date.min,f_date.sec)
|
||||
t_time = Time.mktime(t_date.year,t_date.month,t_date.day,t_date.hour,t_date.min,t_date.sec)
|
||||
from = f_time.beginning_of_day.utc.getlocal
|
||||
to = t_time.end_of_day.utc.getlocal
|
||||
else
|
||||
from = day_ref.beginning_of_day.utc
|
||||
to = day_ref.end_of_day.utc
|
||||
end
|
||||
else
|
||||
case period.to_i
|
||||
when PERIOD["today"]
|
||||
|
||||
from = day_ref.beginning_of_day.utc
|
||||
to = day_ref.end_of_day.utc
|
||||
|
||||
when PERIOD["yesterday"]
|
||||
from = (day_ref - 1.day).beginning_of_day.utc
|
||||
to = (day_ref - 1.day).end_of_day.utc
|
||||
|
||||
when PERIOD["this_week"]
|
||||
from = Time.now.beginning_of_week.utc
|
||||
to = Time.now.utc
|
||||
when PERIOD["last_week"]
|
||||
from = (day_ref - 7.day).beginning_of_week.utc
|
||||
to = (day_ref - 7.day).end_of_week.utc
|
||||
when PERIOD["last_7"]
|
||||
from = (day_ref - 7.day).utc
|
||||
to = Time.now.utc
|
||||
when PERIOD["this_month"]
|
||||
from = Time.now.beginning_of_month.utc
|
||||
to = Time.now.utc
|
||||
when PERIOD["last_month"]
|
||||
from = (day_ref - 1.month).beginning_of_month.utc
|
||||
to = (day_ref - 1.month).end_of_month.utc
|
||||
when PERIOD["last_30"]
|
||||
from = (day_ref - 30.day).utc
|
||||
to = Time.now.utc
|
||||
when PERIOD["this_year"]
|
||||
from = Time.now.beginning_of_year.utc
|
||||
to = Time.now.utc
|
||||
when PERIOD["last_year"]
|
||||
from = (day_ref - 1.year).beginning_of_year.utc
|
||||
to = (day_ref - 1.year).end_of_year.utc
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
return from, to
|
||||
|
||||
|
||||
@@ -4,8 +4,6 @@ class Origami::ShiftsController < BaseOrigamiController
|
||||
end
|
||||
|
||||
def show
|
||||
puts ">>>>>"
|
||||
puts current_user.id
|
||||
@shift = ShiftSale.current_open_shift(current_user.id)
|
||||
end
|
||||
|
||||
|
||||
@@ -1,25 +1,31 @@
|
||||
class Reports::ReceiptNoController < BaseReportController
|
||||
authorize_resource :class => false
|
||||
def index
|
||||
from, to, report_type = get_date_range_from_params
|
||||
@payments = [["All Payment",''], ["Cash Payment","cash"], ["Credit Payment","creditnote"], ["FOC Payment","foc"], ["Other Payment","card"]]
|
||||
|
||||
if params[:shift_name].to_i != 0
|
||||
@shift = ShiftSale.where('shift_started_at >= ? and shift_closed_at <= ?',from,to).take
|
||||
# puts @shift.to_json
|
||||
if @shift.present?
|
||||
@sale_data = Sale.where('shift_sale_id = ? ',@shift.id)
|
||||
@sale_taxes = Sale.get_separate_tax(from,to)
|
||||
end
|
||||
else
|
||||
@sale_data = Sale.where("sale_status=? and receipt_date between ? and ?","completed",from.utc,to.utc)
|
||||
@sale_taxes = Sale.get_separate_tax(from.utc,to.utc)
|
||||
end
|
||||
|
||||
from, to = get_date_range_from_params
|
||||
|
||||
if @shift.present?
|
||||
@shift_from = @shift.shift_started_at.nil? ? '-' : @shift.shift_started_at.utc.getlocal.strftime("%e %b %I:%M%p")
|
||||
@shift_to = @shift.shift_closed_at.nil? ? '-' : @shift.shift_closed_at.utc.getlocal.strftime("%e %b %I:%M%p")
|
||||
end
|
||||
@shift_sale_range = Sale.get_by_shift_sale(from,to,Sale::SALE_STATUS_COMPLETED)
|
||||
|
||||
@shift = ''
|
||||
if params[:shift_name].to_i != 0
|
||||
shift_sale = ShiftSale.find(params[:shift_name])
|
||||
if to.blank?
|
||||
@shift = ShiftSale.where('shift_started_at = ? and shift_closed_at is NULL ',shift_sale.shift_started_at)
|
||||
else
|
||||
|
||||
@shift = ShiftSale.where('shift_started_at = ? and shift_closed_at = ? ',shift_sale.shift_started_at, shift_sale.shift_closed_at)
|
||||
end
|
||||
end
|
||||
@sale_data = Sale.get_shift_sales_by_receipt_no(@shift_sale_range,@shift,from,to, params[:payment_type])
|
||||
|
||||
if @shift.present?
|
||||
@shift.each do |sh|
|
||||
@shift_from = sh.shift_started_at.nil? ? '-' : sh.shift_started_at.utc.getlocal.strftime("%e %b %I:%M%p")
|
||||
@shift_to = sh.shift_closed_at.nil? ? '-' : sh.shift_closed_at.utc.getlocal.strftime("%e %b %I:%M%p")
|
||||
@shift_data = sh
|
||||
end
|
||||
end
|
||||
|
||||
respond_to do |format|
|
||||
format.html
|
||||
@@ -28,7 +34,7 @@ authorize_resource :class => false
|
||||
end
|
||||
|
||||
def show
|
||||
from, to, report_type = get_date_range_from_params
|
||||
from, to = get_date_range_from_params
|
||||
|
||||
@sale_data = Sale.get_by_shift_sale(from,to,Sale::SALE_STATUS_COMPLETED)
|
||||
|
||||
@@ -38,7 +44,8 @@ authorize_resource :class => false
|
||||
local_closing_date = sale.closing_date.nil? ? '-' : sale.closing_date.utc.getlocal.strftime("%e %b %I:%M%p")
|
||||
opening_date = sale.opening_date.nil? ? '-' : sale.opening_date.utc
|
||||
closing_date = sale.closing_date.nil? ? '-' : sale.closing_date.utc
|
||||
str = { :local_opening_date => local_opening_date, :local_closing_date => local_closing_date, :opening_date => opening_date, :closing_date => closing_date}
|
||||
shift_id = sale.id.nil? ? '-' : sale.id
|
||||
str = {:shift_id => shift_id, :local_opening_date => local_opening_date, :local_closing_date => local_closing_date, :opening_date => opening_date, :closing_date => closing_date}
|
||||
date_arr.push(str)
|
||||
end
|
||||
|
||||
@@ -48,205 +55,4 @@ authorize_resource :class => false
|
||||
format.json { render json: out }
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
def get_date_range_from_params
|
||||
|
||||
period_type = params[:period_type]
|
||||
period = params[:period]
|
||||
|
||||
branch = params[:branch]
|
||||
report_type = params[:report_type]
|
||||
|
||||
shift_name = params[:shift_name]
|
||||
unless shift_name.nil?
|
||||
shift_arr = shift_name.split(' - ')
|
||||
shift_from = shift_arr[0]
|
||||
shift_to = shift_arr[1]
|
||||
end
|
||||
|
||||
day_ref = day_ref = Time.now.utc.getlocal
|
||||
|
||||
if period_type.to_i == 1
|
||||
|
||||
### =>search by from and to
|
||||
unless shift_name.nil?
|
||||
if shift_name.to_s == '0'
|
||||
### => all shift
|
||||
f_date = DateTime.parse(params[:from])
|
||||
t_date = DateTime.parse(params[:to])
|
||||
f_time = Time.mktime(f_date.year,f_date.month,f_date.day,f_date.hour,f_date.min,f_date.sec)
|
||||
t_time = Time.mktime(t_date.year,t_date.month,t_date.day,t_date.hour,t_date.min,t_date.sec)
|
||||
from = f_time.beginning_of_day.utc.getlocal
|
||||
to = t_time.end_of_day.utc.getlocal
|
||||
|
||||
else
|
||||
unless shift_from == '-'
|
||||
f_date = DateTime.parse(shift_from)
|
||||
from = f_date
|
||||
else
|
||||
from = ''
|
||||
end
|
||||
|
||||
unless shift_to == '-'
|
||||
t_date = DateTime.parse(shift_to)
|
||||
to = t_date
|
||||
else
|
||||
to = ''
|
||||
end
|
||||
end
|
||||
else
|
||||
f_date = DateTime.parse(params[:from])
|
||||
t_date = DateTime.parse(params[:to])
|
||||
f_time = Time.mktime(f_date.year,f_date.month,f_date.day,f_date.hour,f_date.min,f_date.sec)
|
||||
t_time = Time.mktime(t_date.year,t_date.month,t_date.day,t_date.hour,t_date.min,t_date.sec)
|
||||
from = f_time.beginning_of_day.utc.getlocal
|
||||
to = t_time.end_of_day.utc.getlocal
|
||||
end
|
||||
else
|
||||
### => search by Today or yesterday
|
||||
|
||||
unless shift_name.nil?
|
||||
if shift_name.to_s == '0'
|
||||
### => all shift
|
||||
case period.to_i
|
||||
when PERIOD["today"]
|
||||
|
||||
from = day_ref.beginning_of_day.utc
|
||||
to = day_ref.end_of_day.utc
|
||||
|
||||
when PERIOD["yesterday"]
|
||||
from = (day_ref - 1.day).beginning_of_day.utc
|
||||
to = (day_ref - 1.day).end_of_day.utc
|
||||
|
||||
when PERIOD["this_week"]
|
||||
from = Time.now.beginning_of_week.utc
|
||||
to = Time.now.utc
|
||||
when PERIOD["last_week"]
|
||||
from = (day_ref - 7.day).beginning_of_week.utc
|
||||
to = (day_ref - 7.day).end_of_week.utc
|
||||
when PERIOD["last_7"]
|
||||
from = (day_ref - 7.day).utc
|
||||
to = Time.now.utc
|
||||
when PERIOD["this_month"]
|
||||
from = Time.now.beginning_of_month.utc
|
||||
to = Time.now.utc
|
||||
when PERIOD["last_month"]
|
||||
from = (day_ref - 1.month).beginning_of_month.utc
|
||||
to = (day_ref - 1.month).end_of_month.utc
|
||||
when PERIOD["last_30"]
|
||||
from = (day_ref - 30.day).utc
|
||||
to = Time.now.utc
|
||||
when PERIOD["this_year"]
|
||||
from = Time.now.beginning_of_year.utc
|
||||
to = Time.now.utc
|
||||
when PERIOD["last_year"]
|
||||
from = (day_ref - 1.year).beginning_of_year.utc
|
||||
to = (day_ref - 1.year).end_of_year.utc
|
||||
end
|
||||
|
||||
else
|
||||
unless shift_from == '-'
|
||||
f_date = DateTime.parse(shift_from)
|
||||
#f_time = Time.mktime(f_date.year,f_date.month,f_date.day,f_date.hour,f_date.min,f_date.sec)
|
||||
from = f_date.utc
|
||||
else
|
||||
from = ''
|
||||
end
|
||||
|
||||
unless shift_to == '-'
|
||||
t_date = DateTime.parse(shift_to)
|
||||
#t_time = Time.mktime(t_date.year,t_date.month,t_date.day,t_date.hour,t_date.min,t_date.sec)
|
||||
to = t_date.utc
|
||||
else
|
||||
to = ''
|
||||
end
|
||||
end
|
||||
else
|
||||
if params[:report_type].to_i != 0
|
||||
r_type = params[:report_type].to_s
|
||||
|
||||
if r_type == 'shift_item'
|
||||
|
||||
case period.to_i
|
||||
when PERIOD["today"]
|
||||
|
||||
from = day_ref.beginning_of_day.utc
|
||||
to = day_ref.end_of_day.utc
|
||||
|
||||
when PERIOD["yesterday"]
|
||||
from = (day_ref - 1.day).beginning_of_day.utc
|
||||
to = (day_ref - 1.day).end_of_day.utc
|
||||
|
||||
when PERIOD["this_week"]
|
||||
from = Time.now.beginning_of_week.utc
|
||||
to = Time.now.utc
|
||||
when PERIOD["last_week"]
|
||||
from = (day_ref - 7.day).beginning_of_week.utc
|
||||
to = (day_ref - 7.day).end_of_week.utc
|
||||
when PERIOD["last_7"]
|
||||
from = (day_ref - 7.day).utc
|
||||
to = Time.now.utc
|
||||
when PERIOD["this_month"]
|
||||
from = Time.now.beginning_of_month.utc
|
||||
to = Time.now.utc
|
||||
when PERIOD["last_month"]
|
||||
from = (day_ref - 1.month).beginning_of_month.utc
|
||||
to = (day_ref - 1.month).end_of_month.utc
|
||||
when PERIOD["last_30"]
|
||||
from = (day_ref - 30.day).utc
|
||||
to = Time.now.utc
|
||||
when PERIOD["this_year"]
|
||||
from = Time.now.beginning_of_year.utc
|
||||
to = Time.now.utc
|
||||
when PERIOD["last_year"]
|
||||
from = (day_ref - 1.year).beginning_of_year.utc
|
||||
to = (day_ref - 1.year).end_of_year.utc
|
||||
end
|
||||
end
|
||||
else
|
||||
### => report not shift
|
||||
case period.to_i
|
||||
when PERIOD["today"]
|
||||
from = day_ref.beginning_of_day.utc
|
||||
to = day_ref.end_of_day.utc
|
||||
|
||||
when PERIOD["yesterday"]
|
||||
from = (day_ref - 1.day).beginning_of_day.utc
|
||||
to = (day_ref - 1.day).end_of_day.utc
|
||||
|
||||
when PERIOD["this_week"]
|
||||
from = Time.now.beginning_of_week.utc
|
||||
to = Time.now.utc
|
||||
when PERIOD["last_week"]
|
||||
from = (day_ref - 7.day).beginning_of_week.utc
|
||||
to = (day_ref - 7.day).end_of_week.utc
|
||||
when PERIOD["last_7"]
|
||||
from = (day_ref - 7.day).utc
|
||||
to = Time.now.utc
|
||||
when PERIOD["this_month"]
|
||||
from = Time.now.beginning_of_month.utc
|
||||
to = Time.now.utc
|
||||
when PERIOD["last_month"]
|
||||
from = (day_ref - 1.month).beginning_of_month.utc
|
||||
to = (day_ref - 1.month).end_of_month.utc
|
||||
when PERIOD["last_30"]
|
||||
from = (day_ref - 30.day).utc
|
||||
to = Time.now.utc
|
||||
when PERIOD["this_year"]
|
||||
from = Time.now.beginning_of_year.utc
|
||||
to = Time.now.utc
|
||||
when PERIOD["last_year"]
|
||||
from = (day_ref - 1.year).beginning_of_year.utc
|
||||
to = (day_ref - 1.year).end_of_year.utc
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
end
|
||||
|
||||
return from, to,report_type
|
||||
end
|
||||
|
||||
|
||||
end
|
||||
@@ -2,17 +2,20 @@ class Reports::SaleitemController < BaseReportController
|
||||
authorize_resource :class => false
|
||||
def index
|
||||
|
||||
from, to, report_type = get_date_range_from_params
|
||||
from, to = get_date_range_from_params
|
||||
shift_sale_range = Sale.get_by_shift_sale(from,to,Sale::SALE_STATUS_COMPLETED)
|
||||
|
||||
shift = ''
|
||||
if to.blank?
|
||||
shift = ShiftSale.where('shift_started_at = ? and shift_closed_at is NULL ',from)
|
||||
else
|
||||
shift = ShiftSale.where('shift_started_at = ? and shift_closed_at = ? ',from, to)
|
||||
end
|
||||
if params[:shift_name].to_i != 0
|
||||
shift_sale = ShiftSale.find(params[:shift_name])
|
||||
if to.blank?
|
||||
shift = ShiftSale.where('shift_started_at = ? and shift_closed_at is NULL ',shift_sale.shift_started_at)
|
||||
else
|
||||
|
||||
@sale_data, @discount_data , @cash_data , @card_data , @credit_data , @foc_data , @grand_total = Sale.get_by_shift_items(shift_sale_range,shift, from, to, Sale::SALE_STATUS_COMPLETED, report_type)
|
||||
shift = ShiftSale.where('shift_started_at = ? and shift_closed_at = ? ',shift_sale.shift_started_at, shift_sale.shift_closed_at)
|
||||
end
|
||||
end
|
||||
@sale_data, @discount_data , @cash_data , @card_data , @credit_data , @foc_data , @grand_total , @change_amount = Sale.get_by_shift_items(shift_sale_range,shift, from, to, Sale::SALE_STATUS_COMPLETED)
|
||||
|
||||
@account_cate_count = Hash.new {|hash, key| hash[key] = 0}
|
||||
|
||||
@@ -27,7 +30,7 @@ class Reports::SaleitemController < BaseReportController
|
||||
@sale_data.each {|acc| @totalByAccount[acc.account_id] += acc.grand_total}
|
||||
|
||||
|
||||
if !shift.nil?
|
||||
if shift.present?
|
||||
shift.each do |sh|
|
||||
@shift_from = sh.shift_started_at.nil? ? '-' : sh.shift_started_at.utc.getlocal.strftime("%e %b %I:%M%p")
|
||||
@shift_to = sh.shift_closed_at.nil? ? '-' : sh.shift_closed_at.utc.getlocal.strftime("%e %b %I:%M%p")
|
||||
@@ -52,7 +55,8 @@ class Reports::SaleitemController < BaseReportController
|
||||
local_closing_date = sale.closing_date.nil? ? '-' : sale.closing_date.utc.getlocal.strftime("%e %b %I:%M%p")
|
||||
opening_date = sale.opening_date.nil? ? '-' : sale.opening_date.utc
|
||||
closing_date = sale.closing_date.nil? ? '-' : sale.closing_date.utc
|
||||
str = { :local_opening_date => local_opening_date, :local_closing_date => local_closing_date, :opening_date => opening_date, :closing_date => closing_date}
|
||||
shift_id = sale.id.nil? ? '-' : sale.id
|
||||
str = {:shift_id => shift_id, :local_opening_date => local_opening_date, :local_closing_date => local_closing_date, :opening_date => opening_date, :closing_date => closing_date}
|
||||
date_arr.push(str)
|
||||
end
|
||||
|
||||
@@ -63,225 +67,225 @@ class Reports::SaleitemController < BaseReportController
|
||||
end
|
||||
end
|
||||
|
||||
def get_date_range_from_params
|
||||
period_type = params[:period_type]
|
||||
period = params[:period]
|
||||
from = params[:from]
|
||||
to = params[:to]
|
||||
branch = params[:branch]
|
||||
report_type = params[:report_type]
|
||||
# def get_date_range_from_params
|
||||
# period_type = params[:period_type]
|
||||
# period = params[:period]
|
||||
# from = params[:from]
|
||||
# to = params[:to]
|
||||
# branch = params[:branch]
|
||||
# report_type = params[:report_type]
|
||||
|
||||
shift_name = params[:shift_name]
|
||||
unless shift_name.nil?
|
||||
shift_arr = shift_name.split(' - ')
|
||||
shift_from = shift_arr[0]
|
||||
shift_to = shift_arr[1]
|
||||
end
|
||||
# shift_name = params[:shift_name]
|
||||
# unless shift_name.nil?
|
||||
# shift_arr = shift_name.split(' - ')
|
||||
# shift_from = shift_arr[0]
|
||||
# shift_to = shift_arr[1]
|
||||
# end
|
||||
|
||||
day_ref = Time.now
|
||||
# day_ref = Time.now
|
||||
|
||||
if period_type.to_i == 1
|
||||
### =>search by from and to
|
||||
unless shift_name.nil?
|
||||
if shift_name.to_s == '0'
|
||||
### => all shift
|
||||
#f_date = DateTime.parse(from)
|
||||
#t_date = DateTime.parse(to)
|
||||
if params[:from] && params[:to]
|
||||
if params[:from] != "" && params[:to] !=""
|
||||
f_date = DateTime.strptime(from, "%m/%d/%Y")
|
||||
t_date = DateTime.strptime(to, "%m/%d/%Y")
|
||||
# if period_type.to_i == 1
|
||||
# ### =>search by from and to
|
||||
# unless shift_name.nil?
|
||||
# if shift_name.to_s == '0'
|
||||
# ### => all shift
|
||||
# #f_date = DateTime.parse(from)
|
||||
# #t_date = DateTime.parse(to)
|
||||
# if params[:from] && params[:to]
|
||||
# if params[:from] != "" && params[:to] !=""
|
||||
# f_date = DateTime.strptime(from, "%m/%d/%Y")
|
||||
# t_date = DateTime.strptime(to, "%m/%d/%Y")
|
||||
|
||||
f_time = Time.mktime(f_date.year,f_date.month,f_date.day,f_date.hour,f_date.min,f_date.sec)
|
||||
t_time = Time.mktime(t_date.year,t_date.month,t_date.day,t_date.hour,t_date.min,t_date.sec)
|
||||
from = f_time.beginning_of_day.utc
|
||||
to = t_time.end_of_day.utc
|
||||
end
|
||||
else
|
||||
from = day_ref.beginning_of_day.utc
|
||||
to = day_ref.end_of_day.utc
|
||||
end
|
||||
else
|
||||
unless shift_from == '-'
|
||||
f_date = DateTime.parse(shift_from)
|
||||
from = f_date
|
||||
else
|
||||
from = ''
|
||||
end
|
||||
# f_time = Time.mktime(f_date.year,f_date.month,f_date.day,f_date.hour,f_date.min,f_date.sec)
|
||||
# t_time = Time.mktime(t_date.year,t_date.month,t_date.day,t_date.hour,t_date.min,t_date.sec)
|
||||
# from = f_time.beginning_of_day.utc
|
||||
# to = t_time.end_of_day.utc
|
||||
# end
|
||||
# else
|
||||
# from = day_ref.beginning_of_day.utc
|
||||
# to = day_ref.end_of_day.utc
|
||||
# end
|
||||
# else
|
||||
# unless shift_from == '-'
|
||||
# f_date = DateTime.parse(shift_from)
|
||||
# from = f_date
|
||||
# else
|
||||
# from = ''
|
||||
# end
|
||||
|
||||
unless shift_to == '-'
|
||||
t_date = DateTime.parse(shift_to)
|
||||
to = t_date
|
||||
else
|
||||
to = ''
|
||||
end
|
||||
end
|
||||
else
|
||||
# f_date = DateTime.parse(from)
|
||||
# t_date = DateTime.parse(to)
|
||||
if params[:from] && params[:to]
|
||||
if params[:from] != "" && params[:to] !=""
|
||||
f_date = DateTime.strptime(from, "%m/%d/%Y")
|
||||
t_date = DateTime.strptime(to, "%m/%d/%Y")
|
||||
f_time = Time.mktime(f_date.year,f_date.month,f_date.day,f_date.hour,f_date.min,f_date.sec)
|
||||
t_time = Time.mktime(t_date.year,t_date.month,t_date.day,t_date.hour,t_date.min,t_date.sec)
|
||||
from = f_time.beginning_of_day.utc
|
||||
to = t_time.end_of_day.utc
|
||||
end
|
||||
else
|
||||
from = day_ref.beginning_of_day.utc
|
||||
to = day_ref.end_of_day.utc
|
||||
end
|
||||
end
|
||||
else
|
||||
### => search by Today or yesterday
|
||||
unless shift_name.nil?
|
||||
if shift_name.to_s == '0'
|
||||
### => all shift
|
||||
case period.to_i
|
||||
when PERIOD["today"]
|
||||
# unless shift_to == '-'
|
||||
# t_date = DateTime.parse(shift_to)
|
||||
# to = t_date
|
||||
# else
|
||||
# to = ''
|
||||
# end
|
||||
# end
|
||||
# else
|
||||
# # f_date = DateTime.parse(from)
|
||||
# # t_date = DateTime.parse(to)
|
||||
# if params[:from] && params[:to]
|
||||
# if params[:from] != "" && params[:to] !=""
|
||||
# f_date = DateTime.strptime(from, "%m/%d/%Y")
|
||||
# t_date = DateTime.strptime(to, "%m/%d/%Y")
|
||||
# f_time = Time.mktime(f_date.year,f_date.month,f_date.day,f_date.hour,f_date.min,f_date.sec)
|
||||
# t_time = Time.mktime(t_date.year,t_date.month,t_date.day,t_date.hour,t_date.min,t_date.sec)
|
||||
# from = f_time.beginning_of_day.utc
|
||||
# to = t_time.end_of_day.utc
|
||||
# end
|
||||
# else
|
||||
# from = day_ref.beginning_of_day.utc
|
||||
# to = day_ref.end_of_day.utc
|
||||
# end
|
||||
# end
|
||||
# else
|
||||
# ### => search by Today or yesterday
|
||||
# unless shift_name.nil?
|
||||
# if shift_name.to_s == '0'
|
||||
# ### => all shift
|
||||
# case period.to_i
|
||||
# when PERIOD["today"]
|
||||
|
||||
from = day_ref.beginning_of_day.utc
|
||||
to = day_ref.end_of_day.utc
|
||||
# from = day_ref.beginning_of_day.utc
|
||||
# to = day_ref.end_of_day.utc
|
||||
|
||||
when PERIOD["yesterday"]
|
||||
from = (day_ref - 1.day).beginning_of_day.utc
|
||||
to = (day_ref - 1.day).end_of_day.utc
|
||||
# when PERIOD["yesterday"]
|
||||
# from = (day_ref - 1.day).beginning_of_day.utc
|
||||
# to = (day_ref - 1.day).end_of_day.utc
|
||||
|
||||
when PERIOD["this_week"]
|
||||
from = Time.now.beginning_of_week.utc
|
||||
to = Time.now.utc
|
||||
when PERIOD["last_week"]
|
||||
from = (day_ref - 7.day).beginning_of_week.utc
|
||||
to = (day_ref - 7.day).end_of_week.utc
|
||||
when PERIOD["last_7"]
|
||||
from = (day_ref - 7.day).utc
|
||||
to = Time.now.utc
|
||||
when PERIOD["this_month"]
|
||||
from = Time.now.beginning_of_month.utc
|
||||
to = Time.now.utc
|
||||
when PERIOD["last_month"]
|
||||
from = (day_ref - 1.month).beginning_of_month.utc
|
||||
to = (day_ref - 1.month).end_of_month.utc
|
||||
when PERIOD["last_30"]
|
||||
from = (day_ref - 30.day).utc
|
||||
to = Time.now.utc
|
||||
when PERIOD["this_year"]
|
||||
from = Time.now.beginning_of_year.utc
|
||||
to = Time.now.utc
|
||||
when PERIOD["last_year"]
|
||||
from = (day_ref - 1.year).beginning_of_year.utc
|
||||
to = (day_ref - 1.year).end_of_year.utc
|
||||
# when PERIOD["this_week"]
|
||||
# from = Time.now.beginning_of_week.utc
|
||||
# to = Time.now.utc
|
||||
# when PERIOD["last_week"]
|
||||
# from = (day_ref - 7.day).beginning_of_week.utc
|
||||
# to = (day_ref - 7.day).end_of_week.utc
|
||||
# when PERIOD["last_7"]
|
||||
# from = (day_ref - 7.day).utc
|
||||
# to = Time.now.utc
|
||||
# when PERIOD["this_month"]
|
||||
# from = Time.now.beginning_of_month.utc
|
||||
# to = Time.now.utc
|
||||
# when PERIOD["last_month"]
|
||||
# from = (day_ref - 1.month).beginning_of_month.utc
|
||||
# to = (day_ref - 1.month).end_of_month.utc
|
||||
# when PERIOD["last_30"]
|
||||
# from = (day_ref - 30.day).utc
|
||||
# to = Time.now.utc
|
||||
# when PERIOD["this_year"]
|
||||
# from = Time.now.beginning_of_year.utc
|
||||
# to = Time.now.utc
|
||||
# when PERIOD["last_year"]
|
||||
# from = (day_ref - 1.year).beginning_of_year.utc
|
||||
# to = (day_ref - 1.year).end_of_year.utc
|
||||
|
||||
end
|
||||
# end
|
||||
|
||||
else
|
||||
unless shift_from == '-'
|
||||
f_date = DateTime.parse(shift_from)
|
||||
# f_date = DateTime.strptime(shift_from, "%m/%d/%Y")
|
||||
#f_time = Time.mktime(f_date.year,f_date.month,f_date.day,f_date.hour,f_date.min,f_date.sec)
|
||||
from = f_date
|
||||
else
|
||||
from = ''
|
||||
end
|
||||
# else
|
||||
# unless shift_from == '-'
|
||||
# f_date = DateTime.parse(shift_from)
|
||||
# # f_date = DateTime.strptime(shift_from, "%m/%d/%Y")
|
||||
# #f_time = Time.mktime(f_date.year,f_date.month,f_date.day,f_date.hour,f_date.min,f_date.sec)
|
||||
# from = f_date
|
||||
# else
|
||||
# from = ''
|
||||
# end
|
||||
|
||||
unless shift_to == '-'
|
||||
t_date = DateTime.parse(shift_to)
|
||||
# t_date = DateTime.strptime(shift_to, "%m/%d/%Y")
|
||||
# unless shift_to == '-'
|
||||
# t_date = DateTime.parse(shift_to)
|
||||
# # t_date = DateTime.strptime(shift_to, "%m/%d/%Y")
|
||||
|
||||
#t_time = Time.mktime(t_date.year,t_date.month,t_date.day,t_date.hour,t_date.min,t_date.sec)
|
||||
to = t_date
|
||||
else
|
||||
to = ''
|
||||
end
|
||||
end
|
||||
else
|
||||
if params[:report_type].to_i != 0
|
||||
r_type = params[:report_type].to_s
|
||||
# #t_time = Time.mktime(t_date.year,t_date.month,t_date.day,t_date.hour,t_date.min,t_date.sec)
|
||||
# to = t_date
|
||||
# else
|
||||
# to = ''
|
||||
# end
|
||||
# end
|
||||
# else
|
||||
# if params[:report_type].to_i != 0
|
||||
# r_type = params[:report_type].to_s
|
||||
|
||||
if r_type == 'shift_item'
|
||||
# if r_type == 'shift_item'
|
||||
|
||||
case period.to_i
|
||||
when PERIOD["today"]
|
||||
# case period.to_i
|
||||
# when PERIOD["today"]
|
||||
|
||||
from = day_ref.beginning_of_day.utc
|
||||
to = day_ref.end_of_day.utc
|
||||
# from = day_ref.beginning_of_day.utc
|
||||
# to = day_ref.end_of_day.utc
|
||||
|
||||
when PERIOD["yesterday"]
|
||||
from = (day_ref - 1.day).beginning_of_day.utc
|
||||
to = (day_ref - 1.day).end_of_day.utc
|
||||
# when PERIOD["yesterday"]
|
||||
# from = (day_ref - 1.day).beginning_of_day.utc
|
||||
# to = (day_ref - 1.day).end_of_day.utc
|
||||
|
||||
when PERIOD["this_week"]
|
||||
from = Time.now.beginning_of_week.utc
|
||||
to = Time.now.utc
|
||||
when PERIOD["last_week"]
|
||||
from = (day_ref - 7.day).beginning_of_week.utc
|
||||
to = (day_ref - 7.day).end_of_week.utc
|
||||
when PERIOD["last_7"]
|
||||
from = (day_ref - 7.day).utc
|
||||
to = Time.now.utc
|
||||
when PERIOD["this_month"]
|
||||
from = Time.now.beginning_of_month.utc
|
||||
to = Time.now.utc
|
||||
when PERIOD["last_month"]
|
||||
from = (day_ref - 1.month).beginning_of_month.utc
|
||||
to = (day_ref - 1.month).end_of_month.utc
|
||||
when PERIOD["last_30"]
|
||||
from = (day_ref - 30.day).utc
|
||||
to = Time.now.utc
|
||||
when PERIOD["this_year"]
|
||||
from = Time.now.beginning_of_year.utc
|
||||
to = Time.now.utc
|
||||
when PERIOD["last_year"]
|
||||
from = (day_ref - 1.year).beginning_of_year.utc
|
||||
to = (day_ref - 1.year).end_of_year.utc
|
||||
# when PERIOD["this_week"]
|
||||
# from = Time.now.beginning_of_week.utc
|
||||
# to = Time.now.utc
|
||||
# when PERIOD["last_week"]
|
||||
# from = (day_ref - 7.day).beginning_of_week.utc
|
||||
# to = (day_ref - 7.day).end_of_week.utc
|
||||
# when PERIOD["last_7"]
|
||||
# from = (day_ref - 7.day).utc
|
||||
# to = Time.now.utc
|
||||
# when PERIOD["this_month"]
|
||||
# from = Time.now.beginning_of_month.utc
|
||||
# to = Time.now.utc
|
||||
# when PERIOD["last_month"]
|
||||
# from = (day_ref - 1.month).beginning_of_month.utc
|
||||
# to = (day_ref - 1.month).end_of_month.utc
|
||||
# when PERIOD["last_30"]
|
||||
# from = (day_ref - 30.day).utc
|
||||
# to = Time.now.utc
|
||||
# when PERIOD["this_year"]
|
||||
# from = Time.now.beginning_of_year.utc
|
||||
# to = Time.now.utc
|
||||
# when PERIOD["last_year"]
|
||||
# from = (day_ref - 1.year).beginning_of_year.utc
|
||||
# to = (day_ref - 1.year).end_of_year.utc
|
||||
|
||||
end
|
||||
end
|
||||
else
|
||||
### => report not shift
|
||||
case period.to_i
|
||||
when PERIOD["today"]
|
||||
from = day_ref.beginning_of_day.utc
|
||||
to = day_ref.end_of_day.utc
|
||||
# end
|
||||
# end
|
||||
# else
|
||||
# ### => report not shift
|
||||
# case period.to_i
|
||||
# when PERIOD["today"]
|
||||
# from = day_ref.beginning_of_day.utc
|
||||
# to = day_ref.end_of_day.utc
|
||||
|
||||
when PERIOD["yesterday"]
|
||||
from = (day_ref - 1.day).beginning_of_day.utc
|
||||
to = (day_ref - 1.day).end_of_day.utc
|
||||
# when PERIOD["yesterday"]
|
||||
# from = (day_ref - 1.day).beginning_of_day.utc
|
||||
# to = (day_ref - 1.day).end_of_day.utc
|
||||
|
||||
when PERIOD["this_week"]
|
||||
from = Time.now.beginning_of_week.utc
|
||||
to = Time.now.utc
|
||||
when PERIOD["last_week"]
|
||||
from = (day_ref - 7.day).beginning_of_week.utc
|
||||
to = (day_ref - 7.day).end_of_week.utc
|
||||
when PERIOD["last_7"]
|
||||
from = (day_ref - 7.day).utc
|
||||
to = Time.now.utc
|
||||
when PERIOD["this_month"]
|
||||
from = Time.now.beginning_of_month.utc
|
||||
to = Time.now.utc
|
||||
when PERIOD["last_month"]
|
||||
from = (day_ref - 1.month).beginning_of_month.utc
|
||||
to = (day_ref - 1.month).end_of_month.utc
|
||||
when PERIOD["last_30"]
|
||||
from = (day_ref - 30.day).utc
|
||||
to = Time.now.utc
|
||||
when PERIOD["this_year"]
|
||||
from = Time.now.beginning_of_year.utc
|
||||
to = Time.now.utc
|
||||
when PERIOD["last_year"]
|
||||
from = (day_ref - 1.year).beginning_of_year.utc
|
||||
to = (day_ref - 1.year).end_of_year.utc
|
||||
end
|
||||
end
|
||||
end
|
||||
# when PERIOD["this_week"]
|
||||
# from = Time.now.beginning_of_week.utc
|
||||
# to = Time.now.utc
|
||||
# when PERIOD["last_week"]
|
||||
# from = (day_ref - 7.day).beginning_of_week.utc
|
||||
# to = (day_ref - 7.day).end_of_week.utc
|
||||
# when PERIOD["last_7"]
|
||||
# from = (day_ref - 7.day).utc
|
||||
# to = Time.now.utc
|
||||
# when PERIOD["this_month"]
|
||||
# from = Time.now.beginning_of_month.utc
|
||||
# to = Time.now.utc
|
||||
# when PERIOD["last_month"]
|
||||
# from = (day_ref - 1.month).beginning_of_month.utc
|
||||
# to = (day_ref - 1.month).end_of_month.utc
|
||||
# when PERIOD["last_30"]
|
||||
# from = (day_ref - 30.day).utc
|
||||
# to = Time.now.utc
|
||||
# when PERIOD["this_year"]
|
||||
# from = Time.now.beginning_of_year.utc
|
||||
# to = Time.now.utc
|
||||
# when PERIOD["last_year"]
|
||||
# from = (day_ref - 1.year).beginning_of_year.utc
|
||||
# to = (day_ref - 1.year).end_of_year.utc
|
||||
# end
|
||||
# end
|
||||
# end
|
||||
|
||||
|
||||
|
||||
end
|
||||
# end
|
||||
|
||||
return from, to,report_type
|
||||
end
|
||||
# return from, to,report_type
|
||||
# end
|
||||
|
||||
end
|
||||
|
||||
@@ -3,16 +3,40 @@ class Reports::ShiftsaleController < BaseReportController
|
||||
|
||||
def index
|
||||
|
||||
from, to, report_type = get_date_range_from_params
|
||||
@sale_data = Sale.get_by_shiftsales(from,to)
|
||||
respond_to do |format|
|
||||
from, to = get_date_range_from_params
|
||||
@shift = ''
|
||||
if params[:shift_name].to_i != 0
|
||||
@shift = ShiftSale.find(params[:shift_name])
|
||||
end
|
||||
@sale_data = Sale.get_by_shiftsales(from,to,@shift)
|
||||
|
||||
respond_to do |format|
|
||||
format.html
|
||||
format.xls
|
||||
end
|
||||
end
|
||||
|
||||
def show
|
||||
|
||||
from, to = get_date_range_from_params
|
||||
|
||||
@sale_data = Sale.get_by_shift_sale(from,to,Sale::SALE_STATUS_COMPLETED)
|
||||
|
||||
date_arr = Array.new
|
||||
@sale_data.each do |sale|
|
||||
local_opening_date = sale.opening_date.nil? ? '-' : sale.opening_date.utc.getlocal.strftime("%e %b %I:%M%p")
|
||||
local_closing_date = sale.closing_date.nil? ? '-' : sale.closing_date.utc.getlocal.strftime("%e %b %I:%M%p")
|
||||
opening_date = sale.opening_date.nil? ? '-' : sale.opening_date.utc
|
||||
closing_date = sale.closing_date.nil? ? '-' : sale.closing_date.utc
|
||||
shift_id = sale.id.nil? ? '-' : sale.id
|
||||
str = {:shift_id => shift_id, :local_opening_date => local_opening_date, :local_closing_date => local_closing_date, :opening_date => opening_date, :closing_date => closing_date}
|
||||
date_arr.push(str)
|
||||
end
|
||||
|
||||
out = {:status => 'ok', :message => date_arr}
|
||||
|
||||
respond_to do |format|
|
||||
format.json { render json: out }
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
Reference in New Issue
Block a user