add change tax in table/room and check-in for room

app/controllers/api/check_in_process_controller.rb

@@ -64,9 +64,6 @@ class Api::CheckInProcessController < Api::ApiController
 					end
 
 					if checkout_at.strftime("%Y-%m-%d %H:%M%p") > today.strftime("%Y-%m-%d %H:%M%p")
-						dining_facility.status = "occupied"
-						dining_facility.save!
-
 						if dining_facility.type == "Table"
 							type = "TableBooking"
 						else
@@ -75,7 +72,10 @@ class Api::CheckInProcessController < Api::ApiController
 						
 						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!
+						if booking.save!
+							dining_facility.status = "occupied"
+							dining_facility.save!
+						end
 
 						render :json => { :status => true, :checkout_at => booking.checkout_at.utc.getlocal.strftime("%Y-%m-%d %H:%M") }
 					else

app/controllers/inventory/stock_checks_controller.rb

@@ -28,14 +28,15 @@ class Inventory::StockChecksController < BaseInventoryController
     stockcheck = StockCheck.find(stock_id)
     stockcheck_items = stockcheck.stock_check_items
     member_info = nil
-    unique_code = 'StockPrint'
+    unique_code = 'StockCheckPdf'
 
     shop_details = Shop.find(1)
     checker = Employee.find(stockcheck.check_by)
     print_settings = PrintSetting.find_by_unique_code(unique_code)
-    printer = Printer::ReceiptPrinter.new(print_settings)
-
-    printer.print_stock_check_result(print_settings, stockcheck, stockcheck_items, checker.name, shop_details)
+    if !print_settings.nil?
+      printer = Printer::ReceiptPrinter.new(print_settings)
+      printer.print_stock_check_result(print_settings, stockcheck, stockcheck_items, checker.name, shop_details)
+    end
   end
 
   #Shop Name in Navbor

app/controllers/origami/check_in_process_controller.rb

@@ -16,8 +16,6 @@ class Origami::CheckInProcessController < BaseOrigamiController
 			
 			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"
@@ -27,7 +25,11 @@ class Origami::CheckInProcessController < BaseOrigamiController
 				
 				@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!
+
+				if @booking.save!
+					@dining_facility.status = "occupied"
+					@dining_facility.save!
+				end
 			end
 
 			if ENV["SERVER_MODE"] != "cloud" #no print in cloud server

app/controllers/origami/home_controller.rb

@@ -98,30 +98,44 @@ class Origami::HomeController < BaseOrigamiController
          @status_order = 'order'
        else
         sale = Sale.find(booking.sale_id)
-         if sale.sale_status != "completed" && sale.sale_status != 'void' && sale.sale_status != 'spoile' && sale.sale_status != 'waste'
-           @sale_array.push(sale)
-           if @status_order == 'order'
+          if sale.sale_status != "completed" && sale.sale_status != 'void' && sale.sale_status != 'spoile' && sale.sale_status != 'waste'
+            @sale_array.push(sale)
+            if @status_order == 'order'
              @status_order = 'sale'
-           end
-           @booking= booking
-           @date = sale.created_at
-           @status_sale = 'sale'
-           @obj_sale = sale
-           @customer = sale.customer
-           accounts = @customer.tax_profiles
-              @account_arr =[]
-              accounts.each do |acc|
-                account = TaxProfile.find(acc)
-                @account_arr.push(account)
-              end
-         end
-       end
+            end
+            @booking= booking
+            @date = sale.created_at
+            @status_sale = 'sale'
+            @obj_sale = sale
+            @customer = sale.customer
+            accounts = @customer.tax_profiles
+            @account_arr =[]
+            accounts.each do |acc|
+              account = TaxProfile.find(acc)
+              @account_arr.push(account)
+            end
+          end
+          @sale_taxes = []
+          sale_taxes = SaleTax.where("sale_id = ?", sale.sale_id)
+          if !sale_taxes.empty?
+            sale_taxes.each do |sale_tax|
+              @sale_taxes.push(sale_tax)
+            end
+          end
+        end
      end
 
     #for bank integration
     @checkout_time = Lookup.collection_of('checkout_time')
     @checkout_alert_time = Lookup.collection_of('checkout_alert_time')
 
+    accounts = TaxProfile.where("group_type = ?","cashier").order("order_by ASC")
+    @tax_arr =[]
+    accounts.each do |acc|
+      account = TaxProfile.find(acc.id)
+      @tax_arr.push(account.name)
+    end
+
     lookup_spit_bill = Lookup.collection_of('split_bill')
     @split_bill = 0
     if !lookup_spit_bill[0].nil?

app/controllers/origami/rooms_controller.rb

@@ -100,22 +100,30 @@ class Origami::RoomsController < BaseOrigamiController
            @status_order = 'order'
          else
           sale = Sale.find(booking.sale_id)
-           if sale.sale_status != "completed" && sale.sale_status != 'void' && sale.sale_status != 'spoile' && sale.sale_status != 'waste'
-             @sale_array.push(sale)
-             if @status_order == 'order'
+            if sale.sale_status != "completed" && sale.sale_status != 'void' && sale.sale_status != 'spoile' && sale.sale_status != 'waste'
+              @sale_array.push(sale)
+              if @status_order == 'order'
                @status_order = 'sale'
-             end
-             @booking = booking
-             @date = sale.created_at
-             @status_sale = 'sale'
-             @obj_sale = sale
-             @customer = sale.customer
-             accounts = @customer.tax_profiles
+              end
+              @booking = booking
+              @date = sale.created_at
+              @status_sale = 'sale'
+              @obj_sale = sale
+              @customer = sale.customer
+              accounts = @customer.tax_profiles
               @account_arr =[]
               accounts.each do |acc|
                 account = TaxProfile.find(acc)
                 @account_arr.push(account)
               end
+              
+              @sale_taxes = []
+              sale_taxes = SaleTax.where("sale_id = ?", sale.sale_id)
+              if !sale_taxes.empty?
+                sale_taxes.each do |sale_tax|
+                  @sale_taxes.push(sale_tax)
+                end
+              end
            end
          end
      end
@@ -145,6 +153,17 @@ class Origami::RoomsController < BaseOrigamiController
     #      end
     # end
 
+    #for bank integration
+    @checkout_time = Lookup.collection_of('checkout_time')
+    @checkout_alert_time = Lookup.collection_of('checkout_alert_time')
+
+    accounts = TaxProfile.where("group_type = ?","cashier").order("order_by ASC")
+    @tax_arr =[]
+    accounts.each do |acc|
+      account = TaxProfile.find(acc.id)
+      @tax_arr.push(account.name)
+    end
+
     lookup_spit_bill = Lookup.collection_of('split_bill')
     @split_bill = 0
     if !lookup_spit_bill[0].nil?