diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb index 3ed9115f..1c006be1 100755 --- a/app/controllers/home_controller.rb +++ b/app/controllers/home_controller.rb @@ -126,6 +126,12 @@ class HomeController < ApplicationController render :json => {:status=> "Success", :url => root_path }.to_json end + #Shop Name in Navbor + helper_method :shop_detail + def shop_detail + @shop = Shop.first + end + private # Never trust parameters from the scary internet, only allow the white list through. @@ -163,4 +169,5 @@ class HomeController < ApplicationController redirect_to reports_dailysale_index_path end end + end diff --git a/app/controllers/origami/dashboard_controller.rb b/app/controllers/origami/dashboard_controller.rb index 9f5e25a4..e47a8e48 100644 --- a/app/controllers/origami/dashboard_controller.rb +++ b/app/controllers/origami/dashboard_controller.rb @@ -56,4 +56,9 @@ class Origami::DashboardController < BaseOrigamiController # get printer info @print_settings = PrintSetting.get_precision_delimiter() end + + helper_method :shop_detail + def shop_detail + @shop = Shop.first + end end diff --git a/app/controllers/origami/pending_order_controller.rb b/app/controllers/origami/pending_order_controller.rb index 5d18e473..766c7e47 100644 --- a/app/controllers/origami/pending_order_controller.rb +++ b/app/controllers/origami/pending_order_controller.rb @@ -12,4 +12,8 @@ class Origami::PendingOrderController < BaseOrigamiController @table_id = Booking.find(@booking).dining_facility_id @dining = DiningFacility.find(@table_id) end + helper_method :shop_detail + def shop_detail + @shop = Shop.first + end end diff --git a/app/views/origami/table_invoices/show.html.erb b/app/views/origami/table_invoices/show.html.erb index b70c2ffc..648fdf7c 100755 --- a/app/views/origami/table_invoices/show.html.erb +++ b/app/views/origami/table_invoices/show.html.erb @@ -170,7 +170,7 @@ $('#pay').on('click',function() { // location.reload(); } }); - window.location.href = '/origami/sale/'+ sale_id + "/payment"; + window.location.href = '/origami/sale/'+ sale_id + "/cashier/payment"; }); $('#back').on('click',function(){ window.location.href = '/origami/table/<%= @table.id %>';