diff --git a/.DS_Store b/.DS_Store index bbbc4d5..b985113 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/.gitignore b/.gitignore index 89ac166..7d5a7d3 100644 --- a/.gitignore +++ b/.gitignore @@ -7,4 +7,5 @@ Homestead.yaml ray.php /docker_src /.vscode -**/.DS_Store \ No newline at end of file +**/.DS_Store +db-dump \ No newline at end of file diff --git a/app/Http/Controllers/VaultController.php b/app/Http/Controllers/VaultController.php index 04f3290..03490f9 100644 --- a/app/Http/Controllers/VaultController.php +++ b/app/Http/Controllers/VaultController.php @@ -400,12 +400,14 @@ class VaultController extends Controller } + $bakiakhirVault = $vault ? $vault['bakiakhir'] : 0; + if($total != 0) { - $totalbakiakhirtunai = $vault['bakiakhir'] + $total; + $totalbakiakhirtunai = $bakiakhirVault + $total; }else { - $totalbakiakhirtunai = $vault['bakiakhir']; + $totalbakiakhirtunai = $bakiakhirVault; } return response()->json($totalbakiakhirtunai);