Merge branch 'adminbsb_material_ui'

config/routes.rb

@@ -190,7 +190,7 @@ scope "(:locale)", locale: /en|mm/ do
     get 'sale/:sale_id/:type/payment/others_payment/Voucher' => "voucher#index"
 
     #---------Void --------------#
-    post 'sale/:sale_id/void' => 'void#overall_void'
+    post 'sale/:sale_id/:type/void' => 'void#overall_void'
 
     #---------Multiple Invoices --------------#
     get 'table/:table_id/table_invoices' => "table_invoices#index", :as => "table_invoice_index"
@@ -243,6 +243,8 @@ scope "(:locale)", locale: /en|mm/ do
     post '/split_bills/equal_person', to: 'split_bill#update_sale'
 
     resources :second_display #second display routes
+
+    post '/customer_view' => "second_display#customer_view",:as => "customer_view", :defaults => { :format => 'json' }
   end
 
   #--------- Waiter/Ordering Station ------------#
@@ -432,6 +434,9 @@ scope "(:locale)", locale: /en|mm/ do
 
   #----------- Print Setup --------#
   resources :print_settings
+
+  get '/get_printer_options/:printer_name' => 'print_settings#get_printer_options'
+
   resources :commissioners
   # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html
 end