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

Merge branch 'atie' into 'main'

Browse Source 
update senleltangguh

See merge request online-sistem1/lelong!306
This commit is contained in:
Nur Izzati Zulkifli
2022-11-28 07:53:08 +00:00
parent d4c66be3d9 9afab65807
commit 3ba62f9dd3
5 changed files with 45 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/LelongController.php
+21 -24
View File
@@ -2588,7 +2588,7 @@ class LelongController extends Controller
$tarikhlelongbaru = $request->tarikhlelongbaru;
// dd($tarikhlelongbaru);
$lelongidasal = $request->lelongidasal;
$lelongidbaru = $request->lelongidbaru;
// $lelongidbaru = $request->lelongidbaru;
// dd($request->caw);
$lelkarat = LelKarat::where('lelong_id','=',$lelongidasal)->get();
@@ -2601,26 +2601,26 @@ class LelongController extends Controller
// dd($cawanganasal);
// dd( $lelongidbaru);
$lelongnew = new Lelong();
$lelongnew->tarikh_lelong = $tarikhlelongbaru;
$lelongnew->harga_emas_asas = $lelongasal->harga_emas_asas;
$lelongnew->jbg = $lelongasal->jbg;
$lelongnew->cajlelong = $lelongasal->cajlelong;
$lelongnew->fasa = $lelongasal->fasa;
$lelongnew->kali = $lelongasal->kali;
$lelongnew->save();
// $lelongnew = new Lelong();
// $lelongnew->tarikh_lelong = $tarikhlelongbaru;
// $lelongnew->harga_emas_asas = $lelongasal->harga_emas_asas;
// $lelongnew->jbg = $lelongasal->jbg;
// $lelongnew->cajlelong = $lelongasal->cajlelong;
// $lelongnew->fasa = $lelongasal->fasa;
// $lelongnew->kali = $lelongasal->kali;
// $lelongnew->save();
foreach($lelkarat as $lelongKarat)
{
$lelkarat = new LelKarat;
$lelkarat->lelong_id = $lelongnew->id;
$lelkarat->karat = $lelongKarat->karat;
$lelkarat->keterangan = $lelongKarat->keterangan;
$lelkarat->harga = $lelongKarat->harga;
$lelkarat->harga2 = $lelongKarat->harga2;
$lelkarat->save();
}
// foreach($lelkarat as $lelongKarat)
// {
// $lelkarat = new LelKarat;
// $lelkarat->lelong_id = $lelongnew->id;
// $lelkarat->karat = $lelongKarat->karat;
// $lelkarat->keterangan = $lelongKarat->keterangan;
// $lelkarat->harga = $lelongKarat->harga;
// $lelkarat->harga2 = $lelongKarat->harga2;
// $lelkarat->save();
// }
//tukartarikh ID lelong
@@ -2635,10 +2635,8 @@ class LelongController extends Controller
// dd($cawtukartarikh->caw_id);
$caw_tukartarikh = CawanganLelong::where('caw_id', $cawtukartarikh->id)
->where('lelong_id', $request->lelongidasal)->first();
// dd($caw_tukartarikh);
$caw_tukartarikh->lelong_id = $request->lelongidbaru;
$caw_tukartarikh = Lelong::where('id', $request->lelongidasal)->first();
$caw_tukartarikh->tarikh_lelong = $tarikhlelongbaru;
$caw_tukartarikh->update();
$surat = LelongBid::where('lelong_id','=',$lelongidasal)
@@ -2654,7 +2652,6 @@ class LelongController extends Controller
{
// dd($request->lelongidbaru);
$caw_pindahsag = LelongBid::where('norujukan', $data->norujukan)->first();
$caw_pindahsag->lelong_id = $request->lelongidbaru;
$caw_pindahsag->t_lelong = $tarikhlelongbaru;
$caw_pindahsag->update();
}
app/Http/Controllers/TangguhLelongController.php
+6 -4
View File
@@ -286,10 +286,10 @@ 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()
->get()
->toArray();
->get();
// ->toArray();
foreach($tangguh as $t)
foreach($tangguh as $index=>$t)
{
$sag = TangguhLelong::where('lelong_id', $t['lelong_id'])
->where('kodcaw', $t['caw_code'])
@@ -298,12 +298,13 @@ class TangguhLelongController extends Controller
->get()
->count();
$tangguh[$index]['bilsag'] = $sag;
array_push($arrayinfo,['t'=>$t, 'sag'=>$sag]);
}
return view('tangguhlelong.senleltangguh',compact('tangguh','sag'));
return view('tangguhlelong.senleltangguh',compact('tangguh','arrayinfo'));
}
@@ -726,6 +727,7 @@ class TangguhLelongController extends Controller
$tangguh = TangguhLelong::where('tangguhlelong.kodcaw', $user->kodcaw)
->get();
// dd($tangguh);
foreach($tangguh as $index1=>$t)
{
resources/views/lelong/showtukartarikh.blade.php
+2 -2
View File
@@ -85,13 +85,13 @@
<input type="date" class="form-control" id="tarikhlelongbaru" name="tarikhlelongbaru" value = "">
</div>
</div>
<div class="form-group row">
{{-- <div class="form-group row">
<label for="jbg" class="col-sm-2 col-form-label">Batch Lelong Baru</label>
<div class="col-sm-2">
<input type="text" class="form-control" id="lelongidbaru" name="lelongidbaru" value = "{{$idlelongbaru}}" readonly>
</div>
</div>
</div> --}}
<button type="submit" class="btn btn-success">Tukar Tarikh Lelong</button>
</form>
resources/views/tangguhlelong/senactionoperasi.blade.php
+13 -6
View File
@@ -3,11 +3,18 @@
@section('content')
<div class="container-fluid">
<div class="row ">
<div class="col-md-11 mx-auto card p-4">
<h3 class="pt-3">Senarai Permohonan Tangguh Lelong</h3>
<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">
Senarai Permohonan Tangguh Lelong
</div>
</div>
<div class="card-body">
@if ($message = Session::get('success'))
<div class="alert alert-success">
<p>{{ $message }}</p>
@@ -15,7 +22,7 @@
@endif
<form id="uploadform" action="" method="POST">
<table class="table table-striped table-xl text-center" id="tablelelong" style="width:100%">
<table class="table table-striped table-bordered table-xl text-center" id="tablelelong" style="width:100%">
<thead class="bg-primary text-white">
<tr>
<th>No</th>
resources/views/tangguhlelong/senleltangguh.blade.php
+3 -1
View File
@@ -49,7 +49,9 @@
<span class="m-2">{{$lel['caw_name']}}</span><br>
</td>
<td>{{$sag}}</td>
<td>
{{$lel['bilsag']}}
</td>
<td>{{$lel['jbg']}}</td>
<td>