From 25ef380b4f3fd40b4b104f5e184464bc7febbaf8 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Mon, 17 Jul 2017 11:22:24 +0630
Subject: [PATCH] finished report for all

---
 app/controllers/base_report_controller.rb     |  61 +--
 app/controllers/origami/shifts_controller.rb  |   2 -
 .../reports/receipt_no_controller.rb          | 246 ++---------
 .../reports/saleitem_controller.rb            | 414 +++++++++---------
 .../reports/shiftsale_controller.rb           |  32 +-
 app/models/sale.rb                            | 146 ++----
 .../_shift_sale_report_filter.html.erb        | 177 ++++++++
 app/views/reports/dailysale/index.html.erb    |  71 +--
 app/views/reports/dailysale/index.xls.erb     |  38 +-
 .../_shift_sale_report_filter.html.erb        | 102 +----
 app/views/reports/receipt_no/index.html.erb   | 130 +++---
 app/views/reports/receipt_no/index.xls.erb    | 118 ++---
 .../_shift_sale_report_filter.html.erb        |  96 +---
 app/views/reports/saleitem/index.html.erb     |  24 +-
 .../_shift_sale_report_filter.html.erb        |  34 +-
 app/views/reports/shiftsale/index.html.erb    |  91 +++-
 16 files changed, 792 insertions(+), 990 deletions(-)
 create mode 100644 app/views/reports/_shift_sale_report_filter.html.erb

diff --git a/app/controllers/base_report_controller.rb b/app/controllers/base_report_controller.rb
index 12eeccd2..af9ec4fc 100644
--- a/app/controllers/base_report_controller.rb
+++ b/app/controllers/base_report_controller.rb
@@ -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 
 
diff --git a/app/controllers/origami/shifts_controller.rb b/app/controllers/origami/shifts_controller.rb
index 92f174ae..24ef0b76 100644
--- a/app/controllers/origami/shifts_controller.rb
+++ b/app/controllers/origami/shifts_controller.rb
@@ -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
 
diff --git a/app/controllers/reports/receipt_no_controller.rb b/app/controllers/reports/receipt_no_controller.rb
index e71df43e..d1427e6e 100644
--- a/app/controllers/reports/receipt_no_controller.rb
+++ b/app/controllers/reports/receipt_no_controller.rb
@@ -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
\ No newline at end of file
diff --git a/app/controllers/reports/saleitem_controller.rb b/app/controllers/reports/saleitem_controller.rb
index 80bd8b93..c9715fc3 100644
--- a/app/controllers/reports/saleitem_controller.rb
+++ b/app/controllers/reports/saleitem_controller.rb
@@ -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
diff --git a/app/controllers/reports/shiftsale_controller.rb b/app/controllers/reports/shiftsale_controller.rb
index 87fae97d..fc3adbf9 100644
--- a/app/controllers/reports/shiftsale_controller.rb
+++ b/app/controllers/reports/shiftsale_controller.rb
@@ -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
 
diff --git a/app/models/sale.rb b/app/models/sale.rb
index 12896b7d..8fa54a7c 100644
--- a/app/models/sale.rb
+++ b/app/models/sale.rb
@@ -503,84 +503,18 @@ def self.get_by_range_by_saleitems(from,to,status,report_type)
 
 
 
-    case report_type.to_i
-       when REPORT_TYPE["daily"]
-        return  query
-       when REPORT_TYPE["monthly"]
-
-        return  query.group("MONTH(date)")
-      when REPORT_TYPE["yearly"]
-         return query.group("YEAR(date)")
-     end
 
 end
 
 
-def self.get_by_shiftsales(from,to)
-    return ShiftSale.where("(shift_started_at between ? and ? OR shift_closed_at between ? and ? )", from, to, from, to)
+def self.get_by_shiftsales(from,to,shift)
+   if !shift.blank?
+     ShiftSale.where("id =?",shift.id)
+   else
+     ShiftSale.where("(shift_started_at between ? and ? OR shift_closed_at between ? and ? )", from, to, from, to)
+   end
 end
 
-# def self.get_by_shiftsales(from,to)
-#     shift_sales = ShiftSale.select('shift_sales.id, cs.name as cashier_station_name, shift_sales.shift_started_at as opening_date, shift_sales.shift_closeed_at as closing_date')
-#                             .joins(" INNER JOIN cashier_terminals cs ON cs.id = shift_sales.cashier_terminal_id")
-#                             .where("shift_sales.employee_id = ? and (shift_sales.shift_started_at between ? and ? OR shift_sales.shift_closeed_at between ? and ? )", employee, from, to, from, to)
-#                             .order("shift_sales.id DESC")
-
-#     sale_arr = Array.new
-#     shift_sales.each do |shift|
-#       all_total= Sale.select("grand_total,sr.payment_method, sr.payment_amount, rounding_adjustment")
-#                       .joins("join employees e on sales.cashier_id = e.id join shift_sales sh on sh.id = sales.shift_sale_id")   
-#                       .joins("INNER JOIN (select * from sale_payments group by sale_payments.sale_id, sale_payments.payment_method) sr ON sr.sale_id = sales.sale_id")
-#                      .where("sales.shift_sale_id =? and sales.sale_status = 'completed' and sales.total_amount != 0",shift.id)
-                     
-#       void = Sale.select("SUM(sales.grand_total) AS grand_total")
-#                       .joins("join shift_sales sh on sh.id = sales.shift_sale_id")
-#                       .where('sales.sale_status = "void" and sales.total_amount != 0 and sales.shift_sale_id = ?', shift.id)
-#                       .sum(:grand_total)
-#       cash = all_total.select('sr.payment_method')
-#                       .where('sr.payment_method = "cash"')
-#                       .sum(:amount)
-
-#       credit = all_total.where('sr.payment_method = "creditnote"')
-#                       .sum(:amount)
-                      
-#       accept_credit = all_total.select('ci.amout')
-#                       .joins("INNER JOIN credit_items ci ON ci.sale_id = sales.id")
-#                       .where('sr.payment_method = "creditnote"')
-#                       .sum(:amout)                      
-                      
-
-                      
-#       foc = all_total.where('sales.payment_method = "foc" and sales.sale_status = "completed"')
-#                     .sum(:grand_total)
-                      
-#       card = all_total.select('payment_method')
-#                       .where('sr.payment_method = "card"')
-#                       .sum(:amount).to_f 
-                      
-#       rounding_adj = all_total.sum(:rounding_adjustment)
-
-#       discount = all_total.sum(:discount_amount)
-#       void = void.nil? ? 0 : void
-#       cash = cash.nil? ? 0 : cash
-#       credit = credit.nil? ? 0 : credit
-#       foc = foc.nil? ? 0 : foc
-#       card = card.nil? ? 0 : card
-#       accept_credit = accept_credit.nil? ? 0 : accept_credit
-#       # all_payments = void.to_d + cash.to_d + credit.to_d + foc.to_d + card.to_d + accept_credit.to_d
-#       all_payments = cash.to_d + credit.to_d + foc.to_d + card.to_d + accept_credit.to_d
-#       payments = { void_amount: void, cash_amount: cash, credit_amount: credit,accept_credit_amount: accept_credit, foc_amount: foc, card_amount: card, grand_total: all_payments , cashier_station_name: shift.cashier_station_name, opening_date: shift.opening_date, closing_date: shift.closing_date, rounding_adj: rounding_adj }
-
-#       sale_arr.push(payments)
-#     end
-
-#     return sale_arr            
-#   end
-
-# def self.get_receipt_no_list(from,to)
-#   sale = Sale.where("sale_status=? and receipt_date between ? and ?","completed",from,to)
-# end 
-
 def self.get_by_shift_sale(from,to,status)
   query = ShiftSale.select("shift_sales.id ,shift_started_at AS opening_date,shift_closed_at As closing_date," +
     " grand_total AS grand_total, cash_sales AS cash," +
@@ -604,7 +538,7 @@ def self.get_item_query()
   end  
   
     
-  def self.get_by_shift_items(shift_sale_range, shift, from, to, status, report_type)
+  def self.get_by_shift_items(shift_sale_range, shift, from, to, status)
     
     # date_type_selection = get_sql_function_for_report_type(report_type)
     
@@ -616,11 +550,12 @@ def self.get_item_query()
     total_foc_amount = 0
     total_grand_total = 0   
 
-    if shift == '[]'
+    if shift.blank?
         ### => get all sales range in shift_sales
         query          = query.where("sales.shift_sale_id IN (?) and sale_status='completed'",shift_sale_range.to_a)
         discount_query = Sale.where("sales.shift_sale_id IN (?) and sale_status ='completed'", shift_sale_range.to_a).sum(:total_discount)
-        sale_cash      = Sale.select("SUM(case when (sale_payments.payment_method = 'mpu' or sale_payments.payment_method = 'visa' or sale_payments.payment_method = 'master' or sale_payments.payment_method = 'jcb' or sale_payments.payment_method = 'paypar') then (sale_ - sales.amount_changed) else 0 end) as card_amount,
+        change_amount = Sale.where("sales.shift_sale_id IN (?) and sale_status ='completed'", shift_sale_range.to_a).sum(:amount_changed)
+        sale_cash      = Sale.select("SUM(case when (sale_payments.payment_method = 'mpu' or sale_payments.payment_method = 'visa' or sale_payments.payment_method = 'master' or sale_payments.payment_method = 'jcb' or sale_payments.payment_method = 'paypar') then (sale_payments.payment_amount) else 0 end) as card_amount,
                                       SUM(case when (sale_payments.payment_method='cash') then (sale_payments.payment_amount) else 0 end) as cash_amount, 
                                       SUM(case when (sale_payments.payment_method='creditnote') then (sale_payments.payment_amount) else 0 end) as credit_amount, 
                                       SUM(case when (sale_payments.payment_method='foc') then (sale_payments.payment_amount) else 0 end) as foc_amount")
@@ -633,11 +568,11 @@ def self.get_item_query()
           total_foc_amount += s_c.foc_amount.to_f
         end
         total_grand_total = total_cash_amount.to_f + total_card_amount.to_f + total_credit_amount.to_f
-
-    elsif shift_sale_range == '[]'
+    else
         query          = query.where("sales.shift_sale_id IN (?) and sale_status='completed'",shift.to_a)
         discount_query = Sale.where("sales.shift_sale_id in (?) and sale_status= 'completed' ", shift.to_a).sum(:total_discount)   
-        sale_cash      = Sale.select("SUM(case when (sale_payments.payment_method = 'mpu' or sale_payments.payment_method = 'visa' or sale_payments.payment_method = 'master' or sale_payments.payment_method = 'jcb' or sale_payments.payment_method = 'paypar') then (sale_payments.payment_amount) else 0 end) as card_amount,
+        change_amount = Sale.where("sales.shift_sale_id in (?) and sale_status= 'completed' ", shift.to_a).sum(:amount_changed)   
+        sale_cash      = Sale.select("SUM(case when (sale_payments.payment_method ='mpu' or sale_payments.payment_method = 'visa' or sale_payments.payment_method = 'master' or sale_payments.payment_method = 'jcb' or sale_payments.payment_method = 'paypar') then (sale_payments.payment_amount) else 0 end) as card_amount,
                                       SUM(case when (sale_payments.payment_method='cash') then (sale_payments.payment_amount) else 0 end) as cash_amount, 
                                       SUM(case when (sale_payments.payment_method='creditnote') then (sale_payments.payment_amount) else 0 end) as credit_amount, 
                                       SUM(case when (sale_payments.payment_method='foc') then (sale_payments.payment_amount) else 0 end) as foc_amount")
@@ -649,31 +584,38 @@ def self.get_item_query()
           total_credit_amount += s_c.credit_amount.to_f
           total_foc_amount += s_c.foc_amount.to_f
         end
-        total_grand_total = total_cash_amount.to_f + total_card_amount.to_f + total_credit_amount.to_f
-        
-    else
-       query = query.where("receipt_date between ? and ? and sale_status=?",from,to,'completed')
-       sale_cash      = Sale.select("sales.total_discount as total_discount, 
-                                      SUM(case when (sale_payments.payment_method = 'mpu' or sale_payments.payment_method = 'visa' or sale_payments.payment_method = 'master' or sale_payments.payment_method = 'jcb' or sale_payments.payment_method = 'paypar') then (sale_payments.payment_amount) else 0 end) as card_amount,
-                                      SUM(case when (sale_payments.payment_method='cash') then (sale_payments.payment_amount) else 0 end) as cash_amount, 
-                                      SUM(case when (sale_payments.payment_method='creditnote') then (sale_payments.payment_amount) else 0 end) as credit_amount, 
-                                      SUM(case when (sale_payments.payment_method='foc') then (sale_payments.payment_amount) else 0 end) as foc_amount")
-                                     .joins("join sale_payments on sale_payments.sale_id = sales.sale_id")
-                                     .where("sales.shift_sale_id in (?) and sale_status = 'completed'  ", shift.to_a)       
-        
-        sale_cash.each do |s_c|
-          total_cash_amount += s_c.cash_amount.to_f
-          total_card_amount += s_c.card_amount.to_f
-          total_credit_amount += s_c.credit_amount.to_f
-          total_foc_amount += s_c.foc_amount.to_f
-          discount_query = s_c.total_discount.to_f
-        end
-        total_grand_total = total_cash_amount.to_f + total_card_amount.to_f + total_credit_amount.to_f
-    
+        total_grand_total = total_cash_amount.to_f + total_card_amount.to_f + total_credit_amount.to_f 
+   
     end
 
-    return query, discount_query , total_cash_amount , total_card_amount , total_credit_amount , total_foc_amount , total_grand_total
-  end 
+    return query, discount_query , total_cash_amount , total_card_amount , total_credit_amount , total_foc_amount , total_grand_total , change_amount
+end 
+
+def self.get_shift_sales_by_receipt_no(shift_sale_range,shift,from,to,payment_type)
+    ## => left join -> show all sales although no orders
+    if payment_type.blank?
+      payment_type = ''
+    else
+      if payment_type == 'card'
+        payment_type = " and sale_payments.payment_method = 'mpu' or sale_payments.payment_method = 'visa' or sale_payments.payment_method = 'master' or sale_payments.payment_method = 'jcb' or sale_payments.payment_method = 'paypar'"
+      else
+        payment_type = " and sale_payments.payment_method = '#{payment_type}'"
+      end
+    end
+    query = Sale.all
+    if shift.present?
+      query = query.where("sales.shift_sale_id in (?) #{payment_type} and sale_status= 'completed' and sales.total_amount != 0", shift.to_a)
+              .joins("join sale_payments on sale_payments.sale_id = sales.sale_id")
+             .group("sales.sale_id")
+      
+    else
+      query = query .where("sale_status=? #{payment_type} and sales.shift_sale_id in (?)","completed",shift_sale_range.to_a)
+              .joins("join sale_payments on sale_payments.sale_id = sales.sale_id")
+              .group("sales.sale_id")
+    end 
+                                     
+end  
+
 
 def self.get_separate_tax(from,to,payment_method=nil)
         
@@ -692,7 +634,7 @@ end
     cash = 0.0
     self.sale_payments.each do |pay|
         if pay.payment_method == 'cash'
-          cash = pay.payment_amount
+          cash = pay.payment_amount-self.amount_changed
         end
     end
     return cash
diff --git a/app/views/reports/_shift_sale_report_filter.html.erb b/app/views/reports/_shift_sale_report_filter.html.erb
new file mode 100644
index 00000000..a5513531
--- /dev/null
+++ b/app/views/reports/_shift_sale_report_filter.html.erb
@@ -0,0 +1,177 @@
+<div class="row">
+	<div class="col-md-12">
+			<%= form_tag report_path, :method => :get, :id=>"frm_report", :class => "form" do %>
+				<% if period_type != false %>
+					<div class="row">
+						<div class="form-group col-md-2">
+							<label>Select Period</label>
+							<select name="period" id="sel_period" class="form-control">
+							    <option value="">Select Period</option>
+								<option value="0">Today</option>
+								<option value="1">Yesterday</option>
+								<option value="2">This week</option>
+								<option value="3">Last week</option>
+								<option value="4">Last 7 days</option>
+								<option value="5">This month</option>
+								<option value="6">Last month</option>
+								<option value="7">Last 30 days</option>
+								<option value="8">This year</option>
+								<option value="9">Last year</option>
+							</select>
+						</div>
+						<!-- <input type="hidden" name="report_type" value="shift_item" id="sel_receipt_no"> -->
+						<div class="form-group col-md-2">
+							<label>Select Type</label>
+							<select name="sale_type" id="sel_sale_type" class="form-control">
+								<option value="0">All Sale Type</option>
+								<option value="1">Revenue Only</option>
+								<option value="2">Discount Only</option>
+								<option value="3">Void Only</option>
+								<option value="4">Taxes Only</option>
+								<option value="5">Other Amount Only</option>
+							</select>
+						</div>
+						<div class="form-group col-md-2">					
+							<!-- <label class="">Select Shift Period</label> -->
+				  			<label class="">From</label>
+							<input data-behaviour='datepicker' class="form-control" name="from" id="from" type="text" placeholder="From date">
+						</div>
+						<div class="form-group col-md-2">
+							<label class="">To</label>
+							<input data-behaviour='datepicker' class="form-control" name="to" id="to" type="text" placeholder="To date">
+						</div>
+						<div class="form-group col-md-2">
+						<label class="">All Shift</label>
+							<select name="shift_name" id="shift_name" class="form-control"></select>
+						</div>
+						<div class="form-group col-md-1 margin-top-20">
+							<input type="submit" value="Generate Report" class='btn btn-primary'>
+						</div>							
+					</div>													
+				<% end %>
+	
+				<div class="row">
+					<div class="form-group">
+					<% if defined? promotions %>
+						<%= select_tag "promotion", options_for_select(@promotions, :selected => params[:promotion_type]), :class => "form-control" %>
+					<% end %>
+					
+					<% if defined? menu_types %>
+						<%= select_tag "menu_type", options_for_select(@menu_types, :selected => params[:menu_type]), :class => "form-control" %>	
+					<% end %>
+					
+					<% if defined? payments %>
+						<%= select_tag "payment_type", options_for_select(@payments, :selected => params[:payment_type]), :class => "form-control" %>	
+					<% end %>
+					
+					
+
+					<% if defined? cashiers %>
+						<%= select_tag "cashier", options_from_collection_for_select(@cashiers,"id","name"),:prompt => "All Cashier Stations", :class => "form-control" %>
+					<% end %>
+						
+					<% if defined? singer %>
+						<%= select_tag "singer", options_from_collection_for_select(singer,"id","name"),:prompt => "All Vocal List", :class => "form-control" %>
+					<% end %>
+					
+					<% if defined? bsm %>		
+						<%= select_tag "singer", options_from_collection_for_select(bsm,"id","name"),:prompt => "All BSM List", :class => "form-control" %>
+					<% end %>		
+					
+					<% if defined? guest_role %>
+						<%= select_tag "guest_role", options_from_collection_for_select(@guest_role,"id","name"),:prompt => "Vocal/BSM List", :class => "form-control" %>
+					<% end %>
+					
+					<% if defined? list_by_payment_type %> <!-- for report detail by credit and foc -->
+						<%= select_tag "payment_type_list", options_for_select(@payment_list, :selected => params[:payment_type_list]), :class => "form-control" %>	
+					<% end %>				
+					
+					<% if defined? products %>
+						<%= select_tag "product", options_from_collection_for_select(@products,"id","name"),:prompt => "All Products", :class => "form-control" %>	
+					<% end %>
+
+					<% if defined? items %>	
+						<%= select_tag "item", options_for_select(@items, :selected => params[:item_type]), :class => "form-control" %>			
+					<% end %>
+					</div>
+				</div>
+
+				<!-- <div class="row">
+					<div class="col-md-12">
+						<input type="submit" value="Generate Report" class='btn btn-primary'>
+					</div>
+				</div> -->
+				
+			<% end %>		
+	</div>
+</div>
+
+
+<script type="text/javascript">
+$(function(){
+	$('#custom_excel').hide();
+	
+	$('#custom_excel').click(function(){
+		var url = $('#custom_excel').attr('data-url');
+		$('#frm_report').attr('action',url)
+		$('#frm_report').submit();
+		// window.location = url;
+	});
+	
+	var item = $('#item').val();
+	var payment_type = $('#payment_type');
+	
+	if(item == 'order'){
+		$('#cashier').hide();
+		$('#waiter').show();
+		if(payment_type){
+			$('#payment_type').hide();
+		}		
+	}
+	else if(item == 'sale'){
+		$('#waiter').hide();
+		$('#cashier').show();
+	}
+	else{
+		$('#waiter').hide();
+		$('#cashier').show();		
+		$("#item").val('sale');
+	}
+});
+
+
+
+// $("#from").val("<%=params[:from] rescue '-'%>");
+// $("#to").val("<%=params[:to] rescue '-'%>");
+//  $("#sel_period").val(<%=params[:period] rescue '-'%>);
+// $("#sel_sale_type").val(<%=params[:sale_type] rescue '-'%>);
+
+<% if params[:period_type] == 1 || params[:period_type] == "1" %>
+	$("#rd_period_type_1").attr("checked","checked");
+<% else %>
+	$("#rd_period_type_0").attr("checked","checked");
+<% end %>
+$(".btn-group button").removeClass("active");
+<% report_type = params[:report_type].blank? ? "0" : params[:report_type] %>
+$("#btn_report_type_<%= report_type %>").addClass("active");
+
+$('#item').change(function(){
+	var item = $('#item').val();
+	var payment_type = $('#payment_type');
+
+	if(item == 'sale'){
+		$('#waiter').hide();
+		$('#cashier').show();		
+		if(payment_type){
+			$('#payment_type').show();
+		}
+	}
+	else{
+		$('#cashier').hide();
+		$('#waiter').show();
+		if(payment_type){
+			$('#payment_type').hide();
+		}
+	}
+});
+</script>
diff --git a/app/views/reports/dailysale/index.html.erb b/app/views/reports/dailysale/index.html.erb
index 996393ac..7e70615f 100644
--- a/app/views/reports/dailysale/index.html.erb
+++ b/app/views/reports/dailysale/index.html.erb
@@ -35,7 +35,7 @@
 		    <th style='text-align:center;'>Master Sales</th>
 		    <th style='text-align:center;'>Visa Sales</th>
 		    <th style='text-align:center;'>Jcb Sales</th>
-		    <th style='text-align:center;'>Paypar Sales</th>
+		    <th style='text-align:center;'>Redeem Sales</th>
 		    <th style='text-align:center;'>Cash Sales</th>
 		    <th style='text-align:center;'>Credit Sales</th>
 		    <th style='text-align:center;'>FOC Sales</th>
@@ -59,7 +59,8 @@
 		  <% foc    = 0 %>
 		  <% discount = 0 %>
 		  <% total    = 0 %>
-		  <% grand_total = 0 %>  
+		  <% grand_total = 0 %> 
+		  <% old_grand_total = 0 %>  
 		  <% count = 1 %> <% rounding_adj = 0 %>
 		  <% @sale_data.each do |sale| %>
 		    <% void += sale[:void_amount] %>
@@ -74,6 +75,7 @@
 		    <% discount += sale[:total_discount] %>
 		    <% total += sale[:old_grand_total].to_f + sale[:rounding_adj].to_f  %>
 		    <% grand_total += sale[:grand_total].to_f  %>	
+		    <% old_grand_total += sale[:old_grand_total].to_f  %>	
 		    <% rounding_adj += sale[:rounding_adj].to_f %>	
 		  <tr>
 		    <td style='text-align:right;'><%= count %></td>
@@ -90,25 +92,25 @@
 		    <td style='text-align:right;'>(<%= number_with_delimiter(sprintf("%.2f",sale[:total_discount]), :delimiter => ',') rescue '-'%>)</td>
 		    <td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",sale[:old_grand_total].to_f + sale[:rounding_adj].to_f ), :delimiter => ',') rescue '-'%></td>   
 		    <td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",sale[:rounding_adj].to_f), :delimiter => ',') rescue '-'%></td>
-		    <td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",sale[:grand_total]), :delimiter => ',') rescue '-'%></td>	   	
+		    <td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",sale[:old_grand_total]), :delimiter => ',') rescue '-'%></td>	   	
 		  </tr>
 		  <% count = count + 1 %>
 		  <% end %>
 
 		  <tr style="font-weight:600;">
 		    <td colspan="3" style='text-align:center;'>Total</td>	
-		    <td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",mpu_amount), :delimiter => ',') rescue '-'%></td>
-		    <td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",master_amount), :delimiter => ',') rescue '-'%></td>
-		    <td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",visa_amount), :delimiter => ',') rescue '-'%></td>
-		    <td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",jcb_amount), :delimiter => ',') rescue '-'%></td>
-		    <td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",paypar_amount), :delimiter => ',') rescue '-'%></td>
+		    <td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",mpu), :delimiter => ',') rescue '-'%></td>
+		    <td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",master), :delimiter => ',') rescue '-'%></td>
+		    <td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",visa), :delimiter => ',') rescue '-'%></td>
+		    <td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",jcb), :delimiter => ',') rescue '-'%></td>
+		    <td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",paypar), :delimiter => ',') rescue '-'%></td>
 		    <td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",cash), :delimiter => ',') rescue '-'%></td>
 		    <td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",credit), :delimiter => ',') rescue '-'%></td>
 		    <td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",foc), :delimiter => ',') rescue '-'%></td>    
 		    <td style='text-align:right;'>(<%= number_with_delimiter(sprintf("%.2f",discount), :delimiter => ',') rescue '-'%>)</td>
 		    <td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",total), :delimiter => ',') rescue '-'%></td>    
 			<td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",rounding_adj), :delimiter => ',') rescue '-'%></td>   	
-			<td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",grand_total), :delimiter => ',') rescue '-'%></td>   
+			<td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",old_grand_total), :delimiter => ',') rescue '-'%></td>   
 		  </tr>
 
 		  <% total_tax = 0 %>
@@ -135,54 +137,3 @@
 		</div>
 	</div>
 </div>
-
-
-<script>
-$(function(){
-	var check_arr = [];   	
-	var search = '<%= params[:period_type] %>';	
-	if(search){
-		if(parseInt(search) == 0){
-			search_by_period();	
-		}
-		else{
-			search_by_date();				
-		}
-	}else{
-		search_by_period();		
-	}
-    $('#sel_period').change(function(){	   
-	   search_by_period();	   
-    });   
-	function search_by_period(){
- 	   var period = $('#sel_period').val();
- 	   var period_type = 0;
- 	   var from = "";
- 	   var to = ""; 	
-	}   
-   
-    $('#from').change(function(){
-	   search_by_date();	   
-    });
-   
-    $('#to').change(function(){
-	   search_by_date();
-    });      
-    function search_by_date(){
-	   var from = $('#from').val();
-	   var to = $('#to').val();
-	   var period = 0;
-	   var period_type = 1;	   
-	   if(to != '' && from != ''){
-		   shift_name = from + ',' + to;
-		   check_arr.push(to);		   
-		   // console.log(check_arr.length)
-		   if(check_arr.length == 1){ 		   			   	
-		   }
-		   if(check_arr.length == 3){
-			   check_arr = [];
-		   }
-	   }	   
-   }    
-});
-</script>
\ No newline at end of file
diff --git a/app/views/reports/dailysale/index.xls.erb b/app/views/reports/dailysale/index.xls.erb
index 67e76e3c..424f3b63 100644
--- a/app/views/reports/dailysale/index.xls.erb
+++ b/app/views/reports/dailysale/index.xls.erb
@@ -1,12 +1,11 @@
-<div class="card row">
+<div class="container margin-top-20">
+	<div class="card row">
 	  <div class="table-responsive">
 	  <table class="table table-bordered">
 	  <thead> 
-		  <% if params[:from]%>
 		    <tr>
-		        <th colspan="17"> Sale (<%= params[:from] rescue '-' %> - <%= params[:to]  rescue '-'%>)</th>
+		        <th colspan="17"> Sale (<%= from rescue '-' %> - <%= to  rescue '-'%>)</th>
 		   </tr>
-		  <% end %> 
 		    <tr>
 		    <th style='text-align:center;'>Sr.no</th>
 		    <th style='text-align:center;'>Date</th>
@@ -15,7 +14,7 @@
 		    <th style='text-align:center;'>Master Sales</th>
 		    <th style='text-align:center;'>Visa Sales</th>
 		    <th style='text-align:center;'>Jcb Sales</th>
-		    <th style='text-align:center;'>Paypar Sales</th>
+		    <th style='text-align:center;'>Redeem Sales</th>
 		    <th style='text-align:center;'>Cash Sales</th>
 		    <th style='text-align:center;'>Credit Sales</th>
 		    <th style='text-align:center;'>FOC Sales</th>
@@ -39,7 +38,8 @@
 		  <% foc    = 0 %>
 		  <% discount = 0 %>
 		  <% total    = 0 %>
-		  <% grand_total = 0 %>  
+		  <% grand_total = 0 %> 
+		  <% old_grand_total = 0 %>  
 		  <% count = 1 %> <% rounding_adj = 0 %>
 		  <% @sale_data.each do |sale| %>
 		    <% void += sale[:void_amount] %>
@@ -48,12 +48,13 @@
 		    <% visa += sale[:visa_amount] %>
 		    <% jcb += sale[:jcb_amount] %>
 		    <% paypar += sale[:paypar_amount] %>
-		    <% cash += sale[:cash_amount] %>
+		    <% cash += sale[:cash_amount]-sale[:total_change_amount] %>
 		    <% credit += sale[:credit_amount] %>   
 		    <% foc += sale[:foc_amount] %>
 		    <% discount += sale[:total_discount] %>
-		    <% total += sale[:grand_total].to_f + sale[:rounding_adj].to_f  %>
+		    <% total += sale[:old_grand_total].to_f + sale[:rounding_adj].to_f  %>
 		    <% grand_total += sale[:grand_total].to_f  %>	
+		    <% old_grand_total += sale[:old_grand_total].to_f  %>	
 		    <% rounding_adj += sale[:rounding_adj].to_f %>	
 		  <tr>
 		    <td style='text-align:right;'><%= count %></td>
@@ -64,31 +65,31 @@
 		    <td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",sale[:visa_amount]), :delimiter => ',') rescue '-'%></td>
 		    <td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",sale[:jcb_amount]), :delimiter => ',') rescue '-'%></td>
 		    <td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",sale[:paypar_amount]), :delimiter => ',') rescue '-'%></td>
-		    <td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",sale[:cash_amount]), :delimiter => ',') rescue '-'%></td>
+		    <td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",sale[:cash_amount]-sale[:total_change_amount]), :delimiter => ',') rescue '-'%></td>
 		    <td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",sale[:credit_amount]), :delimiter => ',') rescue '-'%></td>
 		    <td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",sale[:foc_amount]), :delimiter => ',') rescue '-'%></td>    
 		    <td style='text-align:right;'>(<%= number_with_delimiter(sprintf("%.2f",sale[:total_discount]), :delimiter => ',') rescue '-'%>)</td>
-		    <td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",sale[:grand_total].to_f + sale[:rounding_adj].to_f ), :delimiter => ',') rescue '-'%></td>   
+		    <td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",sale[:old_grand_total].to_f + sale[:rounding_adj].to_f ), :delimiter => ',') rescue '-'%></td>   
 		    <td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",sale[:rounding_adj].to_f), :delimiter => ',') rescue '-'%></td>
-		    <td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",sale[:grand_total]), :delimiter => ',') rescue '-'%></td>	   	
+		    <td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",sale[:old_grand_total]), :delimiter => ',') rescue '-'%></td>	   	
 		  </tr>
 		  <% count = count + 1 %>
 		  <% end %>
 
 		  <tr style="font-weight:600;">
 		    <td colspan="3" style='text-align:center;'>Total</td>	
-		    <td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",mpu_amount), :delimiter => ',') rescue '-'%></td>
-		    <td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",master_amount), :delimiter => ',') rescue '-'%></td>
-		    <td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",visa_amount), :delimiter => ',') rescue '-'%></td>
-		    <td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",jcb_amount), :delimiter => ',') rescue '-'%></td>
-		    <td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",paypar_amount), :delimiter => ',') rescue '-'%></td>
+		    <td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",mpu), :delimiter => ',') rescue '-'%></td>
+		    <td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",master), :delimiter => ',') rescue '-'%></td>
+		    <td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",visa), :delimiter => ',') rescue '-'%></td>
+		    <td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",jcb), :delimiter => ',') rescue '-'%></td>
+		    <td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",paypar), :delimiter => ',') rescue '-'%></td>
 		    <td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",cash), :delimiter => ',') rescue '-'%></td>
 		    <td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",credit), :delimiter => ',') rescue '-'%></td>
 		    <td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",foc), :delimiter => ',') rescue '-'%></td>    
 		    <td style='text-align:right;'>(<%= number_with_delimiter(sprintf("%.2f",discount), :delimiter => ',') rescue '-'%>)</td>
 		    <td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",total), :delimiter => ',') rescue '-'%></td>    
 			<td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",rounding_adj), :delimiter => ',') rescue '-'%></td>   	
-			<td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",grand_total), :delimiter => ',') rescue '-'%></td>   
+			<td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",old_grand_total), :delimiter => ',') rescue '-'%></td>   
 		  </tr>
 
 		  <% total_tax = 0 %>
@@ -113,4 +114,5 @@
 		<% end %>
 		</table>
 		</div>
-	</div>
\ No newline at end of file
+	</div>
+</div>
diff --git a/app/views/reports/receipt_no/_shift_sale_report_filter.html.erb b/app/views/reports/receipt_no/_shift_sale_report_filter.html.erb
index 8e1de8e2..c6308a66 100644
--- a/app/views/reports/receipt_no/_shift_sale_report_filter.html.erb
+++ b/app/views/reports/receipt_no/_shift_sale_report_filter.html.erb
@@ -6,6 +6,7 @@
 						<div class="form-group col-md-2">
 							<label>Select Period</label>
 							<select name="period" id="sel_period" class="form-control">
+							    <option value="">Select Period</option>
 								<option value="0">Today</option>
 								<option value="1">Yesterday</option>
 								<option value="2">This week</option>
@@ -18,18 +19,12 @@
 								<option value="9">Last year</option>
 							</select>
 						</div>
-						<input type="hidden" name="report_type" value="shift_item" id="sel_receipt_no">
+						<% if defined? payments %>
 						<div class="form-group col-md-2">
-							<label>Select Type</label>
-							<select name="sale_type" id="sel_sale_type" class="form-control">
-								<option value="0">All Sale Type</option>
-								<option value="1">Revenue Only</option>
-								<option value="2">Discount Only</option>
-								<option value="3">Void Only</option>
-								<option value="4">Taxes Only</option>
-								<option value="5">Other Amount Only</option>
-							</select>
+						<label>Select Payments</label>
+						<%= select_tag "payment_type", options_for_select(@payments, :selected => params[:payment_type]), :class => "form-control" %>	
 						</div>
+					    <% end %>
 						<div class="form-group col-md-2">					
 							<!-- <label class="">Select Shift Period</label> -->
 				  			<label class="">From</label>
@@ -41,7 +36,8 @@
 						</div>
 						<div class="form-group col-md-2">
 						<label class="">All Shift</label>
-							<select name="shift_name" id="shift_name" class="form-control"></select>
+							<select class="form-control select" name="shift_name" id="shift_name" >
+							</select>
 						</div>
 						<div class="form-group col-md-1 margin-top-20">
 							<input type="submit" value="Generate Report" class='btn btn-primary'>
@@ -49,70 +45,6 @@
 					</div>													
 				<% end %>
 				
-				<!-- <div class="row">
-					<% if defined? show_monthly %>
-						<div class="span3" style="margin-bottom:10px;">
-							<input type="hidden" id="report_type" name="report_type" value="0">
-							<div class="btn-group" data-toggle="buttons-radio">
-							  <button id="btn_report_type_1" onclick="$('#report_type').val(1)" type="button" class="btn btn-inverse">Monthly</button>
-							  <button id="btn_report_type_2" onclick="$('#report_type').val(2)" type="button" class="btn btn-inverse">Yearly</button>
-							</div>
-						</div>
-					<% end %>
-				</div> -->
-	
-				<div class="row">
-					<div class="form-group">
-					<% if defined? promotions %>
-						<%= select_tag "promotion", options_for_select(@promotions, :selected => params[:promotion_type]), :class => "form-control" %>
-					<% end %>
-					
-					<% if defined? menu_types %>
-						<%= select_tag "menu_type", options_for_select(@menu_types, :selected => params[:menu_type]), :class => "form-control" %>	
-					<% end %>
-					
-					<% if defined? payments %>
-						<%= select_tag "payment_type", options_for_select(@payments, :selected => params[:payment_type]), :class => "form-control" %>	
-					<% end %>
-					
-					
-
-					<% if defined? cashiers %>
-						<%= select_tag "cashier", options_from_collection_for_select(@cashiers,"id","name"),:prompt => "All Cashier Stations", :class => "form-control" %>
-					<% end %>
-						
-					<% if defined? singer %>
-						<%= select_tag "singer", options_from_collection_for_select(singer,"id","name"),:prompt => "All Vocal List", :class => "form-control" %>
-					<% end %>
-					
-					<% if defined? bsm %>		
-						<%= select_tag "singer", options_from_collection_for_select(bsm,"id","name"),:prompt => "All BSM List", :class => "form-control" %>
-					<% end %>		
-					
-					<% if defined? guest_role %>
-						<%= select_tag "guest_role", options_from_collection_for_select(@guest_role,"id","name"),:prompt => "Vocal/BSM List", :class => "form-control" %>
-					<% end %>
-					
-					<% if defined? list_by_payment_type %> <!-- for report detail by credit and foc -->
-						<%= select_tag "payment_type_list", options_for_select(@payment_list, :selected => params[:payment_type_list]), :class => "form-control" %>	
-					<% end %>				
-					
-					<% if defined? products %>
-						<%= select_tag "product", options_from_collection_for_select(@products,"id","name"),:prompt => "All Products", :class => "form-control" %>	
-					<% end %>
-
-					<% if defined? items %>	
-						<%= select_tag "item", options_for_select(@items, :selected => params[:item_type]), :class => "form-control" %>			
-					<% end %>
-					</div>
-				</div>
-
-				<!-- <div class="row">
-					<div class="col-md-12">
-						<input type="submit" value="Generate Report" class='btn btn-primary'>
-					</div>
-				</div> -->
-				
 			<% end %>		
 	</div>
 </div>
@@ -150,12 +82,22 @@ $(function(){
 	}
 });
 
+ <% if params[:shift_name].to_i > 0%>
+	shift_id = '<%= params[:shift_name] %>'
+	local_date = '<%= @shift_from %> - <%= @shift_to %> '
+	var shift = $('#shift_name');
+	str = '<option value="'+ shift_id +'" '+ 'selected = "selected"' +'>' + local_date + '</option>';
+	shift.append(str);
+<% end %>
 
-
-// $("#from").val("<%=params[:from] rescue '-'%>");
-// $("#to").val("<%=params[:to] rescue '-'%>");
-//  $("#sel_period").val(<%=params[:period] rescue '-'%>);
-// $("#sel_sale_type").val(<%=params[:sale_type] rescue '-'%>);
+ $("#from").val("<%=params[:from] rescue '-'%>");
+ $("#to").val("<%=params[:to] rescue '-'%>");
+  $("#sel_period").val(<%=params[:period] rescue '-'%>);
+ $("#sel_sale_type").val(<%=params[:sale_type] rescue '-'%>);
+ // shift = $(".shift-id").text()
+ // if (shift.length>0) {
+ //  $('.shift_name > option[value="'+shift+'"]').attr('selected','selected');
+ // }
 
 <% if params[:period_type] == 1 || params[:period_type] == "1" %>
 	$("#rd_period_type_1").attr("checked","checked");
diff --git a/app/views/reports/receipt_no/index.html.erb b/app/views/reports/receipt_no/index.html.erb
index d4438d43..30689437 100644
--- a/app/views/reports/receipt_no/index.html.erb
+++ b/app/views/reports/receipt_no/index.html.erb
@@ -7,35 +7,36 @@
 
 <div class="container">
 	<%= render :partial=>'shift_sale_report_filter',
-	:locals=>{ 	:period_type => true, :shift_name => true, :report_path =>reports_receipt_no_index_path} %>
+	:locals=>{ 	:period_type => true, :shift_name => true,:payments => true, :report_path =>reports_receipt_no_index_path} %>
 	<hr />
 </div>
 
-<!-- <div class="container">
+ <div class="container">
 	<div class="row">
 		<div class="col-md-12 text-right">
 			<a href="javascript:export_to('<%=reports_receipt_no_index_path%>.xls')" class = "btn btn-default">Export to Excel</a>
 		</div>	  			
 	</div>
-</div> -->
+</div> 
 
 <div class="container margin-top-20">
 	<div class="card row">
 		<table class="table table-striped" border="0">
 			<thead>
-				<% if !params[:from].blank?%>
-				<tr>
-					<th colspan="7">From Date : <%= params[:from] rescue '-' %>	,	To Date : <%= params[:to]  rescue '-'%></th>
-				</tr>
-				<% end %>
-				<% if @shift_from %>
-				<tr>
-					<% if @shift.employee %>		
-					<% cashier_name = !@shift.nil? ? @shift.employee.name : '-' %>
-					<% end %>	
-					<th colspan="7">Shift Name =  <%= @shift_from  rescue '-'%> - <%= @shift_to  rescue '-'%> ( <%= cashier_name  rescue '-'%> )</th>
-				</tr>
-				<% end %>	 
+				
+					<% if !params[:from].blank?%>
+					<tr>
+						<th colspan="7">From Date : <%= params[:from] %>	,	To Date : <%= params[:to] %></th>
+					</tr>
+					<% end %>
+					<% if @shift_from %>
+					<tr>
+						<% if @shift_data.employee %>		
+						<% cashier_name = !@shift_data.nil? ? @shift_data.employee.name : '-' %>
+						<% end %>			
+						<th colspan="7">Shift Name =  <%= @shift_from %> - <%= @shift_to %> ( <%= cashier_name %> )</th>
+					</tr>
+					<% end %>	 
 
 				<tr>
 					<th>Recipt No</th>
@@ -61,53 +62,54 @@
 				<% other_amt = 0 %>
 				<% total_nett = 0 %>	 
 				<% rounding_adj = 0%> 	 <% gov_tax = 0 %> <% service_charge = 0 %>	    	  
+				<%if @sale_data %> 
+					<% @sale_data.each do |result| %>
 
-				<% @sale_data.each do |result| %>
+					<% grand_total = grand_total.to_f + result.grand_total.to_f %>
+					<% old_grand_total = old_grand_total.to_f + result.old_grand_total.to_f %>
+					<% total_tax += result.total_tax.to_f %>
+					<% total_sum += result.total_amount.to_f %>	
+					<% discount_amt += result.total_discount.to_f %>
+					<% rounding_adj += result.rounding_adjustment.to_f %>
+					
+					<tr>
+						
+						<td><%= result.receipt_no rescue '-' %> </td>
+						<td><%= result.cashier_name rescue '-' %></td>
+						<td><%= result.total_amount rescue '-' %></td>
+						<td><%= result.total_discount rescue '-' %></td>
+						<td><%= result.total_tax rescue '-' %></td>
+						
+						
+						<td><%= result.old_grand_total %></td>			
+						<td><%= result.rounding_adjustment.to_f rescue '-' %></td>			
+						<td><%= result.grand_total_after_rounding()  rescue '-'%></td>
+					</tr>
 
-				<% grand_total = grand_total.to_f + result.grand_total.to_f %>
-				<% old_grand_total = old_grand_total.to_f + result.old_grand_total.to_f %>
-				<% total_tax += result.total_tax.to_f %>
-				<% total_sum += result.total_amount.to_f %>	
-				<% discount_amt += result.total_discount.to_f %>
-				<% rounding_adj += result.rounding_adjustment.to_f %>
-				
-				<tr>
-					
-					<td><%= result.receipt_no rescue '-' %> </td>
-					<td><%= result.cashier_name rescue '-' %></td>
-					<td><%= result.total_amount rescue '-' %></td>
-					<td><%= result.total_discount rescue '-' %></td>
-					<td><%= result.total_tax rescue '-' %></td>
-					
-					
-					<td><%= result.grand_total %></td>			
-					<td><%= result.rounding_adjustment.to_f rescue '-' %></td>			
-					<td><%= result.grand_total_after_rounding()  rescue '-'%></td>
-				</tr>
-
-				<% end %>
-				<tr style="border-top:4px double #666;">
-					<td colspan="2">&nbsp;</td>
-					<td><b><%= total_sum  rescue '-'%></b></td>
-					<td><b><%= discount_amt  rescue '-'%></b></td>
-				<td><b><%= sprintf "%.2f",total_tax  rescue '-'%></b></td><!-- 
-				<td><b><%= sprintf "%.2f",service_charge  rescue '-'%></b></td>	 -->		
-				<!-- <td><b><%= other_amt  rescue '-'%></b></td> -->
-				<td><b><%= grand_total.to_f.round(2)  rescue '-'%></b></td>		
-				<td><b><%= rounding_adj  rescue '-'%></b></td>		
-				<td><b><%= old_grand_total.to_f.round + rounding_adj %></b></td>				
-			</tr>
-			<tr>
-				<td colspan="2">&nbsp;</td>
-				<td>Total Amount</td>
-				<td>Discount Amount</td>
-				<td>Tax Amount</td>
-				<td>Grand Total</td>
-				<td>Rounding Adj.</td>
-				<td>Grand Total +<br/>
-					Rounding Adj.
-				</td>
-			</tr>
+					<% end %>
+					<tr style="border-top:4px double #666;">
+						<td colspan="2">&nbsp;</td>
+						<td><b><%= total_sum  rescue '-'%></b></td>
+						<td><b><%= discount_amt  rescue '-'%></b></td>
+						<td><b><%= sprintf "%.2f",total_tax  rescue '-'%></b></td><!-- 
+						<td><b><%= sprintf "%.2f",service_charge  rescue '-'%></b></td>	 -->		
+						<!-- <td><b><%= other_amt  rescue '-'%></b></td> -->
+						<td><b><%= old_grand_total.to_f.round(2)  rescue '-'%></b></td>		
+						<td><b><%= rounding_adj  rescue '-'%></b></td>		
+						<td><b><%= old_grand_total.to_f.round + rounding_adj %></b></td>				
+					</tr>
+					<tr>
+						<td colspan="2">&nbsp;</td>
+						<td>Total Amount</td>
+						<td>Discount Amount</td>
+						<td>Tax Amount</td>
+						<td>Grand Total</td>
+						<td>Rounding Adj.</td>
+						<td>Grand Total +<br/>
+							Rounding Adj.
+						</td>
+					</tr>
+				<%end%>
 		</tbody>
 	</table>
 </div>
@@ -181,9 +183,9 @@
 					
 					var local_date = data.message[index].local_opening_date + ' - ' + data.message[index].local_closing_date;
 					var sh_date = data.message[index].opening_date + ' - ' + data.message[index].closing_date;
-					
+					var shift_id = data.message[index].shift_id ;
 					if(param_shift != ''){
-						if(sh_date == param_shift){
+						if(shift_id == param_shift){
 							selected = 'selected = "selected"';
 						}
 						else{
@@ -192,7 +194,7 @@
 					}else{
 						selected = '';			   
 					}		   			   
-					str += '<option value="'+ sh_date +'" '+ selected +'>' + local_date + '</option>';
+					str += '<option value="'+ shift_id +'" '+ selected +'>' + local_date + '</option>';
 					
 			   // console.log(sh_date)
 			}) 
diff --git a/app/views/reports/receipt_no/index.xls.erb b/app/views/reports/receipt_no/index.xls.erb
index b55a40c4..2739356d 100644
--- a/app/views/reports/receipt_no/index.xls.erb
+++ b/app/views/reports/receipt_no/index.xls.erb
@@ -2,19 +2,20 @@
 	<div class="card row">
 		<table class="table table-striped" border="0">
 			<thead>
-				<% if !params[:from].blank?%>
-				<tr>
-					<th colspan="7">From Date : <%= params[:from] rescue '-' %>	,	To Date : <%= params[:to]  rescue '-'%></th>
-				</tr>
-				<% end %>
-				<% if @shift_from %>
-				<tr>
-					<% if @shift.employee %>		
-					<% cashier_name = !@shift.nil? ? @shift.employee.name : '-' %>
-					<% end %>	
-					<th colspan="7">Shift Name =  <%= @shift_from  rescue '-'%> - <%= @shift_to  rescue '-'%> ( <%= cashier_name  rescue '-'%> )</th>
-				</tr>
-				<% end %>	 
+				
+					<% if !params[:from].blank?%>
+					<tr>
+						<th colspan="7">From Date : <%= params[:from] %>	,	To Date : <%= params[:to] %></th>
+					</tr>
+					<% end %>
+					<% if @shift_from %>
+					<tr>
+						<% if @shift_data.employee %>		
+						<% cashier_name = !@shift_data.nil? ? @shift_data.employee.name : '-' %>
+						<% end %>			
+						<th colspan="7">Shift Name =  <%= @shift_from %> - <%= @shift_to %> ( <%= cashier_name %> )</th>
+					</tr>
+					<% end %>	 
 
 				<tr>
 					<th>Recipt No</th>
@@ -32,6 +33,7 @@
 			</thead>
 			<tbody>
 				<% grand_total = 0 %>
+				<% old_grand_total = 0 %>
 				<% total_tax = 0 %>
 				<% guest_count = 0 %>
 				<% total_sum = 0 %>	
@@ -39,52 +41,54 @@
 				<% other_amt = 0 %>
 				<% total_nett = 0 %>	 
 				<% rounding_adj = 0%> 	 <% gov_tax = 0 %> <% service_charge = 0 %>	    	  
+				<%if @sale_data %> 
+					<% @sale_data.each do |result| %>
 
-				<% @sale_data.each do |result| %>
+					<% grand_total = grand_total.to_f + result.grand_total.to_f %>
+					<% old_grand_total = old_grand_total.to_f + result.old_grand_total.to_f %>
+					<% total_tax += result.total_tax.to_f %>
+					<% total_sum += result.total_amount.to_f %>	
+					<% discount_amt += result.total_discount.to_f %>
+					<% rounding_adj += result.rounding_adjustment.to_f %>
+					
+					<tr>
+						
+						<td><%= result.receipt_no rescue '-' %> </td>
+						<td><%= result.cashier_name rescue '-' %></td>
+						<td><%= result.total_amount rescue '-' %></td>
+						<td><%= result.total_discount rescue '-' %></td>
+						<td><%= result.total_tax rescue '-' %></td>
+						
+						
+						<td><%= result.old_grand_total %></td>			
+						<td><%= result.rounding_adjustment.to_f rescue '-' %></td>			
+						<td><%= result.grand_total_after_rounding()  rescue '-'%></td>
+					</tr>
 
-				<% grand_total = grand_total.to_f + result.grand_total.to_f %>
-				<% total_tax += result.total_tax.to_f %>
-				<% total_sum += result.total_amount.to_f %>	
-				<% discount_amt += result.total_discount.to_f %>
-				<% rounding_adj += result.rounding_adjustment.to_f %>
-				
-				<tr>
-					
-					<td><%= result.receipt_no rescue '-' %> </td>
-					<td><%= result.cashier_name rescue '-' %></td>
-					<td><%= result.total_amount rescue '-' %></td>
-					<td><%= result.total_discount rescue '-' %></td>
-					<td><%= sprintf "%.2f",result.total_tax rescue '-' %></td>
-					
-					
-					<td><%= result.grand_total %></td>			
-					<td><%= result.rounding_adjustment.to_f rescue '-' %></td>			
-					<td><%= result.grand_total_after_rounding()  rescue '-'%></td>
-				</tr>
-
-				<% end %>
-				<tr style="border-top:4px double #666;">
-					<td colspan="2">&nbsp;</td>
-					<td><b><%= total_sum  rescue '-'%></b></td>
-					<td><b><%= discount_amt  rescue '-'%></b></td>
-				<td><b><%= sprintf "%.2f",total_tax  rescue '-'%></b></td><!-- 
-				<td><b><%= sprintf "%.2f",service_charge  rescue '-'%></b></td>	 -->		
-				<!-- <td><b><%= other_amt  rescue '-'%></b></td> -->
-				<td><b><%= grand_total.to_f.round(2)  rescue '-'%></b></td>		
-				<td><b><%= rounding_adj  rescue '-'%></b></td>		
-				<td><b><%= grand_total.to_f.round + rounding_adj %></b></td>				
-			</tr>
-			<tr>
-				<td colspan="2">&nbsp;</td>
-				<td>Total Amount</td>
-				<td>Discount Amount</td>
-				<td>Tax Amount</td>
-				<td>Grand Total</td>
-				<td>Rounding Adj.</td>
-				<td>Grand Total +<br/>
-					Rounding Adj.
-				</td>
-			</tr>
+					<% end %>
+					<tr style="border-top:4px double #666;">
+						<td colspan="2">&nbsp;</td>
+						<td><b><%= total_sum  rescue '-'%></b></td>
+						<td><b><%= discount_amt  rescue '-'%></b></td>
+						<td><b><%= sprintf "%.2f",total_tax  rescue '-'%></b></td><!-- 
+						<td><b><%= sprintf "%.2f",service_charge  rescue '-'%></b></td>	 -->		
+						<!-- <td><b><%= other_amt  rescue '-'%></b></td> -->
+						<td><b><%= old_grand_total.to_f.round(2)  rescue '-'%></b></td>		
+						<td><b><%= rounding_adj  rescue '-'%></b></td>		
+						<td><b><%= old_grand_total.to_f.round + rounding_adj %></b></td>				
+					</tr>
+					<tr>
+						<td colspan="2">&nbsp;</td>
+						<td>Total Amount</td>
+						<td>Discount Amount</td>
+						<td>Tax Amount</td>
+						<td>Grand Total</td>
+						<td>Rounding Adj.</td>
+						<td>Grand Total +<br/>
+							Rounding Adj.
+						</td>
+					</tr>
+				<%end%>
 		</tbody>
 	</table>
 </div>
diff --git a/app/views/reports/saleitem/_shift_sale_report_filter.html.erb b/app/views/reports/saleitem/_shift_sale_report_filter.html.erb
index 5c8c47b1..9ed12d12 100644
--- a/app/views/reports/saleitem/_shift_sale_report_filter.html.erb
+++ b/app/views/reports/saleitem/_shift_sale_report_filter.html.erb
@@ -41,7 +41,8 @@
 						</div>
 						<div class="form-group col-md-2">
 						<label class="">All Shift</label>
-							<select name="shift_name" id="shift_name" class="form-control"></select>
+							<select class="form-control select" name="shift_name" id="shift_name" >
+							</select>
 						</div>
 						<div class="form-group col-md-2 margin-top-20">
 							<input type="submit" value="Generate Report" class='btn btn-primary'>
@@ -49,74 +50,6 @@
 					</div>													
 				<% end %>
 				
-				<!-- <div class="row">
-					<% if defined? show_monthly %>
-						<div class="span3" style="margin-bottom:10px;">
-							<input type="hidden" id="report_type" name="report_type" value="0">
-							<div class="btn-group" data-toggle="buttons-radio">
-							  <button id="btn_report_type_1" onclick="$('#report_type').val(1)" type="button" class="btn btn-inverse">Monthly</button>
-							  <button id="btn_report_type_2" onclick="$('#report_type').val(2)" type="button" class="btn btn-inverse">Yearly</button>
-							</div>
-						</div>
-					<% end %>
-				</div> -->
-	
-				<div class="row">
-					<div class="form-group">
-					<% if defined? promotions %>
-						<%= select_tag "promotion", options_for_select(@promotions, :selected => params[:promotion_type]), :class => "form-control" %>
-					<% end %>
-					
-					<% if defined? menu_types %>
-						<%= select_tag "menu_type", options_for_select(@menu_types, :selected => params[:menu_type]), :class => "form-control" %>	
-					<% end %>
-					
-					<% if defined? payments %>
-						<%= select_tag "payment_type", options_for_select(@payments, :selected => params[:payment_type]), :class => "form-control" %>	
-					<% end %>
-					
-					<% if defined? shift_name %>
-						<!-- Temporary no needs
-						<select name="shift_name" id="shift_name"></select> 
-						-->
-					<% end %>
-
-					<% if defined? cashiers %>
-						<%= select_tag "cashier", options_from_collection_for_select(@cashiers,"id","name"),:prompt => "All Cashier Stations", :class => "form-control" %>
-					<% end %>
-						
-					<% if defined? singer %>
-						<%= select_tag "singer", options_from_collection_for_select(singer,"id","name"),:prompt => "All Vocal List", :class => "form-control" %>
-					<% end %>
-					
-					<% if defined? bsm %>		
-						<%= select_tag "singer", options_from_collection_for_select(bsm,"id","name"),:prompt => "All BSM List", :class => "form-control" %>
-					<% end %>		
-					
-					<% if defined? guest_role %>
-						<%= select_tag "guest_role", options_from_collection_for_select(@guest_role,"id","name"),:prompt => "Vocal/BSM List", :class => "form-control" %>
-					<% end %>
-					
-					<% if defined? list_by_payment_type %> <!-- for report detail by credit and foc -->
-						<%= select_tag "payment_type_list", options_for_select(@payment_list, :selected => params[:payment_type_list]), :class => "form-control" %>	
-					<% end %>				
-					
-					<% if defined? products %>
-						<%= select_tag "product", options_from_collection_for_select(@products,"id","name"),:prompt => "All Products", :class => "form-control" %>	
-					<% end %>
-
-					<% if defined? items %>	
-						<%= select_tag "item", options_for_select(@items, :selected => params[:item_type]), :class => "form-control" %>			
-					<% end %>
-					</div>
-				</div>
-
-				<!-- <div class="row">
-					<div class="col-md-12">
-						<input type="submit" value="Generate Report" class='btn btn-primary'>
-					</div>
-				</div> -->
-				
 			<% end %>		
 	</div>
 </div>
@@ -152,20 +85,19 @@ $(function(){
 	}
 });
 
-//Reset the form to pervious values
-$("#branch").val(<%=params[:branch]%>);
-$("#waiter").val("<%=params[:waiter]%>");
-$("#cashier").val(<%=params[:cashier]%>);
-$("#product").val(<%=params[:product]%>);
-$("#singer").val(<%=params[:singer]%>);
-$("#item").val('<%=params[:item]%>');
-$("#guest_role").val('<%=params[:guest_role]%>');
+ <% if params[:shift_name].to_i > 0%>
+	shift_id = '<%= params[:shift_name] %>'
+	local_date = '<%= @shift_from %> - <%= @shift_to %> '
+	var shift = $('#shift_name');
+	str = '<option value="'+ shift_id +'" '+ 'selected = "selected"' +'>' + local_date + '</option>';
+	shift.append(str);
+<% end %>
 
+ $("#from").val("<%=params[:from] rescue '-'%>");
+ $("#to").val("<%=params[:to] rescue '-'%>");
+  $("#sel_period").val(<%=params[:period] rescue '-'%>);
+ $("#sel_sale_type").val(<%=params[:sale_type] rescue '-'%>);
 
-$("#from").val("<%=params[:from]%>");
-$("#to").val("<%=params[:to]%>");
-$("#sel_period").val(<%=params[:period]%>);
-$("#sel_sale_type").val(<%=params[:sale_type]%>);
 
 <% if params[:period_type] == 1 || params[:period_type] == "1" %>
 	$("#rd_period_type_1").attr("checked","checked");
@@ -195,4 +127,4 @@ $('#item').change(function(){
 		}
 	}
 });
-</script> 
\ No newline at end of file
+</script>
diff --git a/app/views/reports/saleitem/index.html.erb b/app/views/reports/saleitem/index.html.erb
index 7f51fee5..6a9c5620 100644
--- a/app/views/reports/saleitem/index.html.erb
+++ b/app/views/reports/saleitem/index.html.erb
@@ -134,15 +134,11 @@
 						<td><span><%= grand_total%></span></td> 
 					</tr>
 				<% end %>
-<!-- 	<tr style="border-top:2px solid grey;">
-		<td colspan="5">&nbsp;</td>
-		<td>Total Amount</td>
-		<td><span><%= grand_total%></span></td>
-	</tr> -->
-	<!-- <tr>
+
+	<tr>
 		<td colspan="5">&nbsp;</td>
 		<td>Cash Received</td>
-		<td><span><%= @cash_data %></span></td>
+		<td><span><%= @cash_data - @change_amount %></span></td>
 	</tr>
 	<tr>
 		<td colspan="5">&nbsp;</td>
@@ -168,8 +164,8 @@
 		<td colspan="5">&nbsp;</td>
 		<td>Grand Total</td>
 		<!-- <td><span class="double_underline"><%= grand_total.to_f - @discount_data.to_f%></span></td> -->
-		<!-- <td><span class="double_underline"><%= @grand_total%></span></td> 
-	</tr> -->
+		 <td><span class="double_underline"><%= @grand_total - @change_amount%></span></td> 
+	</tr>
 </tbody>
 </table>
 </div>
@@ -256,9 +252,10 @@
 
 					var local_date = data.message[index].local_opening_date + ' - ' + data.message[index].local_closing_date;
 					var sh_date = data.message[index].opening_date + ' - ' + data.message[index].closing_date;
+					var shift_id = data.message[index].shift_id ;
 
 					if(param_shift != ''){
-						if(sh_date == param_shift){
+						if(shift_id == param_shift){
 							selected = 'selected = "selected"';
 						}
 						else{
@@ -270,7 +267,7 @@
 					}			   
 
 
-					str += '<option value="'+ sh_date +'" '+ selected +'>' + local_date + '</option>';
+					str += '<option value="'+ shift_id +'" '+ selected +'>' + local_date + '</option>';
 
 			   // console.log(sh_date)
 			}) 
@@ -278,10 +275,5 @@
 			});
 		}
 
-   //total price by account
-
-   $('#items_table tr').each(function(i){
-
-   });
 });
 </script>
\ No newline at end of file
diff --git a/app/views/reports/shiftsale/_shift_sale_report_filter.html.erb b/app/views/reports/shiftsale/_shift_sale_report_filter.html.erb
index 34173d99..1ccf99ad 100644
--- a/app/views/reports/shiftsale/_shift_sale_report_filter.html.erb
+++ b/app/views/reports/shiftsale/_shift_sale_report_filter.html.erb
@@ -18,18 +18,7 @@
 								<option value="9">Last year</option>
 							</select>
 						</div>
-						<!-- <input type="hidden" name="report_type" value="daily_sale" id="sel_sale_type"> -->
-						<!-- <div class="form-group col-md-2">
-							<label>Select Type</label>
-							<select name="sale_type" id="sel_sale_type" class="form-control">
-								<option value="0">All Sale Type</option>
-								<option value="1">Revenue Only</option>
-								<option value="2">Discount Only</option>
-								<option value="3">Void Only</option>
-								<option value="4">Taxes Only</option>
-								<option value="5">Other Amount Only</option>
-							</select>
-						</div> -->
+					
 						<div class="form-group col-md-3">					
 							<!-- <label class="">Select Shift Period</label> -->
 				  			<label class="">From</label>
@@ -39,6 +28,11 @@
 							<label class="">To</label>
 							<input data-behaviour='datepicker' class="form-control" name="to" id="to" type="text" placeholder="To date">
 						</div>
+						<div class="form-group col-md-2">
+						<label class="">All Shift</label>
+							<select class="form-control select" name="shift_name" id="shift_name" >
+							</select>
+						</div>
 						<div class="form-group col-md-2 margin-top-20">
 							<input type="submit" value="Generate Report" class='btn btn-primary'>
 						</div>							
@@ -82,15 +76,13 @@ $(function(){
 });
 
 //Reset the form to pervious values
-$("#branch").val(<%=params[:branch]%>);
-$("#waiter").val("<%=params[:waiter]%>");
-$("#cashier").val(<%=params[:cashier]%>);
-$("#product").val(<%=params[:product]%>);
-$("#singer").val(<%=params[:singer]%>);
-$("#item").val('<%=params[:item]%>');
-$("#guest_role").val('<%=params[:guest_role]%>');
-
-
+<% if params[:shift_name].to_i > 0%>
+	shift_id = '<%= params[:shift_name] %>'
+	local_date = '<%= @shift.shift_started_at.utc.getlocal.strftime("%e %b %I:%M%p")%> -<%= @shift.shift_closed_at.utc.getlocal.strftime("%e %b %I:%M%p") %>'
+	var shift = $('#shift_name');
+	str = '<option value="'+ shift_id +'" '+ 'selected = "selected"' +'>' + local_date + '</option>';
+	shift.append(str);
+<% end %>
 $("#from").val("<%=params[:from]%>");
 $("#to").val("<%=params[:to]%>");
 $("#sel_period").val(<%=params[:period]%>);
diff --git a/app/views/reports/shiftsale/index.html.erb b/app/views/reports/shiftsale/index.html.erb
index 714a8328..e8f2d1d8 100644
--- a/app/views/reports/shiftsale/index.html.erb
+++ b/app/views/reports/shiftsale/index.html.erb
@@ -7,7 +7,7 @@
 
 <div class="container">
     <%= render :partial=>'shift_sale_report_filter',
-    		   :locals=>{ 	:period_type => true, :shift_name => false, :report_path =>reports_shiftsale_index_path} %>
+    		   :locals=>{ 	:period_type => true, :shift_name => true, :report_path =>reports_shiftsale_index_path} %>
 	<hr />
 </div>
 
@@ -110,5 +110,94 @@
 		</div>
 	</div>
 </div>
+<script>
+	$(function(){
+
+		var check_arr = [];
+
+		$('#sel_period').change(function(){
+			
+			search_by_period();
+			
+		});
+		
+		function search_by_period(){
+			var period = $('#sel_period').val();
+			var period_type = 0;
+			var from = "";
+			var to = "";
+
+			show_shift_name(period,period_type,from,to,'shift_item');	
+		}   
+		
+		$('#from').change(function(){
+			search_by_date();	   
+		});
+		
+		$('#to').change(function(){
+			search_by_date();
+		});   
+		
+		function search_by_date(){
+			var from = $('#from').val();
+			var to = $('#to').val();
+			var period = 0;
+			var period_type = 1;	   
+
+			if(to != '' && from != ''){
+				shift_name = from + ',' + to;
+
+				check_arr.push(to);
+				
+				console.log(check_arr.length)
+				if(check_arr.length == 1){
+					show_shift_name(period,period_type,from,to,'shift_item');	   	
+				}
+				if(check_arr.length == 3){
+					check_arr = [];
+				}
+			}
+			
+		}
+		
+		function show_shift_name(period,period_type,from,to,shift_item){
+			var shift = $('#shift_name');
+			
+			shift.empty();
+			
+			var str = '';
+			var param_shift = '';	   
+			var param_shift = '<%= params[:shift_name] rescue '-'%>';
+
+			url = '<%= reports_get_shift_by_date_path %>';
+			
+			$.get(url, {period :period, period_type :period_type, from :from, to :to, report_type :shift_item} , function(data){
+
+				str = '<option value="0">--- All Shift ---</option>';
+				$(data.message).each(function(index){	
+					
+					var local_date = data.message[index].local_opening_date + ' - ' + data.message[index].local_closing_date;
+					var sh_date = data.message[index].opening_date + ' - ' + data.message[index].closing_date;
+					var shift_id = data.message[index].shift_id ;
+					if(param_shift != ''){
+						if(shift_id == param_shift){
+							selected = 'selected = "selected"';
+						}
+						else{
+							selected = '';			   
+						}			   	
+					}else{
+						selected = '';			   
+					}		   			   
+					str += '<option value="'+ shift_id +'" '+ selected +'>' + local_date + '</option>';
+					
+			   // console.log(sh_date)
+			}) 
+				shift.append(str);
+			});
+		}
+
+	});
+</script>