Merge branch 'adminbsb_material_ui'

README.md

@@ -25,6 +25,7 @@ BITP
     Campaign Id      => {"campaign_type_id": 1}
 
 java -jar ~/Documents/Jade.jar http://192.168.1.88:3002
+java -jar ~/Documents/c2l_jade.jar http://192.168.1.151:3002
 
 Person and Extra Time
   category_code = SPL... //for menu categories special

app/views/origami/addorders/detail.html.erb

@@ -87,7 +87,7 @@
     <div class="col-md-7 col-lg-7 col-sm-7 m-t-10" >
       <div class="card">
         <div class="card-block">
-          <div id="custom-slimscroll">
+          <div id="custom-">
              <div class="card-columns custom-card-columns menu_items_list" style="column-gap: 0.5rem;">
                <!-- append data -->
                <% @menu.each do |menu| %>

app/views/origami/home/show.html.erb

@@ -726,9 +726,9 @@
                 createReceiptNoInFirstBillData(receipt_no,"");
 
                 // For Server Print - from jade
-                if ($("#server_mode").val() == "cloud") {
+                // if ($("#server_mode").val() == "cloud") {
                   code2lab.printFile(result.filepath, result.printer_url);
-                }
+                // }
                             
               // console.log(result);
               // code2lab.printBill(result.filepath, result.printer_model, result.printer_url);

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