Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into r-1804001-01

config/initializers/action_controller.rb

@@ -50,6 +50,16 @@ class ActionController::Base
     end
   end
 
+  def check_license
+    License.check_license_file 
+  end
+
+  def check_installation
+    if current_company.nil?
+      redirect_to install_path
+    end
+  end
+
   def website_connection(license)
     default_connection.dup.update(:host => license.dbhost, :database => license.dbschema.to_s.downcase,
     :username => license.dbusername, :password => license.dbpassword)

config/routes.rb

@@ -237,6 +237,9 @@ scope "(:locale)", locale: /en|mm/ do
     get '/:addorders/:id' => "addorders#detail"
     post '/:addorders/create' => "addorders#create",:as => "addorder_create", :defaults => { :format => 'json' }
     
+
+    get '/addorders/get_item_instance/:id' => "addorders#get_item_instance",:as => "get_item_instance", :defaults => { :format => 'json' }
+    
     resources :commissions
     resources :commissioners
 

config/secrets.yml

@@ -13,7 +13,7 @@
 development:
   secret_key_base: b61d85f8ed2a1a9e0eeece3443b3e8f838d002cc1d9f32115d8e93db920e2957adfedc57501d44741211538f3108b742cdeada87d5bfae796c53da1f90a3cd61  
   sx_provision_url: https://connect.pos-myanmar.com/bensai/api #connect.smartsales.dev/api #connect.smartsales.asia/api  #provision.zsai.ws/api   
-  server_mode: cloud
+  server_mode: application
   cipher_type: AES-256-CBC
   sx_key: Wh@t1$C2L