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

Merge branch 'atie' into 'main'

Browse Source 
add tt khazanah dalam laporan keluar masuk marhun

See merge request online-sistem1/lelong!242
This commit is contained in:
Nur Izzati Zulkifli
2022-10-19 09:07:46 +00:00
parent 7691745c95 752cfefeac
commit dbe69a6d0b
6 changed files with 187 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/MarhunController.php
+32 -3
View File
@@ -2,6 +2,7 @@
namespace App\Http\Controllers;
use Illuminate\Support\Facades\Http;
use Illuminate\Http\Request;
use Spatie\Permission\Models\Role;
use Spatie\Permission\Models\Permission;
@@ -1718,8 +1719,23 @@ class MarhunController extends Controller
->orderBy('id', 'desc')
->get();
// return view('pdf.cetakkeluarscanbarcode', compact('lelong_id', 'lelongDetail', 'lelongbid', 'senaraiScanKeluar', 'senaraiScanMasuk','caw'));
$pdf = PDF::loadView('pdf.cetakkeluarscanbarcode',compact('caw','lelong_id', 'lelongDetail', 'lelongbid', 'senaraiScanKeluar', 'senaraiScanMasuk'
//get staf cwgn roles harian
$roles_harian_penilai = Http::get('http://zone1.arrahn/api/roles_harian/' . $user->kodcaw ,[
'role_harian' => 'penilai'
])->json();
$roles_harian_khazanah = Http::get('http://zone1.arrahn/api/roles_harian/' . $user->kodcaw ,[
'role_harian' => 'khazanah'
])->json();
$roles_harian_pc = Http::get('http://zone1.arrahn/api/roles_harian/' . $user->kodcaw ,[
'role_harian' => 'pc'
])->json();
// dd($roles_harian_penilai);
// return view('pdf.cetakkeluarscanbarcode', compact('caw','lelong_id', 'lelongDetail', 'lelongbid', 'senaraiScanKeluar', 'senaraiScanMasuk','roles_harian_penilai','roles_harian_khazanah','roles_harian_pc'));
$pdf = PDF::loadView('pdf.cetakkeluarscanbarcode',compact('caw','lelong_id', 'lelongDetail', 'lelongbid', 'senaraiScanKeluar', 'senaraiScanMasuk','roles_harian_penilai','roles_harian_khazanah','roles_harian_pc'
))->setPaper('a4', 'potrait');
return $pdf->download('Senarai Keluar Peti Besi.pdf');
@@ -1746,9 +1762,22 @@ class MarhunController extends Controller
->whereNotNull('scan_masuk')
->orderBy('id', 'desc')
->get();
$roles_harian_penilai = Http::get('http://zone1.arrahn/api/roles_harian/' . $user->kodcaw ,[
'role_harian' => 'penilai'
])->json();
$roles_harian_khazanah = Http::get('http://zone1.arrahn/api/roles_harian/' . $user->kodcaw ,[
'role_harian' => 'khazanah'
])->json();
$roles_harian_pc = Http::get('http://zone1.arrahn/api/roles_harian/' . $user->kodcaw ,[
'role_harian' => 'pc'
])->json();
// return view('pdf.cetakmasukscanbarcode', compact('lelong_id', 'lelongDetail', 'lelongbid', 'senaraiScanKeluar', 'senaraiScanMasuk','caw'));
$pdf = PDF::loadView('pdf.cetakmasukscanbarcode',compact('caw','lelong_id', 'lelongDetail', 'lelongbid', 'senaraiScanKeluar', 'senaraiScanMasuk'
$pdf = PDF::loadView('pdf.cetakmasukscanbarcode',compact('caw','lelong_id', 'lelongDetail', 'lelongbid', 'senaraiScanKeluar', 'senaraiScanMasuk','roles_harian_penilai','roles_harian_khazanah','roles_harian_pc'
))->setPaper('a4', 'potrait');
return $pdf->download('Senarai Masuk Peti Besi.pdf');
resources/views/lelong/showlelong.blade.php
+3 -3
View File
@@ -62,10 +62,10 @@
{{-- {{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
Harga Emas Per Gram (916) : RM{{$tarikhkemaskini->harga2}}
@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
Harga Emas Per Gram (916) : RM{{$tarikhkemaskini->harga2}}
@endif
</td>
<tr>
@@ -163,7 +163,7 @@
<td>{{$total18K}}</td>
<td>{{$total14Kp}}</td>
<td>{{$total14K}}</td>
<td>{{$total9K}}</td>
{{-- <td>{{$total9K}}</td> --}}
</tr>
</tbody>
resources/views/lelong/showlelongpc.blade.php
+2 -2
View File
@@ -62,10 +62,10 @@
{{-- {{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
Harga Emas Per Gram (916) : RM{{$tarikhkemaskini->harga2}}
@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
Harga Emas Per Gram (916) : RM{{$tarikhkemaskini->harga2}}
@endif
</td>
<tr>
resources/views/lelongkhas/showlelongkhas.blade.php
+2 -2
View File
@@ -62,10 +62,10 @@
{{-- {{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
Harga Emas Per Gram (916) : RM{{$tarikhkemaskini->harga2}}
@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
Harga Emas Per Gram (916) : RM{{$tarikhkemaskini->harga2}}
@endif
</td>
<tr>
resources/views/pdf/cetakkeluarscanbarcode.blade.php
+66 -38
View File
@@ -12,10 +12,13 @@
border: 0px solid;
padding: 1px;
text-align: left;
vertical-align = 'top';
}
#sim tr:nth-child(even){}
#sim tr:nth-child(even){
vertical-align = 'top';
}
#sim tr:hover {}
@@ -27,51 +30,50 @@
font-family: "Trebuchet MS", Arial, Helvetica, sans-serif;
}
* {
box-sizing: border-box;
}
.row {
margin-left:-5px;
margin-right:-5px;
}
.column {
float: left;
width: 100%;
padding: 5px;
}
/* Clearfix (clear floats) */
.row::after {
content: "";
clear: both;
display: table;
}
table {
border-collapse: collapse;
border-spacing: 0;
width: 200%;
/* border: 0px solid #ddd; */
}
th, td {
text-align: left;
padding: 16px;
}
tr:nth-child(even) {
/* background-color: #f2f2f2; */
}
</style>
<style>
/** Define the margins of your page **/
<body>
.divfooter {
position: fixed;
bottom: 60px;
left: 0px;
right: 0px;
/* height: 100px; */
font-size: 20px !important;
/** Extra personal styles **/
/* background-color: #008B8B; */
/* color: white; */
text-align: center;
/* line-height: 35px; */
}
.footertable{
font-family: "Trebuchet MS", Arial, Helvetica, sans-serif;
font-size:10px !important;
width: 100%;
/* height: 5px !important; */
}
.footertable td{
vertical-align: top !important;
/* height: 5px !important; */
}
.footertable tr{
height: 5px !important;
}
</style>
<body>
<header>
<table width="100%" border="0" id="sim">
<tr>
<td width="50%"><h3>PERMODALAN KELANTAN BERHAD</h3></td>
<td width="50%"><header><h3>PERMODALAN KELANTAN BERHAD</h3></header></td>
</tr>
<tr>
@@ -86,6 +88,7 @@ tr:nth-child(even) {
</table>
<br>
<div style="margin-top:20px">
<table cellspacing="0" cellpadding="5" style="float:right;" border="0" width="100%" height="80" align="left" id="sim">
<thead>
<tr>
@@ -106,7 +109,32 @@ tr:nth-child(even) {
</tr>
@endforeach
</tbody>
</table>
</table>
</div>
<div style="margin-top:-10px; font-size:10px;" class = "divfooter">
<table border="0" width="100%" align="left" class = "footertable">
<tr style="height:10px">
<td>Penilai</td>
<td>:</td>
<td>........................................</td>
<td>Khazanah</td>
<td>:</td>
<td>........................................</td>
</tr>
<tr>
<td></td>
<td></td>
<td>{{ $roles_harian_penilai[0]['name'] }}</td>
<td></td>
<td></td>
<td>{{ $roles_harian_khazanah[0]['name'] }}</td>
</tr>
</table>
</div>
resources/views/pdf/cetakmasukscanbarcode.blade.php
+82 -61
View File
@@ -1,70 +1,69 @@
<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
<style>
#sim {
font-family: "Trebuchet MS", Arial, Helvetica, sans-serif;
font-size:10px;
/* border-collapse: collapse; */
width: 100%;
}
#sim td {padding:3px 5px 3px 5px; padding-right:10px;}, #sim th {
border: 0px solid;
padding: 1px;
text-align: left;
}
#sim tr:nth-child(even){}
#sim tr:hover {}
#sim th {
text-align: left;
border: 0px solid;
table-layout:auto;
color: black;
font-family: "Trebuchet MS", Arial, Helvetica, sans-serif;
}
* {
box-sizing: border-box;
}
.row {
margin-left:-5px;
margin-right:-5px;
}
#sim {
font-family: "Trebuchet MS", Arial, Helvetica, sans-serif;
font-size:10px;
/* border-collapse: collapse; */
width: 100%;
}
.column {
float: left;
width: 100%;
padding: 5px;
}
#sim td {padding:3px 5px 3px 5px; padding-right:10px;}, #sim th {
border: 0px solid;
padding: 1px;
text-align: left;
vertical-align = 'top';
}
#sim tr:nth-child(even){
vertical-align = 'top';
}
#sim tr:hover {}
#sim th {
text-align: left;
border: 0px solid;
table-layout:auto;
color: black;
font-family: "Trebuchet MS", Arial, Helvetica, sans-serif;
}
</style>
<style>
.divfooter {
position: fixed;
bottom: 60px;
left: 0px;
right: 0px;
/* height: 100px; */
font-size: 20px !important;
/* Clearfix (clear floats) */
.row::after {
content: "";
clear: both;
display: table;
}
table {
border-collapse: collapse;
border-spacing: 0;
width: 200%;
/* border: 0px solid #ddd; */
}
th, td {
text-align: left;
padding: 16px;
}
tr:nth-child(even) {
/* background-color: #f2f2f2; */
}
/** Extra personal styles **/
/* background-color: #008B8B; */
/* color: white; */
text-align: center;
/* line-height: 35px; */
}
.footertable{
font-family: "Trebuchet MS", Arial, Helvetica, sans-serif;
font-size:10px !important;
width: 100%;
/* height: 5px !important; */
}
.footertable td{
vertical-align: top !important;
/* height: 5px !important; */
}
.footertable tr{
height: 5px !important;
}
</style>
<body>
@@ -113,6 +112,28 @@ tr:nth-child(even) {
@endforeach
</tbody>
</table>
<div style="margin-top:-10px; font-size:10px;" class = "divfooter">
<table border="0" width="100%" align="left" class = "footertable">
<tr style="height:10px">
<td>Penilai</td>
<td>:</td>
<td>........................................</td>
<td>Khazanah</td>
<td>:</td>
<td>........................................</td>
</tr>
<tr>
<td></td>
<td></td>
<td>{{ $roles_harian_penilai[0]['name'] }}</td>
<td></td>
<td></td>
<td>{{ $roles_harian_khazanah[0]['name'] }}</td>
</tr>
</table>
</div>