fixed conflit

config/application.rb

@@ -34,6 +34,6 @@ module SXRestaurants
           )
       end
     end
-
+    
   end
 end

config/cable.yml

@@ -4,4 +4,4 @@ redis: &redis
 
 production: *redis
 development: *redis
-test: *redis
+test: *redis

config/initializers/action_controller.rb

@@ -38,7 +38,7 @@ class ActionController::Base
     elsif (flag == 2)
       flash[:notice] = 'Expiring! Please, License extend...'
     else
-      puts "RUN SAY BYAR"
+      Rails.logger.info "Run License"
     end
   end
 

config/initializers/assets.rb

@@ -60,3 +60,7 @@ Rails.application.config.assets.precompile += %w( order_reservation.js )
 # --- Reservation ----
 Rails.application.config.assets.precompile += %w( reservation.css )
 Rails.application.config.assets.precompile += %w( reservation.js )
+
+Rails.application.config.assets.precompile += %w( custom.js )
+
+Rails.application.config.assets.precompile += %w( foodcourt.js )

config/initializers/license.rb

@@ -3,6 +3,4 @@ if File.exist?("config/license.yml")
 	config.fetch(Rails.env, {}).each do |key, value|
 	  ENV[key.upcase] = value.to_s
 	end
-else
-	ENV["SERVER_MODE"] = "cloud"
 end

config/redis.yml

@@ -10,4 +10,4 @@ test:
 
 production:
   <<: *default
-  url: redis://127.0.0.1:6379
+  url: redis://127.0.0.1:6379

config/routes.rb

@@ -607,5 +607,92 @@ scope "(:locale)", locale: /en|mm/ do
 
   post '/run_teamviewer' => 'home#run_teamviewer', :defaults => { :format => 'json' }
   # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html
+
+#only for foodcourt
+  namespace :foodcourt do
+    root "home#index"
+
+    post '/check_emp_access_code/:code' => 'home#check_emp_access_code', :defaults => { :format => 'json' }
+
+    get "dashboard" => "dashboard#index"
+    get "get_all_menu" => "dashboard#get_all_menu"
+    get "/table/:table_id/sale/:sale_id/:type/edit" => "sale_edit#edit"
+    get "/table/sale/:sale_id/:type/edit" => "sale_edit#edit"
+    post 'item_void' => "sale_edit#item_void"
+    post 'item_foc' => "sale_edit#item_foc"
+    post 'item_edit' => "sale_edit#item_edit"
+    post 'item_void_cancel' => "sale_edit#item_void_cancel"
+    post 'cancel_all_void' => 'sale_edit#cancel_all_void'
+    post 'apply_void' => 'sale_edit#apply_void'
+    get 'sale/:sale_id' => 'sales#show'
+    get 'order/:order_id' => "orders#show"
+
+    # Other Charges
+    get "/:sale_id/:type/other_charges" => "other_charges#index"
+    post "/:sale_id/other_charges" => "other_charges#create"
+
+    # Discount
+    get "/:id/:type/discount" => "discounts#index"
+    post "/:id/discount" => "discounts#create"
+    get "/:id/:type/remove_all_discount" => "discounts#remove_all_discount"
+    post "/:id/remove_discount_items" => "discounts#remove_discount_items"
+
+    # Discount for Member
+    post "/:id/member_discount" => "discounts#member_discount"
+
+    get "/:id/request_bills" => "request_bills#print", :as => "request_bill"
+    get '/:sale_id/reprint' => 'payments#reprint', :defaults => {:format => 'json'}
+
+    #---------Shift ---------------#
+    resources :shifts, only: [:index, :new, :create, :edit]
+    post 'close_shift' => 'shifts#update_shift'
+    get 'shift/:type/close' => 'shifts#show'
+    get 'shift/sale_summary' => 'shifts#sale_summary'
+
+    resources :cash_mgmt, only: [:new, :create]
+
+    post 'sale/:sale_id/:type/payment/print' => 'payments#print' #route for print receipt
+    get 'sale/:sale_id/:type/payment' => 'payments#show'
+    post 'payment/:type/foc' => 'payments#foc', :defaults => {:format => 'json'}
+    post 'payment/cash' => 'payments#create'
+    post 'payment/paymal' => 'paymal#create'
+
+    post 'payment/:type/change_tax' => 'payments#change_tax', :defaults => {:format => 'json'}
+
+    #---------Void --------------#
+    post 'sale/:sale_id/:type/void' => 'void#overall_void'
+
+    post 'sale/:sale_id/:type/waste_and_spoilage' => "waste_spoile#waste_and_spoilage"
+
+    #---------Add Customer --------------#
+    #resources :customers
+    get '/:sale_id/:type/customers/:dir_page', to: "customers#add_customer"
+    get '/:customer_id/get_customer' => 'home#get_customer', :as => "show_customer_details"
+    post '/:sale_id/:type/customers/update_sale', to: "customers#update_sale_by_customer" # update customer id in sale table
+
+    post '/:sale_id/get_customer' => "customers#get_customer"
+    post '/:sale_id/send_account' => "customers#send_account"
+
+    get '/:id/:type/surveys', to: "surveys#new"
+    match '/:id/create_survey', to: "surveys#create", as: "create_surveys", via: [:post, :patch, :put]
+
+    get '/addorders/get_menu/:id' => "addorders#get_menu",:as => "get_menu", :defaults => { :format => 'json' }
+    get '/addorders/get_menu_category/:id' => "addorders#get_menu_category",:as => "get_menu_category", :defaults => { :format => 'json' }
+    get '/addorders/get_menu_sub_category/:id' => "addorders#get_menu_sub_category",:as => "get_menu_sub_category", :defaults => { :format => 'json' }
+    get '/addorders/products/list' => "addorders#get_all_product",:as => "get_all_product", :defaults => { :format => 'json' }
+
+    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 :second_display #second display routes
+
+    post '/customer_view' => "second_display#customer_view",:as => "customer_view", :defaults => { :format => 'json' }
+    get "food_court" => "food_court#index"
+    get "app_orders" => "orders#app_orders",:as => "app_order_by_booking"
+    post ':booking_id/:order_id/completed' => "orders#completed", :defaults => { :format => 'json' }
+  end
 end
 end

config/secrets.yml

@@ -11,8 +11,8 @@
 # if you're sharing your code publicly.
 
 development:
- secret_key_base: b61d85f8ed2a1a9e0eeece3443b3e8f838d002cc1d9f32115d8e93db920e2957adfedc57501d44741211538f3108b742cdeada87d5bfae796c53da1f90a3cd61  
- sx_provision_url: connect.smartsales.asia/api #connect.smartsales.dev/api #connect.smartsales.asia/api  #provision.zsai.ws/api   
+ secret_key_base: b61d85f8ed2a1a9e0eeece3443b3e8f838d002cc1d9f32115d8e93db920e2957adfedc57501d44741211538f3108b742cdeada87d5bfae796c53da1f90a3cd61
+ sx_provision_url: connect.smartsales.asia/api #connect.smartsales.dev/api #connect.smartsales.asia/api  #provision.zsai.ws/api
  server_mode: application
  cipher_type: AES-256-CBC
  sx_key: Wh@t1$C2L
@@ -23,8 +23,8 @@ test:
 # Do not keep production secrets in the repository,
 # instead read values from the environment.
 production:
- secret_key_base: c4bc81065013f9a3506d385bcbd49586c42e586488144b0de90c7da36867de9fa880f46b5c4f86f0ce9b7c783bb5a73bdb0e5605a47716567294390e726d3e22  
- sx_provision_url: connect.smartsales.asia/api #192.168.1.147:3002/api
+ secret_key_base: c4bc81065013f9a3506d385bcbd49586c42e586488144b0de90c7da36867de9fa880f46b5c4f86f0ce9b7c783bb5a73bdb0e5605a47716567294390e726d3e22
+ sx_provision_url: connect.smartsales.asia/api #52.221.188.144:9292/api #192.168.1.147:3002/api
  server_mode: application
  cipher_type: AES-256-CBC
  sx_key: Wh@t1$C2L