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

Merge branch 'amirah' into 'main'

Browse Source 
update simula fasa 2 percubaan

See merge request online-sistem1/lelong!177
This commit is contained in:
Nur Izzati Zulkifli
2022-08-22 08:51:49 +00:00
parent d1a6b71e56 c59cd0a8e8
commit 679c8f07e3
3 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/SimulasiController.php
+2 -2
View File
@@ -1569,7 +1569,7 @@ class SimulasiController extends Controller
->where('tagpalsu','=',0)
->where('tagpalsu2','=',0)
->where('taglel','=',0)
->where('lelong_tawarruq','=',1)
// ->where('lelong_tawarruq','=',1)
->whereNotNull('upah12');
$cawangan_simulasi = CawanganSimulasi::where('caw_id',$cawangan->id)->where('kali', '=' ,$kali)->count();
@@ -1687,7 +1687,7 @@ class SimulasiController extends Controller
->get();
dd($senarai);
// dd($senarai);
$total_untung_rebet = TransaksiKeuntungan::on('main')->where('norujukan','=',$surats['norujukan'])->sum('keuntungan_rebet');
$total_untung_asal = TransaksiKeuntungan::on('main')->where('norujukan','=',$surats['norujukan'])->sum('bayaran_keuntungan');
resources/views/pembayaran/kaunterpembayaran.blade.php
+1 -1
View File
@@ -54,7 +54,7 @@
</td>
<td>
<a href=" {{ route('serahan.resit', ['user_id'=>$winner['details']['id'], 'lelong_id'=>$lelong_id]) }} " data-toggle="tooltip" data-placement="top" title="Buat Pembayaran"><i class="far fa-edit"></i></a>
<a href=" {{ route('serahan.resit', ['user_id'=>$winner['details']['id'], 'lelong_id'=>$lelong_id]) }} " data-toggle="tooltip" data-placement="top" title="Resit Pembayaran"><i class="far fa-edit"></i></a>
</td>
resources/views/simulasi/sensimulasipercubaan.blade.php
+5 -1
View File
@@ -32,7 +32,9 @@
}else{
$myDateTime = DateTime::createFromFormat('Y-m-d', $t_lelong2 );
$tarikhlelong = $myDateTime->modify('-12 month')->format('d-m-Y');
$t_gadai1 = $myDateTime->modify('-12 month')->format('Y-m-d');
// $t_gadai1 = $myDateTime->modify('-12 month')->format('Y-m-d');
$t_gadai1 = $myDateTime->format('Y-m-d');
echo($tarikhlelong);
}
@endphp</p>
@@ -63,6 +65,7 @@
</thead>
<tbody>
@foreach($senarai as $send)
@if($send['bil_lelong'] > 0)
<tr>
<td>{{ $loop->iteration}}</td>
<td>{{ $send['kodcaw'] }}</td>
@@ -75,6 +78,7 @@
<td>{{ number_format($send['total_bakipjm'] , 2) }} </td>
</tr>
@endif
@endforeach
</tbody>
</table>