update simulasi (hapus simulasi)

This commit is contained in:
Nur Izzati Zulkifli
2022-07-20 22:43:46 +08:00
parent ae8df91bda
commit 1bc7f11710
7 changed files with 292 additions and 15 deletions
+52 -1
View File
@@ -9,6 +9,7 @@ use Illuminate\Support\Facades\Auth;
use App\Models\Lelong;
use App\Models\CawanganLelong;
use App\Models\Pengesahan;
use Carbon\Carbon;
class HomeController extends Controller
@@ -54,7 +55,30 @@ class HomeController extends Controller
}//dd($detailsinfo);
return view('home',compact('lelong', 'arrayinfo'));
$arrayinfomutu = [];
//HOME KELULUSAN MUTU MARHUN
$lelongmutu = pengesahan::join('lelong','lelong.id','=','pengesahan.lelong_id')
// ->where('sts_lelong', 0)
->whereIn('pengesahan.status_ubah', [1,2,3,4,5])
->where('disahkan_oleh','=', NULL)
->select('pengesahan.lelong_id','lelong.id','lelong.tarikh_lelong','lelong.masatamat_lelong','lelong.harga_emas_asas','lelong.jbg','lelong.cajlelong','sts_lelong')
// ->groupBy('pengesahan.lelong_id')
->distinct()
->get()
->toArray();
// dd($lelong);
foreach($lelongmutu as $infomutu)
{
$detailsinfo = CawanganLelong::join('cawangan','cawangan_lelong.caw_id','=','cawangan.id')
->where('lelong_id',$infomutu['lelong_id'])
->get()
->toArray();
array_push($arrayinfomutu,['info'=>$infomutu, 'detailsinfo'=>$detailsinfo]);
}
return view('home',compact('lelongmutu', 'arrayinfomutu'));
}
public function about()
@@ -63,4 +87,31 @@ class HomeController extends Controller
// $user->assignRole('admin');
return view('about');
}
public function senarailelongubahmutu()
{
$arrayinfo = [];
$lelong = pengesahan::join('lelong','lelong.id','=','pengesahan.lelong_id')
// ->where('sts_lelong', 0)
->whereIn('pengesahan.status_ubah', [1,2,3,4,5])
->select('pengesahan.lelong_id','lelong.id','lelong.tarikh_lelong','lelong.masatamat_lelong','lelong.harga_emas_asas','lelong.jbg','lelong.cajlelong','sts_lelong')
// ->groupBy('pengesahan.lelong_id')
->distinct()
->get()
->toArray();
dd($lelong);
foreach($lelong as $info)
{
$detailsinfo = CawanganLelong::join('cawangan','cawangan_lelong.caw_id','=','cawangan.id')
->where('lelong_id',$info['lelong_id'])
->get()
->toArray();
array_push($arrayinfo,['info'=>$info, 'detailsinfo'=>$detailsinfo]);
}
return view('home',compact('lelong', 'arrayinfo'));
}
}
+1 -1
View File
@@ -669,7 +669,7 @@ class MarhunController extends Controller
'lelongbid.bakiupah',
'lelongbid.cajlelong',
'lelongbid.baki',
'lelongbid.percent',
'lelongbid.percent'
// 'gadaimarhun.harga',
// 'gadaimarhun.id as idgadaimarhun'
)
+42 -4
View File
@@ -867,13 +867,35 @@ class SimulasiController extends Controller
public function deletemarhunlel(Request $request){
// dd($request->checkboxdata);
$user = Auth::user();
$currentdate = Carbon::now();
$currentdate = $currentdate->toDateTimeString();
$data = $request->checkboxdata;
foreach($data as $index=>$norujukan)
{
{
$cawangan = Cawangan::where('id','=',$request->cawid)->first();
// dd($cawangan->caw_code);
$marhun = SimulasiBid::where('norujukan','=',$norujukan)->first();
$marhun->delete();
$updategadai = Http::withOptions(['verify' => config('app.api_verify')])
->post(config('app.api_url').'taglel/revert',[
'kodcaw'=>$cawangan->caw_code,
'norujukan'=>$norujukan
])
->json();
//insert loguser
$loguser = new LogUser;
$loguser->user_id = $user->id;
$loguser->date = $currentdate;
$loguser->username = $user->username;
$loguser->nama_user = $user->name;
$loguser->norujukan = $norujukan;
$loguser->nota = $request->simulasi_id.' Hapus Simulasi' ;
$loguser->save();
}
return redirect()->route('analisa.senaraimarhunlel',['simulasi_id'=>$request->simulasi_id,'cawid'=>$request->cawid])
@@ -1056,8 +1078,23 @@ class SimulasiController extends Controller
$senarai = Gadai::on($details)
->where('norujukan', $surats['norujukan'])
->get();
//dd($senarai);
// dd($surats['tempoh']);
$total_untung_rebet = TransaksiKeuntungan::on('main')->where('norujukan','=',$surats['norujukan'])->sum('keuntungan_rebet');
$total_untung_asal = TransaksiKeuntungan::on('main')->where('norujukan','=',$surats['norujukan'])->sum('bayaran_keuntungan');
$beza_keuntungan = $total_untung_asal - $total_untung_rebet;
// dd($beza_keuntungan);
$keuntungan = bcdiv(($surats['tempoh']-$surats['tempohbayar'])*$surats['kadarupah']/100*$surats['bakipjm'],1,1)-$beza_keuntungan;
// dd($surats['hargajualan']);
$ktlhbyr = $surats['hargajualan']-$surats['bakihargajualan'];
// dd($ktlhbyr);
$getsurat[$index1]['list_norujukan'] = $senarai;
$getsurat[$index1]['keuntungan'] = $keuntungan;
$getsurat[$index1]['ktlhbyr'] = $ktlhbyr;
}
// $keuntungantlhbyr = TransaksiKeuntungan::on('mysql2')
@@ -1066,8 +1103,9 @@ class SimulasiController extends Controller
return view('simulasi.tempbycawsimulasi', compact( 'getsurat',
'details',
'senarai',
't_gadais'
'keuntungan',
't_gadais',
'ktlhbyr'
));
}