diff --git a/app/Http/Controllers/ImportQuickbooksController.php b/app/Http/Controllers/ImportQuickbooksController.php index 558188c91aaf..7913f7a433a0 100644 --- a/app/Http/Controllers/ImportQuickbooksController.php +++ b/app/Http/Controllers/ImportQuickbooksController.php @@ -36,14 +36,11 @@ class ImportQuickbooksController extends BaseController $realm = $request->query('realmId'); $access_token_object = $qb->getAuth()->accessToken($request->query('code'), $realm); - nlog($access_token_object); + nlog($access_token_object); //OAuth2AccessToken $company->quickbooks = $access_token_object; $company->save(); - // $company_key = $request->input('company.company_key'); - // $company_id = $request->input('company.id'); - // $auth_service->saveTokens($company_key, ['realm' => $realm] + $tokens); - return response()->json(['message' => 'Success'], 200); + return response()->json(['message' => 'Success'], 200); //todo swapout for redirect to UI } /** diff --git a/app/Models/Company.php b/app/Models/Company.php index b1d504ca6943..bddb1e3c9619 100644 --- a/app/Models/Company.php +++ b/app/Models/Company.php @@ -374,6 +374,7 @@ class Company extends BaseModel 'ip', 'smtp_username', 'smtp_password', + 'quickbooks', ]; protected $casts = [ diff --git a/app/Services/Import/Quickbooks/Auth.php b/app/Services/Import/Quickbooks/Auth.php index ec0442fba4a2..edc3d605a8c0 100644 --- a/app/Services/Import/Quickbooks/Auth.php +++ b/app/Services/Import/Quickbooks/Auth.php @@ -39,12 +39,6 @@ final class Auth return $this->sdk->getState(); } - public function saveTokens($key, $tokens) - { - // $token_store = new CompanyTokensRepository($key); - // $token_store->save($tokens); - } - public function getAccessToken(): array { $tokens = []; diff --git a/app/Transformers/CompanyTransformer.php b/app/Transformers/CompanyTransformer.php index 71148d81f191..39617954fab2 100644 --- a/app/Transformers/CompanyTransformer.php +++ b/app/Transformers/CompanyTransformer.php @@ -212,7 +212,8 @@ class CompanyTransformer extends EntityTransformer 'smtp_local_domain' => (string)$company->smtp_local_domain ?? '', 'smtp_verify_peer' => (bool)$company->smtp_verify_peer, 'e_invoice' => $company->e_invoice ?: new \stdClass(), - 'quickbooks' => $company->quickbooks ?: new \stdClass(), + 'has_quickbooks_token' => $company->quickbooks ? true : false, + 'is_quickbooks_token_active' => $company->quickbooks?->accessTokenKey ?? false, ]; }