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

Fixes for signup route

Browse Source
This commit is contained in:
David Bomba 2019-09-17 07:42:08 +10:00
parent 3ff6dd4472
commit bacf1f74a0
10 changed files with 24 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/Http/Controllers/AccountController.php
View File

@ -14,7 +14,9 @@ namespace App\Http\Controllers;
use App\Http\Requests\Account\CreateAccountRequest;
use App\Jobs\Account\CreateAccount;
use App\Models\Account;
use App\Models\CompanyUser;
use App\Transformers\AccountTransformer;
use App\Transformers\CompanyUserTransformer;
use Illuminate\Foundation\Bus\DispatchesJobs;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Log;
@ -23,9 +25,9 @@ class AccountController extends BaseController
{
use DispatchesJobs;
protected $entity_type = Account::class;
protected $entity_type = CompanyUser::class;
protected $entity_transformer = AccountTransformer::class;
protected $entity_transformer = CompanyUserTransformer::class;
public function __construct()
{
@ -65,10 +67,9 @@ class AccountController extends BaseController
{
$account = CreateAccount::dispatchNow($request->all());
$account->load('company_users');
return $this->itemResponse($account);
$ct = CompanyUser::whereUserId(auth()->user()->id);
return $this->listResponse($ct);
}

4
tests/Feature/ClientTest.php
View File

@ -65,7 +65,7 @@ class ClientTest extends TestCase
$acc = $response->json();
$account = Account::find($this->decodePrimaryKey($acc['data']['id']));
$account = Account::find($this->decodePrimaryKey($acc['data'][0]['account']['id']));
$token = $account->default_company->tokens->first()->token;
@ -102,7 +102,7 @@ class ClientTest extends TestCase
$acc = $response->json();
$account = Account::find($this->decodePrimaryKey($acc['data']['id']));
$account = Account::find($this->decodePrimaryKey($acc['data'][0]['account']['id']));
$company_token = $account->default_company->tokens()->first();

2
tests/Feature/CompanyTest.php
View File

@ -65,7 +65,7 @@ class CompanyTest extends TestCase
$acc = $response->json();
$account = Account::find($this->decodePrimaryKey($acc['data']['id']));
$account = Account::find($this->decodePrimaryKey($acc['data'][0]['account']['id']));
$token = $account->default_company->tokens->first()->token;

4
tests/Feature/InvoiceTest.php
View File

@ -61,7 +61,7 @@ class InvoiceTest extends TestCase
$acc = $response->json();
$account = Account::find($this->decodePrimaryKey($acc['data']['id']));
$account = Account::find($this->decodePrimaryKey($acc['data'][0]['account']['id']));
$company_token = $account->default_company->tokens()->first();
$token = $company_token->token;
@ -125,7 +125,7 @@ class InvoiceTest extends TestCase
$acc = $response->json();
$account = Account::find($this->decodePrimaryKey($acc['data']['id']));
$account = Account::find($this->decodePrimaryKey($acc['data'][0]['account']['id']));
$company_token = $account->default_company->tokens()->first();
$token = $company_token->token;

4
tests/Feature/PaymentTest.php
View File

@ -62,7 +62,7 @@ class PaymentTest extends TestCase
$acc = $response->json();
$account = Account::find($this->decodePrimaryKey($acc['data']['id']));
$account = Account::find($this->decodePrimaryKey($acc['data'][0]['account']['id']));
$company_token = $account->default_company->tokens()->first();
$token = $company_token->token;
@ -126,7 +126,7 @@ class PaymentTest extends TestCase
$acc = $response->json();
$account = Account::find($this->decodePrimaryKey($acc['data']['id']));
$account = Account::find($this->decodePrimaryKey($acc['data'][0]['account']['id']));
$company_token = $account->default_company->tokens()->first();
$token = $company_token->token;

2
tests/Feature/ProductTest.php
View File

@ -62,7 +62,7 @@ class ProductTest extends TestCase
$acc = $response->json();
$account = Account::find($this->decodePrimaryKey($acc['data']['id']));
$account = Account::find($this->decodePrimaryKey($acc['data'][0]['account']['id']));
$token = $account->default_company->tokens->first()->token;

4
tests/Feature/QuoteTest.php
View File

@ -61,7 +61,7 @@ class QuoteTest extends TestCase
$acc = $response->json();
$account = Account::find($this->decodePrimaryKey($acc['data']['id']));
$account = Account::find($this->decodePrimaryKey($acc['data'][0]['account']['id']));
$company_token = $account->default_company->tokens()->first();
$token = $company_token->token;
@ -125,7 +125,7 @@ class QuoteTest extends TestCase
$acc = $response->json();
$account = Account::find($this->decodePrimaryKey($acc['data']['id']));
$account = Account::find($this->decodePrimaryKey($acc['data'][0]['account']['id']));
$company_token = $account->default_company->tokens()->first();
$token = $company_token->token;

8
tests/Feature/RecurringInvoiceTest.php
View File

@ -46,8 +46,8 @@ class RecurringInvoiceTest extends TestCase
$data = [
'first_name' => $this->faker->firstName,
'last_name' => $this->faker->lastName,
'name' => $this->faker->company,
'email' => $this->faker->unique()->safeEmail,
'name' => $this->faker->company,
'email' => $this->faker->unique()->safeEmail,
'password' => 'ALongAndBrilliantPassword123',
'_token' => csrf_token(),
'privacy_policy' => 1,
@ -61,7 +61,7 @@ class RecurringInvoiceTest extends TestCase
$acc = $response->json();
$account = Account::find($this->decodePrimaryKey($acc['data']['id']));
$account = Account::find($this->decodePrimaryKey($acc['data'][0]['account']['id']));
$company_token = $account->default_company->tokens()->first();
$token = $company_token->token;
@ -124,7 +124,7 @@ class RecurringInvoiceTest extends TestCase
])->post('/api/v1/signup', $data);
$acc = $response->json();
$account = Account::find($this->decodePrimaryKey($acc['data']['id']));
$account = Account::find($this->decodePrimaryKey($acc['data'][0]['account']['id']));
$company_token = $account->default_company->tokens()->first();
$token = $company_token->token;

4
tests/Feature/RecurringQuoteTest.php
View File

@ -61,7 +61,7 @@ class RecurringQuoteTest extends TestCase
$acc = $response->json();
$account = Account::find($this->decodePrimaryKey($acc['data']['id']));
$account = Account::find($this->decodePrimaryKey($acc['data'][0]['account']['id']));
$company_token = $account->default_company->tokens()->first();
$token = $company_token->token;
@ -125,7 +125,7 @@ class RecurringQuoteTest extends TestCase
$acc = $response->json();
$account = Account::find($this->decodePrimaryKey($acc['data']['id']));
$account = Account::find($this->decodePrimaryKey($acc['data'][0]['account']['id']));
$company_token = $account->default_company->tokens()->first();
$token = $company_token->token;

2
tests/Feature/UserTest.php
View File

@ -64,7 +64,7 @@ class UserTest extends TestCase
$acc = $response->json();
$account = Account::find($this->decodePrimaryKey($acc['data']['id']));
$account = Account::find($this->decodePrimaryKey($acc['data'][0]['account']['id']));
$token = $account->default_company->tokens->first()->token;