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

Merge branch 'atie' into 'main'

Browse Source 
Addnew- 'Belum Dikemaskini' pada list lelong

See merge request online-sistem1/lelong!236
This commit is contained in:
Nur Izzati Zulkifli
2022-10-19 04:27:45 +00:00
parent a804ef7e52 d80f2913c2
commit 4e981dfd3f
4 changed files with 48 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/LelongController.php
+11 -3
View File
@@ -291,6 +291,10 @@ class LelongController extends Controller
$data = Lelong::where('lelong.id','=',$lelong_id) $data = Lelong::where('lelong.id','=',$lelong_id)
->get(); ->get();
$tarikhkemaskini = LelKarat::where('lelong_id','=',$id)
->where('karat','=',"22.0K")->first();
// dd($tarikhkemaskini);
} }
@@ -321,7 +325,7 @@ class LelongController extends Controller
'jeniskarat', 'jeniskarat',
'data', 'data',
'total_bakiupah', 'total_bakiupah',
'total_nilaimarhun')); 'total_nilaimarhun','tarikhkemaskini'));
} }
public function create($id) public function create($id)
@@ -3568,6 +3572,8 @@ class LelongController extends Controller
$data = Lelong::where('lelong.id','=',$lelong_id) $data = Lelong::where('lelong.id','=',$lelong_id)
->get(); ->get();
$tarikhkemaskini = LelKarat::where('lelong_id','=',$id)
->where('karat','=',"22.0K")->first();
} }
@@ -3598,7 +3604,7 @@ class LelongController extends Controller
'jeniskarat', 'jeniskarat',
'data', 'data',
'total_bakiupah', 'total_bakiupah',
'total_nilaimarhun')); 'total_nilaimarhun','tarikhkemaskini'));
} }
public function senaraimarhunkhas($lelongid, $cawid){ public function senaraimarhunkhas($lelongid, $cawid){
@@ -4526,6 +4532,8 @@ class LelongController extends Controller
$data = Lelong::where('lelong.id','=',$lelong_id) $data = Lelong::where('lelong.id','=',$lelong_id)
->get(); ->get();
$tarikhkemaskini = LelKarat::where('lelong_id','=',$id)
->where('karat','=',"22.0K")->first();
} }
@@ -4556,7 +4564,7 @@ class LelongController extends Controller
'jeniskarat', 'jeniskarat',
'data', 'data',
'total_bakiupah', 'total_bakiupah',
'total_nilaimarhun')); 'total_nilaimarhun','tarikhkemaskini'));
} }
resources/views/lelong/showlelong.blade.php
+13 -1
View File
@@ -43,6 +43,8 @@
@foreach($data as $data1) @foreach($data as $data1)
<td>Tarikh Lelong : <td>Tarikh Lelong :
@php @php
$today = date('d-m-Y');
$kemaskini = date('d-m-Y', strtotime($tarikhkemaskini->updated_at));
$myDateTime = DateTime::createFromFormat('Y-m-d', $data1['tarikh_lelong'] ); $myDateTime = DateTime::createFromFormat('Y-m-d', $data1['tarikh_lelong'] );
$datez = $myDateTime->format('d-m-Y'); $datez = $myDateTime->format('d-m-Y');
echo($datez); echo($datez);
@@ -56,6 +58,16 @@
<div class="col-md-2"></div> <div class="col-md-2"></div>
<div class="col-md-5"> <div class="col-md-5">
<table class="table table-striped table-xl" id="conclusion2" style="width:100%"> <table class="table table-striped table-xl" id="conclusion2" style="width:100%">
<td>
{{-- {{dd($kemaskini)}} --}}
@if($kemaskini == $today)
<button class="btn btn-success btn-sm" disabled>Telah Dikemaskini Pada {{date('d-m-Y', strtotime($tarikhkemaskini->updated_at))}}</button> <br>
Harga Emas Per Gram (916) : RM{{$tarikhkemaskini->harga2}} /gm
@else
<button class="btn btn-danger btn-sm" disabled>Harga Emas Lelong Belum Dikemaskini Hari Ini</button> <br>
Harga Emas Per Gram (916) : RM{{$tarikhkemaskini->harga2}} /gm
@endif
</td>
<tr> <tr>
<td>Rugi Lelong Keseluruhan : -RM{{ number_format($total_rugilelong, 2, '.', ',') }}</td> <td>Rugi Lelong Keseluruhan : -RM{{ number_format($total_rugilelong, 2, '.', ',') }}</td>
</tr> </tr>
@@ -171,7 +183,7 @@
<button class="btn btn-primary float-right " onclick="kemaskini()" id="btnkemaskini" >Kemaskini</button> <button class="btn btn-primary float-right " onclick="kemaskini()" id="btnkemaskini" >Kemaskini</button>
<div id="hideform"> <div id="hideform">
<label for="hargaasas" class="d-inline float-left pr-2 pl-2 pt-2" id="lblhargaasas">Harga Emas Asas</label> <label for="hargaasas" class="d-inline float-left pr-2 pl-2 pt-2" id="lblhargaasas">Harga Emas Per Gram (916)</label>
<input type="text" class="form-control col-md-4 d-inline float-left" id="txthargaasas" name="hargaasas" placeholder="RM" data-jeniskarat="{{$jeniskarat}}" oninput="calculate(this)"> <input type="text" class="form-control col-md-4 d-inline float-left" id="txthargaasas" name="hargaasas" placeholder="RM" data-jeniskarat="{{$jeniskarat}}" oninput="calculate(this)">
<button class="btn btn-success float-right" onclick="save()" id="btnsimpan">Simpan</button> <button class="btn btn-success float-right" onclick="save()" id="btnsimpan">Simpan</button>
<button class="btn btn-danger float-right" onclick="kemaskini()" id="btncancel">Cancel</button> <button class="btn btn-danger float-right" onclick="kemaskini()" id="btncancel">Cancel</button>
resources/views/lelong/showlelongpc.blade.php
+12
View File
@@ -43,6 +43,8 @@
@foreach($data as $data1) @foreach($data as $data1)
<td>Tarikh Lelong : <td>Tarikh Lelong :
@php @php
$today = date('d-m-Y');
$kemaskini = date('d-m-Y', strtotime($tarikhkemaskini->updated_at));
$myDateTime = DateTime::createFromFormat('Y-m-d', $data1['tarikh_lelong'] ); $myDateTime = DateTime::createFromFormat('Y-m-d', $data1['tarikh_lelong'] );
$datez = $myDateTime->format('d-m-Y'); $datez = $myDateTime->format('d-m-Y');
echo($datez); echo($datez);
@@ -56,6 +58,16 @@
<div class="col-md-2"></div> <div class="col-md-2"></div>
<div class="col-md-5"> <div class="col-md-5">
<table class="table table-striped table-xl" id="conclusion2" style="width:100%"> <table class="table table-striped table-xl" id="conclusion2" style="width:100%">
<td>
{{-- {{dd($kemaskini)}} --}}
@if($kemaskini == $today)
<button class="btn btn-success btn-sm" disabled>Telah Dikemaskini Pada {{date('d-m-Y', strtotime($tarikhkemaskini->updated_at))}}</button> <br>
Harga Emas Per Gram (916) : RM{{$tarikhkemaskini->harga2}} /gm
@else
<button class="btn btn-danger btn-sm" disabled>Harga Emas Lelong Belum Dikemaskini Hari Ini</button> <br>
Harga Emas Per Gram (916) : RM{{$tarikhkemaskini->harga2}} /gm
@endif
</td>
<tr> <tr>
<td>Rugi Lelong Keseluruhan : -RM{{ number_format($total_rugilelong, 2, '.', ',') }}</td> <td>Rugi Lelong Keseluruhan : -RM{{ number_format($total_rugilelong, 2, '.', ',') }}</td>
</tr> </tr>
resources/views/lelongkhas/showlelongkhas.blade.php
+12
View File
@@ -43,6 +43,8 @@
@foreach($data as $data1) @foreach($data as $data1)
<td>Tarikh Lelong : <td>Tarikh Lelong :
@php @php
$today = date('d-m-Y');
$kemaskini = date('d-m-Y', strtotime($tarikhkemaskini->updated_at));
$myDateTime = DateTime::createFromFormat('Y-m-d', $data1['tarikh_lelong'] ); $myDateTime = DateTime::createFromFormat('Y-m-d', $data1['tarikh_lelong'] );
$datez = $myDateTime->format('d-m-Y'); $datez = $myDateTime->format('d-m-Y');
echo($datez); echo($datez);
@@ -56,6 +58,16 @@
<div class="col-md-2"></div> <div class="col-md-2"></div>
<div class="col-md-5"> <div class="col-md-5">
<table class="table table-striped table-xl" id="conclusion2" style="width:100%"> <table class="table table-striped table-xl" id="conclusion2" style="width:100%">
<td>
{{-- {{dd($kemaskini)}} --}}
@if($kemaskini == $today)
<button class="btn btn-success btn-sm" disabled>Telah Dikemaskini Pada {{date('d-m-Y', strtotime($tarikhkemaskini->updated_at))}}</button> <br>
Harga Emas Per Gram (916) : RM{{$tarikhkemaskini->harga2}} /gm
@else
<button class="btn btn-danger btn-sm" disabled>Harga Emas Lelong Belum Dikemaskini Hari Ini</button> <br>
Harga Emas Per Gram (916) : RM{{$tarikhkemaskini->harga2}} /gm
@endif
</td>
<tr> <tr>
<td>Rugi Lelong Keseluruhan : -RM{{ number_format($total_rugilelong, 2, '.', ',') }}</td> <td>Rugi Lelong Keseluruhan : -RM{{ number_format($total_rugilelong, 2, '.', ',') }}</td>
</tr> </tr>