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

Fix forecast and header (SERVER)

Browse Source
This commit is contained in:
root
2023-09-04 15:42:00 +08:00
parent e2321b9bd5
commit 100d5b668a
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/ReportController.php
+1 -1
View File
@@ -1295,7 +1295,7 @@ class ReportController extends Controller
{
$user = Auth::user();
$lelong_id_latest_updated_lelkarat = LelKarat::orderBy('updated_at', 'desc')->select('lelong_id')->first();
$lelong_id_latest_updated_lelkarat = LelKarat::orderBy('updated_at', 'desc')->where('harga2', '!=', '0.00')->where('karat', '22.0K')->select('lelong_id')->first();
$lel_karat_all = LelKarat::where('lelong_id', $lelong_id_latest_updated_lelkarat->lelong_id)->select('lelong_id', 'karat', 'harga2', 'updated_at')->get();
$lelong = Lelong::find($lelong_id_latest_updated_lelkarat->lelong_id, ['id', 'cajlelong', 'tarikh_lelong']);
resources/views/includes/header.blade.php
+3 -3
View File
@@ -18,7 +18,7 @@
<div class="dropdown-menu custom-dropdown" id="custom-dropdown">
<span class="dropdown-item">Queue Job</span>
<div class="dropdown-divider"></div>
<div id="child-dropdown"></div>
<div id="child-dropdown" style="overflow-y: auto; max-height: 450px;"></div>
</div>
<button class="btn btn-dark d-inline-block d-lg-none ml-auto" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
<i class="fas fa-align-justify"></i>
@@ -74,12 +74,12 @@
if (data.user_kodcaw == null) {
var $newDiv = $("<div/>")
.addClass("detail dropdown-item")
.html("<div>" + data.command_name.slice(9) + "<br><span style='text-transform: uppercase;'>" + data.user_name.substring(0, 10) + "</span> </div>");
.html("<div>" + data.command_name.slice(9) + "<br><span style='text-transform: uppercase;'>" + data.user_name.substring(0, 10) + "</span> </div><hr>");
$("#child-dropdown").append($newDiv);
} else {
var $newDiv = $("<div/>")
.addClass("detail dropdown-item")
.html("<div>" + data.command_name.slice(9) + "<br><span style='text-transform: uppercase;'>" + data.user_name.substring(0, 10) + " (" + data.user_kodcaw + ")</span> </div>");
.html("<div>" + data.command_name.slice(9) + "<br><span style='text-transform: uppercase;'>" + data.user_name.substring(0, 10) + " (" + data.user_kodcaw + ")</span> </div><hr>");
$("#child-dropdown").append($newDiv);
}
}