Skip to content

Commit 0cd3be0

Browse files
committed
Merge remote-tracking branch 'origin/develop'
2 parents c93e35e + 1f55a8b commit 0cd3be0

File tree

4 files changed

+13
-2
lines changed

4 files changed

+13
-2
lines changed

app/Http/Controllers/Account/AcceptanceController.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -347,6 +347,7 @@ public function store(Request $request, $id) : RedirectResponse
347347

348348
$acceptance->decline($sig_filename, $request->input('note'));
349349
$acceptance->notify(new AcceptanceAssetDeclinedNotification($data));
350+
Log::debug('New event acceptance.');
350351
event(new CheckoutDeclined($acceptance));
351352
$return_msg = trans('admin/users/message.declined');
352353
}
@@ -356,13 +357,16 @@ public function store(Request $request, $id) : RedirectResponse
356357
$recipient = User::find($acceptance->alert_on_response_id);
357358

358359
if ($recipient) {
360+
Log::debug('Attempting to send email acceptance.');
359361
Mail::to($recipient)->send(new CheckoutAcceptanceResponseMail(
360362
$acceptance,
361363
$recipient,
362364
$request->input('asset_acceptance') === 'accepted',
363365
));
366+
Log::debug('Send email notification sucess on checkout acceptance response.');
364367
}
365368
} catch (Exception $e) {
369+
Log::error($e->getMessage());
366370
Log::warning($e);
367371
}
368372
}

app/Http/Controllers/Api/SettingsController.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,8 +150,11 @@ public function ajaxTestEmail() : JsonResponse
150150
if (!config('app.lock_passwords')) {
151151
try {
152152
Notification::send(Setting::first(), new MailTest());
153+
Log::debug('Attempting to sending to '.config('mail.reply_to.address'));
153154
return response()->json(['message' => 'Mail sent to '.config('mail.reply_to.address')], 200);
154155
} catch (\Exception $e) {
156+
Log::error('Mail sent error using '.config('mail.reply_to.address') .': '. $e->getMessage());
157+
Log::debug($e);
155158
return response()->json(['message' => $e->getMessage()], 500);
156159
}
157160
}
@@ -315,4 +318,4 @@ public function downloadLatestBackup() : JsonResponse | BinaryFileResponse
315318
}
316319

317320

318-
}
321+
}

app/Http/Controllers/SettingsController.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1341,9 +1341,11 @@ public function ajaxTestEmail() : JsonResponse
13411341
'name' => config('mail.from.name'),
13421342
'email' => config('mail.from.address'),
13431343
])->notify(new MailTest());
1344-
1344+
Log::debug('Attempting to send mail to '.config('mail.from.address'));
13451345
return response()->json(Helper::formatStandardApiResponse('success', null, trans('mail_sent.mail_sent')));
13461346
} catch (\Exception $e) {
1347+
Log::error('Mail sent from '.config('mail.from.address') .' with errors '. $e->getMessage());
1348+
Log::debug($e);
13471349
return response()->json(Helper::formatStandardApiResponse('success', null, $e->getMessage()));
13481350
}
13491351
}

app/Presenters/LocationPresenter.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,9 @@ public static function dataTableLayout()
6767
'sortable' => true,
6868
'switchable' => true,
6969
'title' => trans('admin/locations/message.current_location'),
70+
'titleTooltip' => trans('admin/locations/message.current_location'),
7071
'visible' => true,
72+
'class' => 'css-house-laptop',
7173
], [
7274
'field' => 'rtd_assets_count',
7375
'searchable' => false,

0 commit comments

Comments
 (0)