diff --git a/app/Http/Controllers/PembidaController.php b/app/Http/Controllers/PembidaController.php index a1181f4d..ec31b174 100644 --- a/app/Http/Controllers/PembidaController.php +++ b/app/Http/Controllers/PembidaController.php @@ -197,7 +197,7 @@ class PembidaController extends Controller $lelong = Lelong::join('cawangan_lelong','lelong.id','=','cawangan_lelong.lelong_id') ->select('lelong_id','tarikh_lelong','lelong.fasa','harga_emas_asas','jbg','cajlelong','sts_lelong') ->distinct() - ->orderBy('lelong_id') + ->orderBy('lelong_id','DESC') ->where('lelong.sts_lelong', 3) ->get() ->toArray(); diff --git a/resources/views/pdf/pdflelongtebus.blade.php b/resources/views/pdf/pdflelongtebus.blade.php index 5177d5b0..b3a6a292 100644 --- a/resources/views/pdf/pdflelongtebus.blade.php +++ b/resources/views/pdf/pdflelongtebus.blade.php @@ -164,6 +164,7 @@ tr:nth-child(even) { Pinjaman (RM) Keuntungan (RM) Tempoh + Jenis Tebus @@ -176,6 +177,7 @@ tr:nth-child(even) { {{ number_format($laporan['pinjaman'], 2, '.', ',')}} {{ number_format($laporan['upah'], 2, '.', ',')}} {{$laporan['jbg']}} + {{$laporan['jenis_tebus']}} @endforeach diff --git a/resources/views/pembida/listkebenaranbayarantunai.blade.php b/resources/views/pembida/listkebenaranbayarantunai.blade.php index e6422c1b..99154b1e 100644 --- a/resources/views/pembida/listkebenaranbayarantunai.blade.php +++ b/resources/views/pembida/listkebenaranbayarantunai.blade.php @@ -1,25 +1,20 @@ @extends('layouts.app') - @section('content')
-
+
- {{--
--}} +
+
+ Kebenaran Bayaran Tunai +
+
+
@if ($message = Session::get('success'))

{{ $message }}

@endif -
-
- - - -
- Kebenaran Bayaran Tunai -
-
@@ -53,9 +48,10 @@ + + @@ -44,6 +46,7 @@ + + diff --git a/resources/views/pembida/senlelpembayaranbidaan.blade.php b/resources/views/pembida/senlelpembayaranbidaan.blade.php index cfeb28b2..350bc87a 100644 --- a/resources/views/pembida/senlelpembayaranbidaan.blade.php +++ b/resources/views/pembida/senlelpembayaranbidaan.blade.php @@ -43,16 +43,17 @@ @endphp
@foreach($lel['detailsinfo'] as $details) - @if($details['export_data_sts'] == '1') - Selesai Export - + @if($details['export_data_sts'] == 'SUCCESS') + + @elseif($details['export_data_sts'] == 'SUCCESS') + @endif
diff --git a/resources/views/pembida/senaraipembidakeseluruhan.blade.php b/resources/views/pembida/senaraipembidakeseluruhan.blade.php index 7a9b8c49..455c15ff 100644 --- a/resources/views/pembida/senaraipembidakeseluruhan.blade.php +++ b/resources/views/pembida/senaraipembidakeseluruhan.blade.php @@ -30,9 +30,11 @@
Bil Nama Nama PenggunaNo KP No Telefon Emel StatusT.Daftar Tindakan
{{ $loop->iteration }} {{ $user->name }} {{ $user->username }}{{ $user->nokp }} {{ $user->notelbimbit }} {{ $user->email }} @@ -57,6 +60,7 @@ Menunggu Pengesahan Operasi @endif {{ $user->created_at }} @foreach($lel['detailsinfo'] as $details) - + {{ $details['caw_name']}}
@endforeach
@foreach($lel['detailsinfo'] as $details) - @if($details['export_data_sts'] == '1') - Selesai Export - + @if($details['export_data_sts'] == 'SUCCESS') + + @elseif($details['export_data_sts'] == 'SUCCESS') + @endif