diff --git a/app/Http/Controllers/TangguhLelongController.php b/app/Http/Controllers/TangguhLelongController.php index 1201e60c..31f0e50d 100644 --- a/app/Http/Controllers/TangguhLelongController.php +++ b/app/Http/Controllers/TangguhLelongController.php @@ -921,9 +921,19 @@ class TangguhLelongController extends Controller ->where('lelong.sts_lelong',0) ->select('cawangan_lelong.lelong_id', 'cawangan_lelong.caw_id','lelong.sts_lelong','cawangan.caw_name','lelong.tarikh_lelong','cawangan.caw_code','lelong.jbg') ->distinct() + ->orderBy('cawangan_lelong.lelong_id') ->get() ->toArray(); + $lelong= Lelong::join('cawangan_lelong','lelong.id','=','cawangan_lelong.lelong_id') + ->where('lelong.sts_lelong',0) + ->select('lelong_id','tarikh_lelong','lelong.fasa','jbg','sts_lelong') + ->distinct() + ->orderBy('lelong_id') + ->get() + ->toArray(); + // dd($lelong); + foreach($lelong as $info) { @@ -933,7 +943,7 @@ class TangguhLelongController extends Controller ->toArray(); $sag = TangguhLelong::where('lelong_id', $info['lelong_id']) - ->where('kodcaw', $info['caw_code']) + // ->where('kodcaw', $info['caw_code']) ->where('status',4) ->select('norujukan') ->get() @@ -954,6 +964,7 @@ class TangguhLelongController extends Controller $currentdate = $currentdate->toDateTimeString(); $tangguh = TangguhLelong::where('status',4) + ->where('kodcaw','=',$caw_code) ->get(); // dd($pengesahan); diff --git a/resources/views/pdf/lelreport.blade.php b/resources/views/pdf/lelreport.blade.php index cb51fa63..598ecdfd 100644 --- a/resources/views/pdf/lelreport.blade.php +++ b/resources/views/pdf/lelreport.blade.php @@ -7,6 +7,15 @@ border-collapse: collapse; width: 100%; } + + #sim2 { + font-family: "Trebuchet MS", Arial, Helvetica, sans-serif; + font-size:10px; + border-collapse: collapse; + width: 40%; + border: 0px solid #ddd; + + } #sim td {padding:3px 5px 3px 5px; padding-right:10px;}, #sim th { border: 0px solid; @@ -77,8 +86,9 @@
LAPORAN SIMULASI CAWANGAN
+ - + {{--
@@ -86,22 +96,22 @@ -
Bilangan Lelong: {{$total_marhun}}Pembiayaan Keseluruhan: RM{{ number_format($total_pinjaman, 2, '.', ',') }} Keuntungan Keseluruhan:RM{{ number_format($total_bakiupah, 2, '.', ',') }}
+ --}} - +
- + {{-- - - - --}} +
Tarikh Lelong :@php $myDateTime = DateTime::createFromFormat('Y-m-d', $data['tarikh_lelong'] ); $datez = $myDateTime->format('d-m-Y'); echo($datez); @endphp - +
+
Tempoh: {{ $data['jbg']}}
Harga Asas Keseluruhan: RM{{ number_format($total_hargaasas, 2, '.', ',') }}Harga Asas Keseluruhan: RM{{ number_format($total_hargaasas, 2, '.', ',') }} Caj Lelong Keseluruhan: RM{{ number_format($total_cazlelong, 2, '.', ',') }} Baki Lelong Keseluruhan: RM{{ number_format($total_bakilelong, 2, '.', ',') }}Rugi Lelong Keseluruhan: RM{{ number_format($total_rugilelong, 2, '.', ',') }}Tempoh: {{ $data['jbg']}}Tarikh Lelong :@php + Rugi Lelong Keseluruhan: RM{{ number_format($total_rugilelong, 2, '.', ',') }}
@@ -110,10 +120,6 @@
- - {{-- - - --}}

SIMULASI KESELURUHAN

No Cawangan