KoPKB/api_arrahn
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'kaktie' into 'master'

Browse Source 
update mutu dan gadaitebuslelongmobile

See merge request online-sistem1/api_arrahn!34
This commit is contained in:
Zakwan Hamdan
2021-02-08 04:17:55 +00:00
parent 4ec0a6cf92 e6463f5e6d
commit fe43ed3ab2
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/CustomerController.php
+6 -6
View File
@@ -218,8 +218,8 @@ class CustomerController extends Controller
array_push($sttebus_, array( array_push($sttebus_, array(
'norujukan' => $gd->norujukan, 'norujukan' => $gd->norujukan,
'pinjaman' => number_format($gd->pinjaman,2), 'pembiayaan' => number_format($gd->pinjaman,2),
't_gadai' => $gd->t_gadai, 'tarikhgadai' => $gd->t_gadai,
'hargajualan' => $gd->hargajualan, 'hargajualan' => $gd->hargajualan,
'bakihargajualan' => $gd->bakihargajualan, 'bakihargajualan' => $gd->bakihargajualan,
)); ));
@@ -229,8 +229,8 @@ class CustomerController extends Controller
{ {
array_push($sttebus_T, array( array_push($sttebus_T, array(
'norujukan' => $gd->norujukan, 'norujukan' => $gd->norujukan,
'pinjaman' => number_format($gd->pinjaman,2), 'pembiayaan' => number_format($gd->pinjaman,2),
't_gadai' => $gd->t_gadai, 'tarikhgadai' => $gd->t_gadai,
'hargajualan' => $gd->hargajualan, 'hargajualan' => $gd->hargajualan,
'bakihargajualan' => $gd->bakihargajualan, 'bakihargajualan' => $gd->bakihargajualan,
)); ));
@@ -240,8 +240,8 @@ class CustomerController extends Controller
{ {
array_push($sttebus_L, array( array_push($sttebus_L, array(
'norujukan' => $gd->norujukan, 'norujukan' => $gd->norujukan,
'pinjaman' => number_format($gd->pinjaman,2), 'pembiayaan' => number_format($gd->pinjaman,2),
't_gadai' => $gd->t_gadai, 'tarikhgadai' => $gd->t_gadai,
'hargajualan' => $gd->hargajualan, 'hargajualan' => $gd->hargajualan,
'bakihargajualan' => $gd->bakihargajualan, 'bakihargajualan' => $gd->bakihargajualan,
)); ));
app/Http/Controllers/HargaEmasController.php
+1 -1
View File
@@ -76,7 +76,7 @@ class HargaEmasController extends Controller
$emas = HargaEmas::on('mysql7')->orderby('recno')->get(); $emas = HargaEmas::on('mysql7')->orderby('recno')->get();
$hargaemas = []; $hargaemas = [];
foreach($emas as $index=>$harga){ 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); return response()->json($hargaemas);
} }