diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb index 4e0e89f3..11ed3da0 100755 --- a/app/controllers/home_controller.rb +++ b/app/controllers/home_controller.rb @@ -20,7 +20,9 @@ class HomeController < ApplicationController def index # @employees = Employee.all_emp_except_waiter.order("name asc") @employees = Employee.all.where("is_active = true").order("name asc") - @roles = Lookup.collection_of("employee_roles") + @roles = Employee.distinct.pluck(:role) + # byebug + # @roles = Lookup.collection_of("employee_roles") @login_form = LoginForm.new() render "layouts/login_dashboard", layout: false end diff --git a/app/controllers/origami/master_controller.rb b/app/controllers/origami/master_controller.rb index 8d33505c..3ca5d3eb 100644 --- a/app/controllers/origami/master_controller.rb +++ b/app/controllers/origami/master_controller.rb @@ -79,7 +79,11 @@ class Origami::MasterController < BaseOrigamiController payment_for = true end sale_payment = SalePayment.new +<<<<<<< HEAD @status, @sale = sale_payment.process_payment(saleObj, current_user.name, cash, "master",ref_no,payment_for) +======= + @status, @sale = sale_payment.process_payment(saleObj, current_user.name, cash, "master",ref_no) +>>>>>>> 043a1efb2a59c3793b56184a342ba6d132cf57f9 end end diff --git a/app/controllers/origami/visa_controller.rb b/app/controllers/origami/visa_controller.rb index 6e73efda..cb0652f0 100644 --- a/app/controllers/origami/visa_controller.rb +++ b/app/controllers/origami/visa_controller.rb @@ -78,7 +78,6 @@ class Origami::VisaController < BaseOrigamiController payment_for = true end sale_payment = SalePayment.new - @status, @sale = sale_payment.process_payment(saleObj, current_user.name, cash, "visa",ref_no,payment_for) end end diff --git a/app/controllers/settings/tables_controller.rb b/app/controllers/settings/tables_controller.rb index 913ef57e..f0f5f4ac 100755 --- a/app/controllers/settings/tables_controller.rb +++ b/app/controllers/settings/tables_controller.rb @@ -60,7 +60,7 @@ class Settings::TablesController < ApplicationController def destroy @settings_table.destroy flash[:notice] = 'Table was successfully destroyed.' - render :json => {:status=> "Success", :url => settings_zone_path(@zone) }.to_json + render :json => {:status=> "Success", :url => settings_zones_path(@zone) }.to_json # respond_to do |format| # format.html { redirect_to settings_zone_path(@zone), notice: 'Table was successfully destroyed.' } # format.json { head :no_content } diff --git a/app/views/layouts/login_dashboard.html.erb b/app/views/layouts/login_dashboard.html.erb index df2a35c2..10d9def1 100755 --- a/app/views/layouts/login_dashboard.html.erb +++ b/app/views/layouts/login_dashboard.html.erb @@ -113,9 +113,9 @@