itdept/expense
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update revisi

Browse Source
This commit is contained in:
Jagad R R
2025-03-05 13:44:58 +07:00
parent 278fc3741d
commit ee3de88659
18 changed files with 673 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/Forms/FormEntertainmentPresentationController.php
+48 -12
View File
@@ -27,6 +27,7 @@ use App\Rules\FileType;
use App\Helpers\BudgetHelper;
use App\Helpers\NotificationHelper;
use Illuminate\Support\Facades\Log;
use App\Services\BrevoService;
class FormEntertainmentPresentationController extends Controller
{
@@ -232,15 +233,22 @@ class FormEntertainmentPresentationController extends Controller
WhatsappHelper::newExpense($phoneNumbers, $expense_number, $url, $tanggal, $total, $name);
// Send bulk email
$brevoService = app(BrevoService::class);
foreach ($recipients as $recipient) {
try {
Mail::to($recipient)->send(new ExpenseCreated(
$mail = new ExpenseCreated(
$name,
$expense_number,
$tanggal,
$total,
$url
));
);
$response = $brevoService->expenseCreated($recipient, $name, $mail);
if (isset($response['success']) && $response['success'] === false) {
Log::warning("Email to {$recipient} failed: " . ($response['message'] ?? 'Unknown error'));
}
} catch (\Exception $e) {
Log::error("Failed to send email to {$recipient}: " . $e->getMessage());
continue;
@@ -394,16 +402,23 @@ class FormEntertainmentPresentationController extends Controller
$url = route('forms.entertainment.view', $form->id);
WhatsappHelper::approveExpense($phoneNumbers, $expense_number, $url, $tanggal, $total, $name);
// // Send bulk email
// Send bulk email
$brevoService = app(BrevoService::class);
foreach ($recipients as $recipient) {
try {
Mail::to($recipient)->send(new ExpenseApproved(
$mail = new ExpenseApproved(
$name,
$expense_number,
$tanggal,
$total,
$url
));
);
$response = $brevoService->expenseApproved($recipient, $name, $mail);
if (isset($response['success']) && $response['success'] === false) {
Log::warning("Email to {$recipient} failed: " . ($response['message'] ?? 'Unknown error'));
}
} catch (\Exception $e) {
Log::error("Failed to send email to {$recipient}: " . $e->getMessage());
continue;
@@ -478,16 +493,23 @@ class FormEntertainmentPresentationController extends Controller
$url = route('forms.entertainment.view', $form->id);
WhatsappHelper::approve2Expense($phoneNumbers, $expense_number, $url, $tanggal, $total, $name);
// // Send bulk email
// Send bulk email
$brevoService = app(BrevoService::class);
foreach ($recipients as $recipient) {
try {
Mail::to($recipient)->send(new ExpenseApproved2(
$mail = new ExpenseApproved2(
$name,
$expense_number,
$tanggal,
$total,
$url
));
);
$response = $brevoService->expenseApproved2($recipient, $name, $mail);
if (isset($response['success']) && $response['success'] === false) {
Log::warning("Email to {$recipient} failed: " . ($response['message'] ?? 'Unknown error'));
}
} catch (\Exception $e) {
Log::error("Failed to send email to {$recipient}: " . $e->getMessage());
continue;
@@ -571,15 +593,22 @@ class FormEntertainmentPresentationController extends Controller
WhatsappHelper::finalApprove($phoneNumbers, $expense_number, $url, $tanggal, $total, $name);
// Send bulk email
$brevoService = app(BrevoService::class);
foreach ($recipients as $recipient) {
try {
Mail::to($recipient)->send(new FinalApprove(
$mail = new FinalApprove(
$name,
$expense_number,
$tanggal,
$total,
$url
));
);
$response = $brevoService->expenseFinalApproved($recipient, $name, $mail);
if (isset($response['success']) && $response['success'] === false) {
Log::warning("Email to {$recipient} failed: " . ($response['message'] ?? 'Unknown error'));
}
} catch (\Exception $e) {
Log::error("Failed to send email to {$recipient}: " . $e->getMessage());
continue;
@@ -629,15 +658,22 @@ class FormEntertainmentPresentationController extends Controller
WhatsappHelper::rejectExpense($phoneNumbers, $expense_number, $url, $tanggal, $total, $name);
// Send bulk email
$brevoService = app(BrevoService::class);
foreach ($recipients as $recipient) {
try {
Mail::to($recipient)->send(new ExpenseRejected(
$mail = new ExpenseRejected(
$name,
$expense_number,
$tanggal,
$total,
$url
));
);
$response = $brevoService->expenseRejected($recipient, $name, $mail);
if (isset($response['success']) && $response['success'] === false) {
Log::warning("Email to {$recipient} failed: " . ($response['message'] ?? 'Unknown error'));
}
} catch (\Exception $e) {
Log::error("Failed to send email to {$recipient}: " . $e->getMessage());
continue;
app/Http/Controllers/Forms/FormMeetingSeminarController.php
+39 -10
View File
@@ -27,6 +27,7 @@ use App\Models\Admin;
use App\Helpers\BudgetHelper;
use App\Helpers\NotificationHelper;
use Illuminate\Support\Facades\Log;
use App\Services\BrevoService;
class FormMeetingSeminarController extends Controller
{
@@ -268,15 +269,22 @@ class FormMeetingSeminarController extends Controller
WhatsappHelper::newExpense($phoneNumbers, $expense_number, $url, $tanggal, $total, $name);
// Send bulk email
$brevoService = app(BrevoService::class);
foreach ($recipients as $recipient) {
try {
Mail::to($recipient)->send(new ExpenseCreated(
$mail = new ExpenseCreated(
$name,
$expense_number,
$tanggal,
$total,
$url
));
);
$response = $brevoService->expenseCreated($recipient, $name, $mail);
if (isset($response['success']) && $response['success'] === false) {
Log::warning("Email to {$recipient} failed: " . ($response['message'] ?? 'Unknown error'));
}
} catch (\Exception $e) {
Log::error("Failed to send email to {$recipient}: " . $e->getMessage());
continue;
@@ -476,16 +484,23 @@ class FormMeetingSeminarController extends Controller
$url = route('forms.meeting.view', $form->id);
WhatsappHelper::approveExpense($phoneNumbers, $expense_number, $url, $tanggal, $total, $name);
// // Send bulk email
// Send bulk email
$brevoService = app(BrevoService::class);
foreach ($recipients as $recipient) {
try {
Mail::to($recipient)->send(new ExpenseApproved(
$mail = new ExpenseApproved(
$name,
$expense_number,
$tanggal,
$total,
$url
));
);
$response = $brevoService->expenseApproved($recipient, $name, $mail);
if (isset($response['success']) && $response['success'] === false) {
Log::warning("Email to {$recipient} failed: " . ($response['message'] ?? 'Unknown error'));
}
} catch (\Exception $e) {
Log::error("Failed to send email to {$recipient}: " . $e->getMessage());
continue;
@@ -560,16 +575,23 @@ class FormMeetingSeminarController extends Controller
$url = route('forms.meeting.view', $form->id);
WhatsappHelper::approve2Expense($phoneNumbers, $expense_number, $url, $tanggal, $total, $name);
// // Send bulk email
// Send bulk email
$brevoService = app(BrevoService::class);
foreach ($recipients as $recipient) {
try {
Mail::to($recipient)->send(new ExpenseApproved2(
$mail = new ExpenseApproved2(
$name,
$expense_number,
$tanggal,
$total,
$url
));
);
$response = $brevoService->expenseApproved2($recipient, $name, $mail);
if (isset($response['success']) && $response['success'] === false) {
Log::warning("Email to {$recipient} failed: " . ($response['message'] ?? 'Unknown error'));
}
} catch (\Exception $e) {
Log::error("Failed to send email to {$recipient}: " . $e->getMessage());
continue;
@@ -711,15 +733,22 @@ class FormMeetingSeminarController extends Controller
WhatsappHelper::rejectExpense($phoneNumbers, $expense_number, $url, $tanggal, $total, $name);
// Send bulk email
$brevoService = app(BrevoService::class);
foreach ($recipients as $recipient) {
try {
Mail::to($recipient)->send(new ExpenseRejected(
$mail = new ExpenseRejected(
$name,
$expense_number,
$tanggal,
$total,
$url
));
);
$response = $brevoService->expenseRejected($recipient, $name, $mail);
if (isset($response['success']) && $response['success'] === false) {
Log::warning("Email to {$recipient} failed: " . ($response['message'] ?? 'Unknown error'));
}
} catch (\Exception $e) {
Log::error("Failed to send email to {$recipient}: " . $e->getMessage());
continue;
app/Http/Controllers/Forms/FormOtherController.php
+48 -12
View File
@@ -24,6 +24,7 @@ use App\Helpers\BudgetHelper;
use App\Helpers\NotificationHelper;
use App\Models\Cabang;
use Illuminate\Support\Facades\Log;
use App\Services\BrevoService;
class FormOtherController extends Controller
{
@@ -226,15 +227,22 @@ class FormOtherController extends Controller
WhatsappHelper::newExpense($phoneNumbers, $expense_number, $url, $tanggal, $total, $name);
// Send bulk email
$brevoService = app(BrevoService::class);
foreach ($recipients as $recipient) {
try {
Mail::to($recipient)->send(new ExpenseCreated(
$mail = new ExpenseCreated(
$name,
$expense_number,
$tanggal,
$total,
$url
));
);
$response = $brevoService->expenseCreated($recipient, $name, $mail);
if (isset($response['success']) && $response['success'] === false) {
Log::warning("Email to {$recipient} failed: " . ($response['message'] ?? 'Unknown error'));
}
} catch (\Exception $e) {
Log::error("Failed to send email to {$recipient}: " . $e->getMessage());
continue;
@@ -383,16 +391,23 @@ class FormOtherController extends Controller
$url = route('forms.other.view', $form->id);
WhatsappHelper::approveExpense($phoneNumbers, $expense_number, $url, $tanggal, $total, $name);
// // Send bulk email
// Send bulk email
$brevoService = app(BrevoService::class);
foreach ($recipients as $recipient) {
try {
Mail::to($recipient)->send(new ExpenseApproved(
$mail = new ExpenseApproved(
$name,
$expense_number,
$tanggal,
$total,
$url
));
);
$response = $brevoService->expenseApproved($recipient, $name, $mail);
if (isset($response['success']) && $response['success'] === false) {
Log::warning("Email to {$recipient} failed: " . ($response['message'] ?? 'Unknown error'));
}
} catch (\Exception $e) {
Log::error("Failed to send email to {$recipient}: " . $e->getMessage());
continue;
@@ -466,16 +481,23 @@ class FormOtherController extends Controller
$url = route('forms.other.view', $form->id);
WhatsappHelper::approve2Expense($phoneNumbers, $expense_number, $url, $tanggal, $total, $name);
// // Send bulk email
// Send bulk email
$brevoService = app(BrevoService::class);
foreach ($recipients as $recipient) {
try {
Mail::to($recipient)->send(new ExpenseApproved2(
$mail = new ExpenseApproved2(
$name,
$expense_number,
$tanggal,
$total,
$url
));
);
$response = $brevoService->expenseApproved2($recipient, $name, $mail);
if (isset($response['success']) && $response['success'] === false) {
Log::warning("Email to {$recipient} failed: " . ($response['message'] ?? 'Unknown error'));
}
} catch (\Exception $e) {
Log::error("Failed to send email to {$recipient}: " . $e->getMessage());
continue;
@@ -559,15 +581,22 @@ class FormOtherController extends Controller
WhatsappHelper::finalApprove($phoneNumbers, $expense_number, $url, $tanggal, $total, $name);
// Send bulk email
$brevoService = app(BrevoService::class);
foreach ($recipients as $recipient) {
try {
Mail::to($recipient)->send(new FinalApprove(
$mail = new FinalApprove(
$name,
$expense_number,
$tanggal,
$total,
$url
));
);
$response = $brevoService->expenseFinalApproved($recipient, $name, $mail);
if (isset($response['success']) && $response['success'] === false) {
Log::warning("Email to {$recipient} failed: " . ($response['message'] ?? 'Unknown error'));
}
} catch (\Exception $e) {
Log::error("Failed to send email to {$recipient}: " . $e->getMessage());
continue;
@@ -617,15 +646,22 @@ class FormOtherController extends Controller
WhatsappHelper::rejectExpense($phoneNumbers, $expense_number, $url, $tanggal, $total, $name);
// Send bulk email
$brevoService = app(BrevoService::class);
foreach ($recipients as $recipient) {
try {
Mail::to($recipient)->send(new ExpenseRejected(
$mail = new ExpenseRejected(
$name,
$expense_number,
$tanggal,
$total,
$url
));
);
$response = $brevoService->expenseRejected($recipient, $name, $mail);
if (isset($response['success']) && $response['success'] === false) {
Log::warning("Email to {$recipient} failed: " . ($response['message'] ?? 'Unknown error'));
}
} catch (\Exception $e) {
Log::error("Failed to send email to {$recipient}: " . $e->getMessage());
continue;
app/Http/Controllers/Forms/FormUpCountryController.php
+48 -11
View File
@@ -27,6 +27,7 @@ use App\Models\Admin;
use App\Helpers\BudgetHelper;
use App\Helpers\NotificationHelper;
use Illuminate\Support\Facades\Log;
use App\Services\BrevoService;
class FormUpCountryController extends Controller
{
@@ -297,15 +298,22 @@ class FormUpCountryController extends Controller
WhatsappHelper::newExpense($phoneNumbers, $expense_number, $url, $tanggal, $total, $name);
// Send bulk email
$brevoService = app(BrevoService::class);
foreach ($recipients as $recipient) {
try {
Mail::to($recipient)->send(new ExpenseCreated(
$mail = new ExpenseCreated(
$name,
$expense_number,
$tanggal,
$total,
$url
));
);
$response = $brevoService->expenseCreated($recipient, $name, $mail);
if (isset($response['success']) && $response['success'] === false) {
Log::warning("Email to {$recipient} failed: " . ($response['message'] ?? 'Unknown error'));
}
} catch (\Exception $e) {
Log::error("Failed to send email to {$recipient}: " . $e->getMessage());
continue;
@@ -534,15 +542,23 @@ class FormUpCountryController extends Controller
$url = route('forms.up-country.view', $form->id);
WhatsappHelper::approveExpense($phoneNumbers, $expense_number, $url, $tanggal, $total, $name);
// Send bulk email
$brevoService = app(BrevoService::class);
foreach ($recipients as $recipient) {
try {
Mail::to($recipient)->send(new ExpenseApproved(
$mail = new ExpenseApproved(
$name,
$expense_number,
$tanggal,
$total,
$url
));
);
$response = $brevoService->expenseApproved($recipient, $name, $mail);
if (isset($response['success']) && $response['success'] === false) {
Log::warning("Email to {$recipient} failed: " . ($response['message'] ?? 'Unknown error'));
}
} catch (\Exception $e) {
Log::error("Failed to send email to {$recipient}: " . $e->getMessage());
continue;
@@ -616,16 +632,23 @@ class FormUpCountryController extends Controller
$url = route('forms.up-country.view', $form->id);
WhatsappHelper::approve2Expense($phoneNumbers, $expense_number, $url, $tanggal, $total, $name);
// // Send bulk email
// Send bulk email
$brevoService = app(BrevoService::class);
foreach ($recipients as $recipient) {
try {
Mail::to($recipient)->send(new ExpenseApproved2(
$mail = new ExpenseApproved2(
$name,
$expense_number,
$tanggal,
$total,
$url
));
);
$response = $brevoService->expenseApproved2($recipient, $name, $mail);
if (isset($response['success']) && $response['success'] === false) {
Log::warning("Email to {$recipient} failed: " . ($response['message'] ?? 'Unknown error'));
}
} catch (\Exception $e) {
Log::error("Failed to send email to {$recipient}: " . $e->getMessage());
continue;
@@ -709,15 +732,22 @@ class FormUpCountryController extends Controller
WhatsappHelper::finalApprove($phoneNumbers, $expense_number, $url, $tanggal, $total, $name);
// Send bulk email
$brevoService = app(BrevoService::class);
foreach ($recipients as $recipient) {
try {
Mail::to($recipient)->send(new FinalApprove(
$mail = new FinalApprove(
$name,
$expense_number,
$tanggal,
$total,
$url
));
);
$response = $brevoService->expenseFinalApproved($recipient, $name, $mail);
if (isset($response['success']) && $response['success'] === false) {
Log::warning("Email to {$recipient} failed: " . ($response['message'] ?? 'Unknown error'));
}
} catch (\Exception $e) {
Log::error("Failed to send email to {$recipient}: " . $e->getMessage());
continue;
@@ -767,15 +797,22 @@ class FormUpCountryController extends Controller
WhatsappHelper::rejectExpense($phoneNumbers, $expense_number, $url, $tanggal, $total, $name);
// Send bulk email
$brevoService = app(BrevoService::class);
foreach ($recipients as $recipient) {
try {
Mail::to($recipient)->send(new ExpenseRejected(
$mail = new ExpenseRejected(
$name,
$expense_number,
$tanggal,
$total,
$url
));
);
$response = $brevoService->expenseRejected($recipient, $name, $mail);
if (isset($response['success']) && $response['success'] === false) {
Log::warning("Email to {$recipient} failed: " . ($response['message'] ?? 'Unknown error'));
}
} catch (\Exception $e) {
Log::error("Failed to send email to {$recipient}: " . $e->getMessage());
continue;
app/Http/Controllers/Forms/FormVehicleController.php
+48 -12
View File
@@ -27,6 +27,7 @@ use App\Models\Admin;
use App\Helpers\BudgetHelper;
use App\Helpers\NotificationHelper;
use Illuminate\Support\Facades\Log;
use App\Services\BrevoService;
class FormVehicleController extends Controller
{
@@ -233,15 +234,22 @@ class FormVehicleController extends Controller
WhatsappHelper::newExpense($phoneNumbers, $expense_number, $url, $tanggal, $total, $name);
// Send bulk email
$brevoService = app(BrevoService::class);
foreach ($recipients as $recipient) {
try {
Mail::to($recipient)->send(new ExpenseCreated(
$mail = new ExpenseCreated(
$name,
$expense_number,
$tanggal,
$total,
$url
));
);
$response = $brevoService->expenseCreated($recipient, $name, $mail);
if (isset($response['success']) && $response['success'] === false) {
Log::warning("Email to {$recipient} failed: " . ($response['message'] ?? 'Unknown error'));
}
} catch (\Exception $e) {
Log::error("Failed to send email to {$recipient}: " . $e->getMessage());
continue;
@@ -396,16 +404,23 @@ class FormVehicleController extends Controller
$url = route('forms.vehicle.view', $form->id);
WhatsappHelper::approveExpense($phoneNumbers, $expense_number, $url, $tanggal, $total, $name);
// // Send bulk email
// Send bulk email
$brevoService = app(BrevoService::class);
foreach ($recipients as $recipient) {
try {
Mail::to($recipient)->send(new ExpenseApproved(
$mail = new ExpenseApproved(
$name,
$expense_number,
$tanggal,
$total,
$url
));
);
$response = $brevoService->expenseApproved($recipient, $name, $mail);
if (isset($response['success']) && $response['success'] === false) {
Log::warning("Email to {$recipient} failed: " . ($response['message'] ?? 'Unknown error'));
}
} catch (\Exception $e) {
Log::error("Failed to send email to {$recipient}: " . $e->getMessage());
continue;
@@ -480,16 +495,23 @@ class FormVehicleController extends Controller
$url = route('forms.vehicle.view', $form->id);
WhatsappHelper::approve2Expense($phoneNumbers, $expense_number, $url, $tanggal, $total, $name);
// // Send bulk email
// Send bulk email
$brevoService = app(BrevoService::class);
foreach ($recipients as $recipient) {
try {
Mail::to($recipient)->send(new ExpenseApproved2(
$mail = new ExpenseApproved2(
$name,
$expense_number,
$tanggal,
$total,
$url
));
);
$response = $brevoService->expenseApproved2($recipient, $name, $mail);
if (isset($response['success']) && $response['success'] === false) {
Log::warning("Email to {$recipient} failed: " . ($response['message'] ?? 'Unknown error'));
}
} catch (\Exception $e) {
Log::error("Failed to send email to {$recipient}: " . $e->getMessage());
continue;
@@ -574,15 +596,22 @@ class FormVehicleController extends Controller
WhatsappHelper::finalApprove($phoneNumbers, $expense_number, $url, $tanggal, $total, $name);
// Send bulk email
$brevoService = app(BrevoService::class);
foreach ($recipients as $recipient) {
try {
Mail::to($recipient)->send(new FinalApprove(
$mail = new FinalApprove(
$name,
$expense_number,
$tanggal,
$total,
$url
));
);
$response = $brevoService->expenseFinalApproved($recipient, $name, $mail);
if (isset($response['success']) && $response['success'] === false) {
Log::warning("Email to {$recipient} failed: " . ($response['message'] ?? 'Unknown error'));
}
} catch (\Exception $e) {
Log::error("Failed to send email to {$recipient}: " . $e->getMessage());
continue;
@@ -632,15 +661,22 @@ class FormVehicleController extends Controller
WhatsappHelper::rejectExpense($phoneNumbers, $expense_number, $url, $tanggal, $total, $name);
// Send bulk email
$brevoService = app(BrevoService::class);
foreach ($recipients as $recipient) {
try {
Mail::to($recipient)->send(new ExpenseRejected(
$mail = new ExpenseRejected(
$name,
$expense_number,
$tanggal,
$total,
$url
));
);
$response = $brevoService->expenseRejected($recipient, $name, $mail);
if (isset($response['success']) && $response['success'] === false) {
Log::warning("Email to {$recipient} failed: " . ($response['message'] ?? 'Unknown error'));
}
} catch (\Exception $e) {
Log::error("Failed to send email to {$recipient}: " . $e->getMessage());
continue;
app/Http/Kernel.php
+1
View File
@@ -38,6 +38,7 @@ class Kernel extends HttpKernel
\Illuminate\View\Middleware\ShareErrorsFromSession::class,
\App\Http\Middleware\VerifyCsrfToken::class,
\Illuminate\Routing\Middleware\SubstituteBindings::class,
\App\Http\Middleware\SessionTimeout::class,
],
'api' => [
app/Http/Middleware/SessionTimeout.php
+31
View File
@@ -0,0 +1,31 @@
<?php
namespace App\Http\Middleware;
use Closure;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Auth;
use Carbon\Carbon;
class SessionTimeout
{
public function handle(Request $request, Closure $next)
{
// Get last activity time
$lastActivity = session('lastActivityTime');
// Set logout time in minutes (30 minutes)
$timeout = 30 * 60;
if ($lastActivity && (time() - $lastActivity > $timeout)) {
Auth::logout();
session()->flush();
return redirect('/login')->with('message', 'Session expired due to inactivity.');
}
// Update session activity time
session(['lastActivityTime' => time()]);
return $next($request);
}
}