fix skit2

This commit is contained in:
fifi97
2022-03-06 11:06:07 +08:00
parent 28f601252c
commit 6ac338a38a
3 changed files with 359 additions and 37 deletions
+101 -31
View File
@@ -1029,7 +1029,7 @@ class AdminPageController extends Controller
break;
case 2: $bulan = 'Februari';
break;
case 3: $bulan = 'March';
case 3: $bulan = 'Mac';
break;
case 4: $bulan = 'April';
break;
@@ -1122,7 +1122,7 @@ class AdminPageController extends Controller
break;
case 2: $bulan = 'Februari';
break;
case 3: $bulan = 'March';
case 3: $bulan = 'Mac';
break;
case 4: $bulan = 'April';
break;
@@ -1214,14 +1214,48 @@ class AdminPageController extends Controller
->orderBy('t_tebus','asc')
->sum('bakiupah');
$upahlatest = $lelongupahsimpan + $tebus;
$advansur = Advansur::on($cawangan['mysql'])
->selectRaw('SUM(upahDibayar) AS total')
->whereYear('tarikh',$current->year)
->where([['tarikh','<=',$harini],['tarikh','>=',$monthly_date]])
->sum('upahDibayar');
$ansuran = Transaction::on('mysql7')
->selectRaw('SUM(trans.bayaran_keuntungan) AS total')
->whereYear('transaction.created_at',$current->year)
->leftJoin('transaksi_keuntungan as trans', function($join)
{
$join->on('transaction.norujukan', '=', 'trans.norujukan');
$join->on('transaction.created_at', '=', 'trans.tarikh_bayaran');
})
->where('transaction.trans_type','=','A')
->where([['trans.tarikh_bayaran','>=',$monthly_date . ' 00:00:00'],['trans.tarikh_bayaran','<=',$harini. ' 23:59:59']])
->where('trans.kodcaw','=',$request->kodcaw)
->sum('trans.bayaran_keuntungan');
$tebus_upah_tawarruq = Transaction::on('mysql7')
->selectRaw('SUM(trans.keuntungan_rebet) AS total')
->whereYear('transaction.created_at',$current->year)
->leftJoin('transaksi_keuntungan as trans', function($join)
{
$join->on('transaction.norujukan', '=', 'trans.norujukan');
$join->on('transaction.created_at', '=', 'trans.tarikh_bayaran');
})
->where('transaction.trans_type','!=','A')
->where([['trans.tarikh_bayaran','>=',$monthly_date . ' 00:00:00'],['trans.tarikh_bayaran','<=',$harini . ' 23:59:59']])
->where('trans.kodcaw','=',$request->kodcaw)
->sum('trans.keuntungan_rebet');
$upahlatest = $lelongupahsimpan + $tebus + $ansuran + $advansur + $tebus_upah_tawarruq;
switch($current->month){
case 1: $bulan = 'Januari';
break;
case 2: $bulan = 'Februari';
break;
case 3: $bulan = 'March';
case 3: $bulan = 'Mac';
break;
case 4: $bulan = 'April';
break;
@@ -1686,7 +1720,7 @@ class AdminPageController extends Controller
return response()->json($arraykelulusan,200);
}
public function showOneCustomerGadai($ic,$status){
public function showOneCustomerGadai($ic,$status,Request $request){
if($status == 'belum_tebus'){
$gadai_status = '';
}elseif($status == 'sudah_tebus'){
@@ -1697,37 +1731,73 @@ class AdminPageController extends Controller
$cawangan_all = Cawangan::on('mysql7')->get();
$gadai_all = [];
foreach($cawangan_all as $index=>$cawangan){
if($status == 'belum_tebus' || $status == 'sudah_tebus'){
if($status == 'sudah_tebus')
{
$gadai = Gadai::on($cawangan['mysql'])
->join('tebus', 'gadai.norujukan', '=', 'tebus.norujukan')
->where([['gadai.sttebus','=',$gadai_status],['gadai.nokp','=',$ic]])
->orderBy('tebus.t_tebus','desc')
if(isset($request->search))
{
foreach($cawangan_all as $index=>$cawangan){
if($status == 'belum_tebus' || $status == 'sudah_tebus'){
if($status == 'sudah_tebus')
{
$gadai = Gadai::on($cawangan['mysql'])
->join('tebus', 'gadai.norujukan', '=', 'tebus.norujukan')
->where([['gadai.norujukan','LIKE',"%{$request->search}%"],['gadai.sttebus','=',$gadai_status],['gadai.nokp','=',$ic]])
->orderBy('tebus.t_tebus','desc')
->get()->toArray();
}else{
$gadai = Gadai::on($cawangan['mysql'])
->where([['norujukan','LIKE',"%{$request->search}%"],['sttebus','=',$gadai_status],['nokp','=',$ic]])
->orderBy('t_gadai','desc')
->get()->toArray();
}
if(sizeof($gadai) != 0){
$gadai_all += $gadai;
}
}elseif($status == 'lelong'){
$gadai = Gadai::on($cawangan['mysql'])
->where([['norujukan','LIKE',"%{$request->search}%"],['sttebus','=',$gadai_status],['nokp','=',$ic]])
->rightJoin('lelong', 'gadai.norujukan', '=', 'lelong.norujukan')
->get()->toArray();
}else{
$gadai = Gadai::on($cawangan['mysql'])
if(sizeof($gadai) != 0){
$gadai_all += $gadai;
}
}
}
}else{
foreach($cawangan_all as $index=>$cawangan){
if($status == 'belum_tebus' || $status == 'sudah_tebus'){
if($status == 'sudah_tebus')
{
$gadai = Gadai::on($cawangan['mysql'])
->join('tebus', 'gadai.norujukan', '=', 'tebus.norujukan')
->where([['gadai.sttebus','=',$gadai_status],['gadai.nokp','=',$ic]])
->orderBy('tebus.t_tebus','desc')
->get()->toArray();
}else{
$gadai = Gadai::on($cawangan['mysql'])
->where([['sttebus','=',$gadai_status],['nokp','=',$ic]])
->orderBy('t_gadai','desc')
->get()->toArray();
}
if(sizeof($gadai) != 0){
$gadai_all += $gadai;
}
}elseif($status == 'lelong'){
$gadai = Gadai::on($cawangan['mysql'])
->where([['sttebus','=',$gadai_status],['nokp','=',$ic]])
->orderBy('t_gadai','desc')
->rightJoin('lelong', 'gadai.norujukan', '=', 'lelong.norujukan')
->get()->toArray();
if(sizeof($gadai) != 0){
$gadai_all += $gadai;
}
}
}
if(sizeof($gadai) != 0){
$gadai_all += $gadai;
}
}elseif($status == 'lelong'){
$gadai = Gadai::on($cawangan['mysql'])
->where([['sttebus','=',$gadai_status],['nokp','=',$ic]])
->rightJoin('lelong', 'gadai.norujukan', '=', 'lelong.norujukan')
->get()->toArray();
if(sizeof($gadai) != 0){
$gadai_all += $gadai;
}
}
}
$data = $this->paginate($gadai_all);
return response()->json($data);