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

app/controllers/print_settings_controller.rb

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

config/routes.rb

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