diff --git a/app/controllers/origami/customers_controller.rb b/app/controllers/origami/customers_controller.rb index d84dac92..499f0cd4 100755 --- a/app/controllers/origami/customers_controller.rb +++ b/app/controllers/origami/customers_controller.rb @@ -49,6 +49,8 @@ class Origami::CustomersController < BaseOrigamiController def add_customer @sale_id = params[:sale_id] + @cashier_type = params[:type] + if(@sale_id[0,3] == "SAL") @booking = Booking.find_by_sale_id(@sale_id) @dining_facility = DiningFacility.find(@booking.dining_facility_id) diff --git a/app/controllers/origami/discounts_controller.rb b/app/controllers/origami/discounts_controller.rb index 1166a705..17c00af7 100755 --- a/app/controllers/origami/discounts_controller.rb +++ b/app/controllers/origami/discounts_controller.rb @@ -4,6 +4,7 @@ class Origami::DiscountsController < BaseOrigamiController #discount page show from origami index with selected order def index sale_id = params[:id] + @cashier_type = params[:type] if Sale.exists?(sale_id) @sale_data = Sale.find(sale_id) @table = DiningFacility.find(@sale_data.bookings[0].dining_facility_id) diff --git a/app/controllers/origami/other_charges_controller.rb b/app/controllers/origami/other_charges_controller.rb index 51a1f7db..1cc50224 100755 --- a/app/controllers/origami/other_charges_controller.rb +++ b/app/controllers/origami/other_charges_controller.rb @@ -3,6 +3,7 @@ class Origami::OtherChargesController < BaseOrigamiController def index sale_id = params[:sale_id] + @cashier_type = params[:type] if Sale.exists?(sale_id) @sale_data = Sale.find(sale_id) @table = DiningFacility.find(@sale_data.bookings[0].dining_facility_id) diff --git a/app/controllers/origami/quick_service_controller.rb b/app/controllers/origami/quick_service_controller.rb index 374b9ffa..744d4d68 100644 --- a/app/controllers/origami/quick_service_controller.rb +++ b/app/controllers/origami/quick_service_controller.rb @@ -3,8 +3,10 @@ class Origami::QuickServiceController < ApplicationController def index @menu = MenuCategory.all.active - @dining = DiningFacility.all.active + @dining = DiningFacility.all.active @customer = Customer.all + @tables = Table.all.active.order('status desc') + @rooms = Room.all.active.order('status desc') # @tables = Table.all.active.order('zone_id asc').group("zone_id") # @rooms = Room.all.active.order('zone_id asc').group("zone_id") # @all_table = Table.all.active.order('status desc') diff --git a/app/controllers/origami/sale_edit_controller.rb b/app/controllers/origami/sale_edit_controller.rb index c00c35f0..e539356a 100755 --- a/app/controllers/origami/sale_edit_controller.rb +++ b/app/controllers/origami/sale_edit_controller.rb @@ -2,9 +2,10 @@ class Origami::SaleEditController < BaseOrigamiController authorize_resource class: false # Index for sale item void OR edit def edit - sale_id = params[:sale_id] - @table_id = params[:table_id] - @saleobj = Sale.find(sale_id) + sale_id = params[:sale_id] + @table_id = params[:table_id] + @cashier_type = params[:type] + @saleobj = Sale.find(sale_id) end # create item void. make duplicate old record and update qty and price diff --git a/app/controllers/origami/surveys_controller.rb b/app/controllers/origami/surveys_controller.rb index b1baa0a8..cfabae01 100644 --- a/app/controllers/origami/surveys_controller.rb +++ b/app/controllers/origami/surveys_controller.rb @@ -2,6 +2,7 @@ class Origami::SurveysController < BaseOrigamiController def new @survey = Survey.new @id = params[:id] + @cashier_type = params[:type] if(@id[0,3] == "SAL") @sale = Sale.find(@id) @@ -20,8 +21,14 @@ class Origami::SurveysController < BaseOrigamiController def create @dining_facility = DiningFacility.find(params[:table_id]) - @url = "/origami/"+@dining_facility.type.downcase+"/"+params[:table_id] - + + @type = params[:cashier_type] + @sale_id = params[:sale_id] + if @type == "quick_service" + @url = "/origami/sale/"+@sale_id+"/"+@type+"/payment" + else + @url = "/origami/"+@dining_facility.type.downcase+"/"+params[:table_id] + end @survey = Survey.new(survey_params) @survey.foreigner = params["survey"]["foreigner"].to_json # respond_to do |format| diff --git a/app/views/origami/addorders/detail.html.erb b/app/views/origami/addorders/detail.html.erb index 6faa535a..0dbfe61c 100755 --- a/app/views/origami/addorders/detail.html.erb +++ b/app/views/origami/addorders/detail.html.erb @@ -75,12 +75,7 @@
- + Select Table
<% else %> @@ -120,7 +115,7 @@ <% if type %> -
+