diff --git a/app/Http/Controllers/CustomerController.php b/app/Http/Controllers/CustomerController.php index c79965f..24de4c8 100644 --- a/app/Http/Controllers/CustomerController.php +++ b/app/Http/Controllers/CustomerController.php @@ -209,36 +209,23 @@ class CustomerController extends Controller if(!empty($marhun)) { - foreach($marhun as $mar){ - - // if($mar->sttebus_ == '' || empty($mar->sttebus_ )){ + foreach($marhun as $mar) + { - // foreach($arrayData as $data) - // { - // dd($data['norujukan']); - // dd($mar['norujukan'] .' also data norujukan '. $data['norujukan']); - // if($data['norujukan'] == $mar['norujukan']) - // { - array_push($barang, array( - 'descpt' => $mar->descpt, - 'berat' => $mar->berat, - 'karat' => $mar->karat, - 'n_marhuns' => $mar->n_marhuns, - )); - // } - // } - - // } + array_push($barang, array( + 'descpt' => $mar->descpt, + 'berat' => $mar->berat, + 'karat' => $mar->karat, + 'n_marhuns' => $mar->n_marhuns, + )); } - - } return $barang; - } - public function gadaiTebusLelongByCawanganMobile($ic,$kodcaw){ + public function gadaiTebusLelongByCawanganMobile($ic,$kodcaw) + { $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); $sttebus_ = []; @@ -249,17 +236,15 @@ class CustomerController extends Controller $gadai = Gadai::on($cawangan['mysql']) ->where([['nokp','=',$ic]]) ->get(); - // dd($gadai); - //to check if gadai has data + if(!empty($gadai)) { - //loop each array - foreach($gadai as $gd){ - if($gd->sttebus == '' || empty($gd->sttebus)){ + foreach($gadai as $gd) + { - // $test = $this->marhun($cawangan, $gd->norujukan); - // $gd->t_gadai = null; + if($gd->sttebus == '' || empty($gd->sttebus)) + { array_push($sttebus_, array( 'norujukan' => $gd->norujukan, @@ -270,14 +255,9 @@ class CustomerController extends Controller 'barang' => $this->marhun($cawangan, $gd->norujukan) ?? ' tiada data', )); - // dd($sttebus_); - } elseif($gd->sttebus == 'T') { - // dd('masuk dalam T'); - $testT = $this->marhun($cawangan, $gd->norujukan); - array_push($sttebus_T, array( 'norujukan' => $gd->norujukan, 'pembiayaan' => number_format($gd->pinjaman,2), @@ -286,13 +266,9 @@ class CustomerController extends Controller 'bakihargajualan' => $gd->bakihargajualan, 'barang' => $this->marhun($cawangan, $gd->norujukan) ?? ' tiada data', )); - - // dd($sttebus_T); } elseif($gd->sttebus == 'L') - { dd('masuk dalam L'); - $testL = $this->marhun($cawangan, $gd->norujukan); - + { array_push($sttebus_L, array( 'norujukan' => $gd->norujukan, 'pembiayaan' => number_format($gd->pinjaman,2), @@ -314,84 +290,8 @@ class CustomerController extends Controller 'gadai' => $sttebus_, 'tebus' => $sttebus_T, 'lelong' => $sttebus_L, - )); + )); - - dd($array_all); - // $norujukanarray = array_column($sttebus_, 'norujukan'); - // $norujukanarrayT = array_column($sttebus_T, 'norujukan'); - // $norujukanarrayL = array_column($sttebus_L, 'norujukan'); - - // //bismillah - // $test = $this->marhun($cawangan, $norujukanarray, $sttebus_); - // dd($test); - - // // $norujukancompact = array(array($sttebus_, 'norujukan'),array($sttebus_T, 'norujukan'),array($sttebus_L, 'norujukan')); - // // $norujukanarray = array_column($norujukancompact, 'norujukan'); - // // dd($norujukanarray); - // $marhun = Marhun::on($cawangan['mysql']) - // ->where([['norujukan','=',$norujukanarray]]) - // ->rightJoin('jemas','marhun.marhun', '=', 'jemas.marhun') - // ->get(); - // $marhun = Marhun::on($cawangan['mysql']) - // ->where([['norujukan','=',$norujukanarrayT]]) - // ->rightJoin('jemas','marhun.marhun', '=', 'jemas.marhun') - // ->get(); - // dd($marhun); - - // if(!empty($marhun)) - // { - // //loop each array - // foreach($marhun as $mar){ - - // if($mar->sttebus == '' || empty($mar->sttebus )){ - - - // array_push($sttebus_, array( - // 'norujukan' => $mar->norujukan, - // 'descpt' => $mar->descpt, - // 'berat' => $mar->berat, - // 'karat' => $mar->karat, - // 'n_marhuns' => $mar->n_marhuns, - // )); - - // } - // elseif($mar->sttebus == 'T') - // { - // array_push($sttebus_T, array( - // 'norujukan' => $mar->norujukan, - // 'descpt' => $mar->descpt, - // 'berat' => $mar->berat, - // 'karat' => $mar->karat, - // 'n_marhuns' => $mar->n_marhuns, - // )); - - // } - // elseif($mar->sttebus == 'L') - // { - // array_push($sttebus_L, array( - // 'norujukan' => $mar->norujukan, - // 'descpt' => $mar->descpt, - // 'berat' => $mar->berat, - // 'karat' => $mar->karat, - // 'n_marhuns' => $mar->n_marhuns, - // )); - - // } - // } - // } - // else - // { - // return response()->json('Data Not Found'); - // } dd($sttebus_T); - - // array_push($array_all, array( - // 'gadai' => $sttebus_, - // 'tebus' => $sttebus_T, - // 'lelong' => $sttebus_L, - // )); - - return response()->json($array_all); }