many important fixes

This commit is contained in:
2020-02-29 11:43:00 -05:00
parent 2149345d3d
commit 73c207c324
28 changed files with 1463 additions and 242 deletions
+7 -5
View File
@@ -16,11 +16,13 @@ require File.expand_path('./../../lib/couchbase-setting', __FILE__)
Bundler.require(*Rails.groups(assets: %w(development test user_app)))
Bundler.require(:assets) if ENV['DEPLOY']=='yes'
class CouchRest::Connection
alias_method :old_execute, :execute
def execute(method, path, options, payload = nil, &block)
Rails.logger.debug "Couch: #{method} #{Rack::Utils.unescape path} #{options}"
old_execute(method, path, options, payload, &block)
if Rails.env.development?
class CouchRest::Connection
alias_method :old_execute, :execute
def execute(method, path, options, payload = nil, &block)
Rails.logger.debug "Couch: #{method} #{Rack::Utils.unescape path} #{options}"
old_execute(method, path, options, payload, &block)
end
end
end
# Bug in actionview error handling, remove for versions > 6.0.2.1
+2 -2
View File
@@ -252,11 +252,11 @@ Devise.setup do |config|
# config.omniauth :facebook, "505160086210072", "fcc474a3fb13c6bcc0f7c83a92ad1b17",
# scope: 'email,user_birthday,publish_actions'
config.omniauth :facebook, "653729178057509", "d4cea86f70803f1b75ed03c506a4d78e",
scope: 'email,user_birthday,publish_actions'
scope: 'email,user_birthday,user_gender,user_hometown,user_link,user_location'
config.omniauth :instagram, "cd7bdfbee825499b94fb3783d1bc143b", "6b4f9ecf251c462993a696eebc0189be"
else
config.omniauth :facebook, "168928633304849", "22bc53e1a390c1e62d004195c55fe336",
scope: 'email,user_birthday,publish_actions'
scope: 'email,user_birthday,user_gender,user_hometown,user_link,user_location'
config.omniauth :instagram, "81c78b969a7046d6b6b5b5fe3f30929c", "3697c16762ad4f1ca088e829efbaddde"
end
+3 -2
View File
@@ -85,16 +85,17 @@ Qwaiter::Application.routes.draw do
end
member do
get :table
get :orders
post :needs_payment
post :move_to_table
post :order_products
post :reject_join_request
post :approve_join_request
end
resources :orders, only: [:index]
#resources :orders, only: [:index]
end
#resources :orders, only: [:create]
resources :orders, only: [:create]
resources :tables do
member do
post :needs_help