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

Merge branch 'main' into atie

Browse Source
This commit is contained in:
Nur Izzati Zulkifli
2022-04-18 15:58:48 +08:00
parent ed59b967da 185ff5a892
commit 0ee8a21f0d
6 changed files with 29 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/LelongController.php
+7 -9
View File
@@ -51,14 +51,7 @@ class LelongController extends Controller
*/
public function index()
{
// $lelong = Lelong::all();
// foreach($lelong as $lel)
// {
// $caw_lelong = CawanganLelong::join('cawangan', 'cawangan_lelong.caw_id', '=', 'cawangan.id')
// ->where('lelong_id', $lel['id'])
// ->get()->toArray();
// }
$arrayinfo = [];
$lelong = Lelong::join('cawangan_lelong','lelong.id','=','cawangan_lelong.lelong_id')
@@ -222,6 +215,9 @@ class LelongController extends Controller
$total_cazlelong = $total_cazlelong + $cajlelong;
$total_rugilelong = $total_rugilelong + $rugilelong;
$total_bakilelong = $total_bakilelong + $bakilelong;
$data = Lelong::where('lelong.id','=',$lelong_id)
->get();
}
@@ -249,7 +245,8 @@ class LelongController extends Controller
'total9K',
'lelkarat',
'lelong_id',
'jeniskarat'));
'jeniskarat',
'data'));
}
public function create($id)
@@ -806,6 +803,7 @@ class LelongController extends Controller
'lelongbid.cajlelong',
'lelongbid.baki',
'lelongbid.status_jual',
'lelongbid.jbg'
)
->get();
app/Http/Controllers/SimulasiController.php
+8 -1
View File
@@ -350,6 +350,8 @@ class SimulasiController extends Controller
$rugilelong = 0;
$bakilelong = 0;
foreach($databid as $bid)
{
$marhun = SimulasiBidMarhun::where('simulasibid_id','=',$bid->id)->get();
@@ -442,6 +444,9 @@ class SimulasiController extends Controller
$total_cazlelong = $total_cazlelong + $cajlelong;
$total_rugilelong = $total_rugilelong + $rugilelong;
$total_bakilelong = $total_bakilelong + $bakilelong;
$data = Simulasi::where('simulasi.id','=',$simulasi_id)
->get();
}
@@ -470,7 +475,8 @@ class SimulasiController extends Controller
'total9K',
'simkarat',
'simulasi_id',
'jeniskarat'));
'jeniskarat',
'data'));
}
public function delete($id)
@@ -748,6 +754,7 @@ class SimulasiController extends Controller
'simulasibid.cajlelong',
'simulasibid.baki',
'simulasibid.status_jual',
'simulasibid.jbg'
)
->get();
resources/views/lelong/senaraimarhun.blade.php
+2
View File
@@ -24,6 +24,7 @@
<th>Nama Cawangan</th>
<th>Norujukan</th>
<th>Pinjaman (RM)</th>
<th>Tempoh</th>
<th>Berat (gm)</th>
<th>Nilai Marhun (RM)</th>
<th>Harga Asas (RM)</th>
@@ -43,6 +44,7 @@
<td>{{ $marhun->caw_name }}</td>
<td>{{ $marhun->norujukan}}</td>
<td>{{ $marhun->pinjaman }}</td>
<td>{{ $marhun->jbg}}</td>
<td>{{ $marhun->berat }}</td>
<td>{{ $marhun->nilaimarhun }}</td>
<td>{{ $marhun->hargaasas }}</td>
resources/views/lelong/showlelong.blade.php
+5
View File
@@ -49,6 +49,11 @@
<tr>
<td>Caj Lelong Keseluruhan : RM{{ number_format($total_cazlelong, 2, '.', ',') }}</td>
</tr>
<tr>
@foreach($data as $data)
<td>Tempoh: {{$data['jbg'] }}</td>
@endforeach
</tr>
</table>
</div>
</div>
resources/views/simulasi/senaraimarhunlel.blade.php
+2
View File
@@ -24,6 +24,7 @@
<th>Nama Cawangan</th>
<th>Norujukan</th>
<th>Pinjaman (RM)</th>
<th>Tempoh</th>
<th>Berat (gm)</th>
<th>Nilai Marhun (RM)</th>
<th>Harga Asas (RM)</th>
@@ -43,6 +44,7 @@
<td>{{ $marhun->caw_name }}</td>
<td>{{ $marhun->norujukan}}</td>
<td>{{ $marhun->pinjaman }}</td>
<td>{{ $marhun->jbg }}</td>
<td>{{ $marhun->berat }}</td>
<td>{{ $marhun->nilaimarhun }}</td>
<td>{{ $marhun->hargaasas }}</td>
resources/views/simulasi/showsimulasi.blade.php
+5
View File
@@ -46,6 +46,11 @@
<tr>
<td>Caj Lelong Keseluruhan : RM{{ number_format($total_cazlelong, 2, '.', ',') }}</td>
</tr>
<tr>
@foreach ($data as $data)
<td>Tempoh: {{ $data['jbg']}}</td>
@endforeach
</tr>
</table>
</div>
</div>