git_admin/sx-fc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'ui_ux_changes' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes

Browse Source
This commit is contained in:
phyusin
2018-06-20 11:10:51 +06:30
parent ac5fda7c2a 036a4a3ff0
commit d024810739
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/controllers/print_settings_controller.rb
View File

@@ -60,10 +60,8 @@ class PrintSettingsController < ApplicationController
# DELETE /print_settings/1.json # DELETE /print_settings/1.json
def destroy def destroy
@print_setting.destroy @print_setting.destroy
respond_to do |format| flash[:notice] = 'Print setting was successfully destroyed.'
format.html { redirect_to print_settings_url, notice: 'Print setting was successfully destroyed.' } render :json => {:status=> "Success", :url => print_settings_url }.to_json
format.json { head :no_content }
end
end end
def get_printer_options def get_printer_options

1
config/routes.rb
View File

@@ -492,6 +492,7 @@ scope "(:locale)", locale: /en|mm/ do
#----------- Print Setup --------# #----------- Print Setup --------#
resources :print_settings resources :print_settings
delete '/:id/print_settings' => 'print_settings#destroy'
get '/get_printer_options/:printer_name' => 'print_settings#get_printer_options' get '/get_printer_options/:printer_name' => 'print_settings#get_printer_options'