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

Fixes for exception testing

Browse Source
This commit is contained in:
David Bomba 2023-02-01 14:12:44 +11:00
parent fecf1e13b5
commit 801740bdb4
10 changed files with 38 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Http/Controllers/ExpenseController.php
View File

@ -277,6 +277,8 @@ class ExpenseController extends BaseController
event(new ExpenseWasUpdated($expense, $expense->company, Ninja::eventVars(auth()->user() ? auth()->user()->id : null)));
event('eloquent.updated: App\Models\Expense', $expense);
return $this->itemResponse($expense->fresh());
}
@ -369,6 +371,8 @@ class ExpenseController extends BaseController
event(new ExpenseWasCreated($expense, $expense->company, Ninja::eventVars(auth()->user() ? auth()->user()->id : null)));
event('eloquent.created: App\Models\Expense', $expense);
return $this->itemResponse($expense);
}

10
app/Http/Controllers/ProjectController.php
View File

@ -262,12 +262,14 @@ class ProjectController extends BaseController
$project->fill($request->all());
$project->number = empty($project->number) ? $this->getNextProjectNumber($project) : $project->number;
$project->save();
$project->saveQuietly();
if ($request->has('documents')) {
$this->saveDocuments($request->input('documents'), $project);
}
event('eloquent.updated: App\Models\Project', $project);
return $this->itemResponse($project->fresh());
}
@ -358,17 +360,19 @@ class ProjectController extends BaseController
{
$project = ProjectFactory::create(auth()->user()->company()->id, auth()->user()->id);
$project->fill($request->all());
$project->save();
$project->saveQuietly();
if (empty($project->number)) {
$project->number = $this->getNextProjectNumber($project);
$project->save();
$project->saveQuietly();
}
if ($request->has('documents')) {
$this->saveDocuments($request->input('documents'), $project);
}
event('eloquent.created: App\Models\Project', $project);
return $this->itemResponse($project->fresh());
}

5
app/Http/Controllers/TaskController.php
View File

@ -283,6 +283,8 @@ class TaskController extends BaseController
event(new TaskWasUpdated($task, $task->company, Ninja::eventVars(auth()->user() ? auth()->user()->id : null)));
event('eloquent.updated: App\Models\Task', $task);
return $this->itemResponse($task->fresh());
}
@ -376,6 +378,9 @@ class TaskController extends BaseController
event(new TaskWasCreated($task, $task->company, Ninja::eventVars(auth()->user() ? auth()->user()->id : null)));
event('eloquent.created: App\Models\Task', $task);
return $this->itemResponse($task);
}

2
app/Jobs/Util/WebhookHandler.php
View File

@ -68,8 +68,6 @@ class WebhookHandler implements ShouldQueue
public function failed($exception = null)
{
if($exception)
nlog(print_r($exception->getMessage(), 1));
}
}

2
app/Jobs/Util/WebhookSingle.php
View File

@ -245,7 +245,7 @@ class WebhookSingle implements ShouldQueue
private function resolveClient()
{
//make sure it isn't an instance of the Client Model
if (! $this->entity instanceof ClientModel && ! $this->entity instanceof Product && ! $this->entity instanceof Vendor && $this->entity->client()->exists()) {
if ($this->entity->client()->exists()) {
return $this->entity->client;
}

18
app/Models/Webhook.php
View File

@ -44,21 +44,21 @@ class Webhook extends BaseModel
const EVENT_UPDATE_VENDOR = 13; //tested
const EVENT_DELETE_VENDOR = 14; //
const EVENT_DELETE_VENDOR = 14; //tested
const EVENT_CREATE_EXPENSE = 15;
const EVENT_CREATE_EXPENSE = 15; //tested
const EVENT_UPDATE_EXPENSE = 16;
const EVENT_UPDATE_EXPENSE = 16; //tested
const EVENT_DELETE_EXPENSE = 17;
const EVENT_DELETE_EXPENSE = 17; //tested
const EVENT_CREATE_TASK = 18;
const EVENT_CREATE_TASK = 18; //tested
const EVENT_UPDATE_TASK = 19;
const EVENT_UPDATE_TASK = 19; //tested
const EVENT_DELETE_TASK = 20;
const EVENT_DELETE_TASK = 20; //tested
const EVENT_APPROVE_QUOTE = 21;
const EVENT_APPROVE_QUOTE = 21; //tested
const EVENT_LATE_INVOICE = 22;
@ -66,7 +66,7 @@ class Webhook extends BaseModel
const EVENT_REMIND_INVOICE = 24;
const EVENT_PROJECT_CREATE = 25;
const EVENT_PROJECT_CREATE = 25;//
const EVENT_PROJECT_UPDATE = 26;

10
app/Observers/ExpenseObserver.php
View File

@ -27,13 +27,13 @@ class ExpenseObserver
*/
public function created(Expense $expense)
{
$subscriptions = Webhook::where('company_id', $expense->company->id)
$subscriptions = Webhook::where('company_id', $expense->company_id)
->where('event_id', Webhook::EVENT_CREATE_EXPENSE)
->exists();
if ($subscriptions) {
if ($subscriptions)
WebhookHandler::dispatch(Webhook::EVENT_CREATE_EXPENSE, $expense, $expense->company)->delay(rand(1,5));
}
}
/**
@ -53,7 +53,7 @@ class ExpenseObserver
$event = Webhook::EVENT_DELETE_EXPENSE;
$subscriptions = Webhook::where('company_id', $expense->company->id)
$subscriptions = Webhook::where('company_id', $expense->company_id)
->where('event_id', $event)
->exists();
@ -73,7 +73,7 @@ class ExpenseObserver
if($expense->is_deleted)
return;
$subscriptions = Webhook::where('company_id', $expense->company->id)
$subscriptions = Webhook::where('company_id', $expense->company_id)
->where('event_id', Webhook::EVENT_ARCHIVE_EXPENSE)
->exists();

2
app/Repositories/ExpenseRepository.php
View File

@ -48,7 +48,7 @@ class ExpenseRepository extends BaseRepository
if (empty($expense->number))
$expense = $this->findAndSaveNumber($expense);
$expense->save();
$expense->saveQuietly();
if (array_key_exists('documents', $data)) {
$this->saveDocuments($data['documents'], $expense);

12
app/Repositories/TaskRepository.php
View File

@ -42,7 +42,7 @@ class TaskRepository extends BaseRepository
}
$task->fill($data);
$task->save();
$task->saveQuietly();
if ($this->new_task && ! $task->status_id) {
$this->setDefaultStatus($task);
@ -121,7 +121,7 @@ class TaskRepository extends BaseRepository
// $task->start_time = $task->start_time ?: $task->calcStartTime();
// $task->duration = $task->calcDuration();
$task->save();
$task->saveQuietly();
if (array_key_exists('documents', $data)) {
$this->saveDocuments($data['documents'], $task);
@ -183,7 +183,7 @@ class TaskRepository extends BaseRepository
return $key >= $index;
}))->each(function ($item, $key) {
$item->status_order = $key;
$item->save();
$item->saveQuietly();
});
}
@ -199,7 +199,7 @@ class TaskRepository extends BaseRepository
$log = array_merge($log, [[time(), 0]]);
$task->time_log = json_encode($log);
$task->save();
$task->saveQuietly();
}
$log = json_decode($task->time_log, true);
@ -210,7 +210,7 @@ class TaskRepository extends BaseRepository
$new = [time(), 0];
$log = array_merge($log, [$new]);
$task->time_log = json_encode($log);
$task->save();
$task->saveQuietly();
}
return $task;
@ -229,7 +229,7 @@ class TaskRepository extends BaseRepository
$log = array_merge($log, [$last]);
$task->time_log = json_encode($log);
$task->save();
$task->saveQuietly();
}
return $task;

1
app/Services/Email/EmailMailer.php
View File

@ -64,7 +64,6 @@ class EmailMailer implements ShouldQueue
public function handle(): void
{
throw new \Exception("poopies");
MultiDB::setDb($this->email_service->company->db);