Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes
This commit is contained in:
@@ -177,6 +177,7 @@ scope "(:locale)", locale: /en|mm/ do
|
||||
post 'payment/master' => "master#create"
|
||||
post 'payment/visa' => "visa#create"
|
||||
post 'payment/unionpay' => "unionpay#create"
|
||||
post 'payment/junctionpay' => "junction_pay#create"
|
||||
post 'payment/paypar' => 'paypar_payments#create'
|
||||
post 'payment/credit' => 'credit_payments#create'
|
||||
post 'payment/voucher' => 'voucher_payments#create'
|
||||
@@ -188,6 +189,7 @@ scope "(:locale)", locale: /en|mm/ do
|
||||
get 'sale/:sale_id/:type/payment/others_payment/Master' => "master#index"
|
||||
get 'sale/:sale_id/:type/payment/others_payment/JCB' => "jcb#index"
|
||||
get 'sale/:sale_id/:type/payment/others_payment/UNIONPAY' => "unionpay#index"
|
||||
get 'sale/:sale_id/:type/payment/others_payment/JUNCTIONPAY' => "junction_pay#index"
|
||||
get 'sale/:sale_id/:type/payment/others_payment/Redeem' => "redeem_payments#index"
|
||||
get 'sale/:sale_id/:type/payment/others_payment/Voucher' => "voucher#index"
|
||||
|
||||
@@ -435,6 +437,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
|
||||
|
||||
Reference in New Issue
Block a user