From a0d27bd1d1a9a5619692c590991cd6efd96bcbfd Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Wed, 21 Mar 2018 11:18:49 +0630 Subject: [PATCH 1/2] update route for print setting and addorder --- README.md | 1 + app/views/origami/addorders/detail.html.erb | 2 +- config/routes.rb | 2 ++ 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 015eaa5a..ef595739 100755 --- a/README.md +++ b/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.88:3002 Person and Extra Time category_code = SPL... //for menu categories special diff --git a/app/views/origami/addorders/detail.html.erb b/app/views/origami/addorders/detail.html.erb index 4e93e5a7..183a819f 100755 --- a/app/views/origami/addorders/detail.html.erb +++ b/app/views/origami/addorders/detail.html.erb @@ -87,7 +87,7 @@
-
+
<% @menu.each do |menu| %> diff --git a/config/routes.rb b/config/routes.rb index c7eff8a7..cc24bbbd 100755 --- a/config/routes.rb +++ b/config/routes.rb @@ -432,6 +432,8 @@ 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 From e6719462d176b5fccb549953855b486f274f4aa5 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Wed, 21 Mar 2018 13:10:12 +0630 Subject: [PATCH 2/2] update route --- README.md | 2 +- app/views/origami/home/show.html.erb | 4 ++-- config/routes.rb | 11 +++++++---- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index ef595739..a14a0926 100755 --- a/README.md +++ b/README.md @@ -25,7 +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.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 diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb index eda3524a..caa651c4 100755 --- a/app/views/origami/home/show.html.erb +++ b/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); diff --git a/config/routes.rb b/config/routes.rb index cc24bbbd..058c7891 100755 --- a/config/routes.rb +++ b/config/routes.rb @@ -168,7 +168,7 @@ scope "(:locale)", locale: /en|mm/ do get 'sale/:sale_id/:type/payment' => 'payments#show' post 'sale/:sale_id/:type/payment/print' => 'payments#print' #route for print receipt - post 'payment/foc' => 'payments#foc', :defaults => {:format => 'json'} + post 'payment/:type/foc' => 'payments#foc', :defaults => {:format => 'json'} post 'payment/cash' => 'payments#create' post 'payment/mpu' => "mpu#create" post 'payment/jcb' => "jcb#create" @@ -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,8 +434,9 @@ scope "(:locale)", locale: /en|mm/ do #----------- Print Setup --------# resources :print_settings - -get '/get_printer_options/:printer_name' => 'print_settings#get_printer_options' + + 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