diff --git a/app/Http/Controllers/AutoSerahanController.php b/app/Http/Controllers/AutoSerahanController.php
index 2a15b27..214046d 100644
--- a/app/Http/Controllers/AutoSerahanController.php
+++ b/app/Http/Controllers/AutoSerahanController.php
@@ -91,7 +91,12 @@ class AutoSerahanController extends Controller
$currentPage = $response['current_page'] ?? 1; // Current page
$items = array_map(function ($item) {
+ $time_created = Carbon::parse($item['created_at']);
+
$item['cawangan_name'] = $this->CawanganKod($item['kodcaw']);
+ $item['tarikh'] = $time_created->toDateString();
+ $item['masa'] = $time_created->format('h:i A');
+
return $item;
}, $items);
diff --git a/resources/views/autoserahan/index.blade.php b/resources/views/autoserahan/index.blade.php
index b909f45..7642b02 100644
--- a/resources/views/autoserahan/index.blade.php
+++ b/resources/views/autoserahan/index.blade.php
@@ -74,6 +74,7 @@
tableBody.append('| Tiada data |
');
return;
}
+ console.log('this data:',data);
data.forEach((item, index) => {
let actionBadge = '';
@@ -84,20 +85,26 @@
actionBadge = 'Delete';
}
+ let baseApproveUrl = "{{ route('autoserahan.approve') }}";
+ let baseRejectUrl = "{{ route('autoserahan.reject') }}";
+
+ let approveurl = `${baseApproveUrl}?id=${item.id}&kodcaw=${item.kodcaw}&teller=${item.pc_name}&amaun=${item.amount}`;
+ let rejecturl = `${baseRejectUrl}?id=${item.id}&kodcaw=${item.kodcaw}&teller=${item.pc_name}&amaun=${item.amount}`;
+
let row = `
| ${item.id} |
${item.cawangan_name} |
- ${item.tarikh} |
- ${item.masa} |
+ ${item.tarikh} |
+ ${item.masa} |
${actionBadge} |
${item.pc_name} |
${parseFloat(item.amount).toFixed(2)} |
-
+
Lulus
-
+
Tolak
|