Merge branch 'staging' into feature/senior-officer
This commit is contained in:
@@ -34,10 +34,10 @@ class BankDataController extends Controller
|
|||||||
if(isset($item->data_pembanding)){
|
if(isset($item->data_pembanding)){
|
||||||
$data_pembanding = json_decode($item->data_pembanding);
|
$data_pembanding = json_decode($item->data_pembanding);
|
||||||
foreach ($data_pembanding->data_pembanding as $dataPembanding) {
|
foreach ($data_pembanding->data_pembanding as $dataPembanding) {
|
||||||
$lat = trim($dataPembanding->kordinat_lat);
|
$lat = $dataPembanding->kordinat_lat;
|
||||||
$lng = trim($dataPembanding->kordinat_lng);
|
$lng = $dataPembanding->kordinat_lng;
|
||||||
|
|
||||||
if (!empty($lat) && !empty($lng)) {
|
if (!empty($lat) && !empty($lng) && $lng !== null && $lat !== null && $lat !== '' && $lng !== '') {
|
||||||
$lat = floatval($lat);
|
$lat = floatval($lat);
|
||||||
$lng = floatval($lng);
|
$lng = floatval($lng);
|
||||||
|
|
||||||
@@ -48,15 +48,15 @@ class BankDataController extends Controller
|
|||||||
'district_code' => $dataPembanding->district_code,
|
'district_code' => $dataPembanding->district_code,
|
||||||
'city_code' => $dataPembanding->city_code,
|
'city_code' => $dataPembanding->city_code,
|
||||||
'province_code' => $dataPembanding->province_code,
|
'province_code' => $dataPembanding->province_code,
|
||||||
'tahun' => $dataPembanding->tahun,
|
'tahun' => is_numeric($dataPembanding->tahun) ? $dataPembanding->tahun : 0,
|
||||||
'luas_tanah' => $dataPembanding->luas_tanah,
|
'luas_tanah' => is_numeric($dataPembanding->luas_tanah) ? $dataPembanding->luas_tanah : 0,
|
||||||
'luas_bangunan' => $dataPembanding->luas_bangunan,
|
'luas_bangunan' => is_numeric($dataPembanding->luas_bangunan) ? $dataPembanding->luas_bangunan : 0,
|
||||||
'tahun_bangunan' => $dataPembanding->tahun_bangunan,
|
'tahun_bangunan' => is_numeric($dataPembanding->tahun_bangunan) ? $dataPembanding->tahun_bangunan : 0,
|
||||||
'status_nara_sumber' => $dataPembanding->status_nara_sumber,
|
'harga' => is_numeric($dataPembanding->harga) ? $dataPembanding->harga : 0,
|
||||||
'harga' => $dataPembanding->harga,
|
'harga_diskon' => is_numeric($dataPembanding->harga_diskon) ? $dataPembanding->harga_diskon : 0,
|
||||||
'harga_diskon' => $dataPembanding->harga_diskon,
|
'diskon' => is_numeric(str_replace(',', '.', $dataPembanding->diskon)) ? str_replace(',', '.', $dataPembanding->diskon) : 0,
|
||||||
'diskon' => str_replace(',','.',$dataPembanding->diskon),
|
'total' => is_numeric($dataPembanding->total) ? $dataPembanding->total : 0,
|
||||||
'total' => $dataPembanding->total,
|
'harga_penawaran' => is_numeric($dataPembanding->harga_penawaran) ? $dataPembanding->harga_penawaran : 0,
|
||||||
'nama_nara_sumber' => $dataPembanding->nama_nara_sumber,
|
'nama_nara_sumber' => $dataPembanding->nama_nara_sumber,
|
||||||
'peruntukan' => $dataPembanding->peruntukan,
|
'peruntukan' => $dataPembanding->peruntukan,
|
||||||
'penawaran' => $dataPembanding->penawaran,
|
'penawaran' => $dataPembanding->penawaran,
|
||||||
@@ -65,7 +65,6 @@ class BankDataController extends Controller
|
|||||||
'jenis_aset' => $dataPembanding->jenis_aset,
|
'jenis_aset' => $dataPembanding->jenis_aset,
|
||||||
'foto_objek' => $dataPembanding->foto_objek,
|
'foto_objek' => $dataPembanding->foto_objek,
|
||||||
'tanggal' => $dataPembanding->tanggal,
|
'tanggal' => $dataPembanding->tanggal,
|
||||||
'harga_penawaran' => $dataPembanding->harga_penawaran,
|
|
||||||
];
|
];
|
||||||
|
|
||||||
BankData::updateOrCreate(
|
BankData::updateOrCreate(
|
||||||
|
|||||||
Reference in New Issue
Block a user