Pull from master

config/initializers/assets.rb

@@ -53,9 +53,7 @@ Rails.application.config.assets.precompile += %w( sx-sidebar.css )
 Rails.application.config.assets.precompile += %w( inventory_definitions.css )
 Rails.application.config.assets.precompile += %w( inventory.js )
 
-# --- Customer/ Customer - Crm ----
+# --- Order Reservation/ Order ----
 Rails.application.config.assets.precompile += %w( order_reservation.css )
 Rails.application.config.assets.precompile += %w( order_reservation.js )
 
-
-

config/locales/en.yml

@@ -493,6 +493,7 @@ en:
         induty_report: "Induty Report"
         in_time: "In Time"
         out_time: "Out Time"
+        transaction_fee: "Transaction Fee"
         
         code_txt: "code "
         charge_txt: "charge"

config/locales/mm.yml

@@ -487,6 +487,7 @@ mm:
         induty_report: "Induty Report"
         in_time: "In Time"
         out_time: "Out Time"
+        transaction_fee: "Transaction Fee"
         
         code_txt: "ကုတ်ဒ် "
         charge_txt: "ကောက်ခံသည်"

config/routes.rb

@@ -91,6 +91,8 @@ scope "(:locale)", locale: /en|mm/ do
       post "callback/:id" => "order_reservation#update_status"
       get "get_tax_profile" => "order_reservation#get_tax_profile"
     end
+    
+    post "sound_effect" => "sound_effect#sound_effect"
   end
 
   #--------- Cashier ------------#