Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into split_bill

app/controllers/origami/check_in_process_controller.rb

@@ -2,31 +2,34 @@ class Origami::CheckInProcessController < BaseOrigamiController
 
 	def check_in_process
 		lookup_checkout_time = Lookup.collection_of("checkout_time")
-		checkout_at = Time.now.utc
+		today = Time.now.utc.getlocal
+		checkout_at = Time.now.utc.getlocal
 		if !lookup_checkout_time.empty?
 			lookup_checkout_time.each do |checkout_time|
 				arr_time = checkout_time[0].split("-")
-				start_time = Time.parse(arr_time[0].strip).utc.strftime("%H:%M%p")
-				end_time = Time.parse(arr_time[1].strip).utc.strftime("%H:%M%p")
-				if start_time <= checkout_at && checkout_at <= end_time
+				start_time = Time.parse(arr_time[0].strip).utc.getlocal.strftime("%H:%M%p")
+				end_time = Time.parse(arr_time[1].strip).utc.getlocal.strftime("%H:%M%p")
+				if start_time <= checkout_at.strftime("%H:%M%p") && checkout_at.strftime("%H:%M%p") <= end_time
 					checkout_at = checkout_at + (checkout_time[1]).to_i.minutes
 				end
 			end
-		end
-		@dining_facility = DiningFacility.find(params[:dining_id])
-		@dining_facility.status = "occupied"
-		@dining_facility.save!
+			
+			if checkout_at.strftime("%Y-%m-%d %H:%M%p") > today.strftime("%Y-%m-%d %H:%M%p")
+				@dining_facility = DiningFacility.find(params[:dining_id])
+				@dining_facility.status = "occupied"
+				@dining_facility.save!
 
-		if @dining_facility.type == "Table"
-			type = "TableBooking"
-		else
-			type = "RoomBooking"
+				if @dining_facility.type == "Table"
+					type = "TableBooking"
+				else
+					type = "RoomBooking"
+				end
+				
+				@booking = Booking.create({:dining_facility_id => params[:dining_id],:type => type,
+		                                :checkin_by=>current_login_employee.name,:checkin_at => Time.now.utc,:checkout_at =>checkout_at, :booking_status => "assign", :reserved_at => checkout_at, :reserved_by => current_login_employee.name })
+				@booking.save!
+			end
 		end
-		
-		@booking = Booking.create({:dining_facility_id => params[:dining_id],:type => type,
-                                :checkin_by=>current_login_employee.name,:checkin_at => Time.now.utc,:checkout_at =>checkout_at, :booking_status => "assign", :reserved_at => checkout_at, :reserved_by => current_login_employee.name })
-		@booking.save!
-
 		respond = {:status => 'ok'}
 		respond_to do |format|
 			format.json { render json: respond }

app/controllers/origami/home_controller.rb

@@ -84,7 +84,10 @@ class Origami::HomeController < BaseOrigamiController
          end
        end
      end
-     
+
+    #for bank integration
+    @checkout_time = Lookup.collection_of('checkout_time')
+    @checkout_alert_time = Lookup.collection_of('checkout_alert_time')
   end
 
 private

app/controllers/origami/shifts_controller.rb

@@ -4,6 +4,12 @@ class Origami::ShiftsController < BaseOrigamiController
 
   def show
     @shift = ShiftSale.current_open_shift(current_user.id)
+    #for bank integration
+    bank_integration = Lookup.collection_of('bank_integration')
+    @bank_integration = 0
+    if !bank_integration[0].nil?
+      @bank_integration = bank_integration[0][1]
+    end
   end
 
   def new

app/controllers/origami/void_controller.rb

@@ -87,7 +87,7 @@ class Origami::VoidController < BaseOrigamiController
         rebate = MembershipSetting.find_by_rebate(1)
         if customer.membership_id != nil && rebate
           member_info = Customer.get_member_account(customer)
-          rebate_amount  = Customer.get_membership_transactions(customer,saleObj.receipt_no)
+          rebate_amount  = Customer.get_membership_transactions(customer,sale.receipt_no)
           current_balance = SaleAudit.paymal_search(sale_id)
         end