Add total waste and spoil in close cashier and Closing Balance မွာ Character ေတြ ရိုက္လို႕ရေန

app/models/my_aes_crypt.rb

@@ -64,7 +64,7 @@ class MyAesCrypt
 		shop_json["data"].each do |j|
 			if j["lookup"] == from			
 				# add [0...44] for production cloud for remove \n
-				if(j["value"]["key"] == token)
+				if(j["value"]["key"].gsub(/\s+/, "") == token)
 					return true
 				end
 			end

app/models/order_reservation.rb

@@ -93,9 +93,6 @@ class OrderReservation < ApplicationRecord
 	       	count += 1
 	       	items_arr.push(items)
 	    }
-
-	    puts items_arr.to_json
-	    puts "sssssssssssssssssssssss"
       	customer_id = order.customer_id
  
 		@order = Order.new
@@ -125,8 +122,11 @@ class OrderReservation < ApplicationRecord
           update_order_reservation(order.id, @sale.sale_id, SEND_TO_KITCHEN)
 
           result = {:status=> @status, :data => @sale, :message => "send to kitchen" }
-          return result
+   		else
+   			result = {:status=> @status, :message => "No current shift open for this employee!" }
         end
+
+        return result
     end
 
     def self.update_doemal_payment(order,current_user)
@@ -178,10 +178,9 @@ class OrderReservation < ApplicationRecord
     	end
     	Rails.logger.debug "Doemal URL" + base_url
     	post_url = base_url + url
-
-    	if !waiting_time.nil?
+    	if waiting_time != ""
     		send_params = {id: ref_no,type: min_type, waiting_time: waiting_time, status: status}
-    	elsif !reason.nil?
+    	elsif reason != ""
     		send_params = {id: ref_no, status: status, reason: reason}
     	else
     		send_params = {id: ref_no, status: status}
@@ -290,28 +289,46 @@ class OrderReservation < ApplicationRecord
     end
 
     def self.check_new_order
+    	shop = Shop.find_by_id(1)
+    	if !shop.shop_code.nil?
+			shop_code = shop.shop_code
+		else
+			shop_code = ''
+		end
     	order_reservation = OrderReservation.where("status='new'")
     	if order_reservation.length > 0
 			if ENV["SERVER_MODE"] == 'cloud'
-				ActionCable.server.broadcast "check_new_order_channel",data: order_reservation
+				ActionCable.server.broadcast "check_new_order_channel",data: order_reservation, shop_code: shop_code
 			end
 		end
     end
 
     def self.check_order_send_to_kitchen
+    	shop = Shop.find_by_id(1)
+    	if !shop.shop_code.nil?
+			shop_code = shop.shop_code
+		else
+			shop_code = ''
+		end
     	order_reservation = OrderReservation.where("status='accepted' and requested_time <= '#{Time.now.utc}'")
     	if order_reservation.length > 0
 			if ENV["SERVER_MODE"] == 'cloud'
-				ActionCable.server.broadcast "check_order_send_to_kitchen_channel",data: order_reservation
+				ActionCable.server.broadcast "check_order_send_to_kitchen_channel",data: order_reservation, shop_code: shop_code
 			end
 		end
     end
 
     def self.check_order_ready_to_delivery
+    	shop = Shop.find_by_id(1)
+    	if !shop.shop_code.nil?
+			shop_code = shop.shop_code
+		else
+			shop_code = ''
+		end
     	order_reservation = OrderReservation.where("status='send_to_kitchen' and requested_time <= '#{Time.now.utc}'")
     	if order_reservation.length > 0
 			if ENV["SERVER_MODE"] == 'cloud'
-				ActionCable.server.broadcast "check_order_ready_to_delivery_channel",data: order_reservation
+				ActionCable.server.broadcast "check_order_ready_to_delivery_channel",data: order_reservation, shop_code: shop_code
 			end
 		end
     end

app/models/printer/cashier_station_printer.rb

@@ -38,7 +38,7 @@ class Printer::CashierStationPrinter < Printer::PrinterWorker
   #   self.print(filename, cashier_terminal.printer_name)
   # end
 
-  def print_close_cashier(printer_settings,cashier_terminal,shift_sale,shop_details,sale_taxes,other_payment,amount,discount,member_discount,total_dinein,total_takeway,total_other_charges)
+  def print_close_cashier(printer_settings,cashier_terminal,shift_sale,shop_details,sale_taxes,other_payment,amount,discount,member_discount,total_dinein,total_takeway,total_other_charges,total_waste,total_spoile)
 
     #Use CUPS service
     #Generate PDF
@@ -46,7 +46,7 @@ class Printer::CashierStationPrinter < Printer::PrinterWorker
     cashier = shift_sale.employee.name
     shift_name = shift_sale.shift_started_at.utc.getlocal.strftime("%d-%m-%Y %I:%M %p") + "_" + shift_sale.shift_closed_at.utc.getlocal.strftime("%d-%m-%Y %I:%M %p")
     filename = "tmp/close_cashier_#{cashier}_#{shift_name}.pdf"
-    pdf = CloseCashierPdf.new(printer_settings,shift_sale,shop_details,sale_taxes,other_payment,amount,discount,member_discount)
+    pdf = CloseCashierPdf.new(printer_settings,shift_sale,shop_details,sale_taxes,other_payment,amount,discount,member_discount,total_waste,total_spoile)
     close_cashier_pdf = Lookup.collection_of("print_settings") #print_settings with name:CloseCashierPdf
     
     if !close_cashier_pdf.empty?
@@ -55,7 +55,7 @@ class Printer::CashierStationPrinter < Printer::PrinterWorker
           if close_cashier[1] == '1'
             pdf = CloseCashierCustomisePdf.new(printer_settings,shift_sale,shop_details,sale_taxes,other_payment,amount,discount,member_discount,total_dinein,total_takeway,total_other_charges)
           else
-            pdf = CloseCashierPdf.new(printer_settings,shift_sale,shop_details,sale_taxes,other_payment,amount,discount,member_discount)
+            pdf = CloseCashierPdf.new(printer_settings,shift_sale,shop_details,sale_taxes,other_payment,amount,discount,member_discount,total_waste,total_spoile)
           end
         end
       end

app/models/sale.rb

@@ -1092,6 +1092,14 @@ end
      return sale_arr
 end
 
+def self.get_total_waste(shift_id)
+  query = Sale.where("sale_status = 'waste' and shift_sale_id = ?", shift_id)
+end
+
+def self.get_total_spoile(shift_id)
+  query = Sale.where("sale_status = 'spoile' and shift_sale_id = ?", shift_id)
+end
+
 def self.get_separate_tax(shift_sale_range=nil,shift,from,to,payment_type)
 
 # wrong amount tax for service and commercial tax 

app/models/shift_sale.rb

@@ -94,11 +94,6 @@ class ShiftSale < ApplicationRecord
     end
   end
 
-  def self.get_total_waste(shift)   
-    total_waste = Sale.select(" SUM(grand_total) as total_waste")
-                .where("sales.payment_status ='waste' and sale_status = 'waste'", shift.id)
-  end
-
   def get_closing_balance(shift)
      shiftobj = ShiftSale.find(shift)
      closing_balance = shiftobj.grand_total + shiftobj.cash_in - shiftobj.cash_out + shiftobj.total_cash