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

config/initializers/assets.rb

@@ -41,6 +41,11 @@ Rails.application.config.assets.precompile += %w( fileinput.min.js )
 Rails.application.config.assets.precompile += %w( addorder.css )
 Rails.application.config.assets.precompile += %w( addorder.js )
 
+# --- Customer/ Customer - Crm ----
+Rails.application.config.assets.precompile += %w( wow_style.css )
+Rails.application.config.assets.precompile += %w( wowslider.js )
+Rails.application.config.assets.precompile += %w( wow_script.js )
+
 # --- Custom SX Themem ----
 Rails.application.config.assets.precompile += %w( sx-sidebar.css )
 

config/license.yml

@@ -1,15 +0,0 @@
-iv_key: f3ICP0M2HJLIeXURn3yv5A==
-shop_name: sx_license_test3
-email: aungmyo.zaw@code2lab.com
-telephone: 0099404923
-fax: 49494949432
-address: Yangon
-dbhost: m4ZCds3ANyqjqCgZVSTfRQ==
-dbschema: +mvY73HAjWqMrby9Zu+tBg==
-dbusername: UO2rBxhoSfDEKutK2OEL4A==
-dbpassword: sVpy+Lj6i3MpT+CjoJrDOw==
-api_token: srTutEOCzphDFOXQqVWnZwQDTXiHdzwzY
-app_token: pSzbojYfXLNpSLmhdNTfLCtxfzeUahO
-plan_sku: +53eC6oiOsBRxtBgVjyULw==
-renewable_date: hon6p5jvfirTFniaFrH0qw==
-plan_name: eaMIWzHlTnljCEkE2oxoHg==

config/routes.rb

@@ -95,6 +95,9 @@ scope "(:locale)", locale: /en|mm/ do
     get "quick_service/modify_order/:sale_id" => "quick_service#modify_order"
     post 'quick_service/update_modify_order' => "quick_service#update_modify_order", :defaults => { :format => 'json' }
     
+    resources :second_display
+
+    post '/customer_view' => "second_display#customer_view",:as => "customer_view", :defaults => { :format => 'json' }
 
     resources :cash_ins, only: [:new, :create]
     resources :cash_outs, only: [:new, :create]