Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant

config/locales/en.yml

@@ -450,6 +450,7 @@ en:
         additional_parameter: "Additional parameter"
         lookup: "Lookup"
         product_sale_report: "Product Sale"
+        group_type: "Group Type"
         
         code_txt: "code "
         charge_txt: "charge"

config/locales/mm.yml

@@ -445,6 +445,7 @@ mm:
         survey: "ခြုံငုံလေ့လာခြင်း"
         lookup: "သတ်မှတ်ချက်များ"
         product_sale_report: "Product Sale"
+        group_type: "Group Type"
         
         code_txt: "ကုတ်ဒ် "
         charge_txt: "ကောက်ခံသည်"

config/routes.rb

@@ -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