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

config/application.rb

@@ -2,6 +2,7 @@ require_relative 'boot'
 
 require 'csv'
 require 'rails/all'
+# require 'iconv'
 
 # Require the gems listed in Gemfile, including any gems
 # you've limited to :test, :development, or :production.

config/initializers/mime_types.rb

@@ -3,3 +3,4 @@
 # Add new mime types for use in respond_to blocks:
 # Mime::Type.register "text/richtext", :rtf
 Mime::Type.register 'application/vnd.ms-excel', :xls
+Mime::Type.register "application/xlsx", :xlsx

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