diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php index 808d999b4d6e..f95c0d3cbf3d 100644 --- a/app/Exceptions/Handler.php +++ b/app/Exceptions/Handler.php @@ -83,7 +83,7 @@ class Handler extends ExceptionHandler 'email' => 'anonymous@example.com', 'name' => 'Anonymous User', ]); - } elseif (auth()->guard('user') && auth()->guard('user')->user() && auth()->user()->companyIsSet() && auth()->user()->company()->account->report_errors) { + } elseif (auth()->guard('user') && auth()->guard('user')->user() && auth()->user()->company() && auth()->user()->company()->account->report_errors) { $scope->setUser([ 'id' => auth()->user()->account->key, 'email' => 'anonymous@example.com', diff --git a/app/Http/Controllers/StripeConnectController.php b/app/Http/Controllers/StripeConnectController.php index abde779863ab..08458584af06 100644 --- a/app/Http/Controllers/StripeConnectController.php +++ b/app/Http/Controllers/StripeConnectController.php @@ -64,8 +64,8 @@ class StripeConnectController extends BaseController // if($email = $request->getContact()->email) // $endpoint .= "&stripe_user[email]={$email}"; - $company_name = str_replace(" ", "_", $company->present()->name()); - $endpoint .= "&stripe_user[business_name]={$company_name}"; + // $company_name = str_replace(" ", "_", $company->present()->name()); + // $endpoint .= "&stripe_user[business_name]={$company_name}"; return redirect($endpoint); } @@ -83,6 +83,7 @@ class StripeConnectController extends BaseController }catch(\Exception $e) { + nlog($e->getMessage()); } diff --git a/app/Http/Controllers/SubdomainController.php b/app/Http/Controllers/SubdomainController.php index bf16ab4947c9..a44f53469c6d 100644 --- a/app/Http/Controllers/SubdomainController.php +++ b/app/Http/Controllers/SubdomainController.php @@ -41,7 +41,7 @@ class SubdomainController extends BaseController public function index() { - if(in_array(request()->input('subdomain'), $this->protected) || MultiDB::findAndSetDbByDomain(request()->input('subdomain'))) + if(in_array(request()->input('subdomain'), $this->protected) || MultiDB::findAndSetDbByDomain(['subdomain' => request()->input('subdomain')])) return response()->json(['message' => 'Domain not available'] , 401); return response()->json(['message' => 'Domain available'], 200); diff --git a/config/database.php b/config/database.php index d42e43cd26ad..c516de1eee43 100644 --- a/config/database.php +++ b/config/database.php @@ -94,6 +94,9 @@ return [ 'prefix_indexes' => true, 'strict' => env('DB_STRICT', false), 'engine' => 'InnoDB ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=8', + // 'options' => array( + // PDO::ATTR_EMULATE_PREPARES => true + // ), ], 'db-ninja-02' => [ @@ -109,6 +112,9 @@ return [ 'prefix_indexes' => true, 'strict' => env('DB_STRICT', false), 'engine' => 'InnoDB ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=8', + // 'options' => array( + // PDO::ATTR_EMULATE_PREPARES => true + // ), ], ],