Merge branch 'apiaku' of https://gitlab.com/online-sistem1/api_arrahn into apiaku
This commit is contained in:
MUHD HAFIFIE
@@ -1140,8 +1140,6 @@ class GadaiController extends Controller
|
||||
//////////////////
|
||||
|
||||
$daterequest = new Carbon($tarikh);
|
||||
$dateselepas = $daterequest;
|
||||
$dateselepas->addDays(1);
|
||||
|
||||
$ansuran1 = TransaksiKeuntungan::on('mysql7')
|
||||
->leftJoin('transaction as trans', function($join)
|
||||
@@ -1150,7 +1148,7 @@ class GadaiController extends Controller
|
||||
$join->on('transaksi_keuntungan.tarikh_bayaran', '=', 'trans.created_at');
|
||||
})
|
||||
->join($cawangan['db_name'].'.gadai as db2','trans.norujukan','=','db2.norujukan')
|
||||
->where('trans.created_at','<',$dateselepas)
|
||||
->where('trans.created_at','<',$daterequest)
|
||||
->where('trans.trans_type','=','A')
|
||||
->whereBetween('nilaimarhun', [1, 400.99])
|
||||
->groupBy('trans.id')
|
||||
@@ -1163,7 +1161,8 @@ class GadaiController extends Controller
|
||||
$join->on('transaksi_keuntungan.tarikh_bayaran', '=', 'trans.created_at');
|
||||
})
|
||||
->join($cawangan['db_name'].'.gadai as db2','trans.norujukan','=','db2.norujukan')
|
||||
->where('trans.created_at','<',$dateselepas)
|
||||
// ->where('trans.created_at','=',$daterequest)
|
||||
->whereDate('trans.created_at','=',$tarikh)
|
||||
->where('trans.trans_type','=','A')
|
||||
->whereBetween('nilaimarhun', [1, 400.99])
|
||||
->groupBy('trans.id')
|
||||
@@ -1176,7 +1175,7 @@ class GadaiController extends Controller
|
||||
$join->on('transaksi_keuntungan.tarikh_bayaran', '=', 'trans.created_at');
|
||||
})
|
||||
->join($cawangan['db_name'].'.gadai as db2','trans.norujukan','=','db2.norujukan')
|
||||
->where('trans.created_at','<',$dateselepas)
|
||||
->where('trans.created_at','<',$daterequest)
|
||||
->where('trans.trans_type','=','A')
|
||||
->whereBetween('nilaimarhun', [401, 2000.99])
|
||||
->groupBy('trans.id')
|
||||
@@ -1189,12 +1188,12 @@ class GadaiController extends Controller
|
||||
$join->on('transaksi_keuntungan.tarikh_bayaran', '=', 'trans.created_at');
|
||||
})
|
||||
->join($cawangan['db_name'].'.gadai as db2','trans.norujukan','=','db2.norujukan')
|
||||
->where('trans.created_at','<',$dateselepas)
|
||||
->whereDate('trans.created_at','=',$tarikh)
|
||||
->where('trans.trans_type','=','A')
|
||||
->whereBetween('nilaimarhun', [401, 2000.99])
|
||||
->groupBy('trans.id')
|
||||
->get();
|
||||
|
||||
|
||||
$ansuran3 = TransaksiKeuntungan::on('mysql7')
|
||||
->leftJoin('transaction as trans', function($join)
|
||||
{
|
||||
@@ -1202,7 +1201,7 @@ class GadaiController extends Controller
|
||||
$join->on('transaksi_keuntungan.tarikh_bayaran', '=', 'trans.created_at');
|
||||
})
|
||||
->join($cawangan['db_name'].'.gadai as db2','trans.norujukan','=','db2.norujukan')
|
||||
->where('trans.created_at','<',$dateselepas)
|
||||
->where('trans.created_at','<',$daterequest)
|
||||
->where('trans.trans_type','=','A')
|
||||
->whereBetween('nilaimarhun', [2001, 100000])
|
||||
->groupBy('trans.id')
|
||||
@@ -1215,7 +1214,7 @@ class GadaiController extends Controller
|
||||
$join->on('transaksi_keuntungan.tarikh_bayaran', '=', 'trans.created_at');
|
||||
})
|
||||
->join($cawangan['db_name'].'.gadai as db2','trans.norujukan','=','db2.norujukan')
|
||||
->where('trans.created_at','<',$dateselepas)
|
||||
->whereDate('trans.created_at','=',$tarikh)
|
||||
->where('trans.trans_type','=','A')
|
||||
->whereBetween('nilaimarhun', [2001, 100000])
|
||||
->groupBy('trans.id')
|
||||
@@ -1223,34 +1222,67 @@ class GadaiController extends Controller
|
||||
|
||||
//Calculation Ansuran guna foreach
|
||||
|
||||
$totalans1 = 0;
|
||||
$countans1 = 0;
|
||||
$totalans1 = 0;$totalharinians1 = 0;
|
||||
$countans1 = 0;$countharinians1 = 0;
|
||||
foreach($ansuran1 as $ans1)
|
||||
{
|
||||
$totalans1 += $ans1['bayaran_pembiayaan'];
|
||||
$countans1++;
|
||||
}
|
||||
|
||||
$arrayans1 = ['bil' => $countans1, 'pinj' => $totalans1];
|
||||
|
||||
$totalans2 = 0;
|
||||
$countans2 = 0;
|
||||
foreach($ansuranharini1 as $ansharini1)
|
||||
{
|
||||
$totalharinians1 += $ansharini1['bayaran_pembiayaan'];
|
||||
$countharinians1 ++;
|
||||
}
|
||||
|
||||
$arrayharinians1 = ['bil' => $countharinians1, 'pinj' => $totalharinians1];
|
||||
|
||||
//End 1
|
||||
|
||||
|
||||
$totalans2 = 0;$totalharinians2 = 0;
|
||||
$countans2 = 0;$countharinians2 = 0;
|
||||
foreach($ansuran2 as $ans2)
|
||||
{
|
||||
$totalans2 += $ans2['bayaran_pembiayaan'];
|
||||
$countans2++;
|
||||
}
|
||||
|
||||
$totalans3 = 0;
|
||||
$countans3 = 0;
|
||||
$arrayans2 = ['bil' => $countans2, 'pinj' => $totalans2];
|
||||
|
||||
|
||||
foreach($ansuranharini2 as $ansharini2)
|
||||
{
|
||||
$totalharinians2 += $ansharini2['bayaran_pembiayaan'];
|
||||
$countharinians2 ++;
|
||||
}
|
||||
|
||||
$arrayharinians2 = ['bil' => $countharinians2, 'pinj' => $totalharinians2];
|
||||
|
||||
//End 2
|
||||
|
||||
$totalans3 = 0;$totalharinians3 = 0;
|
||||
$countans3 = 0;$countharinians3 = 0;
|
||||
foreach($ansuran3 as $ans3)
|
||||
{
|
||||
$totalans3 += $ans3['bayaran_pembiayaan'];
|
||||
$countans3++;
|
||||
}
|
||||
|
||||
$arrayans3 = ['bil' => $countans3, 'pinj' => $totalans3];
|
||||
|
||||
return;
|
||||
|
||||
|
||||
foreach($ansuranharini3 as $ansharini3)
|
||||
{
|
||||
$totalharinians3 += $ansharini3['bayaran_pembiayaan'];
|
||||
$countharinians3 ++;
|
||||
}
|
||||
|
||||
$arrayharinians3 = ['bil' => $countharinians3, 'pinj' => $totalharinians3];
|
||||
|
||||
//End 3
|
||||
|
||||
|
||||
//////////////////
|
||||
@@ -1311,6 +1343,7 @@ class GadaiController extends Controller
|
||||
array_push($array_kawalanstok,["tebus1" => $tebus1, "tebus2" => $tebus2, "tebus3" => $tebus3,"tebusini1" => $tebusini1, "tebusini2" => $tebusini2, "tebusini3" => $tebusini3]);
|
||||
array_push($array_kawalanstok,["lelong1" => $lelong1, "lelong2" => $lelong2, "lelong3" => $lelong3,"lelongini1" => $lelongini1, "lelongini2" => $lelongini2, "lelongini3" => $lelongini3]);
|
||||
array_push($array_kawalanstok,["hapuskira1" => $hapuskira1, "hapuskira2" => $hapuskira2, "hapuskira3" => $hapuskira3,"hapuskiraini1" => $hapuskiraini1, "hapuskiraini2" => $hapuskiraini2, "hapuskiraini3" => $hapuskiraini3]);
|
||||
array_push($array_kawalanstok,["ans1" => $arrayans1, "ans2" => $arrayans2, "ans3" => $arrayans3,"ansini1" => $arrayharinians1, "ansini2" => $arrayharinians2, "ansini3" => $arrayharinians3]);
|
||||
return response()->json($array_kawalanstok);
|
||||
|
||||
}
|
||||
|
||||
@@ -53,6 +53,22 @@ class LaporanController extends Controller
|
||||
$panjar_tahunan = Panjar::on($cawangan['mysql'])->where([['tarikh','<=',$request->tarikh],['tarikh','>=',$firstDayYear]])->sum('bayaran');
|
||||
|
||||
//e
|
||||
/* Imbang Duga */
|
||||
|
||||
|
||||
|
||||
/* Stok Audit */
|
||||
|
||||
$stokaudit = Gadai::on($cawangan['mysql'])
|
||||
->where('tagpalsu','=',0)
|
||||
->where([['t_gadai','<=',$request->tarikh],['sttebus','=','']])
|
||||
->orWhere([['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh]])
|
||||
->sum('pinjaman');
|
||||
|
||||
/* Kawalan Stok */
|
||||
|
||||
|
||||
|
||||
|
||||
//f
|
||||
$data_lelong = Lelong::on($cawangan['mysql'])->where('t_jual','=',$request->tarikh)->get();
|
||||
@@ -120,7 +136,8 @@ class LaporanController extends Controller
|
||||
'total_keuntungan'=>$total_keuntungan,
|
||||
'total_upah'=>$total_upah,
|
||||
'petibesi_sistem'=>$petibesi_sistem,
|
||||
'petibesi_deno'=>$petibesi_deno
|
||||
'petibesi_deno'=>$petibesi_deno,
|
||||
'stokaudit'=>$stokaudit
|
||||
|
||||
]);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user