diff --git a/public/assets/admin/js/chart/income-by-barber.js b/public/assets/admin/js/chart/income-by-barber.js index 6a21299..24ddb0c 100644 --- a/public/assets/admin/js/chart/income-by-barber.js +++ b/public/assets/admin/js/chart/income-by-barber.js @@ -3,7 +3,6 @@ let incomeByBarberCtx = document.getElementById('incomeByBarberChart').getContex let incomeByBarberLabels = incomeByBarber.map(incomeByBarber => incomeByBarber.biography.full_name); let incomeByBarberData = incomeByBarber.map(incomeByBarber => incomeByBarber.transactions_sum_total); -console.log(incomeByBarberLabels, incomeByBarberData) let incomeByBarberBackgroundColors = incomeByBarberData.map(() => getRandomColor()); let incomeByBarberBorderColors = incomeByBarberBackgroundColors.map(color => color.replace('0.2', '1')); diff --git a/public/assets/admin/js/filter.js b/public/assets/admin/js/filter.js index fafe376..ee06ed3 100644 --- a/public/assets/admin/js/filter.js +++ b/public/assets/admin/js/filter.js @@ -24,7 +24,7 @@ $(document).ready(function () { }, success: function (response) { $("#total-asset").text(formatToRupiah(response.data.totalAsset)); - $("#net-income").text(formatToRupiah(response.data.totalIncome + response.data.totalExpense)); + $("#net-income").text(formatToRupiah(response.data.totalIncome - response.data.totalExpense)); $("#total-barber").text(response.data.totalBarber); $("#total-user").text(response.data.totalUser); $("#top-barber-name").text(response.data.topBarber.biography.full_name || "-deleted-"); diff --git a/resources/views/pages/admin/dashboard/analytic.blade.php b/resources/views/pages/admin/dashboard/analytic.blade.php index 1b40418..ecb62b1 100644 --- a/resources/views/pages/admin/dashboard/analytic.blade.php +++ b/resources/views/pages/admin/dashboard/analytic.blade.php @@ -279,7 +279,7 @@ class="feather feather-user-minus font-success"> - + - + @endsection