Merged in amirah_wtd (pull request #2)

pdf/excel wtd dalam proses
This commit is contained in:
nur amirah zulkipli
2023-07-24 08:08:06 +00:00
2 changed files with 81 additions and 0 deletions
@@ -2392,6 +2392,86 @@ class AdminPageController extends Controller
}
public function rekodWTDDalamProses(Request $request){
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first();
$wtdnorujukan = WTDDraft::on('mysql7')->where('batchno_serah',$request->batchno)
->where('kodcaw','=',$request->kodcaw)
->orderBy('norujukan','ASC')
->get();
$pluck_norujukan = $wtdnorujukan->pluck('norujukan');
$lelongs = Lelong::on($cawangan['mysql'])
->whereIn('lelong.norujukan',$pluck_norujukan)
->join('gadai','lelong.norujukan','=','gadai.norujukan')
->select('nokp', 'lelong.norujukan','lelong.t_jual','lelong.hargajual','lelong.gst_hj','lelong.pinjaman','lelong.bakiupah','lelong.cajlelong','lelong.gst_cl','lelong.cajlain','lelong.baki')
->orderBy('lelong.norujukan','ASC')
->get();
$pluck_nokp = $lelongs->pluck('nokp');
// dd($pluck_nokp);
$customers = Customer::on('mysql7')
->whereIn('kpbaru', $pluck_nokp)
->orWhereIn('kplama', $pluck_nokp)
->select('nama','kpbaru','kplama')
->get();
// dd($pluck_nokp, $customers->toArray());
$gadai_all_keyBy_norujukan = $lelongs->keyBy('norujukan');
$gadai_all_keyBy_nokp = $gadai_all_keyBy_norujukan->keyBy('nokp');
foreach($customers as $index=> $customer){
if($customer->kpbaru != ''){
$customers[$index]['nokp'] = $customer->kpbaru;
}
elseif($customer->kplama != ''){
$customers[$index]['nokp'] = $customer->kplama;
}
}
// dd($customers);
$customer_keyBy_nokp = $customers->keyBy('nokp');
// dd($customer_keyBy_nokp->toArray(),$customers->toArray());
foreach($lelongs as $index=>$lelong){
// dd($gadai_all_keyBy_nokp, $lelong->nokp,$gadai_all_keyBy_nokp[$lelong->nokp] );
$lelongs[$index]['customer'] = $customer_keyBy_nokp[$lelong->nokp]->toArray();
// dd($lelong->toArray());
}
// dd($lelongs->toArray());
return response()->json($lelongs,200);
}
public function RangeBakiLelong($kodcaw,Request $request){
$current = Carbon::now();
+1
View File
@@ -733,6 +733,7 @@ $router->group(['prefix'=>'admin'], function () use ($router){
$router->get('wtd/rekod',['uses'=>'AdminPageController@rekodWTD']);
$router->get('wtd/rekod/{batchno}',['uses'=>'AdminPageController@rekodWTDByBatchNo']);
$router->post('wtd/delete',['uses'=>'AdminPageController@RemoveDraftWTD']);
$router->get('wtd/dalamproses',['uses'=>'AdminPageController@rekodWTDDalamProses']);
$router->get('audit/keuntungansebenar',['uses'=>'AdminPageController@KeuntunganSebenarExport']);
$router->get('laporan/aging',['uses'=>'AdminPageController@LaporanAging']);