Finalize all-report

2026-08-04 15:51:35 +07:00
parent 73fff183d7
commit 9547bdca7c
21 changed files with 1246 additions and 819 deletions
@@ -312,9 +312,31 @@ function tableVehicle(response) {
    let jmlCashCasual = 0;
    let incomeCashCasual = 0;

+    let jmlCashLost = 0;
+    let incomeCashLost = 0;
+
+    let jmlCashMember = 0;
+    let incomeCashMember = 0;
+
+    let jmlCashManual = 0;
+    let incomeCashManual = 0;
+
+    let jmlCashMasalah = 0;
+    let incomeCashMasalah = 0;
+
+    // Init data cashless
    let jmlCashlessCasual = 0;
    let incomeCashlessCasual = 0;

+    let jmlCashlessLost = 0;
+    let incomeCashlessLost = 0;
+
+    let jmlCashlessMember = 0;
+    let incomeCashlessMember = 0;
+
+    let jmlCashlessManual = 0;
+    let incomeCashlessManual = 0;
+
    let grandTotal = 0;

    response.tunai.forEach(function (cash) {
@@ -340,6 +362,8 @@ function tableVehicle(response) {
        let tLost = cash.keluar.lost;
        let tMember = cash.keluar.member;
        let tManual = cash.keluar.manual;
+        let tManualMix = cash.keluar.manualMix;
+        let tMasalah = cash.keluar.masalah;

        // ===== DATA NON TUNAI =====
        let nonTunaiOut = cashless.nonTunaiOut;
@@ -348,65 +372,49 @@ function tableVehicle(response) {
        let nLost = cashless.keluar.lost;
        let nMember = cashless.keluar.member;
        let nManual = cashless.keluar.manual;
+        let nManualMix = cashless.keluar.manualMix;
+        let nMasalah = cashless.keluar.masalah;

        let totalTunai = cash.totalCash || 0;
        let totalNonTunai = cashless.totalCashless || 0;

+        // init data cash
        jmlCashCasual += cash.keluar.casual.jumlah;
        incomeCashCasual += cash.keluar.casual.income;

+        jmlCashLost += tLost.jumlah;
+        incomeCashLost += tLost.income;
+
+        jmlCashMember += tMember.jumlah;
+        incomeCashMember += tMember.income;
+
+        jmlCashManual += tManual.jumlah;
+        incomeCashManual += tManual.income;
+
+        subTotalIncomeCash = incomeCashCasual + incomeCashLost + incomeCashMember + incomeCashManual;
+
+        // =========     init data cashless
        jmlCashlessCasual += cashless.keluar.casual.jumlah;
        incomeCashlessCasual += cashless.keluar.casual.income;

-        grandTotal += totalTunai + totalNonTunai;
-        // let casualCash   = cash.keluar.casual;
-        // let lostCash     = cash.keluar.lost;
-        // let memberCash   = cash.keluar.member;
-        // let casualIn     = cash.total;
+        jmlCashlessLost += nLost.jumlah;
+        incomeCashlessLost += nLost.income;

-        // let casualNon    = cashless ? cashless.keluar.casual : { jumlah: 0, income: 0 };
-        // let lostNon      = cashless ? cashless.keluar.lost   : { jumlah: 0, income: 0 };
-        // let memberNon    = cashless ? cashless.keluar.member : { jumlah: 0, income: 0 };
+        jmlCashlessMember += nMember.jumlah;
+        incomeCashlessMember += nMember.income;

-        // let totalIncome =
-        //     (cash.totalCash || 0);
+        jmlCashlessManual += nManual.jumlah;
+        incomeCashlessManual += nManual.income;

-        // html += `
-        // <tr>
-        //     <td style="text-align: left;">${cash.jenis_mobil}</td>
+        subTotalIncomeCashless =
+            incomeCashlessCasual + incomeCashlessLost + incomeCashlessMember + incomeCashlessManual;

-        //     <!-- Jenis Transaksi -->
-        //     <td>${casualIn}</td>
-        //     <td>${cash.tunaiOut}</td>
+        //
+        grandTotal = subTotalIncomeCash + subTotalIncomeCashless;

-        //     <!-- Casual -->
-        //     <td>${casualCash.jumlah}</td>
-        //     <td>${rupiah(casualCash.income)}</td>
+        // console.log(tLost.income);
+        // console.log(incomeCashLost);

-        //     <!-- Tiket Hilang -->
-        //     <td>${lostCash.jumlah}</td>
-        //     <td>${rupiah(lostCash.income)}</td>
-
-        //     <!-- Member -->
-        //     <td>${memberCash.jumlah}</td>
-        //     <td>${rupiah(memberCash.income)}</td>
-
-        //     <!-- Manual Input -->
-        //     <td>0</td>
-        //     <td>0</td>
-
-        //     <!-- Manual Mix -->
-        //     <td>0</td>
-        //     <td>0</td>
-
-        //     <!-- Tiket Masalah -->
-        //     <td>0</td>
-        //     <td>0</td>
-
-        //     <!-- Pendapatan -->
-        //     <td><strong>${rupiah(totalIncome)}</strong></td>
-        // </tr>
-        // `;
        html += `
            <tr>
                <td rowspan="2" style="text-align: left;"><strong>${cash.jenis_mobil}</strong></td>
@@ -468,13 +476,22 @@ function tableVehicle(response) {
    // ===== FOOTER TOTAL =====
    html += `
            <tr class="table">
-                <td rowspan="2" style="text-align: center;"><strong>TOTAL</strong></td>
+                <td rowspan="2" style="text-align: center;"><strong>SUB TOTAL<br>KENDARAAN</strong></td>
                <td style="text-align: left;"><span class="badge bg-success">Tunai</span></td>
                <td>0</td>
                <td>0</td>
-                <td data-value="${jmlCashCasual}">${rupiah(jmlCashCasual)}</td>
+                <td data-value="${jmlCashCasual}">${jmlCashCasual}</td>
                <td data-value="${incomeCashCasual}">${rupiah(incomeCashCasual)}</td>
-                <td colspan="10"></td>
+                <td data-value="${jmlCashLost}">${jmlCashLost}</td>
+                <td data-value="${incomeCashLost}">${rupiah(incomeCashLost)}</td>
+                <td data-value="${jmlCashMember}">${jmlCashMember}</td>
+                <td data-value="${incomeCashMember}">${rupiah(incomeCashMember)}</td>
+                <td data-value="${jmlCashManual}">${jmlCashManual}</td>
+                <td data-value="${incomeCashManual}">${rupiah(incomeCashManual)}</td>
+                <td>0</td>
+                <td>0</td>
+                <td>0</td>
+                <td>0</td>
                <td data-value="${incomeCashCasual}">${rupiah(incomeCashCasual)}</td>
            </tr>
            <tr>
@@ -483,24 +500,33 @@ function tableVehicle(response) {
                <td>0</td>
                <td>${jmlCashlessCasual}</td>
                <td data-value="${incomeCashlessCasual}">${rupiah(incomeCashlessCasual)}</td>
-                <td colspan="10"></td>
-                <td data-value="${incomeCashlessCasual}">${rupiah(incomeCashlessCasual)}</td>
+                <td data-value="${jmlCashlessLost}">${rupiah(jmlCashlessLost)}</td>
+                <td data-value="${incomeCashlessLost}">${rupiah(incomeCashlessLost)}</td>
+                <td data-value="${jmlCashlessMember}">${rupiah(jmlCashlessMember)}</td>
+                <td data-value="${incomeCashlessMember}">${rupiah(incomeCashlessMember)}</td>
+                <td data-value="${jmlCashlessManual}">${rupiah(jmlCashlessManual)}</td>
+                <td data-value="${incomeCashlessManual}">${rupiah(incomeCashlessManual)}</td>
+                <td>0</td>
+                <td>0</td>
+                <td>0</td>
+                <td>0</td>
+                <td data-value="${subTotalIncomeCashless}">${rupiah(subTotalIncomeCashless)}</td>
            </tr>
            <tr class="table">
-                <td colspan="3" class="text-center"><strong>GRAND TOTAL</strong></td>
+                <td colspan="3" class="text-center"><strong>GRAND TOTAL<br>Pendapatan Per Kendaraan</strong></td>
                <td colspan="0"></td>
                <td colspan="0">${jmlCashCasual + jmlCashlessCasual}</td>
                <td colspan="0" data-value="${incomeCashCasual + incomeCashlessCasual}">${rupiah(incomeCashCasual + incomeCashlessCasual)}</td>
-                <td colspan="0"></td>
-                <td colspan="0"></td>
-                <td colspan="0"></td>
-                <td colspan="0"></td>
-                <td colspan="0"></td>
-                <td colspan="0"></td>
-                <td colspan="0"></td>
-                <td colspan="0"></td>
-                <td colspan="0"></td>
-                <td colspan="0"></td>
+                <td colspan="0" data-value="${jmlCashLost + jmlCashlessLost}">${rupiah(jmlCashLost + jmlCashlessLost)}</td>
+                <td colspan="0" data-value="${incomeCashLost + incomeCashlessLost}">${rupiah(incomeCashLost + incomeCashlessLost)}</td>
+                <td colspan="0" data-value="${jmlCashMember + incomeCashlessMember}">${rupiah(jmlCashMember + incomeCashlessMember)}</td>
+                <td colspan="0" data-value="${incomeCashMember + incomeCashlessMember}">${rupiah(incomeCashMember + incomeCashlessMember)}</td>
+                <td colspan="0" data-value="${jmlCashManual + jmlCashlessManual}">${rupiah(jmlCashManual + jmlCashlessManual)}</td>/td>
+                <td colspan="0" data-value="${incomeCashManual + incomeCashlessManual}">${rupiah(incomeCashManual + incomeCashlessManual)}</td>
+                <td colspan="0" data-value="0">0</td>/td>
+                <td colspan="0" data-value="0">0</td>
+                <td colspan="0" data-value="0">0</td>
+                <td colspan="0" data-value="0">0</td>
                <td><strong>${rupiah(grandTotal)}</strong></td>
            </tr>
        `;
@@ -534,13 +560,32 @@ function tableOfficer(response) {
    console.log(response);

    let html = "";
-    let onData = "";
+    // init petugas data cash
    let jmlCashCasual = 0;
    let incomeCashCasual = 0;

+    let jmlCashLost = 0;
+    let incomeCashLost = 0;
+
+    let jmlCashMember = 0;
+    let incomeCashMember = 0;
+
+    let jmlCashManual = 0;
+    let incomeCashManual = 0;
+
+    // init petugas data cash
    let jmlCashlessCasual = 0;
    let incomeCashlessCasual = 0;

+    let jmlCashlessLost = 0;
+    let incomeCashlessLost = 0;
+
+    let jmlCashlessMember = 0;
+    let incomeCashlessMember = 0;
+
+    let jmlCashlessManual = 0;
+    let incomeCashlessManual = 0;
+
    let grandTotal = 0;

    response.tunai.forEach(function (cash) {
@@ -579,61 +624,40 @@ function tableOfficer(response) {
        let totalTunai = cash.totalCash || 0;
        let totalNonTunai = cashless.totalCashless || 0;

+        // get data cash
        jmlCashCasual += cash.keluar.casual.jumlah;
        incomeCashCasual += cash.keluar.casual.income;

+        jmlCashLost += cash.keluar.lost.jumlah;
+        incomeCashLost += tLost.income;
+
+        jmlCashMember += cash.keluar.member.jumlah;
+        incomeCashMember += cash.keluar.member.income;
+
+        jmlCashManual += cash.keluar.manual.jumlah;
+        incomeCashManual += cash.keluar.manual.income;
+
+        subTotalIncomeCash = incomeCashCasual + incomeCashLost + incomeCashMember + incomeCashManual;
+
+        // =========     init data cashless
        jmlCashlessCasual += cashless.keluar.casual.jumlah;
        incomeCashlessCasual += cashless.keluar.casual.income;

-        grandTotal += totalTunai + totalNonTunai;
-        // let casualCash   = cash.keluar.casual;
-        // let lostCash     = cash.keluar.lost;
-        // let memberCash   = cash.keluar.member;
-        // let casualIn     = cash.total;
+        jmlCashlessLost += nLost.jumlah;
+        incomeCashlessLost += nLost.income;

-        // let casualNon    = cashless ? cashless.keluar.casual : { jumlah: 0, income: 0 };
-        // let lostNon      = cashless ? cashless.keluar.lost   : { jumlah: 0, income: 0 };
-        // let memberNon    = cashless ? cashless.keluar.member : { jumlah: 0, income: 0 };
+        jmlCashlessMember += cashless.keluar.member.jumlah;
+        incomeCashlessMember += cashless.keluar.member.income;

-        // let totalIncome =
-        //     (cash.totalCash || 0);
+        jmlCashlessManual += cashless.keluar.manual.jumlah;
+        incomeCashlessManual += cashless.keluar.manual.income;

-        // html += `
-        // <tr>
-        //     <td style="text-align: left;">${cash.jenis_mobil}</td>
+        subTotalIncomeCashless =
+            incomeCashlessCasual + incomeCashlessLost + incomeCashlessMember + incomeCashlessManual;

-        //     <!-- Jenis Transaksi -->
-        //     <td>${casualIn}</td>
-        //     <td>${cash.tunaiOut}</td>
-
-        //     <!-- Casual -->
-        //     <td>${casualCash.jumlah}</td>
-        //     <td>${rupiah(casualCash.income)}</td>
-
-        //     <!-- Tiket Hilang -->
-        //     <td>${lostCash.jumlah}</td>
-        //     <td>${rupiah(lostCash.income)}</td>
-
-        //     <!-- Member -->
-        //     <td>${memberCash.jumlah}</td>
-        //     <td>${rupiah(memberCash.income)}</td>
-
-        //     <!-- Manual Input -->
-        //     <td>0</td>
-        //     <td>0</td>
-
-        //     <!-- Manual Mix -->
-        //     <td>0</td>
-        //     <td>0</td>
-
-        //     <!-- Tiket Masalah -->
-        //     <td>0</td>
-        //     <td>0</td>
-
-        //     <!-- Pendapatan -->
-        //     <td><strong>${rupiah(totalIncome)}</strong></td>
-        // </tr>
-        // `;
+        //
+        grandTotal = subTotalIncomeCash + subTotalIncomeCashless;
+        //========= init table body by petugas
        html += `
            <tr>
                <td rowspan="2" style="text-align: left;"><strong>${petugas}</strong></td>
@@ -655,10 +679,10 @@ function tableOfficer(response) {
                <td data-value="${tManual.income}">${rupiah(tManual.income)}</td>

                <td>0</td>
-                <td data-value="0}">0</td>
+                <td data-value="0">0</td>

                <td>0</td>
-                <td data-value="0"></td>
+                <td data-value="0">0</td>

                <td data-value="${totalTunai}"><strong>${rupiah(totalTunai)}</strong></td>
            </tr>
@@ -695,13 +719,23 @@ function tableOfficer(response) {
    // ===== FOOTER TOTAL =====
    html += `
            <tr class="table">
-                <td rowspan="2" style="text-align: center;"><strong>TOTAL</strong></td>
+                <td rowspan="2" style="text-align: center;"><strong>SUB TOTAL<br>Per Petugas</strong></td>
                <td style="text-align: left;"><span class="badge bg-success">Tunai</span></td>
                <td>0</td>
                <td>0</td>
                <td data-value="${jmlCashCasual}">${rupiah(jmlCashCasual)}</td>
                <td data-value="${incomeCashCasual}">${rupiah(incomeCashCasual)}</td>
-                <td colspan="11">${rupiah(incomeCashCasual)}</td>
+                <td data-value="${jmlCashLost}">${rupiah(jmlCashLost)}</td>
+                <td data-value="${incomeCashLost}">${incomeCashLost}</td>
+                <td data-value="${jmlCashMember}">${rupiah(jmlCashMember)}</td>
+                <td data-value="${incomeCashMember}">${rupiah(incomeCashMember)}</td>
+                <td data-value="${jmlCashManual}">${rupiah(jmlCashManual)}</td>
+                <td data-value="${incomeCashManual}">${rupiah(incomeCashManual)}</td>
+                <td>0</td>
+                <td>0</td>
+                <td>0</td>
+                <td>0</td>
+                <td data-value="${incomeCashCasual}">${rupiah(incomeCashCasual)}</td>
            </tr>
            <tr>
                <td style="text-align: left;"><span class="badge bg-warning">NON TUNAI</td>
@@ -709,23 +743,33 @@ function tableOfficer(response) {
                <td>0</td>
                <td>${jmlCashlessCasual}</td>
                <td data-value="${incomeCashlessCasual}">${rupiah(incomeCashlessCasual)}</td>
-                <td colspan="11">${rupiah(incomeCashlessCasual)}</td>
+                <td data-value="${jmlCashlessLost}">${rupiah(jmlCashlessLost)}</td>
+                <td data-value="${incomeCashlessLost}">${rupiah(incomeCashlessLost)}</td>
+                <td data-value="${jmlCashlessMember}">${rupiah(jmlCashlessMember)}</td>
+                <td data-value="${incomeCashlessMember}">${rupiah(incomeCashlessMember)}</td>
+                <td data-value="${jmlCashlessManual}">${rupiah(jmlCashlessManual)}</td>
+                <td data-value="${incomeCashlessManual}">${rupiah(incomeCashlessManual)}</td>
+                <td>0</td>
+                <td>0</td>
+                <td>0</td>
+                <td>0</td>
+                <td data-value="${subTotalIncomeCashless}">${rupiah(subTotalIncomeCashless)}</td>
            </tr>
            <tr class="table">
-                <td colspan="3" class="text-center"><strong>GRAND TOTAL</strong></td>
+                <td colspan="3" class="text-center"><strong>GRAND TOTAL<br>Pendapatan Per Petugas</strong></td>
                <td colspan="0"></td>
                <td colspan="0">${jmlCashCasual + jmlCashlessCasual}</td>
                <td colspan="0" data-value="${incomeCashCasual + incomeCashlessCasual}">${rupiah(incomeCashCasual + incomeCashlessCasual)}</td>
-                <td colspan="0"></td>
-                <td colspan="0"></td>
-                <td colspan="0"></td>
-                <td colspan="0"></td>
-                <td colspan="0"></td>
-                <td colspan="0"></td>
-                <td colspan="0"></td>
-                <td colspan="0"></td>
-                <td colspan="0"></td>
-                <td colspan="0"></td>
+                <td colspan="0" data-value="${jmlCashLost + jmlCashlessLost}">${rupiah(jmlCashLost + jmlCashlessLost)}</td>
+                <td colspan="0" data-value="${incomeCashLost + incomeCashlessLost}">${rupiah(incomeCashLost + incomeCashlessLost)}</td>
+                <td colspan="0" data-value="${jmlCashMember + incomeCashlessMember}">${rupiah(jmlCashMember + incomeCashlessMember)}</td>
+                <td colspan="0" data-value="${incomeCashMember + incomeCashlessMember}">${rupiah(incomeCashMember + incomeCashlessMember)}</td>
+                <td colspan="0" data-value="${jmlCashManual + jmlCashlessManual}">${rupiah(jmlCashManual + jmlCashlessManual)}</td>/td>
+                <td colspan="0" data-value="${incomeCashManual + incomeCashlessManual}">${rupiah(incomeCashManual + incomeCashlessManual)}</td>
+                <td colspan="0" data-value="0">0</td>/td>
+                <td colspan="0" data-value="0">0</td>
+                <td colspan="0" data-value="0">0</td>
+                <td colspan="0" data-value="0">0</td>
                <td><strong>${rupiah(grandTotal)}</strong></td>
            </tr>
        `;
@@ -756,16 +800,35 @@ function tableOfficer(response) {

 function tablePayment(response) {
    // Update tabel dengan data yang diterima
-    console.log(response);
+    // console.log(response);

    let html = "";
-    let onData = "";
+    // init data cash
    let jmlCashCasual = 0;
    let incomeCashCasual = 0;

+    let jmlCashLost = 0;
+    let incomeCashLost = 0;
+
+    let jmlCashMember = 0;
+    let incomeCashMember = 0;
+
+    let jmlCashManual = 0;
+    let incomeCashManual = 0;
+
+    // init data cashless
    let jmlCashlessCasual = 0;
    let incomeCashlessCasual = 0;

+    let jmlCashlessLost = 0;
+    let incomeCashlessLost = 0;
+
+    let jmlCashlessMember = 0;
+    let incomeCashlessMember = 0;
+
+    let jmlCashlessManual = 0;
+    let incomeCashlessManual = 0;
+
    let grandTotal = 0;

    response.tunai.forEach(function (cash) {
@@ -808,10 +871,35 @@ function tablePayment(response) {
        jmlCashCasual += cash.keluar.casual.jumlah;
        incomeCashCasual += cash.keluar.casual.income;

+        jmlCashLost += cash.keluar.lost.jumlah;
+        incomeCashLost += tLost.income;
+
+        jmlCashMember += cash.keluar.member.jumlah;
+        incomeCashMember += cash.keluar.member.income;
+
+        jmlCashManual += cash.keluar.manual.jumlah;
+        incomeCashManual += cash.keluar.manual.income;
+
+        subTotalIncomeCash = incomeCashCasual + incomeCashLost + incomeCashMember + incomeCashManual;
+
+        // =========     init data cashless
        jmlCashlessCasual += cashless.keluar.casual.jumlah;
        incomeCashlessCasual += cashless.keluar.casual.income;

-        grandTotal += totalTunai + totalNonTunai;
+        jmlCashlessLost += nLost.jumlah;
+        incomeCashlessLost += nLost.income;
+
+        jmlCashlessMember += cashless.keluar.member.jumlah;
+        incomeCashlessMember += cashless.keluar.member.income;
+
+        jmlCashlessManual += cashless.keluar.manual.jumlah;
+        incomeCashlessManual += cashless.keluar.manual.income;
+
+        subTotalIncomeCashless =
+            incomeCashlessCasual + incomeCashlessLost + incomeCashlessMember + incomeCashlessManual;
+
+        grandTotal = subTotalIncomeCash + subTotalIncomeCashless;
+
        html += `
            <tr>
                <td rowspan="2" style="text-align: left;"><strong>${payment}</strong></td>
@@ -836,7 +924,7 @@ function tablePayment(response) {
                <td data-value="0}">0</td>

                <td>0</td>
-                <td data-value="0"></td>
+                <td data-value="0">0</td>

                <td data-value="${totalTunai}"><strong>${rupiah(totalTunai)}</strong></td>
            </tr>
@@ -873,13 +961,23 @@ function tablePayment(response) {
    // ===== FOOTER TOTAL =====
    html += `
            <tr class="table">
-                <td rowspan="2" style="text-align: center;"><strong>TOTAL</strong></td>
+                <td rowspan="2" style="text-align: center;"><strong>SUB TOTAL<br>Per Jenis Pembayaran</strong></td>
                <td style="text-align: left;"><span class="badge bg-success">Tunai</span></td>
                <td>0</td>
                <td>0</td>
                <td data-value="${jmlCashCasual}">${rupiah(jmlCashCasual)}</td>
                <td data-value="${incomeCashCasual}">${rupiah(incomeCashCasual)}</td>
-                <td colspan="11">${rupiah(incomeCashCasual)}</td>
+                <td data-value="${jmlCashLost}">${rupiah(jmlCashLost)}</td>
+                <td data-value="${incomeCashLost}">${incomeCashLost}</td>
+                <td data-value="${jmlCashMember}">${rupiah(jmlCashMember)}</td>
+                <td data-value="${incomeCashMember}">${rupiah(incomeCashMember)}</td>
+                <td data-value="${jmlCashManual}">${rupiah(jmlCashManual)}</td>
+                <td data-value="${incomeCashManual}">${rupiah(incomeCashManual)}</td>
+                <td>0</td>
+                <td>0</td>
+                <td>0</td>
+                <td>0</td>
+                <td data-value="${incomeCashCasual}">${rupiah(incomeCashCasual)}</td>
            </tr>
            <tr>
                <td style="text-align: left;"><span class="badge bg-warning">NON TUNAI</td>
@@ -887,23 +985,33 @@ function tablePayment(response) {
                <td>0</td>
                <td>${jmlCashlessCasual}</td>
                <td data-value="${incomeCashlessCasual}">${rupiah(incomeCashlessCasual)}</td>
-                <td colspan="11">${rupiah(incomeCashlessCasual)}</td>
+                <td data-value="${jmlCashlessLost}">${rupiah(jmlCashlessLost)}</td>
+                <td data-value="${incomeCashlessLost}">${rupiah(incomeCashlessLost)}</td>
+                <td data-value="${jmlCashlessMember}">${rupiah(jmlCashlessMember)}</td>
+                <td data-value="${incomeCashlessMember}">${rupiah(incomeCashlessMember)}</td>
+                <td data-value="${jmlCashlessManual}">${rupiah(jmlCashlessManual)}</td>
+                <td data-value="${incomeCashlessManual}">${rupiah(incomeCashlessManual)}</td>
+                <td>0</td>
+                <td>0</td>
+                <td>0</td>
+                <td>0</td>
+                <td data-value="${subTotalIncomeCashless}">${rupiah(subTotalIncomeCashless)}</td>
            </tr>
            <tr class="table">
-                <td colspan="3" class="text-center"><strong>GRAND TOTAL</strong></td>
+                <td colspan="3" class="text-center"><strong>GRAND TOTAL<br>Pendapatan Per Pembayaran</strong></td>
                <td colspan="0"></td>
                <td colspan="0">${jmlCashCasual + jmlCashlessCasual}</td>
-                <td colspan="0" data-value="${incomeCashCasual + incomeCashlessCasual}"><strong>${rupiah(incomeCashCasual + incomeCashlessCasual)}</strong></td>
-                <td colspan="0"></td>
-                <td colspan="0"></td>
-                <td colspan="0"></td>
-                <td colspan="0"></td>
-                <td colspan="0"></td>
-                <td colspan="0"></td>
-                <td colspan="0"></td>
-                <td colspan="0"></td>
-                <td colspan="0"></td>
-                <td colspan="0"></td>
+                <td colspan="0" data-value="${incomeCashCasual + incomeCashlessCasual}">${rupiah(incomeCashCasual + incomeCashlessCasual)}</td>
+                <td colspan="0" data-value="${jmlCashLost + jmlCashlessLost}">${rupiah(jmlCashLost + jmlCashlessLost)}</td>
+                <td colspan="0" data-value="${incomeCashLost + incomeCashlessLost}">${rupiah(incomeCashLost + incomeCashlessLost)}</td>
+                <td colspan="0" data-value="${jmlCashMember + incomeCashlessMember}">${rupiah(jmlCashMember + incomeCashlessMember)}</td>
+                <td colspan="0" data-value="${incomeCashMember + incomeCashlessMember}">${rupiah(incomeCashMember + incomeCashlessMember)}</td>
+                <td colspan="0" data-value="${jmlCashManual + jmlCashlessManual}">${rupiah(jmlCashManual + jmlCashlessManual)}</td>/td>
+                <td colspan="0" data-value="${incomeCashManual + incomeCashlessManual}">${rupiah(incomeCashManual + incomeCashlessManual)}</td>
+                <td colspan="0" data-value="0">0</td>/td>
+                <td colspan="0" data-value="0">0</td>
+                <td colspan="0" data-value="0">0</td>
+                <td colspan="0" data-value="0">0</td>
                <td><strong>${rupiah(grandTotal)}</strong></td>
            </tr>
        `;