transaction sales
This commit is contained in:
@@ -6,31 +6,30 @@ class Transactions::SalesController < ApplicationController
|
||||
# GET /transactions/sales
|
||||
# GET /transactions/sales.json
|
||||
def index
|
||||
|
||||
sale =nil
|
||||
receipt_no = params[:receipt_no]
|
||||
# from = params[:from]
|
||||
# to = params[:to]
|
||||
from, to = get_date_range_from_params
|
||||
@shift = ''
|
||||
from = params[:from]
|
||||
to = params[:to]
|
||||
if params[:shift_name].to_i != 0
|
||||
@shift = ShiftSale.find(params[:shift_name])
|
||||
@shift = ShiftSale.find(params[:shift_name])
|
||||
end
|
||||
|
||||
if receipt_no.nil? && from.nil? && to.nil?
|
||||
if params[:period].blank? && from.blank? && to.blank?
|
||||
if @shift.blank?
|
||||
@sales = Sale.where("NOT sale_status='new'").order("sale_id desc")
|
||||
else
|
||||
@sales = Sale.where("NOT sale_status='new' and shift_sale_id ='#{@shift.id}'").order("sale_id desc")
|
||||
if current_user.role =="cashier"
|
||||
@shift =ShiftSale.current_open_shift(current_user)
|
||||
end
|
||||
end
|
||||
@sales = Kaminari.paginate_array(@sales).page(params[:page]).per(20)
|
||||
else
|
||||
sale = Sale.search(receipt_no,from,to,@shift)
|
||||
if sale.count > 0
|
||||
@sales = sale
|
||||
@sales = Kaminari.paginate_array(@sales).page(params[:page]).per(20)
|
||||
else
|
||||
@sales = 0
|
||||
end
|
||||
from, to = get_date_range_from_params
|
||||
end
|
||||
sale = Sale.search(receipt_no,from,to,@shift)
|
||||
if !sale.nil?
|
||||
if sale.count > 0
|
||||
@sales = sale
|
||||
@sales = Kaminari.paginate_array(@sales).page(params[:page]).per(20)
|
||||
else
|
||||
@sales = 0
|
||||
end
|
||||
end
|
||||
@receipt_no = receipt_no
|
||||
@from = from
|
||||
|
||||
Reference in New Issue
Block a user