Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-05-24 02:14:21 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4068 from turbo124/v2

Browse Source 
Fixes for create test data
This commit is contained in:
David Bomba 2020-09-16 17:06:33 +10:00 committed by GitHub
commit d9c6ce1f4c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -329,7 +329,7 @@ class CreateTestData extends Command
'company_id' => $company->id,
]);
$this->count = $this->count * 100;
$this->count = $this->count * 10;
$this->info('Creating '.$this->count.' clients');

3
app/Factory/RecurringInvoiceToInvoiceFactory.php
View File

@ -47,7 +47,8 @@ class RecurringInvoiceToInvoiceFactory
$invoice->user_id = $recurring_invoice->user_id;
$invoice->company_id = $recurring_invoice->company_id;
$invoice->recurring_id = $recurring_invoice->id;
$invoice->client_id = $client->id;
return $invoice;
}
}

3
app/Http/Controllers/UserController.php
View File

@ -15,6 +15,7 @@ use App\DataMapper\CompanySettings;
use App\DataMapper\DefaultSettings;
use App\Events\User\UserEmailAddressChangedNewEmail;
use App\Events\User\UserEmailAddressChangedOldEmail;
use App\Events\User\UserWasCreated;
use App\Factory\UserFactory;
use App\Filters\UserFilters;
use App\Http\Controllers\Traits\VerifiesUserEmail;
@ -204,6 +205,8 @@ class UserController extends BaseController
$ct = CreateCompanyToken::dispatchNow($company, $user, $user_agent);
event(new UserWasCreated($user, $company, Ninja::eventVars()));
return $this->itemResponse($user->fresh());
}

4
app/Listeners/SendVerificationNotification.php
View File

@ -50,7 +50,11 @@ class SendVerificationNotification implements ShouldQueue
$event->user->notify(new VerifyUser($event->user));
Ninja::registerNinjaUser($event->user);
} catch (\Exception $e) {
info("I couldn't send the email " . $e->getMessage());
}
}
}

7
app/Repositories/UserRepository.php
View File

@ -17,6 +17,7 @@ use App\Factory\CompanyUserFactory;
use App\Models\CompanyUser;
use App\Models\User;
use App\Utils\Ninja;
use App\Utils\Traits\MakesHash;
use Illuminate\Http\Request;
/**
@ -24,6 +25,8 @@ use Illuminate\Http\Request;
*/
class UserRepository extends BaseRepository
{
use MakesHash;
/**
* Gets the class name.
*
@ -66,6 +69,10 @@ class UserRepository extends BaseRepository
}
$user->fill($details);
if(!$user->confirmation_code)
$user->confirmation_code = $this->createDbHash(config('database.default'));
$user->account_id = $account->id;
$user->save();

3
app/Transformers/RecurringInvoiceTransformer.php
View File

@ -85,7 +85,7 @@ class RecurringInvoiceTransformer extends EntityTransformer
'assigned_user_id' => $this->encodePrimaryKey($invoice->assigned_user_id),
'amount' => (float) $invoice->amount,
'balance' => (float) $invoice->balance,
'client_id' => (string) $invoice->client_id,
'client_id' => (string) $this->encodePrimaryKey($invoice->client_id),
'vendor_id' => (string) $this->encodePrimaryKey($invoice->vendor_id),
'status_id' => (string) ($invoice->status_id ?: 1),
'design_id' => (string) $this->encodePrimaryKey($invoice->design_id),
@ -136,6 +136,7 @@ class RecurringInvoiceTransformer extends EntityTransformer
'remaining_cycles' => (int) $invoice->remaining_cycles,
'recurring_dates' => (array) $invoice->recurringDates(),
'auto_bill' => (string) $invoice->auto_bill,
'due_date_days' => (string) $invoice->due_date_days ?: '',
];
}
}