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

Merge branch 'atie' into 'main'

Browse Source 
update back button

See merge request online-sistem1/lelong!307
This commit is contained in:
Nur Izzati Zulkifli
2022-11-28 13:40:23 +00:00
parent 3ba62f9dd3 9e4fcd0275
commit 7b1e904a1e
8 changed files with 86 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/TangguhLelongController.php
+11 -9
View File
@@ -965,17 +965,19 @@ class TangguhLelongController extends Controller
->where('kodcaw','=',$caw_code)
->get();
// dd($pengesahan);
// dd($tangguh);
if($tangguh){
foreach($tangguh as $index1=>$sah)
{
$lelongbid = CawanganLelong::join('lelong','cawangan_lelong.lelong_id','=','lelong.id')
->where('lelong.id', $sah->lelong_id)
->get();
// dd($lelongbid);
foreach($tangguh as $index1=>$sah)
{
$lelongbid = CawanganLelong::join('lelong','cawangan_lelong.lelong_id','=','lelong.id')
->where('lelong.id', $sah->lelong_id)
->get();
// dd($lelongbid);
$tangguh[$index1]['bid_details'] = $lelongbid;
$tangguh[$index1]['bid_details'] = $lelongbid;
$tangguh[$index1]['status'] = $sah['status'];
}
}
// $filter_null = function($x){
app/Mail/ResetPassword.php
+2 -2
View File
@@ -36,8 +36,8 @@ class ResetPassword extends Mailable
$user['name'] = $this->name;
$user['token'] = $this->token;
return $this->from("masterlelongpkb@gmail.com", "Admin Lelong")
->subject('Sistem Lelong Online PKB-Tukar Katalaluan')
return $this->from("masterlelongpkb@gmail.com", "Admin ArrahnBid")
->subject('ArrahnBid -Tukar Katalaluan')
->view('template.reset-password', ['user' => $user]);
}
}
resources/views/lelong/listsagpindah.blade.php
+21 -19
View File
@@ -4,25 +4,27 @@
<div class="container-fluid">
<div class="row ">
<div class="col-md-11 mx-auto card p-4">
<div class="nav nav-tabs" id="nav-tab" role="tablist">
<button type="button" class="btn btn-light" ><a href="javascript:window.history.go(-1);"><h3><i class="fas fa-arrow-alt-circle-left"></i></h3></a></button>
</div>
<span class="pt-3" style="margin-left:1%; font-size:20px"><b>Senarai Lelong(Pindah Batch Lelong)</b></span>
@foreach ($arrayinfo as $laporan)
<div class="col mx-auto p-4">
<div class="card">
<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>
@foreach ($arrayinfo as $laporan)
<div class="header-style-title">
Senarai SAG(Pindah Batch Lelong) : @foreach($laporan['details'] as $details)
<b>{{ $details['caw_name']}}</b>
@endforeach
</div>
</div>
<div class="card-body">
<span class="pt-3" style="margin-left:1%;"><b>Batch Lelong : {{ $laporan['laporan']['lelong_id']}}</b></span>
<span class="pt-3" style="margin-left:1%;"><b>Batch Lelong : {{ $laporan['laporan']['lelong_id']}}</b></span><br>
<span class="pt-3" style="margin-left:1%;"><b>Tarikh Lelong : @php
$myDateTime = DateTime::createFromFormat('Y-m-d', $laporan['laporan']['tarikh_lelong'] );
$datez = $myDateTime->format('d-m-Y');
echo($datez);
@endphp</b></span>
@foreach($laporan['details'] as $details)
<span class="pt-3" style="margin-left:1%;"><b>Nama Cawangan : {{ $details['caw_name']}}</b></span>
<span class="pt-3" style="margin-left:1%;"><b>Kod Cawangan : {{ $details['caw_code']}}</b></span>
@endforeach
@endforeach
@if ($message = Session::get('success'))
@@ -34,15 +36,15 @@
@csrf
<input type="hidden" name="lelongid" value="{{$lelongid}}">
<input type="hidden" name="cawid" value="{{$cawid}}">
<div> Pindah Ke-</div>
<div><span class="pt-3" style="margin-left:1%;>" Pindah Ke-</div>
<select class="js-states browser-default select2" name="lelongidbaru" required id="lelongidbaru">
<option value="option_select" disabled selected>SILA PILIH BATCH LELONG</option>
<option value="option_select" disabled selected>SILA PILIH BATCH LELONG UNTUK PINDAH BATCH</option>
@foreach($datapindah as $data)
<option value="{{ $data['id'] }}">Batch Lelong:{{ $data['id']}} / Tarikh: {{ $data['tarikh_lelong']}} / Kali Ke-: {{ $data['kali']}}</option>
@endforeach
</select>
</select></span>
<button type="submit" class="btn btn-success">Pindah Lelong</button>
<table class="table table-striped table-xl" id="marhun" style="width:100%">
<table class="table text-right table-bordered" id="marhun" style="width:100%">
<thead class="bg-primary text-white">
<tr>
<th>Pilih</th>
@@ -51,10 +53,10 @@
<th>Tempoh</th>
<th>Berat (gm)</th>
<th>Nilai Marhun (RM)</th>
<th>Harga Asas (RM)</th>
<th>Pembiayaan (RM)</th>
<th>Keuntungan (RM)</th>
<th>Caj Lelong (%)</th>
<th>Harga Asas (RM)</th>
<th>Rugi Lelong (RM)</th>
<th>Baki Lelong (RM)</th>
@@ -67,7 +69,7 @@
<input type="checkbox" aria-label="Checkbox for following text input" onclick="btnDelete(this)" name="checkboxdata[]" value="{{ $marhun['norujukan'] }}">
</td>
<td>{{$loop->iteration}}</td>
<td>{{ $marhun['norujukan']}}</td>
<td style="white-space: nowrap;">{{ $marhun['norujukan']}}</td>
<td>{{ $marhun['jbg']}}</td>
<td>{{ $marhun['berat'] }}</td>
<td>{{ number_format($marhun['nilaimarhun'], 2, '.', ',') }}</td>
resources/views/pembida/senaraipembida.blade.php
+10 -3
View File
@@ -3,8 +3,15 @@
@section('content')
<div class="container-fluid">
<div class="row ">
<div class="col-md-11 mx-auto card p-4">
<div class="col mx-auto p-4">
<div class="card">
<div class="card-header header-style">
<div class="header-style-title">
Senarai Pembida
</div>
</div>
<div class="card-body">
@if ($message = Session::get('success'))
<div class="alert alert-success">
<p>{{ $message }}</p>
@@ -16,7 +23,7 @@
<form id="exportform" action="{{route('pengguna.export')}}" method="POST">
@csrf
<input type="hidden" name="type" value="User">
<table class="table table-striped table-xl text-center" id="pengguna" style="width:100%">
<table class="table text-center table-bordered" id="pengguna" style="width:100%">
<thead class="bg-primary text-white">
<tr>
<th><input type="checkbox" aria-label="Checkbox for following text input" onclick="selectall(this)"></th>
resources/views/pembida/senaraipembidakeseluruhan.blade.php
+11 -4
View File
@@ -3,8 +3,15 @@
@section('content')
<div class="container-fluid">
<div class="row ">
<div class="col-md-11 mx-auto card p-4">
<div class="col mx-auto p-4">
<div class="card">
<div class="card-header header-style">
<div class="header-style-title">
Senarai pembida
</div>
</div>
<div class="card-body">
@if ($message = Session::get('success'))
<div class="alert alert-success">
<p>{{ $message }}</p>
@@ -16,7 +23,7 @@
<form id="exportform" action="{{route('pengguna.export')}}" method="POST">
@csrf
<input type="hidden" name="type" value="User">
<table class="table table-striped table-xl text-center" id="pengguna" style="width:100%">
<table class="table text-center table-bordered" id="pengguna" style="width:100%">
<thead class="bg-primary text-white">
<tr>
<!-- <th><input type="checkbox" aria-label="Checkbox for following text input" onclick="selectall(this)"></th> -->
@@ -49,7 +56,7 @@
@endif
</td>
<td class="text-center">
<a href="{{ route('pembida.kemaskini',$user->id) }}" data-toggle="tooltip" data-placement="top" title="Kemaskini Pembida"><i class="fas fa-edit"></i></a>
<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>
</tr>
@endforeach
resources/views/simulasi/tempbycawsimulasi.blade.php
+1 -1
View File
@@ -51,8 +51,8 @@
<td style='white-space:nowrap;'>{{ $surat['list_norujukan'][0]['norujukan'] }}</td>
<td>{{ $surat['list_norujukan'][0]['nokp'] }}</td>
<td>{{ $surat['list_norujukan'][0]['tempoh'] }}</td>
<td>{{ number_format($surat['list_norujukan'][0]['nilaimarhun'], 2, '.', ',') }}</td>
<td>{{ number_format($surat['list_norujukan'][0]['berat'] , 2, '.', ',') }}</td>
<td>{{ number_format($surat['list_norujukan'][0]['nilaimarhun'], 2, '.', ',') }}</td>
<td>{{ number_format($surat['list_norujukan'][0]['pinjaman'] , 2, '.', ',') }}</td>
<td>{{ number_format($surat['list_norujukan'][0]['bakipjm'] , 2, '.', ',') }}</td>
<td>{{ number_format($surat['ktlhbyr'] , 2, '.', ',')}}</td>
resources/views/tangguhlelong/senleltlhtangguh.blade.php
+10 -3
View File
@@ -3,8 +3,15 @@
@section('content')
<div class="container-fluid">
<div class="row ">
<div class="col-md-11 mx-auto card p-4">
<h3 class="pt-3">Senarai Telah Tangguh Lelong</h3>
<div class="col mx-auto p-4">
<div class="card">
<div class="card-header header-style">
<div class="header-style-title">
Senarai Telah Tangguh Lelong
</div>
</div>
<div class="card-body">
@if ($message = Session::get('success'))
<div class="alert alert-success">
<p>{{ $message }}</p>
@@ -12,7 +19,7 @@
@endif
<form id="exportform" action="" method="POST">
<input type="hidden" name="type" value="User">
<table class="table table-striped table-xl text-center" id="tablelelong" style="width:100%">
<table class="table text-center table-bordered" id="tablelelong" style="width:100%">
<thead class="bg-primary text-white">
<tr>
<th>No</th>
resources/views/tangguhlelong/sentangguhoperasi.blade.php
+20 -13
View File
@@ -3,10 +3,17 @@
@section('content')
<div class="container-fluid">
<div class="row ">
<div class="col-md-11 mx-auto card p-4">
<div class="nav nav-tabs" id="nav-tab" role="tablist">
<button type="button" class="btn btn-light" ><a href="javascript:window.history.go(-1);"><h3><i class="fas fa-arrow-alt-circle-left"></i></h3></a></button>
</div>
<div class="col mx-auto p-4">
<div class="card">
<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">
Pengesahan Tangguh Lelong
</div>
</div>
<div class="card-body">
@if ($message = Session::get('success'))
<div class="alert alert-success">
<p>{{ $message }}</p>
@@ -14,7 +21,7 @@
@endif
<form id="uploadform" action="" method="POST">
<table class="table table-striped table-xl text-center" id="tangguhlelong" style="width:100%">
<table class="table text-center table-bordered" id="tangguhlelong" style="width:100%">
<thead class="bg-primary text-white">
<tr>
<th>No</th>
@@ -31,7 +38,7 @@
<tbody>
@foreach ($tangguh as $index1=>$sah)
@forelse ($tangguh as $index1=>$sah)
<tr>
<input type="hidden" name="lelongbidid" id="lelongbidid" value="{{ $sah['lelongbid_id'] }}" />
<input type="hidden" name="norujukan" id="norujukan" value="{{ $sah['norujukan'] }}" />
@@ -71,16 +78,16 @@
<td><a href=" {{ route('tangguhlelong.operasidownloadboranglulus', ['lelongbid_id'=>$sah['lelongbid_id']]) }} " data-toggle="tooltip" data-placement="top" title="Muat Turun Borang"><i class="fas fa-download"></i></a>
</td>
</tr>
@endforeach
@empty
<tr>
<td colspan="5">No Data</td>
</tr>
@endforelse
</tbody>
</table>
</form>
<div class="modal-footer" style="margin-top:2%;">
<!-- {{-- <a href="{{ route('pengesahan.senarailelongtangguh') }}" class="btn btn-primary">Kembali</a> --}} -->
<!-- @if($sah['status'] == 3)
<button type="submit" onclick="confirm()" class="btn btn-warning">Sahkan</button>
@endif -->
</div>
</div>
</div>