Merge branch 'amir_dev' into 'main'

merge api payment + export data lelong TBC

See merge request online-sistem1/lelong!164
This commit is contained in:
Nur Izzati Zulkifli
2022-08-17 01:20:06 +00:00
8 changed files with 134 additions and 318 deletions
@@ -0,0 +1,58 @@
@extends('layouts.app')
@section('content')
<div class="container">
<div class="card">
<div class="card-header">Export Data Lelong</div>
<div class="card-body">
<a href="javascript:window.history.go(-1);" class="btn btn-light">
<h3><i class="fas fa-arrow-alt-circle-left"></i></h3>
</a>
<p>ID Lelong: {{$lelong['id']}}</p>
<p>Tarikh Lelong: {{$lelong['tarikh_lelong']}}</p>
<p>Masa Mula Lelong: {{$lelong['masamula_lelong']}}</p>
<p>Masa Tamat Lelong: {{$lelong['masatamat_lelong']}}</p>
<table class="table table-striped table-xl text-center" id="senarailelongtaklaku" style="width:100%">
<thead class="bg-primary text-white">
<tr>
<th>Bil</th>
<th>Kod Cawangan</th>
<th>Cawangan</th>
<th>Tindakan</th>
</tr>
</thead>
<tbody>
@foreach($lelongbycaw as $data)
<tr>
<td>{{$loop->iteration}}</td>
<td>{{$data['caw_code']}}</td>
<td>
{{$data['caw_name']}}
{{--<table class="table">
<thead class="bg-secondary text-white">
<tr>
<th>No Rujukan</th>
<th>Marhun</th>
</tr>
</thead>
<tbody>
@foreach($data['lelongbid'] as $value)
<tr>
<td>{{$value['norujukan']}}</td>
<td>{{$value['marhun']}}</td>
</tr>
@endforeach
</tbody>
</table>--}}
</td>
<td><button class="btn btn-primary">EXPORT</button></td>
</tr>
@endforeach
</tbody>
</table>
</div>
</div>
</div>
@endsection
@@ -88,7 +88,7 @@
<button class="btn btn-info btn-sm" disabled>JANA PEMENANG</button>
@elseif($data['laporan']['sts_lelong'] == 3)
<button class="btn btn-success btn-sm" disabled>LELONG SELESAI</button>
<button class="btn btn-primary btn-sm">EXPORT DATA LELONG</button>
<a href="{{ route('lelong.exportDataByCawangan', $data['laporan']['lelong_id']) }}" class="btn btn-primary btn-sm">EXPORT <i class="fas fa-file-export"></i></a>
@endif
@endhasrole
</td>