Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-10 21:22:58 +01:00
Code Issues Releases Activity

Merge pull request #5743 from turbo124/v5-develop

Browse Source 
Change VersionCheck URL away from GitHub
This commit is contained in:
David Bomba 2021-05-19 09:43:07 +10:00 committed by GitHub
commit 7a697b3fa0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/Http/Controllers/StripeConnectController.php
View File

@ -98,7 +98,7 @@ class StripeConnectController extends BaseController
$company_gateway->gateway_key = 'd14dd26a47cecc30fdd65700bfb67b34'; $company_gateway->gateway_key = 'd14dd26a47cecc30fdd65700bfb67b34';
$company_gateway->fees_and_limits = $fees_and_limits; $company_gateway->fees_and_limits = $fees_and_limits;
$company_gateway->setConfig([]); $company_gateway->setConfig([]);
$company_gateway->save(); // $company_gateway->save();
$payload = [ $payload = [
'account_id' => $response->stripe_user_id, 'account_id' => $response->stripe_user_id,
@ -112,15 +112,16 @@ class StripeConnectController extends BaseController
]; ];
/* Link account if existing account exists */ /* Link account if existing account exists */
if($account_id = $this->checkAccountAlreadyLinkToEmail($company_gateway, $request->getContact()->email)) { // if($account_id = $this->checkAccountAlreadyLinkToEmail($company_gateway, $request->getContact()->email)) {
$payload['account_id'] = $account_id; // $payload['account_id'] = $account_id;
$company_gateway->setConfig($payload); // $payload['stripe_user_id'] = $account_id;
$company_gateway->save(); // $company_gateway->setConfig($payload);
// $company_gateway->save();
return view('auth.connect.existing'); // return view('auth.connect.existing');
} // }
$company_gateway->setConfig($payload); $company_gateway->setConfig($payload);
$company_gateway->save(); $company_gateway->save();

2
config/ninja.php
View File

@ -7,7 +7,7 @@ return [
'license_url' => 'https://app.invoiceninja.com', 'license_url' => 'https://app.invoiceninja.com',
'production' => env('NINJA_PROD', false), 'production' => env('NINJA_PROD', false),
'license' => env('NINJA_LICENSE', ''), 'license' => env('NINJA_LICENSE', ''),
'version_url' => 'https://raw.githubusercontent.com/invoiceninja/invoiceninja/v5-stable/VERSION.txt', 'version_url' => 'https://pdf.invoicing.co/api/version',
'app_name' => env('APP_NAME', 'Invoice Ninja'), 'app_name' => env('APP_NAME', 'Invoice Ninja'),
'app_env' => env('APP_ENV', 'selfhosted'), 'app_env' => env('APP_ENV', 'selfhosted'),
'debug_enabled' => env('APP_DEBUG', false), 'debug_enabled' => env('APP_DEBUG', false),