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

Add activities to entities

Browse Source
This commit is contained in:
David Bomba 2021-05-07 07:41:37 +10:00
parent 85c05f7c30
commit f3a56c8174
7 changed files with 61 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/Http/Requests/User/UpdateUserRequest.php
View File

@ -45,9 +45,9 @@ class UpdateUserRequest extends Request
{
$input = $this->all();
if (isset($input['company_user']) && ! auth()->user()->isAdmin()) {
unset($input['company_user']);
}
// if (isset($input['company_user']) && ! auth()->user()->isAdmin()) {
// unset($input['company_user']);
// }
$this->replace($input);
}

20
app/Repositories/UserRepository.php
View File

@ -89,10 +89,22 @@ class UserRepository extends BaseRepository
$data['company_user']['notifications'] = CompanySettings::notificationDefaults();
$user->companies()->attach($company->id, $data['company_user']);
} else {
$cu->fill($data['company_user']);
$cu->restore();
$cu->tokens()->restore();
$cu->save();
if(auth()->user()->isAdmin())
{
$cu->fill($data['company_user']);
$cu->restore();
$cu->tokens()->restore();
$cu->save();
}
else {
$cu->notifications = $data['company_user']['notifications'];
$cu->settings = $data['company_user']['settings'];
$cu->save();
}
}
$user->with(['company_users' => function ($query) use ($company, $user) {

10
app/Transformers/CreditTransformer.php
View File

@ -11,10 +11,12 @@
namespace App\Transformers;
use App\Models\Activity;
use App\Models\Backup;
use App\Models\Credit;
use App\Models\CreditInvitation;
use App\Models\Document;
use App\Transformers\ActivityTransformer;
use App\Utils\Traits\MakesHash;
class CreditTransformer extends EntityTransformer
@ -31,8 +33,16 @@ class CreditTransformer extends EntityTransformer
'history',
// 'client',
'documents',
'activities',
];
public function includeActivities(Credit $credit)
{
$transformer = new ActivityTransformer($this->serializer);
return $this->includeCollection($credit->activities, $transformer, Activity::class);
}
public function includeHistory(Credit $credit)
{
$transformer = new InvoiceHistoryTransformer($this->serializer);

11
app/Transformers/InvoiceTransformer.php
View File

@ -11,12 +11,14 @@
namespace App\Transformers;
use App\Models\Activity;
use App\Models\Backup;
use App\Models\Client;
use App\Models\Document;
use App\Models\Invoice;
use App\Models\InvoiceInvitation;
use App\Models\Payment;
use App\Transformers\ActivityTransformer;
use App\Utils\Traits\MakesHash;
class InvoiceTransformer extends EntityTransformer
@ -33,6 +35,7 @@ class InvoiceTransformer extends EntityTransformer
'history',
'payments',
'client',
'activities',
// 'documents',
];
@ -80,6 +83,14 @@ class InvoiceTransformer extends EntityTransformer
return $this->includeCollection($invoice->documents, $transformer, Document::class);
}
public function includeActivities(Invoice $invoice)
{
$transformer = new ActivityTransformer($this->serializer);
return $this->includeCollection($invoice->activities, $transformer, Activity::class);
}
public function transform(Invoice $invoice)
{
return [

10
app/Transformers/QuoteTransformer.php
View File

@ -11,10 +11,12 @@
namespace App\Transformers;
use App\Models\Activity;
use App\Models\Backup;
use App\Models\Document;
use App\Models\Quote;
use App\Models\QuoteInvitation;
use App\Transformers\ActivityTransformer;
use App\Utils\Traits\MakesHash;
class QuoteTransformer extends EntityTransformer
@ -30,10 +32,18 @@ class QuoteTransformer extends EntityTransformer
'invitations',
'documents',
'history',
'activities',
// 'payments',
// 'client',
];
public function includeActivities(Quote $quote)
{
$transformer = new ActivityTransformer($this->serializer);
return $this->includeCollection($quote->activities, $transformer, Activity::class);
}
public function includeHistory(Quote $quote)
{
$transformer = new InvoiceHistoryTransformer($this->serializer);

10
app/Transformers/RecurringInvoiceTransformer.php
View File

@ -11,10 +11,12 @@
namespace App\Transformers;
use App\Models\Activity;
use App\Models\Document;
use App\Models\Invoice;
use App\Models\RecurringInvoice;
use App\Models\RecurringInvoiceInvitation;
use App\Transformers\ActivityTransformer;
use App\Utils\Traits\MakesHash;
class RecurringInvoiceTransformer extends EntityTransformer
@ -29,6 +31,7 @@ class RecurringInvoiceTransformer extends EntityTransformer
protected $availableIncludes = [
'invitations',
'documents',
'activities',
// 'payments',
// 'client',
];
@ -62,6 +65,13 @@ class RecurringInvoiceTransformer extends EntityTransformer
return $this->includeItem($invoice->client, $transformer, ENTITY_CLIENT);
}
*/
public function includeActivities(RecurringInvoice $invoice)
{
$transformer = new ActivityTransformer($this->serializer);
return $this->includeCollection($invoice->activities, $transformer, Activity::class);
}
public function includeInvitations(RecurringInvoice $invoice)
{
$transformer = new RecurringInvoiceInvitationTransformer($this->serializer);

2
database/migrations/2021_05_06_211039_add_show_task_end_date_to_companies_table.php
View File

@ -14,7 +14,7 @@ class AddShowTaskEndDateToCompaniesTable extends Migration
public function up()
{
Schema::table('companies', function (Blueprint $table) {
$table->boolean('show_task_end_date')->default('false');
$table->boolean('show_task_end_date')->default(false);
});
}