Merged in feature/autoserahan (pull request #94)

delete all Log add encode_html
This commit is contained in:
Muhd hafifie
2025-04-08 15:54:32 +00:00
2 changed files with 9 additions and 22 deletions
+5 -21
View File
@@ -20,12 +20,8 @@ class AutoSerahanController extends Controller
$perPage = $response['per_page'] ?? 10; // Items per page
$currentPage = $response['current_page'] ?? 1; // Current page
usort($items, function ($a, $b) {
return strtotime($b['created_at']) <=> strtotime($a['created_at']); // descending
});
$items = array_map(function ($item) {
$time_created = Carbon::parse($item['created_at']);
$time_created = Carbon::parse($item['created_at'])->setTimezone('Asia/Kuala_Lumpur');
$item['cawangan_name'] = $this->CawanganKod($item['kodcaw']);
$item['tarikh'] = $time_created->toDateString();
@@ -60,13 +56,10 @@ class AutoSerahanController extends Controller
$total = $response['total'] ?? 0; // Total items
$perPage = $response['per_page'] ?? 10; // Items per page
$currentPage = $response['current_page'] ?? 1; // Current page
usort($items, function ($a, $b) {
return strtotime($b['created_at']) <=> strtotime($a['created_at']); // descending
});
$items = array_map(function ($item) {
$time_created = Carbon::parse($item['created_at']);
$time_created = Carbon::parse($item['created_at'])->setTimezone('Asia/Kuala_Lumpur');
$item['cawangan_name'] = $this->CawanganKod($item['kodcaw']);
$item['tarikh'] = $time_created->toDateString();
@@ -98,12 +91,9 @@ class AutoSerahanController extends Controller
$perPage = $response['per_page'] ?? 10; // Items per page
$currentPage = $response['current_page'] ?? 1; // Current page
usort($items, function ($a, $b) {
return strtotime($b['created_at']) <=> strtotime($a['created_at']); // descending
});
$items = array_map(function ($item) {
$time_created = Carbon::parse($item['created_at']);
$time_created = Carbon::parse($item['created_at'])->setTimezone('Asia/Kuala_Lumpur');
$item['cawangan_name'] = $this->CawanganKod($item['kodcaw']);
$item['tarikh'] = $time_created->toDateString();
@@ -131,7 +121,7 @@ class AutoSerahanController extends Controller
'sendApproval' => 'ACCEPTED',
'operasi_name' => auth()->user()->name,
])->json();
Log::debug($response);
if($response['approve_status'] == 'approved'){
$approvalserahan = Http::get(config('api.url_koop') . '/api/autoserahan/get', [
'id' => $request->id,
@@ -154,7 +144,6 @@ class AutoSerahanController extends Controller
'amaun' => $request->amaun,
'denopendser_id' => $approvalserahan['denopendser_id_v2']
])->json();
Log::error($serahan);
$call_set_approval_v3 = Http::withOptions(['verify' => config('app.api_verify')])
->put(config('api.url_koop') . '/api/autoserahan/setapproval', [
@@ -169,8 +158,6 @@ class AutoSerahanController extends Controller
'teller' => $request->teller,
'amaun' => $request->amaun,
])->json();
Log::info($pendahuluan);
$serahan = Http::put(config('api.url_pkb') . '/api/autoserahan/delete/serahan', [
'array_approval' => $approvalserahan,
@@ -179,7 +166,6 @@ class AutoSerahanController extends Controller
'amaun' => $request->amaun,
])->json();
Log::info($serahan);
}
@@ -231,8 +217,6 @@ class AutoSerahanController extends Controller
private function CawanganKod($kodcaw) {
$cawangan = Http::get(config('api.url_koop') . '/api/cawangan/' . $kodcaw)->json();
return $cawangan['details_caw'] ?? 'Undefined';
}
}
+4 -1
View File
@@ -77,6 +77,9 @@
console.log('this data:',data);
data.forEach((item, index) => {
let currentPage = "{{ $list->currentPage() }}";
let perPage = "{{ $list->perPage() }}";
let rowNumber = (currentPage - 1) * perPage + (index + 1);
let actionBadge = '';
if (item.action === 'create') {
@@ -93,7 +96,7 @@
let row = `
<tr>
<td class="px-5 py-5 border-b border-gray-200 bg-white text-sm text-center">${item.id}</td>
<td class="px-5 py-5 border-b border-gray-200 bg-white text-sm text-center">${rowNumber}</td>
<td class="px-5 py-5 border-b border-gray-200 bg-white text-sm text-center">${item.cawangan_name}</td>
<td class="px-5 py-5 border-b border-gray-200 bg-white text-sm text-center">${item.tarikh}</td>
<td class="px-5 py-5 border-b border-gray-200 bg-white text-sm text-center">${item.masa}</td>