Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-10-31 03:17:32 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixes for invitations

Browse Source
This commit is contained in:
David Bomba 2021-10-14 17:59:03 +11:00
parent dc116013d9
commit 59c54b48e4
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Jobs/Entity/CreateEntityPdf.php
View File

@ -116,7 +116,7 @@ class CreateEntityPdf implements ShouldQueue
$t->replace(Ninja::transformTranslations($this->client->getMergedSettings())); $t->replace(Ninja::transformTranslations($this->client->getMergedSettings()));
$translate = microtime(true); $translate = microtime(true);
nlog("Translate ". $translate - $start); // nlog("Translate ". $translate - $start);
if (config('ninja.phantomjs_pdf_generation') || config('ninja.pdf_generator') == 'phantom') { if (config('ninja.phantomjs_pdf_generation') || config('ninja.pdf_generator') == 'phantom') {
return (new Phantom)->generate($this->invitation); return (new Phantom)->generate($this->invitation);

3
app/Repositories/BaseRepository.php
View File

@ -239,7 +239,7 @@ class BaseRepository
/* Get array of Keys which have been removed from the invitations array and soft delete each invitation */ /* Get array of Keys which have been removed from the invitations array and soft delete each invitation */
$model->invitations->pluck('key')->diff($invitations->pluck('key'))->each(function ($invitation) use ($resource) { $model->invitations->pluck('key')->diff($invitations->pluck('key'))->each(function ($invitation) use ($resource) {
$invitation_class = sprintf('App\\Models\\%sInvitation', $resource); $invitation_class = sprintf('App\\Models\\%sInvitation', $resource);
$invitation = $invitation_class::whereRaw('BINARY `key`= ?', [$invitation])->first(); $invitation = $invitation_class::where('key', $invitation)->first();
if ($invitation) if ($invitation)
$invitation->delete(); $invitation->delete();
@ -276,6 +276,7 @@ class BaseRepository
$new_invitation = $invitation_factory_class::create($model->company_id, $model->user_id); $new_invitation = $invitation_factory_class::create($model->company_id, $model->user_id);
$new_invitation->{$lcfirst_resource_id} = $model->id; $new_invitation->{$lcfirst_resource_id} = $model->id;
$new_invitation->client_contact_id = $contact->id; $new_invitation->client_contact_id = $contact->id;
$new_invitation->key = $this->createDbHash(config('database.default'));
$new_invitation->save(); $new_invitation->save();
} }