Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-05-30 23:34:33 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixes for stripe connect

Browse Source
This commit is contained in:
David Bomba 2024-03-12 11:30:05 +11:00
parent fb39818c5c
commit b95ce4c2ec
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Console/Commands/CheckData.php
View File

@ -891,7 +891,7 @@ class CheckData extends Command
$this->logMessage("Fixing country for # {$client->id}"); $this->logMessage("Fixing country for # {$client->id}");
}); });
Client::query()->whereNull("settings->currency_id")->cursor()->each(function ($client) { Client::query()->whereNull("settings->currency_id")->orWhereJsonContains('settings', ['currency_id' => ''])->cursor()->each(function ($client) {
$settings = $client->settings; $settings = $client->settings;
$settings->currency_id = (string)$client->company->settings->currency_id; $settings->currency_id = (string)$client->company->settings->currency_id;
$client->settings = $settings; $client->settings = $settings;

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

@ -54,8 +54,6 @@ class StripeConnectController extends BaseController
$redirect_uri = config('ninja.app_url').'/stripe/completed'; $redirect_uri = config('ninja.app_url').'/stripe/completed';
$endpoint = "https://connect.stripe.com/oauth/authorize?response_type=code&client_id={$stripe_client_id}&redirect_uri={$redirect_uri}&scope=read_write&state={$token}"; $endpoint = "https://connect.stripe.com/oauth/authorize?response_type=code&client_id={$stripe_client_id}&redirect_uri={$redirect_uri}&scope=read_write&state={$token}";
\Illuminate\Support\Facades\Cache::pull($token);
return redirect($endpoint); return redirect($endpoint);
} }
@ -156,6 +154,8 @@ class StripeConnectController extends BaseController
$redirect_uri = config('ninja.app_url'); $redirect_uri = config('ninja.app_url');
} }
\Illuminate\Support\Facades\Cache::pull($request->token);
//response here //response here
return view('auth.connect.completed', ['url' => $redirect_uri]); return view('auth.connect.completed', ['url' => $redirect_uri]);
// return redirect($redirect_uri); // return redirect($redirect_uri);

2
lang/en/texts.php
View File

@ -5254,6 +5254,8 @@ $lang = array(
'paylater' => 'Pay in 4', 'paylater' => 'Pay in 4',
'payment_provider' => 'Payment Provider', 'payment_provider' => 'Payment Provider',
'select_email_provider' => 'Set your email as the sending user', 'select_email_provider' => 'Set your email as the sending user',
'purchase_order_items' => 'Purchase Order Items',
); );
return $lang; return $lang;