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

Improve activities

Browse Source
This commit is contained in:
David Bomba 2023-06-26 22:50:26 +10:00
parent 2385bf8ad2
commit 5f1267d495
4 changed files with 41 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
app/Http/Controllers/ActivityController.php
View File

@ -92,46 +92,47 @@ class ActivityController extends BaseController
->company()
->take($default_activities);
if ($request->has('react')) {
// if ($request->has('react')) {
/** @var \App\Models\User auth()->user() */
$user = auth()->user();
// /** @var \App\Models\User auth()->user() */
// $user = auth()->user();
if (!$user->isAdmin()) {
$activities->where('user_id', auth()->user()->id);
}
// if (!$user->isAdmin()) {
// $activities->where('user_id', auth()->user()->id);
// }
$system = ctrans('texts.system');
// $system = ctrans('texts.system');
$data = $activities->cursor()->map(function ($activity) {
// $data = $activities->cursor()->map(function ($activity) {
$arr =
[
'client' => $activity->client ? $activity->client : '',
'contact' => $activity->client ? $activity->contact : '',
'quote' => $activity->quote ? $activity->quote : '',
'user' => $activity->user ? $activity->user : '',
'expense' => $activity->expense ? $activity->expense : '',
'invoice' => $activity->invoice ? $activity->invoice : '',
'recurring_invoice' => $activity->recurring_invoice ? $activity->recurring_invoice : '',
'payment' => $activity->payment ? $activity->payment : '',
'credit' => $activity->credit ? $activity->credit : '',
'task' => $activity->task ? $activity->task : '',
'vendor' => $activity->vendor ? $activity->vendor : '',
'purchase_order' => $activity->purchase_order ? $activity->purchase_order : '',
'subscription' => $activity->subscription ? $activity->subscription : '',
'vendor_contact' => $activity->vendor_contact ? $activity->vendor_contact : '',
'recurring_expense' => $activity->recurring_expense ? $activity->recurring_expense : '',
];
// $arr =
// [
// 'client' => $activity->client ? $activity->client : '',
// 'contact' => $activity->client ? $activity->contact : '',
// 'quote' => $activity->quote ? $activity->quote : '',
// 'user' => $activity->user ? $activity->user : '',
// 'expense' => $activity->expense ? $activity->expense : '',
// 'invoice' => $activity->invoice ? $activity->invoice : '',
// 'recurring_invoice' => $activity->recurring_invoice ? $activity->recurring_invoice : '',
// 'payment' => $activity->payment ? $activity->payment : '',
// 'credit' => $activity->credit ? $activity->credit : '',
// 'task' => $activity->task ? $activity->task : '',
// 'vendor' => $activity->vendor ? $activity->vendor : '',
// 'purchase_order' => $activity->purchase_order ? $activity->purchase_order : '',
// 'subscription' => $activity->subscription ? $activity->subscription : '',
// 'vendor_contact' => $activity->vendor_contact ? $activity->vendor_contact : '',
// 'recurring_expense' => $activity->recurring_expense ? $activity->recurring_expense : '',
// ];
$activity_array = $activity->toArray();
// $activity_array = $activity->toArray();
return array_merge($arr, $activity_array);
});
// return array_merge($arr, $activity_array);
// });
return response()->json(['data' => $data->toArray()], 200);
}
elseif($request->has('reactv2')) {
// return response()->json(['data' => $data->toArray()], 200);
// }
// else
if($request->has('reactv2')) {
/** @var \App\Models\User auth()->user() */
$user = auth()->user();

2
app/Http/Requests/Chart/ShowChartRequest.php
View File

@ -58,8 +58,6 @@ class ShowChartRequest extends Request
$input['end_date'] = now()->format('Y-m-d');
}
nlog($input);
$this->replace($input);
}
}

5
app/Listeners/Activity/PaymentCreatedActivity.php
View File

@ -42,6 +42,10 @@ class PaymentCreatedActivity implements ShouldQueue
MultiDB::setDb($event->company->db);
$payment = $event->payment;
$invoice_id = null;
if($payment->invoices()->exists())
$invoice_id = $payment->invoices->first()->id;
$user_id = array_key_exists('user_id', $event->event_vars) ? $event->event_vars['user_id'] : $event->payment->user_id;
@ -50,6 +54,7 @@ class PaymentCreatedActivity implements ShouldQueue
$fields = new stdClass;
$fields->payment_id = $payment->id;
$fields->invoice_id = $invoice_id;
$fields->client_id = $payment->client_id;
$fields->user_id = $user_id;
$fields->company_id = $payment->company_id;

6
app/Models/Activity.php
View File

@ -515,9 +515,8 @@ class Activity extends StaticModel
{
$system = ctrans('texts.system');
return match($variable) {
':invoice' => $translation = [substr($variable, 1) => [ 'label' => $this?->invoice?->number ?? '', 'hashed_id' => $this->invoice?->hashed_id ?? '']],
':contact' => $translation = $this->resolveContact(),
match($variable) {
':invoice' => $translation = [substr($variable, 1) => [ 'label' => $this?->invoice?->number ?? '', 'hashed_id' => $this->invoice?->hashed_id ?? '']],
':user' => $translation = [substr($variable, 1) => [ 'label' => $this?->user?->present()->name() ?? $system, 'hashed_id' => $this->user->hashed_id ?? '']],
':quote' => $translation = [substr($variable, 1) => [ 'label' => $this?->quote?->number ?? '', 'hashed_id' => $this->quote->hashed_id ?? '']],
':credit' => $translation = [substr($variable, 1) => [ 'label' => $this?->credit?->number ?? '', 'hashed_id' => $this->credit->hashed_id ?? '']],
@ -531,6 +530,7 @@ class Activity extends StaticModel
':payment_amount' => $translation = [substr($variable, 1) =>[ 'label' => Number::formatMoney($this?->payment?->amount, $this?->payment?->client) ?? '', 'hashed_id' => '']],
':adjustment' => $translation = [substr($variable, 1) =>[ 'label' => Number::formatMoney($this?->payment?->refunded, $this?->payment?->client) ?? '', 'hashed_id' => '']],
':ip' => $translation = [ 'ip' => $this->ip ?? ''],
':contact' => $translation = $this->resolveContact(),
default => $translation = [],
};