Merge branch 'atie' into 'main'
update lelong tebus, senarai pembida, pembayaran bidaan dan kebenaran bayaran tunai See merge request online-sistem1/lelong!435
This commit is contained in:
Nur Izzati Zulkifli
@@ -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();
|
||||
|
||||
@@ -164,6 +164,7 @@ tr:nth-child(even) {
|
||||
<th>Pinjaman (RM)</th>
|
||||
<th>Keuntungan (RM)</th>
|
||||
<th>Tempoh</th>
|
||||
<th>Jenis Tebus</th>
|
||||
</tr>
|
||||
</thead>
|
||||
|
||||
@@ -176,6 +177,7 @@ tr:nth-child(even) {
|
||||
<td align="right">{{ number_format($laporan['pinjaman'], 2, '.', ',')}}</td>
|
||||
<td align="right">{{ number_format($laporan['upah'], 2, '.', ',')}}</td>
|
||||
<td align="center">{{$laporan['jbg']}}</td>
|
||||
<td align="center">{{$laporan['jenis_tebus']}}</td>
|
||||
|
||||
</tr>
|
||||
@endforeach
|
||||
|
||||
@@ -1,25 +1,20 @@
|
||||
@extends('layouts.app')
|
||||
|
||||
@section('content')
|
||||
<div class="container-fluid">
|
||||
<div class="row ">
|
||||
<div class="col mx-auto p-4">
|
||||
<div class="col">
|
||||
<div class="card">
|
||||
{{-- <div class="col-md-11 mx-auto card p-4"> --}}
|
||||
<div class="card-header header-style">
|
||||
<div class="header-style-title">
|
||||
Kebenaran Bayaran Tunai
|
||||
</div>
|
||||
</div>
|
||||
<div class="card-body">
|
||||
@if ($message = Session::get('success'))
|
||||
<div class="alert alert-success">
|
||||
<p>{{ $message }}</p>
|
||||
</div>
|
||||
@endif
|
||||
<div class="card-body">
|
||||
<div class="card-header header-style">
|
||||
<a href="javascript:window.history.go(-1);" class="header-style-icon">
|
||||
<i class="fas fa-arrow-left"></i>
|
||||
</a>
|
||||
<div class="header-style-title">
|
||||
Kebenaran Bayaran Tunai
|
||||
</div>
|
||||
</div>
|
||||
<table class="table table-bordered text-center" id="senarailelongonline" style="width:100%">
|
||||
<thead class="bg-primary text-white">
|
||||
<tr>
|
||||
@@ -53,9 +48,10 @@
|
||||
</td>
|
||||
<td class="text-left">
|
||||
@foreach($lel['detailsinfo'] as $details)
|
||||
<span class="m-2"> @if($details['export_data_sts'] == '1')
|
||||
<i class="far fa-flag"></i> Selesai Export
|
||||
|
||||
<span class="m-2"> @if($details['export_data_sts'] == 'SUCCESS')
|
||||
<button class="btn btn-success btn-sm m-1" disabled>Selesai Export</button>
|
||||
@elseif($details['export_data_sts'] == 'SUCCESS')
|
||||
<button class="btn btn-danger btn-sm m-1" disabled>Belum Export</button>
|
||||
@endif
|
||||
|
||||
</span><br>
|
||||
|
||||
@@ -30,9 +30,11 @@
|
||||
<th>Bil</th>
|
||||
<th>Nama</th>
|
||||
<th>Nama Pengguna</th>
|
||||
<th>No KP</th>
|
||||
<th>No Telefon</th>
|
||||
<th>Emel</th>
|
||||
<th>Status</th>
|
||||
<th>T.Daftar</th>
|
||||
<th class="text-center">Tindakan</th>
|
||||
</tr>
|
||||
</thead>
|
||||
@@ -44,6 +46,7 @@
|
||||
<td>{{ $loop->iteration }}</td>
|
||||
<td align = 'left'>{{ $user->name }}</td>
|
||||
<td>{{ $user->username }}</td>
|
||||
<td>{{ $user->nokp }}</td>
|
||||
<td>{{ $user->notelbimbit }}</td>
|
||||
<td>{{ $user->email }}</td>
|
||||
<td>
|
||||
@@ -57,6 +60,7 @@
|
||||
Menunggu Pengesahan Operasi
|
||||
@endif
|
||||
</td>
|
||||
<td>{{ $user->created_at }}</td>
|
||||
<td class="text-center">
|
||||
<a class="btn btn-info" href="{{ route('pembida.kemaskini',$user->id) }}" data-toggle="tooltip" data-placement="top" title="Kemaskini Pembida"><i class="fas fa-edit"></i></a>
|
||||
</td>
|
||||
|
||||
@@ -43,16 +43,17 @@
|
||||
@endphp</td>
|
||||
<td class="text-left">
|
||||
@foreach($lel['detailsinfo'] as $details)
|
||||
<a class="btn m-1 btn-info" href=" {{ route('pembida.pembayaranbidaan', ['lelong_id'=>$lel['detail']['lelong_id'], 'kodcaw'=>$details['caw_code']]) }} " data-toggle="tooltip" data-placement="top" title="Butiran Bidaan"><i class="far fa-edit"></i></a>
|
||||
<a class="btn btn-info btn-sm m-1" href=" {{ route('pembida.pembayaranbidaan', ['lelong_id'=>$lel['detail']['lelong_id'], 'kodcaw'=>$details['caw_code']]) }} " data-toggle="tooltip" data-placement="top" title="Butiran Bidaan"><i class="far fa-edit"></i></a>
|
||||
<span class="m-2">{{ $details['caw_name']}}
|
||||
</span><br>
|
||||
@endforeach
|
||||
</td>
|
||||
<td class="text-left">
|
||||
@foreach($lel['detailsinfo'] as $details)
|
||||
<span class="m-2"> @if($details['export_data_sts'] == '1')
|
||||
<i class="far fa-flag"></i> Selesai Export
|
||||
|
||||
<span class="m-2"> @if($details['export_data_sts'] == 'SUCCESS')
|
||||
<button class="btn btn-success btn-sm m-1" disabled>Selesai Export</button>
|
||||
@elseif($details['export_data_sts'] == 'SUCCESS')
|
||||
<button class="btn btn-danger btn-sm m-1" disabled>Belum Export</button>
|
||||
@endif
|
||||
|
||||
</span><br>
|
||||
|
||||
Reference in New Issue
Block a user