diff --git a/app/controllers/print_settings_controller.rb b/app/controllers/print_settings_controller.rb index 8efb9dd5..5bf654ef 100644 --- a/app/controllers/print_settings_controller.rb +++ b/app/controllers/print_settings_controller.rb @@ -70,6 +70,6 @@ class PrintSettingsController < ApplicationController # Never trust parameters from the scary internet, only allow the white list through. def print_setting_params - params.require(:print_setting).permit(:name, :unique_code, :template, :db_name, :db_type, :db_username, :db_password, :printer_name, :api_settings, :page_width, :page_height, :print_copies,:precision,:delimiter,:heading_space) + params.require(:print_setting).permit(:name, :unique_code, :template, :printer_name, :api_settings, :page_width, :page_height, :print_copies,:precision,:delimiter,:heading_space) end end diff --git a/app/models/ability.rb b/app/models/ability.rb index ffd0dbaa..444795dd 100644 --- a/app/models/ability.rb +++ b/app/models/ability.rb @@ -122,11 +122,9 @@ class Ability can :edit, :sale_edit can :item_void, :sale_edit - can :an :edit, :sale_edit - can :item_void, :sale_edit can :item_edit, :sale_edit can :item_void_cancel, :sale_edit - can :cancel_all_void, :sale_edit + can :cancel_all_void, :sale_edit can :apply_void, :sale_edit can :overall_void, :void diff --git a/app/views/print_settings/_form.html.erb b/app/views/print_settings/_form.html.erb index ba703aae..f9079f99 100644 --- a/app/views/print_settings/_form.html.erb +++ b/app/views/print_settings/_form.html.erb @@ -5,10 +5,6 @@ <%= f.input :name %> <%= f.input :unique_code %> <%= f.input :template %> - <%= f.input :db_name %> - <%= f.input :db_type %> - <%= f.input :db_username %> - <%= f.input :db_password %> <%= f.input :printer_name %> <%= f.input :api_settings %> <%= f.input :page_width %> diff --git a/app/views/print_settings/index.html.erb b/app/views/print_settings/index.html.erb index 9c8ce0b0..c16a28c2 100644 --- a/app/views/print_settings/index.html.erb +++ b/app/views/print_settings/index.html.erb @@ -16,11 +16,7 @@