diff --git a/resources/views/pages/History/index.blade.php b/resources/views/pages/History/index.blade.php index 8f21618..30ad92f 100644 --- a/resources/views/pages/History/index.blade.php +++ b/resources/views/pages/History/index.blade.php @@ -38,17 +38,18 @@ Total Pesanan Sub Total Diskon(%) - Total + Grand Total - Total + Total + - - + + @@ -116,6 +117,7 @@ { data: 'total_bayar', name: 'total_bayar', + className: 'text-right', render: function(data) { // change to IDR return 'Rp. ' + data.toString().replace(/\B(?=(\d{3})+(?!\d))/g, '.'); @@ -132,6 +134,7 @@ { data: 'grand_total', name: 'grand_total', + className: 'text-right', render: function(data) { // change to IDR return 'Rp. ' + data.toString().replace(/\B(?=(\d{3})+(?!\d))/g, '.'); @@ -155,12 +158,18 @@ 0; }; - // Total over all pages + // GrandTotal over all pages totalAll = api .column(8) .data() .reduce((a, b) => intVal(a) + intVal(b), 0); + // GrandTotal over all pages + diskonTotal = api + .column(7) + .data() + .reduce((a, b) => intVal(a) + intVal(b), 0); + // Total over this page pageTotal = api .column(6, { @@ -169,9 +178,17 @@ .data() .reduce((a, b) => intVal(a) + intVal(b), 0); + // total pesanan + totalPesanan = api + .column(5) + .data() + .reduce((a, b) => intVal(a) + intVal(b), 0); + // Update footer + api.column(5).footer().innerHTML = totalPesanan + ' Pesanan'; api.column(6).footer().innerHTML = 'Rp. ' + pageTotal.toString().replace(/\B(?=(\d{3})+(?!\d))/g, '.'); + api.column(7).footer().innerHTML = diskonTotal + ' %'; api.column(8).footer().innerHTML = 'Rp. ' + totalAll.toString().replace(/\B(?=(\d{3})+(?!\d))/g, '.'); }