Merge branch 'staging' of bitbucket.org:code2lab/sxrestaurant

app/controllers/origami/home_controller.rb

@@ -15,7 +15,7 @@ class Origami::HomeController < BaseOrigamiController
     @rooms = Room.all.active.order('status desc')
     @complete = Sale.where("sale_status != 'new'")
     @orders = Order.all.order('date desc')
-    @shop   = Shop.find_by_id(1)
+    
     @status_order = ""
     @status_sale = ""
     @sale_array = Array.new

app/controllers/origami/payments_controller.rb

@@ -166,7 +166,14 @@ class Origami::PaymentsController < BaseOrigamiController
   def rounding_adj
 
       saleObj      = Sale.find(params[:sale_id])
-      new_total    = Sale.get_rounding_adjustment(saleObj.grand_total)
+      @shop        = Shop.find_by_id(1)
+      
+      if @shop.is_rounding_adj
+        new_total    = Sale.get_rounding_adjustment(saleObj.grand_total)
+      else
+        new_total    = saleObj.grand_total
+      end
+      
       rounding_adj = new_total-saleObj.grand_total
 
       saleObj.update_attributes(grand_total: new_total,old_grand_total: saleObj.grand_total,rounding_adjustment:rounding_adj)

app/controllers/reports/credit_payment_controller.rb

@@ -0,0 +1,61 @@
+class Reports::CreditPaymentController < BaseReportController	  
+authorize_resource :class => false
+	def index
+
+		from, to  = get_date_range_from_params
+
+		@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_by_shift_sale_credit_payment(@shift_sale_range,@shift,from,to) 
+       
+        @from       = from
+        @to         = to
+
+        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
+	      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

app/controllers/reports/void_sale_controller.rb

@@ -0,0 +1,60 @@
+class Reports::VoidSaleController < BaseReportController	  
+authorize_resource :class => false
+	def index
+
+		from, to  = get_date_range_from_params
+
+		# @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_void_sale(@shift,from,to) 
+       
+        @from       = from
+        @to         = to
+
+        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
+	      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

app/controllers/transactions/manual_sales_controller.rb

@@ -3,6 +3,7 @@ class Transactions::ManualSalesController < ApplicationController
   def void
    @sale = params[:sale_id]   
    @reason = Lookup.where("lookup_type = 'void_reason'")
+
    respond_to do |format|
       format.html # index.html.erb
       format.json { render json: @sales }