diff --git a/app/Http/Controllers/Auth/ResetPasswordController.php b/app/Http/Controllers/Auth/ResetPasswordController.php index 4d05cb2f31..f8751f2747 100644 --- a/app/Http/Controllers/Auth/ResetPasswordController.php +++ b/app/Http/Controllers/Auth/ResetPasswordController.php @@ -15,6 +15,7 @@ use App\Http\Controllers\Controller; use App\Libraries\MultiDB; use App\Models\Account; use App\Models\Company; +use App\Utils\Ninja; use Illuminate\Foundation\Auth\ResetsPasswords; use Illuminate\Http\JsonResponse; use Illuminate\Http\RedirectResponse; @@ -55,9 +56,14 @@ class ResetPasswordController extends Controller public function showResetForm(Request $request, $token = null) { + $company = false; - MultiDB::findAndSetDbByCompanyKey($request->session()->get('company_key')); - $company = Company::where('company_key', $request->session()->get('company_key'))->first(); + if(Ninja::isHosted()){ + + MultiDB::findAndSetDbByCompanyKey($request->session()->get('company_key')); + $company = Company::where('company_key', $request->session()->get('company_key'))->first(); + + } if($company) $account = $company->account; diff --git a/app/Jobs/Mail/NinjaMailerJob.php b/app/Jobs/Mail/NinjaMailerJob.php index fc7eb61059..dfaec8927b 100644 --- a/app/Jobs/Mail/NinjaMailerJob.php +++ b/app/Jobs/Mail/NinjaMailerJob.php @@ -219,7 +219,7 @@ class NinjaMailerJob implements ShouldQueue $google->getClient()->setAccessToken(json_encode($user->oauth_user_token)); //need to slow down gmail requests otherwise we hit 429's - sleep(1); + sleep(rand(1,3)); } catch(\Exception $e) { $this->logMailError('Gmail Token Invalid', $this->company->clients()->first()); diff --git a/app/PaymentDrivers/Stripe/BrowserPay.php b/app/PaymentDrivers/Stripe/BrowserPay.php index 9de0cbcca8..b5ba9c7ca5 100644 --- a/app/PaymentDrivers/Stripe/BrowserPay.php +++ b/app/PaymentDrivers/Stripe/BrowserPay.php @@ -227,11 +227,11 @@ class BrowserPay implements MethodInterface if(Ninja::isHosted()) { - if($this->company_gateway->company->portal_mode == 'domain'){ - $domain = $this->company_gateway->company->portal_domain; + if($this->stripe->company_gateway->company->portal_mode == 'domain'){ + $domain = $this->stripe->company_gateway->company->portal_domain; } else{ - $domain = $this->company_gateway->company->subdomain . '.' . config('ninja.app_domain'); + $domain = $this->stripe->company_gateway->company->subdomain . '.' . config('ninja.app_domain'); } } diff --git a/app/PaymentDrivers/Stripe/UpdatePaymentMethods.php b/app/PaymentDrivers/Stripe/UpdatePaymentMethods.php index de7d38b0ea..f585ada7b8 100644 --- a/app/PaymentDrivers/Stripe/UpdatePaymentMethods.php +++ b/app/PaymentDrivers/Stripe/UpdatePaymentMethods.php @@ -88,7 +88,7 @@ class UpdatePaymentMethods ], $this->stripe->stripe_connect_auth); - foreach($alipay_methods as $method) + foreach($sofort_methods as $method) { $this->addOrUpdateCard($method, $customer->id, $client, GatewayType::SOFORT); } diff --git a/config/database.php b/config/database.php index b4136c460a..7ae5cf6fd2 100644 --- a/config/database.php +++ b/config/database.php @@ -97,12 +97,12 @@ return [ 'strict' => env('DB_STRICT', false), 'engine' => 'InnoDB ROW_FORMAT=DYNAMIC', // 'options' => Ninja::isHosted() ? config('ninja.db_options') : [], - 'options' => [ - PDO::MYSQL_ATTR_SSL_VERIFY_SERVER_CERT => false, - PDO::MYSQL_ATTR_SSL_KEY => env("DB_CLIENT_KEY", ''), - PDO::MYSQL_ATTR_SSL_CERT => env("DB_CLIENT_CERT", ''), - PDO::MYSQL_ATTR_SSL_CA => env("DB_CA_CERT", ''), - ], + // 'options' => [ + // PDO::MYSQL_ATTR_SSL_VERIFY_SERVER_CERT => false, + // PDO::MYSQL_ATTR_SSL_KEY => env("DB_CLIENT_KEY", ''), + // PDO::MYSQL_ATTR_SSL_CERT => env("DB_CLIENT_CERT", ''), + // PDO::MYSQL_ATTR_SSL_CA => env("DB_CA_CERT", ''), + // ], ], 'db-ninja-01a' => [ @@ -118,7 +118,6 @@ return [ 'prefix_indexes' => true, 'strict' => env('DB_STRICT', false), 'engine' => 'InnoDB ROW_FORMAT=DYNAMIC', - 'ssl_mode' => env('SSL_MODE',''), //required // 'options' => Ninja::isHosted() ? config('ninja.db_options') : [], ], @@ -135,7 +134,6 @@ return [ 'prefix_indexes' => true, 'strict' => env('DB_STRICT', false), 'engine' => 'InnoDB ROW_FORMAT=DYNAMIC', - 'ssl_mode' => env('SSL_MODE',''), // 'options' => Ninja::isHosted() ? config('ninja.db_options') : [], ], @@ -152,7 +150,6 @@ return [ 'prefix_indexes' => true, 'strict' => env('DB_STRICT', false), 'engine' => 'InnoDB ROW_FORMAT=DYNAMIC', - 'ssl_mode' => env('SSL_MODE',''), // 'options' => Ninja::isHosted() ? config('ninja.db_options') : [], ], ],