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

Merge branch 'adminbsb_material_ui'

Browse Source
This commit is contained in:
Aung Myo
2018-03-21 13:10:59 +06:30
parent 9c8cf6d748 e6719462d1
commit a30abfb30c
4 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
README.md
View File

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

2
app/views/origami/addorders/detail.html.erb
View File

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

4
app/views/origami/home/show.html.erb
View File

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

7
config/routes.rb
View File

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