Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-09 03:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5759 from turbo124/v5-develop

Browse Source 
Fixes for import
This commit is contained in:
David Bomba 2021-05-20 15:36:18 +10:00 committed by GitHub
commit c0e258eabb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/Jobs/Util/Import.php
View File

@ -1650,7 +1650,7 @@ class Import implements ShouldQueue
$ninja_company = Company::on('db-ninja-01')->find(config('ninja.ninja_default_company_id')); $ninja_company = Company::on('db-ninja-01')->find(config('ninja.ninja_default_company_id'));
/* If we already have a record of this user - move along. */ /* If we already have a record of this user - move along. */
if($client_contact = ClientContact::on('db-ninja-01')->where(['email' => $owner->email, 'company_id' => $ninja_company->id)->exists()) if($client_contact = ClientContact::on('db-ninja-01')->where(['email' => $owner->email, 'company_id' => $ninja_company->id])->exists())
return $client_contact->client; return $client_contact->client;
$ninja_client = ClientFactory::create($ninja_company->id, $ninja_company->owner()->id); $ninja_client = ClientFactory::create($ninja_company->id, $ninja_company->owner()->id);
@ -1689,11 +1689,12 @@ class Import implements ShouldQueue
$token['company_id'] = $ninja_client->company_id; $token['company_id'] = $ninja_client->company_id;
$token['client_id'] = $ninja_client->id; $token['client_id'] = $ninja_client->id;
$token['user_id'] = $ninja_client->user_id; $token['user_id'] = $ninja_client->user_id;
$token['company_gateway_id'] = config('ninja.ninja_default_company_gateway_id') $token['company_gateway_id'] = config('ninja.ninja_default_company_gateway_id');
//todo //todo
ClientGatewayToken::unguard();
$cgt = ClientGatewayToken::Create($token); $cgt = ClientGatewayToken::Create($token);
ClientGatewayToken::reguard();
} }
} }

2
app/PaymentDrivers/Stripe/UpdatePaymentMethods.php
View File

@ -111,7 +111,7 @@ class UpdatePaymentMethods
} }
private function addOrUpdateCard(PaymentMethod $method, ClientGatewayToken $token, GatewayType $type_id) private function addOrUpdateCard(PaymentMethod $method, ClientGatewayToken $token, $type_id)
{ {
$token_exists = ClientGatewayToken::where([ $token_exists = ClientGatewayToken::where([