From b0cc934625b8b98c91d1a8813107cffc956274b4 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Tue, 20 Feb 2018 15:29:19 +0630 Subject: [PATCH] update quick service for split bill --- app/controllers/origami/orders_controller.rb | 9 +++++++-- .../origami/pending_order_controller.rb | 2 -- .../origami/split_bill_controller.rb | 20 +++++++++++-------- app/views/origami/orders/show.html.erb | 11 +++++++--- 4 files changed, 27 insertions(+), 15 deletions(-) diff --git a/app/controllers/origami/orders_controller.rb b/app/controllers/origami/orders_controller.rb index f5b71bf8..13f5b684 100755 --- a/app/controllers/origami/orders_controller.rb +++ b/app/controllers/origami/orders_controller.rb @@ -11,8 +11,13 @@ class Origami::OrdersController < BaseOrigamiController @booking = Array.new if !booking.nil? - dining_facilities = DiningFacility.find_by_id(booking.dining_facility_id) - @booking.push({'booking_id' => booking.booking_id, 'dining_facility_id' => booking.dining_facility_id, 'type' => dining_facilities.type}) + if booking.dining_facility_id.to_i > 0 + dining_facilities = DiningFacility.find_by_id(booking.dining_facility_id) + @booking.push({'booking_id' => booking.booking_id, 'dining_facility_id' => booking.dining_facility_id, 'type' => dining_facilities.type}) + else + @booking.push({'booking_id' => booking.booking_id, 'dining_facility_id' => booking.dining_facility_id, 'type' => nil}) + end + end #for split bill diff --git a/app/controllers/origami/pending_order_controller.rb b/app/controllers/origami/pending_order_controller.rb index dd2f4cc7..a1942a27 100644 --- a/app/controllers/origami/pending_order_controller.rb +++ b/app/controllers/origami/pending_order_controller.rb @@ -9,8 +9,6 @@ class Origami::PendingOrderController < BaseOrigamiController @sale = Sale.find(params[:sale_id]) @order = SaleOrder.find_by_sale_id(@sale.sale_id).order_id @booking = BookingOrder.find_by_order_id(@order).booking_id - puts "sssssssssss" - puts @booking if Booking.find(@booking).dining_facility_id.to_i > 0 @table_id = Booking.find(@booking).dining_facility_id @dining = DiningFacility.find(@table_id) diff --git a/app/controllers/origami/split_bill_controller.rb b/app/controllers/origami/split_bill_controller.rb index 037f3f6c..4c74d4a7 100644 --- a/app/controllers/origami/split_bill_controller.rb +++ b/app/controllers/origami/split_bill_controller.rb @@ -86,18 +86,22 @@ class Origami::SplitBillController < BaseOrigamiController end status = false - if shift_by_terminal = ShiftSale.current_open_shift(get_cashier[0].id) + if !ShiftSale.current_shift.nil? #create Bill by Booking ID table = 0 if !params[:booking_id].empty? booking = Booking.find(params[:booking_id]) # for Multiple Cashier by Zone - table = DiningFacility.find(booking.dining_facility_id) + if booking.dining_facility_id.to_i>0 + table = DiningFacility.find(booking.dining_facility_id) + cashier_zone = CashierTerminalByZone.find_by_zone_id(table.zone_id) + else + table = nil + end - cashier_zone = CashierTerminalByZone.find_by_zone_id(table.zone_id) - - shift_by_terminal = ShiftSale.find_by_cashier_terminal_id_and_shift_closed_at(cashier_zone.cashier_terminal_id,nil) - get_cashier_by_terminal = Employee.find(shift_by_terminal.employee_id) + # shift_by_terminal = ShiftSale.find_by_cashier_terminal_id_and_shift_closed_at(cashier_zone.cashier_terminal_id,nil) + # get_cashier_by_terminal = Employee.find(shift_by_terminal.employee_id) + get_cashier_by_terminal = current_user if booking if booking.sale_id.nil? @@ -320,8 +324,8 @@ class Origami::SplitBillController < BaseOrigamiController end # Bind shift sale id to sale - sale_data.shift_sale_id = shift_by_terminal.id - sale_data.save + # sale_data.shift_sale_id = shift_by_terminal.id + # sale_data.save Promotion.promo_activate(sale) diff --git a/app/views/origami/orders/show.html.erb b/app/views/origami/orders/show.html.erb index 4ffe9de6..57a55597 100755 --- a/app/views/origami/orders/show.html.erb +++ b/app/views/origami/orders/show.html.erb @@ -334,11 +334,16 @@ swal("Information!", result.error_message); } else{ - if(type=='Table'){ - window.location.href = '/origami/table/' + dining_id; + if (dining_id == 0) { + window.location.href = '/origami'; }else{ - window.location.href = '/origami/room/' + dining_id; + if(type=='Table'){ + window.location.href = '/origami/table/' + dining_id; + }else{ + window.location.href = '/origami/room/' + dining_id; + } } + } } });