KoPKB/lelong
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'atie' into 'main'

Browse Source 
update new pada lelong

See merge request online-sistem1/lelong!291
This commit is contained in:
Nur Izzati Zulkifli
2022-11-25 10:10:45 +00:00
parent 57c4f01f84 f92fdb477f
commit 08313d1a35
5 changed files with 47 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/LelongController.php
+32 -29
View File
@@ -250,8 +250,10 @@ class LelongController extends Controller
//$cajlelong += $lel_bid->cajlelong;
$sumcajlelong = $lel_bid['hargaasas'] * ($lelong->cajlelong / 100);
$cajlelong = $cajlelong + bcdiv($sumcajlelong, 1, 1);
$totalbaki = $lel_bid['hargaasas'] - $lel_bid['pinjaman'] - $lel_bid['bakiupah'] - bcdiv($sumcajlelong, 1, 1);
$cajlelongnew = round($sumcajlelong, 1, 1);
// $cajlelong = $cajlelong + bcdiv($sumcajlelong, 1, 1);
$cajlelong = $cajlelong + $cajlelongnew;
$totalbaki = $lel_bid['hargaasas'] - $lel_bid['pinjaman'] - $lel_bid['bakiupah'] - $cajlelongnew;
if (strpos($totalbaki, '-') !== false) {
$rugi = -$totalbaki;
$rugilelong += $rugi;
@@ -1304,8 +1306,9 @@ class LelongController extends Controller
$arraymarhun = [];
foreach ($marhuns as $index1=> $cal) {
$sumcajlelong = $cal['hargaasas'] * ($lelonglel->cajlelong/100);
$totalbaki = $cal['hargaasas'] - $cal['pinjaman'] - $cal['bakiupah'] - bcdiv($sumcajlelong,1,1);
$marhuns[$index1]['cajlelong'] = bcdiv($sumcajlelong,1,1);
$cajlelongnew = round($sumcajlelong,1,1);
$totalbaki = $cal['hargaasas'] - $cal['pinjaman'] - $cal['bakiupah'] - $cajlelongnew;
$marhuns[$index1]['cajlelong'] = $cajlelongnew;
$marhuns[$index1]['baki'] = $totalbaki;
$marhuns[$index1]['keuntungan'] = $keuntungan;
@@ -1314,7 +1317,7 @@ class LelongController extends Controller
$total_hargaasas = $total_hargaasas + $cal['hargaasas'];
$total_nilaimarhun = $total_nilaimarhun + $cal['nilaimarhun'];
$total_bakiupah = $total_bakiupah + $cal['bakiupah'];
$total_cazlelong = $total_cazlelong + bcdiv($sumcajlelong,1,1);
$total_cazlelong = $total_cazlelong + $cajlelongnew;
array_push($arraymarhun,[
'norujukan' => $cal['norujukan'],
@@ -1324,7 +1327,7 @@ class LelongController extends Controller
'hargaasas' => $cal['hargaasas'],
'pinjaman' => $cal['pinjaman'],
'bakiupah' => $cal['bakiupah'],
'cajlelong' => $cal['cajlelong'],
'cajlelong' => $cajlelongnew,
'baki' => $cal['baki'],
]);
}
@@ -3685,7 +3688,6 @@ class LelongController extends Controller
$kali = $kali;
$lelong = Lelong::where('kali','=',$kali)->first();
// dd($t_simulasi);
$cawanganlel = CawanganLelong::where('kali','=',$kali)->get();
// dd($cawangansim);
@@ -3754,26 +3756,28 @@ class LelongController extends Controller
// dd($bid['id']);
$marhun = LelongBidMarhun::where('lelongbid_id','=',$bid['id'])->get();
$berat = $berat + $bid['berat'];
// $nilai_marhun = $nilai_marhun + ($marhun->sum('n_marhun'));
$nilai_marhun = $nilai_marhun + $bid['nilaimarhun'];
$pinjaman =$pinjaman + $bid['pinjaman'];
$bakiupah = $bakiupah + $bid['bakiupah'];
$hargaasas = $hargaasas + $bid['hargaasas'];
$cajlelong = $cajlelong + $bid['cajlelong'];
// $cajlelong = $cajlelong + $bid['cajlelong'];
// $lelongsim = Lelong::where('id',$id)->get();
// $sumcajlelong = $bid['hargaasas'] * ($lelongsim[0]['cajlelong']/100);
// $cajlelong = $cajlelong + bcdiv($sumcajlelong,1,1);
// $totalbaki = $bid['hargaasas'] - $bid['pinjaman'] - $bid['bakiupah'] - bcdiv($sumcajlelong,1,1);
$lelongsim = Lelong::where('id',$id)->get();
$sumcajlelong = $bid['hargaasas'] * ($lelongsim[0]['cajlelong']/100);
$cajlelongnew = round($sumcajlelong,1,1);
$cajlelong = $cajlelong + $cajlelongnew;
$totalbaki = $bid['hargaasas'] - $bid['pinjaman'] - $bid['bakiupah'] - $cajlelongnew;
// if($totalbaki > 0)
// {
// $bakilelong = $bakilelong + $totalbaki;
// }
// else
// {
// $rugilelong = $rugilelong - $totalbaki;
// }
if($totalbaki > 0)
{
$bakilelong = $bakilelong + $totalbaki;
}
else
{
$rugilelong = $rugilelong - $totalbaki;
}
@@ -3785,7 +3789,7 @@ class LelongController extends Controller
'id_cawangan'=> $cawangan['id'],
'cawangan'=>$cawangan['caw_name'],
't_lelong'=>$lelong['tarikh_lelong'],
't_simulasi'=>$t_lelong['tarikh_lelong'],
't_lelong'=>$t_lelong['tarikh_lelong'],
'bil_marhun'=>sizeof($databid),
'berat'=>$berat,
'n_marhun'=>$nilai_marhun,
@@ -5243,10 +5247,8 @@ class LelongController extends Controller
{
$kali = $request->kali;
// dd($lelong_id);
$lelong = Lelong::where('kali','=',$kali)->first();
$lelonglel = CawanganLelong::where('kali','=',$kali)->get();
// dd($simulasilel);
// $lelkarat = LelKarat::where('lelong_id','=',$lelong_id)->get();
@@ -5294,7 +5296,7 @@ class LelongController extends Controller
$t_lelong = Lelong::join('cawangan_lelong','cawangan_lelong.lelong_id','=','lelong.id')
->where('cawangan_lelong.lelong_id','=', $lellel->lelong_id)
->where('cawangan_lelong.kali','=',$kali)->first();
// dd($t_simulasi);
// dump($t_lelong);
// dd($databid->toArray());
$packet = 0;
$berat = 0;
@@ -5319,8 +5321,9 @@ class LelongController extends Controller
$lelongsim = Lelong::where('id',$id)->get();
$sumcajlelong = $bid['hargaasas'] * ($lelongsim[0]['cajlelong']/100);
$cajlelong = $cajlelong + bcdiv($sumcajlelong,1,1);
$totalbaki = $bid['hargaasas'] - $bid['pinjaman'] - $bid['bakiupah'] - bcdiv($sumcajlelong,1,1);
$cajlelongnew = round($sumcajlelong,1,1);
$cajlelong = $cajlelong + $cajlelongnew;
$totalbaki = $bid['hargaasas'] - $bid['pinjaman'] - $bid['bakiupah'] - $cajlelongnew;
if($totalbaki > 0)
{
@@ -5339,7 +5342,7 @@ class LelongController extends Controller
array_push($arraycaw,[
'id_cawangan'=> $cawangan['id'],
'cawangan'=>$cawangan['caw_name'],
't_lelong'=>$lelong['tarikh_lelong'],
't_lelong'=>$t_lelong['tarikh_lelong'],
'bil_marhun'=>sizeof($databid),
// 'jbg'=>$bid['jbg'],
'berat'=>$berat,
@@ -5363,7 +5366,7 @@ class LelongController extends Controller
$total_nilaimarhun = $total_nilaimarhun + $nilai_marhun;
$total_bakiupah = $total_bakiupah + $bakiupah;
// dd($t_lelong);
$data = Lelong::where('kali','=',$kali)
->first();
}
app/Http/Controllers/ReportController.php
+4 -3
View File
@@ -797,8 +797,9 @@ class ReportController extends Controller
// dd($customer);
$simulasilel = Lelong::where('id',$lelongid)->get();
$sumcajlelong = $cal['hargaasas'] * ($simulasilel[0]['cajlelong']/100);
$totalbaki = $cal['hargaasas'] - $cal['pinjaman'] - $cal['bakiupah'] - bcdiv($sumcajlelong,1,1);
$marhuns[$index1]['cajlelong'] = bcdiv($sumcajlelong,1,1);
$cajlelongnew = round($sumcajlelong,1,1);
$totalbaki = $cal['hargaasas'] - $cal['pinjaman'] - $cal['bakiupah'] - $cajlelongnew;
$marhuns[$index1]['cajlelong'] = $cajlelongnew;
$marhuns[$index1]['baki'] = $totalbaki;
@@ -828,7 +829,7 @@ class ReportController extends Controller
$total_hargaasas = $total_hargaasas + $cal['hargaasas'];
$total_nilaimarhun = $total_nilaimarhun + $cal['nilaimarhun'];
$total_bakiupah = $total_bakiupah + $cal['bakiupah'];
$total_cazlelong = $total_cazlelong + bcdiv($sumcajlelong,1,1);
$total_cazlelong = $total_cazlelong + $cajlelongnew;
}
resources/views/lelong/senaraimarhun.blade.php
+5 -1
View File
@@ -132,7 +132,11 @@
<td align = 'right'><b>{{ number_format($total_bakiupah, 2, '.', ',') }}</b></td>
<td align = 'right'><b>{{ number_format($total_cazlelong, 2, '.', ',') }}</b></td>
<td align = 'right'><b>{{ number_format($total_hargaasas, 2, '.', ',') }}</b></td>
<td align = 'right'><b>{{ number_format($bakilelong, 2, '.', ',') }}</b></td>
<td align = 'right'><b>@if($bakilelong > 0)
{{ number_format($bakilelong, 2, '.', ',') }}
@else
({{number_format(-($bakilelong), 2, '.', ',')}})
@endif</b></td>
<td align = 'right'></td>
</tr>
</tfoot>
resources/views/lelong/showlelongallsim.blade.php
+1 -1
View File
@@ -159,7 +159,7 @@
<tr>
<td>{{$index+1}}</td>
<td>@php
$myDateTime = DateTime::createFromFormat('Y-m-d', $caw['t_simulasi'] );
$myDateTime = DateTime::createFromFormat('Y-m-d', $caw['t_lelong'] );
$t_lelong = $myDateTime->format('d-m-Y');
echo($t_lelong);
@endphp</td>
resources/views/pdf/pdflelongreport.blade.php
+5 -1
View File
@@ -214,7 +214,11 @@
<td align = 'right'><b>{{ number_format($total_bakiupah, 2, '.', ',') }}</b></td>
<td align = 'right'><b>{{ number_format($total_cazlelong, 2, '.', ',') }}</b></td>
<td align = 'right'><b>{{ number_format($total_hargaasas, 2, '.', ',') }}</b></td>
<td align = 'right'><b>{{ number_format($bakilelong, 2, '.', ',') }}</b></td>
<td align = 'right'><b>@if($bakilelong > 0)
{{ number_format($bakilelong, 2, '.', ',') }}
@else
({{number_format(-($bakilelong), 2, '.', ',')}})
@endif</b></td>
</tr>
</tfoot>