diff --git a/app/Http/Controllers/CustomerController.php b/app/Http/Controllers/CustomerController.php index b62fb67..2064f33 100644 --- a/app/Http/Controllers/CustomerController.php +++ b/app/Http/Controllers/CustomerController.php @@ -218,8 +218,8 @@ class CustomerController extends Controller array_push($sttebus_, array( 'norujukan' => $gd->norujukan, - 'pinjaman' => number_format($gd->pinjaman,2), - 't_gadai' => $gd->t_gadai, + 'pembiayaan' => number_format($gd->pinjaman,2), + 'tarikhgadai' => $gd->t_gadai, 'hargajualan' => $gd->hargajualan, 'bakihargajualan' => $gd->bakihargajualan, )); @@ -229,8 +229,8 @@ class CustomerController extends Controller { array_push($sttebus_T, array( 'norujukan' => $gd->norujukan, - 'pinjaman' => number_format($gd->pinjaman,2), - 't_gadai' => $gd->t_gadai, + 'pembiayaan' => number_format($gd->pinjaman,2), + 'tarikhgadai' => $gd->t_gadai, 'hargajualan' => $gd->hargajualan, 'bakihargajualan' => $gd->bakihargajualan, )); @@ -240,8 +240,8 @@ class CustomerController extends Controller { array_push($sttebus_L, array( 'norujukan' => $gd->norujukan, - 'pinjaman' => number_format($gd->pinjaman,2), - 't_gadai' => $gd->t_gadai, + 'pembiayaan' => number_format($gd->pinjaman,2), + 'tarikhgadai' => $gd->t_gadai, 'hargajualan' => $gd->hargajualan, 'bakihargajualan' => $gd->bakihargajualan, )); diff --git a/app/Http/Controllers/HargaEmasController.php b/app/Http/Controllers/HargaEmasController.php index 6c6adc6..5e2c1ac 100644 --- a/app/Http/Controllers/HargaEmasController.php +++ b/app/Http/Controllers/HargaEmasController.php @@ -76,7 +76,7 @@ class HargaEmasController extends Controller $emas = HargaEmas::on('mysql7')->orderby('recno')->get(); $hargaemas = []; foreach($emas as $index=>$harga){ - array_push($hargaemas,['mutu_emas'=>$harga['keterangan'],'karat'=>$harga['karat'],'harga'=>$harga['harga']]); + array_push($hargaemas,['mutu'=>$harga['keterangan'],'karat'=>$harga['karat'],'harga'=>$harga['harga']]); } return response()->json($hargaemas); }