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

Fixes for cleanly deleting and restoring users

Browse Source
This commit is contained in:
David Bomba 2020-09-29 08:08:44 +10:00
parent 3e86da3712
commit e310118bf4
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Listeners/User/DeletedUserActivity.php
View File

@ -48,7 +48,7 @@ class DeletedUserActivity implements ShouldQueue
$fields = new \stdClass; $fields = new \stdClass;
if (auth()->user()->id) { if (auth()->check()) {
$fields->user_id = auth()->user()->id; $fields->user_id = auth()->user()->id;
} else { } else {
$fields->user_id = $event->user->id; $fields->user_id = $event->user->id;

4
app/Utils/Traits/Recurring/HasRecurrence.php
View File

@ -53,8 +53,12 @@ trait HasRecurrence
*/ */
public function setDayOfMonth($date, $day_of_month) public function setDayOfMonth($date, $day_of_month)
{ {
info($date);
$carbon_date = Carbon::parse($date); $carbon_date = Carbon::parse($date);
info($carbon_date);
$set_date = $carbon_date->copy()->setUnitNoOverflow('day', $day_of_month, 'month'); $set_date = $carbon_date->copy()->setUnitNoOverflow('day', $day_of_month, 'month');
//If the set date is less than the original date we need to add a month. //If the set date is less than the original date we need to add a month.