diff --git a/app/assets/javascripts/addorder.js b/app/assets/javascripts/addorder.js index 6ea9abf6..e26374c0 100755 --- a/app/assets/javascripts/addorder.js +++ b/app/assets/javascripts/addorder.js @@ -1014,7 +1014,8 @@ $(function() { dataType: "json", success:function(result){ if (type == "quick_service" || type=="food_court") { - window.location.href = "/origami/"+type; + module_name = window.location.href.includes('foodcourt') ? 'foodcourt' : 'origami' + window.location.href = "/"+module_name+"/"+type; }else{ if(table_type == "Table"){ window.location.href = "/origami/table/" + table_id; @@ -1093,7 +1094,13 @@ $(function() { }); }else if(result.data == 'OK'){ - window.location.href = '/origami/'+type+'/pending_order/' + $('#sale_id').text(); + if (window.location.pathname.includes('foodcourt')) { + order_id = $('#order_id').val() + window.location.href = '/foodcourt/food_court/'+order_id+'/request_bill' + } + else { + window.location.href = '/origami/'+type+'/pending_order/' + $('#sale_id').text(); + } }else{ if(result.current_user_role == 'cashier'){ window.location.href = "/foodcourt/sale/"+result.data["sale_id"]+"/"+type+"/payment"; @@ -1601,20 +1608,22 @@ $(function() { image_path = menu_items[field].image; } if (out_of_stock === true) { - oos_item = out_of_stock_item - oos_item = '
' - oos_header = '
OUT OF STOCK
' + // oos_item = out_of_stock_item + oos_item = '
' + oos_header = '
OUT OF STOCK
' + opacity = 0.5 }else{ - oos_item = '
' + oos_item = '
' oos_header = '' + opacity = '' } - row = '
' + row = '
' + oos_item + oos_header - +'
' + +'
' +'
'+ menu_items[field].name +'
' +'
' - +"
" + + '' +'
' - +'
' + +'
' +''+ price +'' + "
' - oos_header = '
OUT OF STOCK
' + oos_item = '
' + oos_header = '
OUT OF STOCK
' }else{ oos_item = '
' oos_header = '' } - row = '
' + row = '
' + oos_item + oos_header - +'
{ :status => false } + end + + is_extra_time = false + extra_time = '' + cashier_type = "quick_service" + + items_arr = [] + JSON.parse(params[:order_items]).each { |i| + i["item_instance_code"] = i["item_instance_code"].downcase.to_s + if i["item_instance_code"].include? "ext" + is_extra_time = true + arr_exts = i["item_instance_code"].split("_") + if arr_exts[1].match(/^(\d)+$/) + time = arr_exts[1].to_i*60*i["quantity"].to_i + extra_time = Time.at(time) + end + end + if i["parent_order_item_id"] + items = {"order_item_id": i["order_item_id"],"item_instance_code": i["item_instance_code"],"quantity": i["quantity"],"parent_order_item_id": i["parent_order_item_id"],"options": i["options"]} + else + items = {"order_item_id": i["order_item_id"],"item_instance_code": i["item_instance_code"],"quantity": i["quantity"],"options": i["options"]} + end + items_arr.push(items) + } + + # begin + order = Order.new + order.source = params[:order_source] + order.order_type = params[:order_type] + # order.customer_id = params[:customer_id].present? ? params[:customer_id] : walkin.customer_id # for no customer id from mobile + order.items = items_arr + order.guest = params[:guest_info] + order.table_id = params[:table_id] # this is dining facilities's id + order.waiters = current_login_employee.name + order.employee_name = current_login_employee.name + + order.is_extra_time = is_extra_time + order.extra_time = extra_time + + order.new_booking = false + order.booking_id = booking.booking_id + + if order.generate + if sale + Sale.add_to_existing_pending_invoice(nil, sale.sale_id, booking) + render :json => { :status => true, :data => sale } + else + render :json => { :status => true, :data => 'OK' } + end + else + render :json => { :status => false } + end + end + + def request_bill + sale_data =[] + if !ShiftSale.current_shift.nil? + order_id = params[:order_id] # order_id + order = Order.find(order_id) + booking = order.booking + if booking.checkin_at.utc > Time.now.utc && booking.checkout_at.nil? + @status = false + @error_message = "Operation failed, Could not request bill!" + else + table = DiningFacility.find_by(id: booking.dining_facility_id) + + if booking.sale_id.nil? + if sale_data = Sale.generate_invoice_from_booking(booking, current_login_employee, current_user, order.source, params[:current_checkin_induties_count]) + # in-duty update + in_duties = InDuty.where("booking_id=?", booking.id) + if !in_duties.empty? + in_duties.each do |in_duty| + induty = InDuty.find(in_duty.id) + induty.sale_id = sale_data.sale_id + induty.out_time = Time.now.utc + induty.save + end + end + + action_by = current_user.name + type = "REQUEST_BILL" + + remark = "Request bill Receipt No #{sale_data.receipt_no}" + sale_audit = SaleAudit.record_audit_sale(sale_data.sale_id,remark,action_by,type ) + + # Promotion Activation + Promotion.promo_activate(sale_data) + + #bill channel + if ENV["SERVER_MODE"] == 'cloud' + from = request.subdomain + "." + request.domain + else + from = "" + end + + if ["quick_service", "cashier"].include? order.source + ActionCable.server.broadcast "bill_channel", table: table, from: from + end + + unless ["quick_service", "food_court"].include? order.source + #check checkInOut pdf print + checkout_time = Lookup.collection_of('checkout_time') + if !booking.dining_facility_id.nil? + terminal = DiningFacility.find_by_id(booking.dining_facility_id) + cashier_terminal = CashierTerminal.find_by_id(terminal.zone_id) + + if (!checkout_time.empty?) && (ENV["SERVER_MODE"] != "cloud") #no print in cloud server + unique_code = "CheckInOutPdf" + printer = PrintSetting.find_by_unique_code(unique_code) + + # print when complete click + order_queue_printer = Printer::OrderQueuePrinter.new(printer) + + if !printer.nil? + order_queue_printer.print_check_in_out(printer, cashier_terminal, booking, table) + end + end + end + end + @status = true + sale_id = sale_data.sale_id + else + @status = false + sale_id = nil + end + else + @status = true + sale_id = booking.sale_id + end + end + else + @status = false + @error_message = "No Current Open Shift for This Employee" + end + if ["quick_service", "food_court"].include? order.source + redirect_to "/foodcourt/sale/#{sale_data.sale_id}/food_court/payment#" + end + # end def completed diff --git a/app/models/card_sale_tran.rb b/app/models/card_sale_tran.rb index ea76e45a..4ff5ffb9 100644 --- a/app/models/card_sale_tran.rb +++ b/app/models/card_sale_tran.rb @@ -67,7 +67,7 @@ class CardSaleTran < ApplicationRecord shift_closed_at As closing_date,") .order("shift_sales.id DESC") return query = query.where("shift_sales.shift_started_at >= ?" , from) - byebug + # byebug end end \ No newline at end of file diff --git a/app/models/card_settle_tran.rb b/app/models/card_settle_tran.rb index 2f087ef3..5e0695d8 100644 --- a/app/models/card_settle_tran.rb +++ b/app/models/card_settle_tran.rb @@ -64,6 +64,6 @@ class CardSettleTran < ApplicationRecord shift_closed_at As closing_date,") .order("shift_sales.id DESC") return query = query.where("shift_sales.shift_started_at >= ?" , from) - byebug + # byebug end end diff --git a/app/models/sale.rb b/app/models/sale.rb index 954674bb..7e1ff6ad 100644 --- a/app/models/sale.rb +++ b/app/models/sale.rb @@ -673,26 +673,28 @@ class Sale < ApplicationRecord end - def self.get_mobile_orders + def self.get_foodcourt_current_shift_orders + @current_shift = ShiftSale.current_shift @bookings = Booking.select("bookings.*,customers.*") .joins(" JOIN sales ON bookings.sale_id=sales.sale_id") .joins(" JOIN booking_orders ON booking_orders.booking_id=bookings.booking_id") .joins("JOIN orders ON orders.order_id=booking_orders.order_id") .joins("JOIN order_items ON orders.order_id=order_items.order_id") .joins("JOIN customers ON orders.customer_id=customers.customer_id") - .where("sales.sale_status =? and sales.payment_status =? and orders.source='app' and DATE(bookings.created_at)=?",'completed','paid', Date.today) - .order("bookings.created_at desc").uniq + .where("sales.sale_status =? and sales.payment_status =? and orders.source='app' and sales.shift_sale_id = ?", + 'completed','paid', @current_shift.id + ).order("bookings.created_at desc").uniq - @competed = [] + @completed = [] @assigns = [] @bookings.each do |b| if b.booking_status == 'completed' - @competed << b + @completed << b else @assigns << b end end - return @competed, @assigns + return @completed, @assigns end #Generate new Receipt No when it is not assigned diff --git a/app/views/foodcourt/addorders/detail.html.erb b/app/views/foodcourt/addorders/detail.html.erb index 389d53ac..f94bd073 100644 --- a/app/views/foodcourt/addorders/detail.html.erb +++ b/app/views/foodcourt/addorders/detail.html.erb @@ -6,10 +6,12 @@ + <% @order_id = params[:order_id].gsub('"', '') if params[:order_id] %> +