From 30d194eae99885cc3ae8a8a58e727ec68a4fae25 Mon Sep 17 00:00:00 2001 From: Afiq Hamzah Date: Mon, 7 Apr 2025 11:34:29 +0800 Subject: [PATCH] Split transaction detail by organization --- .../table-gldetail.blade.php | 58 +++++++++++++ .../table-transactions-online.blade.php | 62 ++++++++++++++ .../table-transactions.blade.php | 50 +++++++++++ .../table-transaksi-keuntungan.blade.php | 52 ++++++++++++ .../trail/kopkb/partials/table-diff.blade.php | 83 +++++++++++++++++++ .../kopkb/partials/table-gldetail.blade.php | 54 ++++++++++++ .../table-transactions-online.blade.php | 58 +++++++++++++ .../partials/table-transactions.blade.php | 46 ++++++++++ .../table-transaksi-keuntungan.blade.php | 48 +++++++++++ .../table-gldetail.blade.php | 4 +- .../table-transactions-online.blade.php | 4 +- .../table-transactions.blade.php | 4 +- .../table-transaksi-keuntungan.blade.php | 4 +- .../{ => pkb}/partials/table-diff.blade.php | 6 +- .../partials/table-gldetail.blade.php | 2 +- .../table-transactions-online.blade.php | 2 +- .../partials/table-transactions.blade.php | 2 +- .../table-transaksi-keuntungan.blade.php | 2 +- 18 files changed, 526 insertions(+), 15 deletions(-) create mode 100644 resources/views/online/trail/kopkb/partials/grouped-by-norujukan/table-gldetail.blade.php create mode 100644 resources/views/online/trail/kopkb/partials/grouped-by-norujukan/table-transactions-online.blade.php create mode 100644 resources/views/online/trail/kopkb/partials/grouped-by-norujukan/table-transactions.blade.php create mode 100644 resources/views/online/trail/kopkb/partials/grouped-by-norujukan/table-transaksi-keuntungan.blade.php create mode 100644 resources/views/online/trail/kopkb/partials/table-diff.blade.php create mode 100644 resources/views/online/trail/kopkb/partials/table-gldetail.blade.php create mode 100644 resources/views/online/trail/kopkb/partials/table-transactions-online.blade.php create mode 100644 resources/views/online/trail/kopkb/partials/table-transactions.blade.php create mode 100644 resources/views/online/trail/kopkb/partials/table-transaksi-keuntungan.blade.php rename resources/views/online/trail/{ => pkb}/partials/grouped-by-norujukan/table-gldetail.blade.php (95%) rename resources/views/online/trail/{ => pkb}/partials/grouped-by-norujukan/table-transactions-online.blade.php (95%) rename resources/views/online/trail/{ => pkb}/partials/grouped-by-norujukan/table-transactions.blade.php (94%) rename resources/views/online/trail/{ => pkb}/partials/grouped-by-norujukan/table-transaksi-keuntungan.blade.php (94%) rename resources/views/online/trail/{ => pkb}/partials/table-diff.blade.php (96%) rename resources/views/online/trail/{ => pkb}/partials/table-gldetail.blade.php (97%) rename resources/views/online/trail/{ => pkb}/partials/table-transactions-online.blade.php (97%) rename resources/views/online/trail/{ => pkb}/partials/table-transactions.blade.php (97%) rename resources/views/online/trail/{ => pkb}/partials/table-transaksi-keuntungan.blade.php (96%) diff --git a/resources/views/online/trail/kopkb/partials/grouped-by-norujukan/table-gldetail.blade.php b/resources/views/online/trail/kopkb/partials/grouped-by-norujukan/table-gldetail.blade.php new file mode 100644 index 0000000..f4f0480 --- /dev/null +++ b/resources/views/online/trail/kopkb/partials/grouped-by-norujukan/table-gldetail.blade.php @@ -0,0 +1,58 @@ +
+ + @forelse ($transactionTrailKOOP['glDetail'] as $norujukan => $transaction) + +

{{ $norujukan }}

+
+ + + + + + + + + + + + + + + + + + + + + + + @foreach ($transaction as $data) + + + + + + + + + + + + + + + + + + + + @endforeach + + + + @empty +
+ No data available for the date selected +
+ @endforelse +
diff --git a/resources/views/online/trail/kopkb/partials/grouped-by-norujukan/table-transactions-online.blade.php b/resources/views/online/trail/kopkb/partials/grouped-by-norujukan/table-transactions-online.blade.php new file mode 100644 index 0000000..92aa948 --- /dev/null +++ b/resources/views/online/trail/kopkb/partials/grouped-by-norujukan/table-transactions-online.blade.php @@ -0,0 +1,62 @@ +
+ + @forelse ($transactionTrailKOOP['transactionsOnline'] as $norujukan => $transaction) + +

{{ $norujukan }}

+
+ + + + + + + + + + + + + + + + + + + + + + + + + @foreach ($transaction as $data) + + + + + + + + + + + + + + + + + + + + + + @endforeach + + + @empty +
+ No data available for the date selected +
+ @endforelse + +
diff --git a/resources/views/online/trail/kopkb/partials/grouped-by-norujukan/table-transactions.blade.php b/resources/views/online/trail/kopkb/partials/grouped-by-norujukan/table-transactions.blade.php new file mode 100644 index 0000000..58a4c8f --- /dev/null +++ b/resources/views/online/trail/kopkb/partials/grouped-by-norujukan/table-transactions.blade.php @@ -0,0 +1,50 @@ +
+ + @forelse ($transactionTrailKOOP['transaction'] as $norujukan => $transaction) + +

{{ $norujukan }}

+
+ + + + + + + + + + + + + + + + + + + @foreach ($transaction as $data) + + + + + + + + + + + + + + + + @endforeach + + + @empty +
+ No data available for the date selected +
+ @endforelse + +
diff --git a/resources/views/online/trail/kopkb/partials/grouped-by-norujukan/table-transaksi-keuntungan.blade.php b/resources/views/online/trail/kopkb/partials/grouped-by-norujukan/table-transaksi-keuntungan.blade.php new file mode 100644 index 0000000..bcdf0c7 --- /dev/null +++ b/resources/views/online/trail/kopkb/partials/grouped-by-norujukan/table-transaksi-keuntungan.blade.php @@ -0,0 +1,52 @@ +
+ + @forelse ($transactionTrailKOOP['transaksiKeuntungan'] as $norujukan => $transaction) + +

{{ $norujukan }}

+
+ + + + + + + + + + + + + + + + + + + + @foreach ($transaction as $data) + + + + + + + + + + + + + + + + + @endforeach + + + + @empty +
+ No data available for the date selected +
+ @endforelse +
diff --git a/resources/views/online/trail/kopkb/partials/table-diff.blade.php b/resources/views/online/trail/kopkb/partials/table-diff.blade.php new file mode 100644 index 0000000..8dbd101 --- /dev/null +++ b/resources/views/online/trail/kopkb/partials/table-diff.blade.php @@ -0,0 +1,83 @@ +
+
+
+
+ @php + $recordNumbers = [ + $transactionOnlineNumbers, + $transactionNumbers, + $transaksiKeuntunganNumbers, + $glDetailNumbers, + ]; + + $uniqueRecordNumbers = array_unique($recordNumbers); + $diffCount = count($uniqueRecordNumbers) > 1 ? max($uniqueRecordNumbers) - min($uniqueRecordNumbers) : 0; + $extractNorujukan = fn($x) => array_column($x, 'norujukan'); + + $norujukan_table_transaction_online = $extractNorujukan($transactionTrailKOOP['transactionsOnline']); + $norujukan_table_transaction = $extractNorujukan($transactionTrailKOOP['transaction']); + $norujukan_table_transaksiKeuntungan = $extractNorujukan($transactionTrailKOOP['transaksiKeuntungan']); + + @endphp + + @if($diffCount !== 0) +
+

Diff table transaction

+ @php + $diff_norujukan_1 = array_diff($norujukan_table_transaction_online, $norujukan_table_transaction); + $diff_norujukan_2 = array_diff($norujukan_table_transaction_online, $norujukan_table_transaksiKeuntungan); + @endphp + +
    + @forelse($diff_norujukan_1 as $norujukan) +
  • + - {{ $norujukan }} + + + +
  • + @empty +
  • No records
  • + @endforelse +
+
+ +
+

Diff table transaksi_keuntungan

+
    + @forelse($diff_norujukan_2 as $norujukan) +
  • + - {{ $norujukan }} + + + +
  • + @empty + - No records + @endforelse +
+
+ @endif + +

+
+
+
+
+ +@push('additional_scripts') + + +@endpush diff --git a/resources/views/online/trail/kopkb/partials/table-gldetail.blade.php b/resources/views/online/trail/kopkb/partials/table-gldetail.blade.php new file mode 100644 index 0000000..a2a821e --- /dev/null +++ b/resources/views/online/trail/kopkb/partials/table-gldetail.blade.php @@ -0,0 +1,54 @@ +
+ + + + + + + + + + + + + + + + + + + + + + + + @forelse ($transactionTrailKOOP['glDetail'] as $data) + + + + + + + + + + + + + + + + + + + + + @empty + + + + @endforelse + + + +
diff --git a/resources/views/online/trail/kopkb/partials/table-transactions-online.blade.php b/resources/views/online/trail/kopkb/partials/table-transactions-online.blade.php new file mode 100644 index 0000000..6b7f5f3 --- /dev/null +++ b/resources/views/online/trail/kopkb/partials/table-transactions-online.blade.php @@ -0,0 +1,58 @@ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + @forelse ($transactionTrailKOOP['transactionsOnline'] as $data) + + + + + + + + + + + + + + + + + + + + + + + @empty + + + + @endforelse + + + +
diff --git a/resources/views/online/trail/kopkb/partials/table-transactions.blade.php b/resources/views/online/trail/kopkb/partials/table-transactions.blade.php new file mode 100644 index 0000000..e9689fe --- /dev/null +++ b/resources/views/online/trail/kopkb/partials/table-transactions.blade.php @@ -0,0 +1,46 @@ +
+ + + + + + + + + + + + + + + + + + + + @forelse($transactionTrailKOOP['transaction'] as $data) + + + + + + + + + + + + + + + + + @empty + + + + @endforelse + + + +
diff --git a/resources/views/online/trail/kopkb/partials/table-transaksi-keuntungan.blade.php b/resources/views/online/trail/kopkb/partials/table-transaksi-keuntungan.blade.php new file mode 100644 index 0000000..b7049f3 --- /dev/null +++ b/resources/views/online/trail/kopkb/partials/table-transaksi-keuntungan.blade.php @@ -0,0 +1,48 @@ +
+ + + + + + + + + + + + + + + + + + + + + @forelse ($transactionTrailKOOP['transaksiKeuntungan'] as $data) + + + + + + + + + + + + + + + + + + @empty + + + + @endforelse + + + +
diff --git a/resources/views/online/trail/partials/grouped-by-norujukan/table-gldetail.blade.php b/resources/views/online/trail/pkb/partials/grouped-by-norujukan/table-gldetail.blade.php similarity index 95% rename from resources/views/online/trail/partials/grouped-by-norujukan/table-gldetail.blade.php rename to resources/views/online/trail/pkb/partials/grouped-by-norujukan/table-gldetail.blade.php index 0d666bd..8a8acff 100644 --- a/resources/views/online/trail/partials/grouped-by-norujukan/table-gldetail.blade.php +++ b/resources/views/online/trail/pkb/partials/grouped-by-norujukan/table-gldetail.blade.php @@ -1,6 +1,6 @@
- @forelse ($transactionTrail['glDetail'] as $norujukan => $transaction) + @forelse ($transactionTrailPKB['glDetail'] as $norujukan => $transaction)

{{ $norujukan }}

@@ -51,7 +51,7 @@ @empty -
+
No data available for the date selected
@endforelse diff --git a/resources/views/online/trail/partials/grouped-by-norujukan/table-transactions-online.blade.php b/resources/views/online/trail/pkb/partials/grouped-by-norujukan/table-transactions-online.blade.php similarity index 95% rename from resources/views/online/trail/partials/grouped-by-norujukan/table-transactions-online.blade.php rename to resources/views/online/trail/pkb/partials/grouped-by-norujukan/table-transactions-online.blade.php index d554adb..bbee0ae 100644 --- a/resources/views/online/trail/partials/grouped-by-norujukan/table-transactions-online.blade.php +++ b/resources/views/online/trail/pkb/partials/grouped-by-norujukan/table-transactions-online.blade.php @@ -1,6 +1,6 @@
- @forelse ($transactionTrail['transactionsOnline'] as $norujukan => $transaction) + @forelse ($transactionTrailPKB['transactionsOnline'] as $norujukan => $transaction)

{{ $norujukan }}

@@ -54,7 +54,7 @@ @empty -
+
No data available for the date selected
@endforelse diff --git a/resources/views/online/trail/partials/grouped-by-norujukan/table-transactions.blade.php b/resources/views/online/trail/pkb/partials/grouped-by-norujukan/table-transactions.blade.php similarity index 94% rename from resources/views/online/trail/partials/grouped-by-norujukan/table-transactions.blade.php rename to resources/views/online/trail/pkb/partials/grouped-by-norujukan/table-transactions.blade.php index 61d2ae0..d47fe98 100644 --- a/resources/views/online/trail/partials/grouped-by-norujukan/table-transactions.blade.php +++ b/resources/views/online/trail/pkb/partials/grouped-by-norujukan/table-transactions.blade.php @@ -1,6 +1,6 @@
- @forelse ($transactionTrail['transaction'] as $norujukan => $transaction) + @forelse ($transactionTrailPKB['transaction'] as $norujukan => $transaction)

{{ $norujukan }}

@@ -42,7 +42,7 @@ @empty -
+
No data available for the date selected
@endforelse diff --git a/resources/views/online/trail/partials/grouped-by-norujukan/table-transaksi-keuntungan.blade.php b/resources/views/online/trail/pkb/partials/grouped-by-norujukan/table-transaksi-keuntungan.blade.php similarity index 94% rename from resources/views/online/trail/partials/grouped-by-norujukan/table-transaksi-keuntungan.blade.php rename to resources/views/online/trail/pkb/partials/grouped-by-norujukan/table-transaksi-keuntungan.blade.php index 8bf64fb..9e96002 100644 --- a/resources/views/online/trail/partials/grouped-by-norujukan/table-transaksi-keuntungan.blade.php +++ b/resources/views/online/trail/pkb/partials/grouped-by-norujukan/table-transaksi-keuntungan.blade.php @@ -1,6 +1,6 @@
- @forelse ($transactionTrail['transaksiKeuntungan'] as $norujukan => $transaction) + @forelse ($transactionTrailPKB['transaksiKeuntungan'] as $norujukan => $transaction)

{{ $norujukan }}

@@ -45,7 +45,7 @@ @empty -
+
No data available for the date selected
@endforelse diff --git a/resources/views/online/trail/partials/table-diff.blade.php b/resources/views/online/trail/pkb/partials/table-diff.blade.php similarity index 96% rename from resources/views/online/trail/partials/table-diff.blade.php rename to resources/views/online/trail/pkb/partials/table-diff.blade.php index 9fc9f87..1131d2b 100644 --- a/resources/views/online/trail/partials/table-diff.blade.php +++ b/resources/views/online/trail/pkb/partials/table-diff.blade.php @@ -14,9 +14,9 @@ $diffCount = count($uniqueRecordNumbers) > 1 ? max($uniqueRecordNumbers) - min($uniqueRecordNumbers) : 0; $extractNorujukan = fn($x) => array_column($x, 'norujukan'); - $norujukan_table_transaction_online = $extractNorujukan($transactionTrail['transactionsOnline']); - $norujukan_table_transaction = $extractNorujukan($transactionTrail['transaction']); - $norujukan_table_transaksiKeuntungan = $extractNorujukan($transactionTrail['transaksiKeuntungan']); + $norujukan_table_transaction_online = $extractNorujukan($transactionTrailPKB['transactionsOnline']); + $norujukan_table_transaction = $extractNorujukan($transactionTrailPKB['transaction']); + $norujukan_table_transaksiKeuntungan = $extractNorujukan($transactionTrailPKB['transaksiKeuntungan']); @endphp diff --git a/resources/views/online/trail/partials/table-gldetail.blade.php b/resources/views/online/trail/pkb/partials/table-gldetail.blade.php similarity index 97% rename from resources/views/online/trail/partials/table-gldetail.blade.php rename to resources/views/online/trail/pkb/partials/table-gldetail.blade.php index efb99cb..81bcef5 100644 --- a/resources/views/online/trail/partials/table-gldetail.blade.php +++ b/resources/views/online/trail/pkb/partials/table-gldetail.blade.php @@ -22,7 +22,7 @@ - @forelse ($transactionTrail['glDetail'] as $data) + @forelse ($transactionTrailPKB['glDetail'] as $data) diff --git a/resources/views/online/trail/partials/table-transactions-online.blade.php b/resources/views/online/trail/pkb/partials/table-transactions-online.blade.php similarity index 97% rename from resources/views/online/trail/partials/table-transactions-online.blade.php rename to resources/views/online/trail/pkb/partials/table-transactions-online.blade.php index 0319755..c5a2465 100644 --- a/resources/views/online/trail/partials/table-transactions-online.blade.php +++ b/resources/views/online/trail/pkb/partials/table-transactions-online.blade.php @@ -24,7 +24,7 @@ - @forelse ($transactionTrail['transactionsOnline'] as $data) + @forelse ($transactionTrailPKB['transactionsOnline'] as $data) diff --git a/resources/views/online/trail/partials/table-transactions.blade.php b/resources/views/online/trail/pkb/partials/table-transactions.blade.php similarity index 97% rename from resources/views/online/trail/partials/table-transactions.blade.php rename to resources/views/online/trail/pkb/partials/table-transactions.blade.php index 03a0058..ecc7b0c 100644 --- a/resources/views/online/trail/partials/table-transactions.blade.php +++ b/resources/views/online/trail/pkb/partials/table-transactions.blade.php @@ -18,7 +18,7 @@ - @forelse($transactionTrail['transaction'] as $data) + @forelse($transactionTrailPKB['transaction'] as $data) diff --git a/resources/views/online/trail/partials/table-transaksi-keuntungan.blade.php b/resources/views/online/trail/pkb/partials/table-transaksi-keuntungan.blade.php similarity index 96% rename from resources/views/online/trail/partials/table-transaksi-keuntungan.blade.php rename to resources/views/online/trail/pkb/partials/table-transaksi-keuntungan.blade.php index 6e64bcc..497a861 100644 --- a/resources/views/online/trail/partials/table-transaksi-keuntungan.blade.php +++ b/resources/views/online/trail/pkb/partials/table-transaksi-keuntungan.blade.php @@ -19,7 +19,7 @@ - @forelse ($transactionTrail['transaksiKeuntungan'] as $data) + @forelse ($transactionTrailPKB['transaksiKeuntungan'] as $data)