fix aliran tunai separuh

This commit is contained in:
hafifierahman
2021-03-24 16:18:31 +08:00
parent 0ce6f4495c
commit d86244657a
6 changed files with 137 additions and 53 deletions
+57 -32
View File
@@ -16,6 +16,7 @@ use App\Customer;
use App\Lelong;
use App\HapusKira;
use App\Parameter;
use App\Panjar;
use Illuminate\Http\Request;
@@ -548,22 +549,40 @@ class TebusController extends Controller
$keuntunganselepastawarruq = 0;
$keuntungansebelumtawarruq = 0;
if($request->tarikh >= '2021-03-15')
{
$keuntunganselepastawarruq = Tebus::on($cawangan['mysql'])
->where('t_tebus','<=',$request->tarikh)
->whereYear('t_tebus','=',$current->year)
->whereNotNull('rebate')
->sum('rebate');
}
$keuntungansebelumtawarruq = Tebus::on($cawangan['mysql'])
$keuntunganselepastawarruqrebate = Tebus::on($cawangan['mysql'])
->where('t_tebus','<=',$request->tarikh)
->where('t_tebus','>','2013-12-31')
->where('t_tebus','>=','2021-03-14')
->whereYear('t_tebus','=',$current->year)
->whereNotNull('rebate')
->sum('rebate');
$keuntunganselepastawarruqupah = Tebus::on($cawangan['mysql'])
->where('t_tebus','<=',$request->tarikh)
->where('t_tebus','>=','2021-03-14')
->whereYear('t_tebus','=',$current->year)
->whereNotNull('bakiupah')
->sum('bakiupah');
$upahtebus = Tebus::on($cawangan['mysql'])
->where([['t_tebus','<=',$request->tarikh],['t_tebus','>','2013-12-31']])
->whereYear('t_tebus','=',$current->year)
// ->whereNotNull('upahdibayar')
->sum('upahdibayar');
$upahlelong = Lelong::on($cawangan['mysql'])
->where([['t_jual','<=',$request->tarikh],['t_jual','>','2013-12-31']])
->whereYear('t_jual','=',$current->year)
->sum('bakiupah');
$upahansur = Advansur::on($cawangan['mysql'])
->where('tarikh','<=',$request->tarikh)
->whereYear('tarikh','=',$current->year)
->sum('upahdibayar');
$keuntungansebelumtawarruq = $upahtebus + $upahlelong + $upahansur;
$keuntunganselepastawarruq = $keuntunganselepastawarruqrebate + $keuntunganselepastawarruqupah;
$total = $keuntungansebelumtawarruq + $keuntunganselepastawarruq;
@@ -578,9 +597,8 @@ class TebusController extends Controller
$total = 0;
//Untung Rugi Terkumpul Sebelum 01.12.2013
$utgrugilama = imbangdugalama::on($cawangan['mysql'])
$utgrugilama = imbangdugalama::on($cawangan['mysql']) //--masuk
->sum('untung_t');
//Yuran Ahli
@@ -593,7 +611,7 @@ class TebusController extends Controller
->sum('yuranahli');
//Caj Lelong
$lelong = Lelong::on($cawangan['mysql'])
$lelong = Lelong::on($cawangan['mysql']) //--masuk
->whereNotNull('t_jual')
->where('t_jual','>','2013-12-31')
->whereYear('t_jual','<',$current->year)
@@ -603,31 +621,28 @@ class TebusController extends Controller
->sum('cajlelong_t');
// dd($current->year);
//Upah Simpan Tebus
$upahsimpantebus = Tebus::on($cawangan['mysql'])
$upahsimpantebus = Tebus::on($cawangan['mysql']) //--masuk
->where('t_tebus','>','2013-12-31')
->whereYear('t_tebus','<',$current->year)
->sum('upahdibayar');
//Upah Simpan Lelong
$upahsimpanlelong = Lelong::on($cawangan['mysql'])
$upahsimpanlelong = Lelong::on($cawangan['mysql']) //--masuk
->where('t_jual','>','2013-12-31')
->whereYear('t_jual','<',$current->year)
->sum('bakiupah');
//Upah Simpan Advansur
$upahsimpanansur = Advansur::on($cawangan['mysql'])
$upahsimpanansur = Advansur::on($cawangan['mysql']) //--masuk
->whereYear('tarikh','<',$current->year)
->sum('upahdibayar');
$upahsimpanlama = imbangdugalama::on($cawangan['mysql'])
->sum('upah_t');
// dd($upahsimpanansur->toSql());
//GST Caj Lelong
$gstcajlelong = Lelong::on($cawangan['mysql'])
$gstcajlelong = Lelong::on($cawangan['mysql']) //--masuk
->where('t_jual','<=',$request->tarikh)
->whereYear('t_jual','<',$current->year)
->sum('gst_cl');
@@ -638,20 +653,30 @@ class TebusController extends Controller
->whereYear('tarikh','<',$current->year)
->sum('bakiupah');
$parameter = Parameter::on($cawangan['mysql'])
->sum('sumpanjarlama');
$panjar1 = Panjar::on($cawangan['mysql'])
->whereYear('tarikh','<',$current->year)
->where('tag','=','1')
->sum('bayaran');
// dd($utgrugilama,$yuranTlama,$lelong,$upahsimpantebus,$upahsimpanlelong,$upahsimpanansur,$upahhapuskira,$parameter,$gstcajlelong);
$panjar2 = Panjar::on($cawangan['mysql'])
->whereYear('tarikh','<',$current->year)
->where('tag','=','2')
->sum('bayaran');
$panjar3 = Panjar::on($cawangan['mysql'])
->whereYear('tarikh','<',$current->year)
->where('tag','=','3')
->sum('bayaran');
$parameter = ($panjar1*-1) + ($panjar2*-1) + ($panjar3*-1);
// $parameter = Parameter::on($cawangan['mysql']) //--masuk
// ->sum('sumpanjarlama');
$total = ($utgrugilama + $lelong + $upahsimpantebus + $upahsimpanlelong + $upahsimpanansur + $gstcajlelong) + $parameter;
// echo "UTGRUGI:" . $utgrugilama . " YuranTLama:" . $yuranTlama . " YuranBaru:" . $yuranbaru . " Lelong:" . $lelong . " Caj Lelong:" . $cajlelonglama . " Upah Tebus:" . $upahsimpantebus . " Upah Lelong:" . $upahsimpanlelong . " Upah Ansuran:". $upahsimpanansur;
// echo " UPah Hapus Kira : " . $upahhapuskira;
// var_dump($utgrugilama,$yuranTlama,$yuranbaru,$lelong,$cajlelonglama,$upahsimpantebus,$upahsimpanlelong,$upahsimpanansur,$upahsimpanlama,$gstcajlelong);
// + $cajlelonglama+ $upahsimpanlama+ $yuranbaru
// $total = ($yuranTlama + $lelong + $upahsimpantebus + $upahsimpanlelong + $upahsimpanansur + $gstcajlelong + $utgrugilama ) - ($upahhapuskira);
return response()->json($total,200);
}